Update Buildroot to 2025.02 (#4027)

* Update Buildroot base to v2025.02

Packages updated:

* Added host-blake3 1.5.4
* Added host-go-src
* Added host-libxcrypt 4.4.38
* Added host-tar 1.35
* Added host-xxhash 0.8.3
* Added libtalloc 2.4.2
* Added libxcrypt 4.4.38
* apparmor updated from 3.1.2 to 3.1.7
* busybox updated from 1.36.1 to 1.37.0
* cifs-utils updated from 6.15 to 7.1
* containerd updated from 1.7.26 to 2.0.2
* dbus-broker updated from 35 to 36
* dropbear updated from 2024.85 to 2024.86
* e2fsprogs updated from 1.47.0 to 1.47.2
* expat updated from 2.6.4 to 2.7.0
* gcc-final updated from 12.4.0 to 13.3.0
* glibc updated from 2.38-81-gc8cb4d2b86ece572793e31a3422ea29e88d77df5 to 2.41-5-gcb7f20653724029be89224ed3a35d627cc5b4163
* gptfdisk updated from 1.0.9 to 1.0.10
* host-binutils updated from 2.40 to 2.43.1
* host-ccache updated from 4.8.2 to 4.10.2
* host-cmake updated from 3.28.3 to 3.31.5
* host-dtc updated from 1.7.0 to 1.7.2
* host-e2fsprogs updated from 1.47.0 to 1.47.2
* host-elfutils updated from 0.189 to 0.192
* host-expat updated from 2.6.4 to 2.7.0
* host-fakeroot updated from 1.32.1 to 1.36
* host-gawk updated from 5.3.0 to 5.3.1
* host-gcc-final updated from 12.4.0 to 13.3.0
* host-gcc-initial updated from 12.4.0 to 13.3.0
* host-genimage updated from 17 to 18
* host-go updated from 1.22.12 to unknown
* host-gptfdisk updated from 1.0.9 to 1.0.10
* host-kmod updated from 31 to 33
* host-libcap updated from 2.69 to 2.73
* host-libffi updated from 3.4.4 to 3.4.6
* host-libglib2 updated from 2.76.1 to 2.82.5
* host-libopenssl updated from 3.2.4 to 3.4.1
* host-libtirpc updated from 1.3.4 to 1.3.6
* host-libxml2 updated from 2.12.9 to 2.13.6
* host-lz4 updated from 1.9.4 to 1.10.0
* host-lzip updated from 1.23 to 1.25
* host-meson updated from 1.3.1 to 1.7.0
* host-mpc updated from 1.2.1 to 1.3.1
* host-mtools updated from 4.0.43 to 4.0.47
* host-nfs-utils updated from 2.6.4 to 2.8.2
* host-pcre2 updated from 10.42 to 10.44
* host-pkgconf updated from 1.6.3 to 2.3.0
* host-python3 updated from 3.11.11 to 3.12.9
* host-python-flit-core updated from 3.9.0 to 3.10.1
* host-python-jinja2 updated from 3.1.2 to 3.1.5
* host-python-markupsafe updated from 2.1.3 to 3.0.2
* host-python-packaging updated from 23.2 to 24.2
* host-python-pypa-build updated from 1.0.3 to 1.2.2
* host-python-pyproject-hooks updated from 1.0.0 to 1.2.0
* host-python-setuptools updated from 69.0.3 to 75.8.0
* host-python-wheel updated from 0.40.0 to 0.45.1
* host-rauc updated from 1.11.3 to 1.13
* host-sqlite updated from 3.44.2 to 3.48.0
* host-systemd updated from 254.13 to 256.7
* host-util-linux updated from 2.39.3 to 2.40.2
* host-xz updated from 5.4.5 to 5.6.4
* host-zstd updated from 1.5.5 to 1.5.7
* iproute2 updated from 6.7.0 to 6.13.0
* iptables updated from 1.8.9 to 1.8.11
* json-c updated from 0.17 to 0.18
* kmod updated from 31 to 33
* libapparmor updated from 3.1.2 to 3.1.7
* libblockdev updated from 3.1.1 to 3.3.0
* libbytesize updated from 2.7 to 2.10
* libcap-ng updated from 0.8.4 to 0.8.5
* libcap updated from 2.69 to 2.73
* libdnet updated from 1.16.4 to 1.18.0
* libffi updated from 3.4.4 to 3.4.6
* libglib2 updated from 2.76.1 to 2.82.5
* libgudev updated from 237 to 238
* libmicrohttpd updated from 0.9.77 to 1.0.1
* libnftnl updated from 1.2.6 to 1.2.7
* libnl updated from 3.9.0 to 3.11.0
* libnvme updated from 1.7.1 to 1.11.1
* libopenssl updated from 3.2.4 to 3.4.1
* libtirpc updated from 1.3.4 to 1.3.6
* libunistring updated from 1.1 to 1.3
* libusb updated from 1.0.26 to 1.0.27
* lvm2 updated from 2.03.14 to 2.03.27
* nettle updated from 3.9.1 to 3.10.1
* network-manager updated from 1.44.2 to 1.50.2
* nfs-utils updated from 2.6.4 to 2.8.2
* pcre2 updated from 10.42 to 10.44
* procps-ng updated from 4.0.4 to 4.0.5
* rauc updated from 1.11.3 to 1.13
* rpcbind updated from 1.2.6 to 1.2.7
* rtl8821cu updated from 1597dfeda6cefd2e603fc7020ceca226d05fb108 to 96c65c58b544241178638e810b333dcc9aa26b91
* sqlite updated from 3.44.2 to 3.48.0
* systemd updated from 254.13 to 256.7
* util-linux-libs updated from 2.39.3 to 2.40.2
* util-linux updated from 2.39.3 to 2.40.2
* wireless-regdb updated from 2023.09.01 to 2024.10.07
* wpa_supplicant updated from 2.10 to 2.11

* patches/genimage: drop upstreamed patches

* patches/systemd: drop merged patch

* patches/network-manager: drop upstreamed patch

* Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_* to defconfigs

.github/actions/bump-rpi-imager-version/action.yml

@@ -83,6 +83,7 @@ runs:
         bump_entry /tmp/version/rpi-imager-haos.json "$INPUTS_VERSION" "${{ steps.validate-input.outputs.date }}" "rpi3-64" "RPi 3"
         bump_entry /tmp/version/rpi-imager-haos.json "$INPUTS_VERSION" "${{ steps.validate-input.outputs.date }}" "rpi4-64" "RPi 4/400"
         bump_entry /tmp/version/rpi-imager-haos.json "$INPUTS_VERSION" "${{ steps.validate-input.outputs.date }}" "rpi5-64" "RPi 5"
+        bump_entry /tmp/version/rpi-imager-haos.json "$INPUTS_VERSION" "${{ steps.validate-input.outputs.date }}" "yellow" "Yellow"
 
     - shell: bash
       env:

.github/release-drafter.yml

@@ -4,8 +4,6 @@ version-template: "$MAJOR.$MINOR"
 categories:
   - title: 'Home Assistant Operating System'
     label: 'os'
-  - title: 'Build System'
-    label: 'build'
   - title: 'Raspberry Pi'
     label: 'board/raspberrypi'
   - title: 'Home Assistant Yellow'
@@ -24,6 +22,12 @@ categories:
     label: 'board/khadas'
   - title: 'Generic aarch64'
     label: 'board/generic-aarch64'
+  - title: 'Documentation'
+    label: 'documentation'
+  - title: 'Build System'
+    label: 'build'
+  - title: 'Dependencies'
+    label: 'dependencies'
 filter-by-commitish: true
 template: |
   ## Changes

.github/workflows/artifacts-index.yaml

@@ -31,7 +31,7 @@ on:
         required: true
 
 env:
-  PYTHON_VERSION: "3.10"
+  PYTHON_VERSION: "3.13"
 
 jobs:
   build-index:
@@ -49,7 +49,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Install AWS CLI
-        run: pip install awscli
+        run: pip install 'awscli<1.37.0'
 
       - name: Create build index
         env:
@@ -83,11 +83,20 @@ jobs:
 
       - name: Flush CloudFlare cache
         run: |
-          curl --silent --show-error --fail -X POST \
-            "https://api.cloudflare.com/client/v4/zones/${{ secrets.CF_ZONE }}/purge_cache" \
-            -H "Authorization: Bearer ${{ secrets.CF_PURGE_TOKEN }}" \
-            -H "Content-Type: application/json" \
-            --data '{"files": [
-              "https://os-artifacts.home-assistant.io/index.html",
-              "https://os-artifacts.home-assistant.io/index.json"
-            ] }'
+          # Create purge list of all artifacts
+          jq -r '. | map("https://os-artifacts.home-assistant.io/${{ inputs.version }}/" + .) | join("\n")' < "${{ inputs.version }}.json" > purge_list
+          # Add indexes to purge list too
+          echo "https://os-artifacts.home-assistant.io/indexes/${{ inputs.version }}.json" >> purge_list
+          echo "https://os-artifacts.home-assistant.io/index.html" >> purge_list
+          echo "https://os-artifacts.home-assistant.io/index.json" >> purge_list
+          # Split to chunks of 30 files (limit of CF API)
+          split -d -l30 purge_list purge_list_chunked
+          # Convert chunked lists to JSON arrays and call CF purge API
+          for f in purge_list_chunked*; do
+            files=$(jq -R -s 'split("\n")[:-1]' < "$f")
+            curl --silent --show-error --fail -X POST \
+              "https://api.cloudflare.com/client/v4/zones/${{ secrets.CF_ZONE }}/purge_cache" \
+              -H "Authorization: Bearer ${{ secrets.CF_PURGE_TOKEN }}" \
+              -H "Content-Type: application/json" \
+              --data "{\"files\": ${files}}"
+          done

.github/workflows/build.yaml

@@ -18,7 +18,7 @@ on:
         default: true
 
 env:
-  PYTHON_VERSION: "3.10"
+  PYTHON_VERSION: "3.13"
 
 jobs:
   prepare:
@@ -136,15 +136,15 @@ jobs:
             }
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.3.0
+        uses: docker/setup-buildx-action@v3.10.0
       - name: Log in to the GitHub container registry
-        uses: docker/login-action@v3.2.0
+        uses: docker/login-action@v3.4.0
         with:
             registry: ghcr.io
             username: ${{ github.repository_owner }}
             password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and Push
-        uses: docker/build-push-action@v5.4.0
+        uses: docker/build-push-action@v6.15.0
         id: build_haos_builder
         with:
           context: .
@@ -199,7 +199,7 @@ jobs:
 
       - name: Install AWS CLI
         if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build == 'true' }}
-        run: pip install awscli
+        run: pip install 'awscli<1.37.0'
 
       - name: Set version suffix
         if: ${{ github.event_name != 'release' }}
@@ -316,7 +316,7 @@ jobs:
           echo "## Partitions" >> $GITHUB_STEP_SUMMARY
           echo "| File | Size (bytes) | Size (formatted) |" >> $GITHUB_STEP_SUMMARY
           echo "|:-|:-|:-|" >> $GITHUB_STEP_SUMMARY
-          for f in boot.vfat kernel.img rootfs.squashfs overlay.ext4 data.ext4; do
+          for f in boot.vfat kernel.img rootfs.erofs overlay.ext4 data.ext4; do
             echo "| ${f} | $(du -b output/images/$f | cut -f1) | $(du -bh output/images/$f | cut -f1) |" >> $GITHUB_STEP_SUMMARY
           done
 

.github/workflows/lock.yml

@@ -0,0 +1,25 @@
+name: Lock
+
+on:
+  schedule:
+    - cron: "45 5 * * *"
+
+permissions:
+  discussions: write
+  issues: write
+  pull-requests: write
+
+jobs:
+  lock:
+    if: github.repository_owner == 'home-assistant'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v5.0.1
+        with:
+          github-token: ${{ github.token }}
+          issue-inactive-days: "30"
+          exclude-issue-created-before: "2025-01-01T00:00:00Z"
+          issue-lock-reason: ""
+          pr-inactive-days: "7"
+          exclude-pr-created-before: "2025-01-01T00:00:00Z"
+          pr-lock-reason: ""

.github/workflows/stale.yml

@@ -19,7 +19,7 @@ jobs:
       # - No PRs marked as no-stale or pinned
       # - No issues marked as no-stale, help-wanted or pinned
       - name: 90 days stale issues & PRs policy
-        uses: actions/stale@v9.0.0
+        uses: actions/stale@v9.1.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 90

.github/workflows/test.yaml

@@ -74,7 +74,7 @@ jobs:
 
       - name: Run tests
         run: |
-          ./tests/run_tests.sh
+          ./tests/run_tests.sh --durations=0 --durations-min=5.0
 
       - name: Archive logs
         uses: actions/upload-artifact@v4
@@ -93,7 +93,7 @@ jobs:
             tests/junit_reports/*.xml
 
       - name: Publish test report
-        uses: mikepenz/action-junit-report@v4
+        uses: mikepenz/action-junit-report@v5
         if: always()
         with:
           report_paths: 'tests/junit_reports/*.xml'

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "buildroot"]
 	path = buildroot
 	url = https://github.com/home-assistant/buildroot.git
-	branch = 2022.02.x-haos
+	branch = 2024.02.x-haos

Dockerfile

@@ -21,6 +21,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 # Build tools
 RUN apt-get update && apt-get install -y --no-install-recommends \
+	automake \
         bash \
         bc \
         binutils \
@@ -30,6 +31,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         file \
         git \
         graphviz \
+	help2man \
         jq \
         make \
         ncurses-dev \
@@ -43,6 +45,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         rsync \
         skopeo \
         sudo \
+	texinfo \
         unzip \
         vim \
         wget \

Documentation/boards/hardkernel/odroid-m1s.md

@@ -10,8 +10,8 @@ ODROID-M1S can boot HAOS directly from an SD card, as it has higher priority tha
 
 HAOS can be installed directly to the eMMC using a special boot image, to do that:
 
-1. Download [`ODROID-M1S_EMMC2UMS.img`][1]
-2. Use balenaEtcher or another tool to flash the UMS utility onto an SD card.
+1. Download the _UMS Utility_ image: [`ODROID-M1S_EMMC2UMS.img`][1]. The _UMS Utility_ is a special image that switches ODROID-M1S to USB Mass Storage device.
+2. Use balenaEtcher or another tool to flash the _UMS utility_ onto an SD card.
 3. Plug-in that SD card to your ODROID-M1S and boot it. Connect your PC to the Micro USB OTG port.
 4. The eMMC will show as a drive on your PC and you can directly flash the HAOS image with balenaEther.
 

Documentation/kernel.md

@@ -1,26 +1,24 @@
 
 # Kernel Version
 
-Default Kernel tree: 6.1
-
 | Board | Version |
 |-------|---------|
-| Open Virtual Appliance | 6.6.33 |
-| Raspberry Pi | 6.6.31 |
-| Raspberry Pi 0-W | 6.6.31 |
-| Raspberry Pi 2 | 6.6.31 |
-| Raspberry Pi 3 | 6.6.31 |
-| Raspberry Pi 4 | 6.6.31 |
-| Raspberry Pi 5 | 6.6.31 |
-| Home Assistant Yellow | 6.6.31 |
-| Home Assistant Green | 6.6.33 |
-| Tinker Board | 6.6.33 |
-| ODROID-C2 | 6.6.33 |
-| ODROID-C4 | 6.6.33 |
-| ODROID-M1 | 6.6.33 |
-| ODROID-M1S | 6.6.33 |
-| ODROID-N2 | 6.6.33 |
-| ODROID-XU4 | 6.6.33 |
-| Generic aarch64 | 6.6.33 |
-| Generic x86-64 | 6.6.33 |
-| Khadas VIM3 | 6.6.33 |
+| Open Virtual Appliance | 6.12.23 |
+| Raspberry Pi | 6.6.74 |
+| Raspberry Pi 0-W | 6.6.74 |
+| Raspberry Pi 2 | 6.6.74 |
+| Raspberry Pi 3 | 6.6.74 |
+| Raspberry Pi 4 | 6.6.74 |
+| Raspberry Pi 5 | 6.6.74 |
+| Home Assistant Yellow | 6.6.74 |
+| Home Assistant Green | 6.12.23 |
+| Tinker Board | 6.12.23 |
+| ODROID-C2 | 6.12.23 |
+| ODROID-C4 | 6.12.23 |
+| ODROID-M1 | 6.12.23 |
+| ODROID-M1S | 6.12.23 |
+| ODROID-N2 | 6.12.23 |
+| ODROID-XU4 | 6.12.23 |
+| Generic aarch64 | 6.12.23 |
+| Generic x86-64 | 6.12.23 |
+| Khadas VIM3 | 6.12.23 |

README.md

@@ -4,6 +4,8 @@ Home Assistant Operating System (formerly HassOS) is a Linux based operating sys
 
 Home Assistant Operating System uses Docker as its container engine. By default it deploys the Home Assistant Supervisor as a container. Home Assistant Supervisor in turn uses the Docker container engine to control Home Assistant Core and Add-Ons in separate containers. Home Assistant Operating System is **not** based on a regular Linux distribution like Ubuntu. It is built using [Buildroot](https://buildroot.org/) and it is optimized to run Home Assistant. It targets single board compute (SBC) devices like the Raspberry Pi or ODROID but also supports x86-64 systems with UEFI.
 
+[![Home Assistant - A project from the Open Home Foundation](https://www.openhomefoundation.org/badges/home-assistant.png)](https://www.openhomefoundation.org/)
+
 ## Features
 
 - Lightweight and memory-efficient
@@ -38,7 +40,7 @@ The Home Assistant Operating System documentation can be found on the [Home Assi
 ### Components
 
 - **Bootloader:**
-  - [Barebox](https://barebox.org/) for devices that support UEFI
+  - [GRUB](https://www.gnu.org/software/grub/) for devices that support UEFI
   - [U-Boot](https://www.denx.de/wiki/U-Boot) for devices that don't support UEFI
 - **Operating System:**
   - [Buildroot](https://buildroot.org/) LTS Linux

buildroot

@@ -1 +1 @@
-Subproject commit d03dda4fcfa0a701e07de1dcf9a0c035c12b609e
+Subproject commit ead21eb6d24055317b7281b1a8e7d1d6e809313b

buildroot-external/Config.in

@@ -2,6 +2,8 @@ source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-rtl8723/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/eq3_char_loop/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/gasket/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/generic_raw_uart/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/hailo8-firmware/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/hailo-pci/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/hardkernel-boot/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/hassio/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/khadas-boot/Config.in"

buildroot-external/board/arm-uefi/generic-aarch64/hassos-hook.sh

@@ -10,6 +10,9 @@ function hassos_pre_image() {
     cp "${BOARD_DIR}/grub.cfg" "${EFIPART_DATA}/EFI/BOOT/grub.cfg"
     cp "${BOARD_DIR}/cmdline.txt" "${EFIPART_DATA}/cmdline.txt"
     grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" create
+    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" set ORDER="A B"
+    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" set A_OK=1
+    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" set A_TRY=0
 
     cp -r "${EFIPART_DATA}/"* "${BOOT_DATA}/"
 }
@@ -24,4 +27,3 @@ function hassos_post_image() {
 
     convert_disk_image_xz
 }
-

buildroot-external/board/arm-uefi/generic-aarch64/kernel.config

@@ -55,3 +55,23 @@ CONFIG_HYPERV_VSOCKETS=m
 CONFIG_PCI_HYPERV=m
 CONFIG_PCI_HYPERV_INTERFACE=m
 CONFIG_FB_HYPERV=y
+
+CONFIG_I6300ESB_WDT=y
+
+# GPIO support
+CONFIG_GPIO_ZYNQ=y
+CONFIG_GPIO_PCA9570=y
+
+# PHY drivers
+CONFIG_PHY_XILINX_ZYNQMP=y
+
+# USB support
+CONFIG_USB_ONBOARD_DEV=y
+CONFIG_USB_ONBOARD_DEV_USB5744=y
+
+# i2c support
+CONFIG_I2C_CADENCE=y
+
+# 1-wire
+CONFIG_W1_MASTER_AMD_AXI=m
+CONFIG_W1_SLAVE_THERM=m

buildroot-external/board/arm-uefi/generic-aarch64/patches/linux/0001-r8169-add-support-for-RTL8125D.patch

@@ -0,0 +1,154 @@
+From f0fb974644a132ecc4bd2dc5cce9622435d0ec13 Mon Sep 17 00:00:00 2001
+From: Heiner Kallweit <hkallweit1@gmail.com>
+Date: Thu, 24 Oct 2024 22:42:33 +0200
+Subject: [PATCH] r8169: add support for RTL8125D
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This adds support for new chip version RTL8125D, which can be found on
+boards like Gigabyte X870E AORUS ELITE WIFI7. Firmware rtl8125d-1.fw
+for this chip version is available in linux-firmware already.
+
+Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
+Reviewed-by: Simon Horman <horms@kernel.org>
+Link: https://patch.msgid.link/d0306912-e88e-4c25-8b5d-545ae8834c0c@gmail.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f75d1fbe7809bc5ed134204b920fd9e2fc5db1df
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
+---
+ drivers/net/ethernet/realtek/r8169.h          |  1 +
+ drivers/net/ethernet/realtek/r8169_main.c     | 23 +++++++++++++------
+ .../net/ethernet/realtek/r8169_phy_config.c   | 10 ++++++++
+ 3 files changed, 27 insertions(+), 7 deletions(-)
+
+diff --git a/drivers/net/ethernet/realtek/r8169.h b/drivers/net/ethernet/realtek/r8169.h
+index e2db944e6fa8b..be4c9622618d8 100644
+--- a/drivers/net/ethernet/realtek/r8169.h
++++ b/drivers/net/ethernet/realtek/r8169.h
+@@ -68,6 +68,7 @@ enum mac_version {
+ 	/* support for RTL_GIGA_MAC_VER_60 has been removed */
+ 	RTL_GIGA_MAC_VER_61,
+ 	RTL_GIGA_MAC_VER_63,
++	RTL_GIGA_MAC_VER_64,
+ 	RTL_GIGA_MAC_VER_65,
+ 	RTL_GIGA_MAC_VER_66,
+ 	RTL_GIGA_MAC_NONE
+diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
+index 5ed2818bac257..1cbde7ebd6f30 100644
+--- a/drivers/net/ethernet/realtek/r8169_main.c
++++ b/drivers/net/ethernet/realtek/r8169_main.c
+@@ -55,6 +55,7 @@
+ #define FIRMWARE_8107E_2	"rtl_nic/rtl8107e-2.fw"
+ #define FIRMWARE_8125A_3	"rtl_nic/rtl8125a-3.fw"
+ #define FIRMWARE_8125B_2	"rtl_nic/rtl8125b-2.fw"
++#define FIRMWARE_8125D_1	"rtl_nic/rtl8125d-1.fw"
+ #define FIRMWARE_8126A_2	"rtl_nic/rtl8126a-2.fw"
+ #define FIRMWARE_8126A_3	"rtl_nic/rtl8126a-3.fw"
+ 
+@@ -138,6 +139,7 @@ static const struct {
+ 	[RTL_GIGA_MAC_VER_61] = {"RTL8125A",		FIRMWARE_8125A_3},
+ 	/* reserve 62 for CFG_METHOD_4 in the vendor driver */
+ 	[RTL_GIGA_MAC_VER_63] = {"RTL8125B",		FIRMWARE_8125B_2},
++	[RTL_GIGA_MAC_VER_64] = {"RTL8125D",		FIRMWARE_8125D_1},
+ 	[RTL_GIGA_MAC_VER_65] = {"RTL8126A",		FIRMWARE_8126A_2},
+ 	[RTL_GIGA_MAC_VER_66] = {"RTL8126A",		FIRMWARE_8126A_3},
+ };
+@@ -707,6 +709,7 @@ MODULE_FIRMWARE(FIRMWARE_8168FP_3);
+ MODULE_FIRMWARE(FIRMWARE_8107E_2);
+ MODULE_FIRMWARE(FIRMWARE_8125A_3);
+ MODULE_FIRMWARE(FIRMWARE_8125B_2);
++MODULE_FIRMWARE(FIRMWARE_8125D_1);
+ MODULE_FIRMWARE(FIRMWARE_8126A_2);
+ MODULE_FIRMWARE(FIRMWARE_8126A_3);
+ 
+@@ -2098,10 +2101,7 @@ static void rtl_set_eee_txidle_timer(struct rtl8169_private *tp)
+ 		tp->tx_lpi_timer = timer_val;
+ 		r8168_mac_ocp_write(tp, 0xe048, timer_val);
+ 		break;
+-	case RTL_GIGA_MAC_VER_61:
+-	case RTL_GIGA_MAC_VER_63:
+-	case RTL_GIGA_MAC_VER_65:
+-	case RTL_GIGA_MAC_VER_66:
++	case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_66:
+ 		tp->tx_lpi_timer = timer_val;
+ 		RTL_W16(tp, EEE_TXIDLE_TIMER_8125, timer_val);
+ 		break;
+@@ -2233,6 +2233,9 @@ static enum mac_version rtl8169_get_mac_version(u16 xid, bool gmii)
+ 		{ 0x7cf, 0x64a,	RTL_GIGA_MAC_VER_66 },
+ 		{ 0x7cf, 0x649,	RTL_GIGA_MAC_VER_65 },
+ 
++		/* 8125D family. */
++		{ 0x7cf, 0x688,	RTL_GIGA_MAC_VER_64 },
++
+ 		/* 8125B family. */
+ 		{ 0x7cf, 0x641,	RTL_GIGA_MAC_VER_63 },
+ 
+@@ -2500,9 +2503,7 @@ static void rtl_init_rxcfg(struct rtl8169_private *tp)
+ 	case RTL_GIGA_MAC_VER_61:
+ 		RTL_W32(tp, RxConfig, RX_FETCH_DFLT_8125 | RX_DMA_BURST);
+ 		break;
+-	case RTL_GIGA_MAC_VER_63:
+-	case RTL_GIGA_MAC_VER_65:
+-	case RTL_GIGA_MAC_VER_66:
++	case RTL_GIGA_MAC_VER_63 ... RTL_GIGA_MAC_VER_66:
+ 		RTL_W32(tp, RxConfig, RX_FETCH_DFLT_8125 | RX_DMA_BURST |
+ 			RX_PAUSE_SLOT_ON);
+ 		break;
+@@ -3814,6 +3815,12 @@ static void rtl_hw_start_8125b(struct rtl8169_private *tp)
+ 	rtl_hw_start_8125_common(tp);
+ }
+ 
++static void rtl_hw_start_8125d(struct rtl8169_private *tp)
++{
++	rtl_set_def_aspm_entry_latency(tp);
++	rtl_hw_start_8125_common(tp);
++}
++
+ static void rtl_hw_start_8126a(struct rtl8169_private *tp)
+ {
+ 	rtl_set_def_aspm_entry_latency(tp);
+@@ -3862,6 +3869,7 @@ static void rtl_hw_config(struct rtl8169_private *tp)
+ 		[RTL_GIGA_MAC_VER_53] = rtl_hw_start_8117,
+ 		[RTL_GIGA_MAC_VER_61] = rtl_hw_start_8125a_2,
+ 		[RTL_GIGA_MAC_VER_63] = rtl_hw_start_8125b,
++		[RTL_GIGA_MAC_VER_64] = rtl_hw_start_8125d,
+ 		[RTL_GIGA_MAC_VER_65] = rtl_hw_start_8126a,
+ 		[RTL_GIGA_MAC_VER_66] = rtl_hw_start_8126a,
+ 	};
+@@ -3879,6 +3887,7 @@ static void rtl_hw_start_8125(struct rtl8169_private *tp)
+ 	/* disable interrupt coalescing */
+ 	switch (tp->mac_version) {
+ 	case RTL_GIGA_MAC_VER_61:
++	case RTL_GIGA_MAC_VER_64:
+ 		for (i = 0xa00; i < 0xb00; i += 4)
+ 			RTL_W32(tp, i, 0);
+ 		break;
+diff --git a/drivers/net/ethernet/realtek/r8169_phy_config.c b/drivers/net/ethernet/realtek/r8169_phy_config.c
+index cf29b12084826..d09b2a41cd062 100644
+--- a/drivers/net/ethernet/realtek/r8169_phy_config.c
++++ b/drivers/net/ethernet/realtek/r8169_phy_config.c
+@@ -1104,6 +1104,15 @@ static void rtl8125b_hw_phy_config(struct rtl8169_private *tp,
+ 	rtl8125b_config_eee_phy(phydev);
+ }
+ 
++static void rtl8125d_hw_phy_config(struct rtl8169_private *tp,
++				   struct phy_device *phydev)
++{
++	r8169_apply_firmware(tp);
++	rtl8125_legacy_force_mode(phydev);
++	rtl8168g_disable_aldps(phydev);
++	rtl8125b_config_eee_phy(phydev);
++}
++
+ static void rtl8126a_hw_phy_config(struct rtl8169_private *tp,
+ 				   struct phy_device *phydev)
+ {
+@@ -1160,6 +1169,7 @@ void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev,
+ 		[RTL_GIGA_MAC_VER_53] = rtl8117_hw_phy_config,
+ 		[RTL_GIGA_MAC_VER_61] = rtl8125a_2_hw_phy_config,
+ 		[RTL_GIGA_MAC_VER_63] = rtl8125b_hw_phy_config,
++		[RTL_GIGA_MAC_VER_64] = rtl8125d_hw_phy_config,
+ 		[RTL_GIGA_MAC_VER_65] = rtl8126a_hw_phy_config,
+ 		[RTL_GIGA_MAC_VER_66] = rtl8126a_hw_phy_config,
+ 	};

buildroot-external/board/arm-uefi/generic-aarch64/patches/linux/0002-net-phy-realtek-merge-the-drivers-for-internal-NBase.patch

@@ -0,0 +1,143 @@
+From acc8d5ec4b6cdbf0a9625a9f9d3710b52555f3b2 Mon Sep 17 00:00:00 2001
+From: Heiner Kallweit <hkallweit1@gmail.com>
+Date: Tue, 15 Oct 2024 07:47:14 +0200
+Subject: [PATCH] net: phy: realtek: merge the drivers for internal NBase-T
+ PHY's
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The Realtek RTL8125/RTL8126 NBase-T MAC/PHY chips have internal PHY's
+which are register-compatible, at least for the registers we use here.
+So let's use just one PHY driver to support all of them.
+These internal PHY's exist also as external C45 PHY's, but on the
+internal PHY's no access to MMD registers is possible. This can be
+used to differentiate between the internal and external version.
+
+As a side effect the drivers for two now external-only drivers don't
+require read_mmd/write_mmd hooks any longer.
+
+Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
+Link: https://patch.msgid.link/c57081a6-811f-4571-ab35-34f4ca6de9af@gmail.com
+Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f87a17ed3b51fba4dfdd8f8b643b5423a85fc551
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
+---
+ drivers/net/phy/realtek.c | 53 +++++++++++++++++++++++++++++++--------
+ 1 file changed, 43 insertions(+), 10 deletions(-)
+
+diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
+index 166f6a7283731..830a0d337de5d 100644
+--- a/drivers/net/phy/realtek.c
++++ b/drivers/net/phy/realtek.c
+@@ -92,6 +92,7 @@
+ 
+ #define RTL_GENERIC_PHYID			0x001cc800
+ #define RTL_8211FVD_PHYID			0x001cc878
++#define RTL_8221B				0x001cc840
+ #define RTL_8221B_VB_CG				0x001cc849
+ #define RTL_8221B_VN_CG				0x001cc84a
+ #define RTL_8251B				0x001cc862
+@@ -1040,6 +1041,23 @@ static bool rtlgen_supports_2_5gbps(struct phy_device *phydev)
+ 	return val >= 0 && val & MDIO_PMA_SPEED_2_5G;
+ }
+ 
++/* On internal PHY's MMD reads over C22 always return 0.
++ * Check a MMD register which is known to be non-zero.
++ */
++static bool rtlgen_supports_mmd(struct phy_device *phydev)
++{
++	int val;
++
++	phy_lock_mdio_bus(phydev);
++	__phy_write(phydev, MII_MMD_CTRL, MDIO_MMD_PCS);
++	__phy_write(phydev, MII_MMD_DATA, MDIO_PCS_EEE_ABLE);
++	__phy_write(phydev, MII_MMD_CTRL, MDIO_MMD_PCS | MII_MMD_CTRL_NOINCR);
++	val = __phy_read(phydev, MII_MMD_DATA);
++	phy_unlock_mdio_bus(phydev);
++
++	return val > 0;
++}
++
+ static int rtlgen_match_phy_device(struct phy_device *phydev)
+ {
+ 	return phydev->phy_id == RTL_GENERIC_PHYID &&
+@@ -1049,7 +1067,8 @@ static int rtlgen_match_phy_device(struct phy_device *phydev)
+ static int rtl8226_match_phy_device(struct phy_device *phydev)
+ {
+ 	return phydev->phy_id == RTL_GENERIC_PHYID &&
+-	       rtlgen_supports_2_5gbps(phydev);
++	       rtlgen_supports_2_5gbps(phydev) &&
++	       rtlgen_supports_mmd(phydev);
+ }
+ 
+ static int rtlgen_is_c45_match(struct phy_device *phydev, unsigned int id,
+@@ -1061,6 +1080,11 @@ static int rtlgen_is_c45_match(struct phy_device *phydev, unsigned int id,
+ 		return !is_c45 && (id == phydev->phy_id);
+ }
+ 
++static int rtl8221b_match_phy_device(struct phy_device *phydev)
++{
++	return phydev->phy_id == RTL_8221B && rtlgen_supports_mmd(phydev);
++}
++
+ static int rtl8221b_vb_cg_c22_match_phy_device(struct phy_device *phydev)
+ {
+ 	return rtlgen_is_c45_match(phydev, RTL_8221B_VB_CG, false);
+@@ -1081,9 +1105,21 @@ static int rtl8221b_vn_cg_c45_match_phy_device(struct phy_device *phydev)
+ 	return rtlgen_is_c45_match(phydev, RTL_8221B_VN_CG, true);
+ }
+ 
+-static int rtl8251b_c22_match_phy_device(struct phy_device *phydev)
++static int rtl_internal_nbaset_match_phy_device(struct phy_device *phydev)
+ {
+-	return rtlgen_is_c45_match(phydev, RTL_8251B, false);
++	if (phydev->is_c45)
++		return false;
++
++	switch (phydev->phy_id) {
++	case RTL_GENERIC_PHYID:
++	case RTL_8221B:
++	case RTL_8251B:
++		break;
++	default:
++		return false;
++	}
++
++	return rtlgen_supports_2_5gbps(phydev) && !rtlgen_supports_mmd(phydev);
+ }
+ 
+ static int rtl8251b_c45_match_phy_device(struct phy_device *phydev)
+@@ -1345,10 +1381,8 @@ static struct phy_driver realtek_drvs[] = {
+ 		.resume		= rtlgen_resume,
+ 		.read_page	= rtl821x_read_page,
+ 		.write_page	= rtl821x_write_page,
+-		.read_mmd	= rtl822x_read_mmd,
+-		.write_mmd	= rtl822x_write_mmd,
+ 	}, {
+-		PHY_ID_MATCH_EXACT(0x001cc840),
++		.match_phy_device = rtl8221b_match_phy_device,
+ 		.name		= "RTL8226B_RTL8221B 2.5Gbps PHY",
+ 		.get_features	= rtl822x_get_features,
+ 		.config_aneg	= rtl822x_config_aneg,
+@@ -1359,8 +1393,6 @@ static struct phy_driver realtek_drvs[] = {
+ 		.resume		= rtlgen_resume,
+ 		.read_page	= rtl821x_read_page,
+ 		.write_page	= rtl821x_write_page,
+-		.read_mmd	= rtl822x_read_mmd,
+-		.write_mmd	= rtl822x_write_mmd,
+ 	}, {
+ 		PHY_ID_MATCH_EXACT(0x001cc838),
+ 		.name           = "RTL8226-CG 2.5Gbps PHY",
+@@ -1438,8 +1470,9 @@ static struct phy_driver realtek_drvs[] = {
+ 		.read_page      = rtl821x_read_page,
+ 		.write_page     = rtl821x_write_page,
+ 	}, {
+-		.match_phy_device = rtl8251b_c22_match_phy_device,
+-		.name           = "RTL8126A-internal 5Gbps PHY",
++		.match_phy_device = rtl_internal_nbaset_match_phy_device,
++		.name           = "Realtek Internal NBASE-T PHY",
++		.flags		= PHY_IS_INTERNAL,
+ 		.get_features   = rtl822x_get_features,
+ 		.config_aneg    = rtl822x_config_aneg,
+ 		.read_status    = rtl822x_read_status,

buildroot-external/board/arm-uefi/generic-aarch64/patches/linux/0003-net-phy-realtek-add-RTL8125D-internal-PHY.patch

@@ -0,0 +1,36 @@
+From 7ab842c714924784cae4b6ab229997905b096b4f Mon Sep 17 00:00:00 2001
+From: Heiner Kallweit <hkallweit1@gmail.com>
+Date: Thu, 17 Oct 2024 18:01:13 +0200
+Subject: [PATCH] net: phy: realtek: add RTL8125D-internal PHY
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The first boards show up with Realtek's RTL8125D. This MAC/PHY chip
+comes with an integrated 2.5Gbps PHY with ID 0x001cc841. It's not
+clear yet whether there's an external version of this PHY and how
+Realtek calls it, therefore use the numeric id for now.
+
+Link: https://lore.kernel.org/netdev/2ada65e1-5dfa-456c-9334-2bc51272e9da@gmail.com/T/
+Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
+Message-ID: <7d2924de-053b-44d2-a479-870dc3878170@gmail.com>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: Andrew Lunn <andrew@lunn.ch>
+Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8989bad541133c43550bff2b80edbe37b8fb9659
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
+---
+ drivers/net/phy/realtek.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
+index 830a0d337de5d..8ce5705af69c5 100644
+--- a/drivers/net/phy/realtek.c
++++ b/drivers/net/phy/realtek.c
+@@ -1114,6 +1114,7 @@ static int rtl_internal_nbaset_match_phy_device(struct phy_device *phydev)
+ 	case RTL_GENERIC_PHYID:
+ 	case RTL_8221B:
+ 	case RTL_8251B:
++	case 0x001cc841:
+ 		break;
+ 	default:
+ 		return false;

buildroot-external/board/asus/tinker/kernel.config

@@ -71,7 +71,6 @@ CONFIG_ZSWAP_DEFAULT_ON=y
 CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4=y
 CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC=y
 CONFIG_ZBUD=y
-CONFIG_Z3FOLD=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_KSM=y
 CONFIG_CMA=y
@@ -217,7 +216,6 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
 CONFIG_NETFILTER_XT_MATCH_BPF=m
@@ -394,9 +392,6 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
 CONFIG_6LOWPAN=m
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_HTB=m
@@ -452,7 +447,6 @@ CONFIG_NET_ACT_GACT=m
 CONFIG_GACT_PROB=y
 CONFIG_NET_ACT_MIRRED=m
 CONFIG_NET_ACT_SAMPLE=m
-CONFIG_NET_ACT_IPT=m
 CONFIG_NET_ACT_NAT=m
 CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
@@ -649,9 +643,6 @@ CONFIG_ATH10K_USB=m
 CONFIG_WCN36XX=m
 CONFIG_AT76C50X_USB=m
 CONFIG_BRCMFMAC=m
-CONFIG_HOSTAP=y
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 # CONFIG_WLAN_VENDOR_MARVELL is not set
 CONFIG_MT7601U=m
 # CONFIG_WLAN_VENDOR_MICROCHIP is not set
@@ -669,9 +660,7 @@ CONFIG_RTL8192CU=m
 CONFIG_RTL8XXXU=m
 # CONFIG_WLAN_VENDOR_ST is not set
 # CONFIG_WLAN_VENDOR_TI is not set
-CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
-CONFIG_USB_NET_RNDIS_WLAN=m
 CONFIG_NET_FAILOVER=m
 CONFIG_INPUT_MATRIXKMAP=y
 CONFIG_INPUT_JOYDEV=y
@@ -1497,7 +1486,6 @@ CONFIG_CUSE=m
 CONFIG_OVERLAY_FS=y
 CONFIG_FSCACHE=y
 CONFIG_FSCACHE_STATS=y
-CONFIG_CACHEFILES=y
 CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
@@ -1505,7 +1493,6 @@ CONFIG_UDF_FS=m
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_NTFS_FS=m
-CONFIG_NTFS_RW=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_ECRYPT_FS=m
@@ -1529,7 +1516,6 @@ CONFIG_NFS_SWAP=y
 CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_2=y
 CONFIG_ROOT_NFS=y
-CONFIG_NFS_FSCACHE=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
@@ -1573,7 +1559,6 @@ CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_KEYWRAP=m
 CONFIG_CRYPTO_LRW=m

buildroot-external/board/asus/tinker/patches/linux/0001-Revert-ARM-dts-rockchip-use-DMA-channels-for-UARTs-f.patch

@@ -1,4 +1,4 @@
-From b4d676729c5bee4b9adb85362f6f2e32f833b6c2 Mon Sep 17 00:00:00 2001
+From 675fbbc309e4f7c805cf4fbd7c463cfc8308b54e Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Wed, 17 Feb 2021 19:55:41 +0100
 Subject: [PATCH] Revert "ARM: dts: rockchip: use DMA channels for UARTs for
@@ -10,10 +10,10 @@ This reverts commit 3425fe335c29310f6628faf9a7947d07f32d8962.
  1 file changed, 8 deletions(-)
 
 diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi
-index cb9cdaddffd4..51f1273d6beb 100644
+index 3f1d640afafae..becf3abd8367f 100644
 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi
 +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi
-@@ -378,8 +378,6 @@ uart0: serial@ff180000 {
+@@ -387,8 +387,6 @@ uart0: serial@ff180000 {
  		reg-io-width = <4>;
  		clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>;
  		clock-names = "baudclk", "apb_pclk";
@@ -22,7 +22,7 @@ index cb9cdaddffd4..51f1273d6beb 100644
  		pinctrl-names = "default";
  		pinctrl-0 = <&uart0_xfer>;
  		status = "disabled";
-@@ -393,8 +391,6 @@ uart1: serial@ff190000 {
+@@ -402,8 +400,6 @@ uart1: serial@ff190000 {
  		reg-io-width = <4>;
  		clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>;
  		clock-names = "baudclk", "apb_pclk";
@@ -31,7 +31,7 @@ index cb9cdaddffd4..51f1273d6beb 100644
  		pinctrl-names = "default";
  		pinctrl-0 = <&uart1_xfer>;
  		status = "disabled";
-@@ -421,8 +417,6 @@ uart3: serial@ff1b0000 {
+@@ -430,8 +426,6 @@ uart3: serial@ff1b0000 {
  		reg-io-width = <4>;
  		clocks = <&cru SCLK_UART3>, <&cru PCLK_UART3>;
  		clock-names = "baudclk", "apb_pclk";
@@ -40,7 +40,7 @@ index cb9cdaddffd4..51f1273d6beb 100644
  		pinctrl-names = "default";
  		pinctrl-0 = <&uart3_xfer>;
  		status = "disabled";
-@@ -436,8 +430,6 @@ uart4: serial@ff1c0000 {
+@@ -445,8 +439,6 @@ uart4: serial@ff1c0000 {
  		reg-io-width = <4>;
  		clocks = <&cru SCLK_UART4>, <&cru PCLK_UART4>;
  		clock-names = "baudclk", "apb_pclk";

buildroot-external/board/asus/tinker/patches/linux/0002-ARM-DTS-rk3288-tinker-Defining-the-SPI-interface.patch

@@ -1,4 +1,4 @@
-From 02c7d9bb23f497993d52f5a41341ed955e6a2745 Mon Sep 17 00:00:00 2001
+From 37b4467356113f17f55066aef54db55b64daa030 Mon Sep 17 00:00:00 2001
 From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
 Date: Mon, 5 Nov 2018 22:15:14 +0100
 Subject: [PATCH] ARM: DTS: rk3288-tinker: Defining the SPI interface
@@ -18,7 +18,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 19 insertions(+)
 
 diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-index 09618bb7d872..30430d2e64b9 100644
+index 09618bb7d872c..30430d2e64b93 100644
 --- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
 +++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
 @@ -483,6 +483,25 @@ &sdio0 {

buildroot-external/board/asus/tinker/patches/linux/0003-ARM-dts-rockchip-enable-I2C1-4-on-rk3288-tinker.patch

@@ -1,4 +1,4 @@
-From bf7869033cf3caa50912cbdfa548428a6571c104 Mon Sep 17 00:00:00 2001
+From 1a15fc7f6a241895a31b00c1f324d358d408a610 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Fri, 4 Sep 2020 21:57:55 +0200
 Subject: [PATCH] ARM: dts: rockchip: enable I2C1/4 on rk3288-tinker
@@ -11,7 +11,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 8 insertions(+)
 
 diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-index 30430d2e64b9..395afc2b2283 100644
+index 30430d2e64b93..395afc2b2283c 100644
 --- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
 +++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
 @@ -342,10 +342,18 @@ regulator-state-mem {

buildroot-external/board/asus/tinker/patches/linux/0004-RK3288-DTSI-rk3288.dtsi-Add-missing-SPI2-pinctrl.patch

@@ -1,4 +1,4 @@
-From a0ef6a86e96920a9cf703d8c65d0126494037d37 Mon Sep 17 00:00:00 2001
+From d6c44c231fc4518ad69bb7870a193bb10c563f2a Mon Sep 17 00:00:00 2001
 From: Myy Miouyouyou <myy@miouyouyou.fr>
 Date: Thu, 19 Oct 2017 21:24:47 +0200
 Subject: [PATCH] RK3288: DTSI: rk3288.dtsi: Add missing SPI2 pinctrl
@@ -14,10 +14,10 @@ Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi
-index 51f1273d6beb..d8663928bfe2 100644
+index becf3abd8367f..e78fa883b9841 100644
 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi
 +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi
-@@ -311,7 +311,7 @@ spi2: spi@ff130000 {
+@@ -320,7 +320,7 @@ spi2: spi@ff130000 {
  		dma-names = "tx", "rx";
  		interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
  		pinctrl-names = "default";

buildroot-external/board/asus/tinker/patches/linux/0005-ARM-DTSI-rk3288-tinker-Improving-the-CPU-max-voltage.patch

@@ -1,4 +1,4 @@
-From e828e0fc2be98e5ad20c93981681505fc97b063b Mon Sep 17 00:00:00 2001
+From dfb0232e9fae1267d04247aaf171739038c1659e Mon Sep 17 00:00:00 2001
 From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
 Date: Mon, 5 Nov 2018 20:16:05 +0100
 Subject: [PATCH] ARM: DTSI: rk3288-tinker: Improving the CPU max voltage
@@ -11,7 +11,7 @@ Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-index 395afc2b2283..c7e79e594720 100644
+index 395afc2b2283c..c7e79e5947206 100644
 --- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
 +++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
 @@ -184,7 +184,7 @@ vdd_cpu: DCDC_REG1 {

buildroot-external/board/asus/tinker/patches/linux/0006-drivers-mmc-dw-mci-rockchip-Handle-ASUS-Tinkerboard-.patch

@@ -1,4 +1,4 @@
-From ad1ffd6be5f54a0871e3c303602548687dfe0ffc Mon Sep 17 00:00:00 2001
+From 4955695e410289df07258b00290d4028c3ac8fb1 Mon Sep 17 00:00:00 2001
 From: Myy Miouyouyou <myy@miouyouyou.fr>
 Date: Sun, 7 Jan 2018 01:52:44 +0100
 Subject: [PATCH] drivers: mmc: dw-mci-rockchip: Handle ASUS Tinkerboard reboot
@@ -21,7 +21,7 @@ Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
  1 file changed, 66 insertions(+)
 
 diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
-index b07190ba4b7a..0badaa1b404e 100644
+index f96260fd143b4..fa779ce8fb661 100644
 --- a/drivers/mmc/host/dw_mmc-rockchip.c
 +++ b/drivers/mmc/host/dw_mmc-rockchip.c
 @@ -12,6 +12,11 @@
@@ -36,7 +36,7 @@ index b07190ba4b7a..0badaa1b404e 100644
  #include "dw_mmc.h"
  #include "dw_mmc-pltfm.h"
  
-@@ -340,6 +345,66 @@ static const struct of_device_id dw_mci_rockchip_match[] = {
+@@ -527,6 +532,66 @@ static const struct of_device_id dw_mci_rockchip_match[] = {
  };
  MODULE_DEVICE_TABLE(of, dw_mci_rockchip_match);
  
@@ -103,7 +103,7 @@ index b07190ba4b7a..0badaa1b404e 100644
  static int dw_mci_rockchip_probe(struct platform_device *pdev)
  {
  	const struct dw_mci_drv_data *drv_data;
-@@ -367,6 +432,7 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev)
+@@ -554,6 +619,7 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev)
  	}
  
  	pm_runtime_put_autosuspend(&pdev->dev);

buildroot-external/board/asus/tinker/patches/linux/0007-ARM-dts-rockchip-Add-Bluetooth-to-rk3288-tinker.patch

@@ -1,4 +1,4 @@
-From 4e6c3d013c847f199664a3075934f5ca52d8cba4 Mon Sep 17 00:00:00 2001
+From 74227462bbe9236dca234dd24cce4191fa71bdf9 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Tue, 10 May 2022 22:57:26 +0200
 Subject: [PATCH] ARM: dts: rockchip: Add Bluetooth to rk3288-tinker
@@ -12,7 +12,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 26 insertions(+)
 
 diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-index c7e79e594720..5d261fae6e72 100644
+index c7e79e5947206..5d261fae6e72a 100644
 --- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
 +++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
 @@ -386,6 +386,20 @@ bl_en: bl-en {

buildroot-external/board/asus/tinker/patches/linux/0008-usb-audio-add-ASUS-TinkerBoard-s-ALC4040.patch

@@ -1,4 +1,4 @@
-From f597ec583c262ed4c3264ddf661e22b503fb8a11 Mon Sep 17 00:00:00 2001
+From eb29ab60a69353f355b3af58b06fff1a89d17992 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
 Date: Wed, 10 Jan 2024 16:29:59 +0100
 Subject: [PATCH] usb-audio: add ASUS TinkerBoard's ALC4040
@@ -12,10 +12,10 @@ Co-authored-by: Pascal Vizeli <pascal.vizeli@syshack.ch>
  1 file changed, 8 insertions(+)
 
 diff --git a/sound/usb/card.c b/sound/usb/card.c
-index 1b2edc0fd2e9..3069ac5b6759 100644
+index 9c411b82a218d..672136e25c81d 100644
 --- a/sound/usb/card.c
 +++ b/sound/usb/card.c
-@@ -521,6 +521,14 @@ static void usb_audio_make_shortname(struct usb_device *dev,
+@@ -533,6 +533,14 @@ static void usb_audio_make_shortname(struct usb_device *dev,
  	}
  
  	strim(card->shortname);

buildroot-external/board/asus/tinker/patches/uboot/0001-pmic-enable-LDO2-vcc33_mipi-at-bootup.patch

@@ -1,31 +1,30 @@
-From defc964eaa9f4ccc9cd1568ade4e4d81f35b9e07 Mon Sep 17 00:00:00 2001
+From 78bd1a46cfc585773719963ce8e0a380e9676a93 Mon Sep 17 00:00:00 2001
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Fri, 24 Apr 2020 11:37:55 +0000
 Subject: [PATCH] pmic: enable LDO2 vcc33_mipi at bootup
 
 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 ---
- board/rockchip/tinker_rk3288/tinker-rk3288.c | 37 ++++++++++++++++++++
- 1 file changed, 37 insertions(+)
+ board/rockchip/tinker_rk3288/tinker-rk3288.c | 36 ++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
 
 diff --git a/board/rockchip/tinker_rk3288/tinker-rk3288.c b/board/rockchip/tinker_rk3288/tinker-rk3288.c
-index f85209c649..6fa1bb0c66 100644
+index e966e9f201a..2944d8c084f 100644
 --- a/board/rockchip/tinker_rk3288/tinker-rk3288.c
 +++ b/board/rockchip/tinker_rk3288/tinker-rk3288.c
-@@ -13,6 +13,7 @@
+@@ -9,6 +9,7 @@
+ #include <init.h>
+ #include <net.h>
  #include <netdev.h>
- #include <asm/arch-rockchip/bootrom.h>
- #include <asm/io.h>
 +#include <power/regulator.h>
  
  static int get_ethaddr_from_eeprom(u8 *addr)
  {
-@@ -48,3 +49,39 @@ int mmc_get_env_dev(void)
+@@ -34,3 +35,38 @@ int rk3288_board_late_init(void)
  
- 	return 1;
+ 	return 0;
  }
 +
-+
 +#ifdef CONFIG_DM_PMIC
 +static int rockchip_set_regulator_on(const char *name, uint uv)
 +{
@@ -60,6 +59,3 @@ index f85209c649..6fa1bb0c66 100644
 +	return 0;
 +}
 +#endif
--- 
-2.43.0
-

buildroot-external/board/asus/tinker/uboot-boot.ush

@@ -23,8 +23,8 @@ test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=t
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro rootwait"
-setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro rootwait"
+setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd ro rootwait"
+setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 ro rootwait"
 
 # Load environment from haos-config.txt
 if test -e mmc ${devnum}:1 haos-config.txt; then

buildroot-external/board/hardkernel/kernel-amlogic.config

@@ -228,7 +228,6 @@ CONFIG_PCIE_KIRIN=y
 # CONFIG_PCI_MESON is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_BRCMSTB_GISB_ARB=y
 CONFIG_VEXPRESS_CONFIG=y
 CONFIG_ARM_SCPI_PROTOCOL=y
 CONFIG_EFI_CAPSULE_LOADER=y
@@ -381,7 +380,6 @@ CONFIG_TCG_TIS_I2C_INFINEON=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
-CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_MESON=y
 CONFIG_I2C_RK3X=y
@@ -409,7 +407,6 @@ CONFIG_W1=y
 CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_MASTER_GPIO=m
-CONFIG_POWER_RESET_BRCMSTB=y
 CONFIG_POWER_RESET_VEXPRESS=y
 CONFIG_POWER_RESET_XGENE=y
 CONFIG_POWER_RESET_SYSCON=y
@@ -541,7 +538,6 @@ CONFIG_DRM_MESON=m
 CONFIG_DRM_PL111=m
 CONFIG_DRM_LIMA=m
 CONFIG_DRM_PANFROST=m
-CONFIG_DRM_LEGACY=y
 CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_EFI=y
@@ -684,7 +680,6 @@ CONFIG_ARM_SMMU_V3=y
 CONFIG_REMOTEPROC=y
 CONFIG_RPMSG_QCOM_GLINK_RPM=y
 CONFIG_MESON_CANVAS=y
-CONFIG_SOC_BRCMSTB=y
 CONFIG_SOC_TI=y
 CONFIG_EXTCON_USB_GPIO=y
 CONFIG_EXTCON_USBC_CROS_EC=y

buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush

@@ -25,8 +25,8 @@ test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=t
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
-setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait"
+setenv bootargs_a "root=PARTUUID=48617373-06 ro rootwait"
+setenv bootargs_b "root=PARTUUID=48617373-08 ro rootwait"
 
 # Load environment from haos-config.txt
 if test -e mmc ${devnum}:1 haos-config.txt; then

buildroot-external/board/hardkernel/odroid-c4/uboot-boot.ush

@@ -25,8 +25,8 @@ test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=t
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} clk_ignore_unused usb-storage.quirks=0x2537:0x1066:u,0x2537:0x1068:u ${BOOT_CONDITION}"
 
 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
-setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait"
+setenv bootargs_a "root=PARTUUID=48617373-06 ro rootwait"
+setenv bootargs_b "root=PARTUUID=48617373-08 ro rootwait"
 
 # Load environment from haos-config.txt
 if test -e mmc ${devnum}:1 haos-config.txt; then

buildroot-external/board/hardkernel/odroid-m1/uboot-boot.ush

@@ -1,15 +1,15 @@
-part start mmc ${devnum} hassos-bootstate mmc_env
-mmc dev ${devnum}
+part start ${devtype} ${devnum} hassos-bootstate mmc_env
+${devtype} dev ${devnum}
 
 setenv loadbootstate " \
     echo 'loading env...'; \
-    mmc read ${ramdisk_addr_r} ${mmc_env} 0x40; \
+    ${devtype} read ${ramdisk_addr_r} ${mmc_env} 0x40; \
     env import -c ${ramdisk_addr_r} 0x8000;"
 
 setenv storebootstate " \
     echo 'storing env...'; \
     env export -c -s 0x8000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT MACHINE_ID; \
-    mmc write ${ramdisk_addr_r} ${mmc_env} 0x40;"
+    ${devtype} write ${ramdisk_addr_r} ${mmc_env} 0x40;"
 
 run loadbootstate
 test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
@@ -23,37 +23,37 @@ test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=t
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro rootwait"
-setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro rootwait"
+setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd ro rootwait"
+setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 ro rootwait"
 
-part number mmc ${devnum} hassos-boot boot_partnum
+part number ${devtype} ${devnum} hassos-boot boot_partnum
 
 # Load environment from haos-config.txt
-if test -e mmc ${devnum}:${boot_partnum} haos-config.txt; then
-  fatload mmc ${devnum}:${boot_partnum} ${ramdisk_addr_r} haos-config.txt
+if test -e ${devtype} ${devnum}:${boot_partnum} haos-config.txt; then
+  fatload ${devtype} ${devnum}:${boot_partnum} ${ramdisk_addr_r} haos-config.txt
   env import -t ${ramdisk_addr_r} ${filesize}
 fi
 
 # Load extraargs
-fileenv mmc ${devnum}:${boot_partnum} ${ramdisk_addr_r} cmdline.txt cmdline
+fileenv ${devtype} ${devnum}:${boot_partnum} ${ramdisk_addr_r} cmdline.txt cmdline
 
 # Load device tree
 setenv fdtfile rk3568-odroid-m1.dtb
 echo "Loading standard device tree ${fdtfile}"
-fatload mmc ${devnum}:${boot_partnum} ${fdt_addr_r} ${fdtfile}
+fatload ${devtype} ${devnum}:${boot_partnum} ${fdt_addr_r} ${fdtfile}
 fdt addr ${fdt_addr_r}
 
 # load dt overlays
 fdt resize 65536
 for overlay_file in ${overlays}; do
-  if fatload mmc ${devnum}:${boot_partnum} ${ramdisk_addr_r} overlays/${overlay_file}.dtbo; then
+  if fatload ${devtype} ${devnum}:${boot_partnum} ${ramdisk_addr_r} overlays/${overlay_file}.dtbo; then
     echo "Applying kernel provided DT overlay ${overlay_file}.dtbo"
     fdt apply ${ramdisk_addr_r} || setenv overlay_error "true"
   fi
 done
 if test "${overlay_error}" = "true"; then
   echo "Error applying DT overlays, restoring original DT"
-  fatload mmc ${devnum}:${boot_partnum} ${fdt_addr_r} ${fdtfile}
+  fatload ${devtype} ${devnum}:${boot_partnum} ${fdt_addr_r} ${fdtfile}
 fi
 
 setenv bootargs
@@ -64,8 +64,8 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
     if test ${BOOT_A_LEFT} -gt 0; then
       setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1
       echo "Trying to boot slot A, ${BOOT_A_LEFT} attempts remaining. Loading kernel ..."
-      part number mmc ${devnum} hassos-kernel0 kernel_partnum
-      if load mmc ${devnum}:${kernel_partnum} ${kernel_addr_r} Image; then
+      part number ${devtype} ${devnum} hassos-kernel0 kernel_partnum
+      if load ${devtype} ${devnum}:${kernel_partnum} ${kernel_addr_r} Image; then
           setenv bootargs "${bootargs_hassos} ${bootargs_a} rauc.slot=A ${cmdline}"
       fi
     fi
@@ -73,8 +73,8 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
     if test ${BOOT_B_LEFT} -gt 0; then
       setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1
       echo "Trying to boot slot B, ${BOOT_B_LEFT} attempts remaining. Loading kernel ..."
-      part number mmc ${devnum} hassos-kernel1 kernel_partnum
-      if load mmc ${devnum}:${kernel_partnum} ${kernel_addr_r} Image; then
+      part number ${devtype} ${devnum} hassos-kernel1 kernel_partnum
+      if load ${devtype} ${devnum}:${kernel_partnum} ${kernel_addr_r} Image; then
           setenv bootargs "${bootargs_hassos} ${bootargs_b} rauc.slot=B ${cmdline}"
       fi
     fi

buildroot-external/board/hardkernel/odroid-m1s/patches/linux/0001-arm64-dts-rockchip-Enable-Rockchip-TRNG-on-ODROID-M1.patch

@@ -0,0 +1,32 @@
+From 60b24f8c30181ef60964ce186c2a6d05b85f3be1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
+Date: Fri, 31 Jan 2025 16:13:48 +0100
+Subject: [PATCH] arm64: dts: rockchip: Enable Rockchip TRNG on ODROID-M1S
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+HAOS with 6.6 kernel had the RNG disbled because of a downstream patch. Now the
+rk356x.dtsi has it's enabled only in rk3568.dtsi. We want it enabled also for
+RK3566 on ODROID-M1S.
+
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
+---
+ arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
+index 33bc5249d729b..a0d912b5ce4aa 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
+@@ -551,6 +551,10 @@ &pmu_io_domains {
+ 	status = "okay";
+ };
+ 
++&rng {
++	status = "okay";
++};
++
+ &saradc {
+ 	vref-supply = <&vcca_1v8>;
+ 	status = "okay";

buildroot-external/board/hardkernel/odroid-m1s/patches/linux/0001-arm64-dts-rockchip-Import-Hardkernel-ODROID-M1S-boar.patch

@@ -1,896 +0,0 @@
-From 83dadbe0a615f6fc7550dec98dee938647050990 Mon Sep 17 00:00:00 2001
-From: Tim Lunn <tim@feathertop.org>
-Date: Sun, 28 Jan 2024 18:52:26 +1100
-Subject: [PATCH] arm64: dts: rockchip: Import Hardkernel ODROID-M1S board
-
-Odroid-m1s is in the process of being upstreamed.
-For now sync dts for Odroid-m1s:
-https://github.com/tobetter/linux/blob/ae33b445578884c70d7bfc5d6d519de4db815ccd/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
----
- arch/arm64/boot/dts/rockchip/Makefile         |   1 +
- .../boot/dts/rockchip/rk3566-odroid-m1s.dts   | 861 ++++++++++++++++++
- 2 files changed, 862 insertions(+)
- create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-
-diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
-index 8c15593c0ca4..362359684ed0 100644
---- a/arch/arm64/boot/dts/rockchip/Makefile
-+++ b/arch/arm64/boot/dts/rockchip/Makefile
-@@ -63,6 +63,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353p.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg503.dtb
-+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-odroid-m1s.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb
-diff --git a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-new file mode 100644
-index 000000000000..1cad9217c374
---- /dev/null
-+++ b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-@@ -0,0 +1,861 @@
-+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-+/*
-+ * Copyright (c) 2023 Hardkernel Co., Ltd.
-+ *
-+ */
-+
-+/dts-v1/;
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/leds/common.h>
-+#include <dt-bindings/pinctrl/rockchip.h>
-+#include <dt-bindings/soc/rockchip,vop2.h>
-+
-+#include "rk3566.dtsi"
-+
-+/ {
-+	model = "Hardkernel ODROID-M1S";
-+	compatible = "rockchip,rk3566-odroid-m1", "rockchip,rk3566";
-+
-+	aliases {
-+		ethernet1 = &gmac1;
-+		i2c0 = &i2c3;
-+		i2c3 = &i2c0;
-+		mmc0 = &sdhci;
-+		mmc1 = &sdmmc0;
-+		serial0 = &uart1;
-+		serial1 = &uart0;
-+	};
-+
-+	chosen: chosen {
-+		stdout-path = "serial2:1500000n8";
-+	};
-+
-+	hdmi-con {
-+		compatible = "hdmi-connector";
-+		type = "a";
-+
-+		port {
-+			hdmi_con_in: endpoint {
-+				remote-endpoint = <&hdmi_out_con>;
-+			};
-+		};
-+	};
-+
-+	gmac1_clkin: external-gmac1-clock {
-+		compatible = "fixed-clock";
-+		clock-frequency = <125000000>;
-+		clock-output-names = "gmac1_clkin";
-+		#clock-cells = <0>;
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+		status = "okay";
-+
-+		red_led: red {
-+			gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_LOW>;
-+			linux,default-trigger = "default-on";
-+			function = LED_FUNCTION_POWER;
-+			color = <LED_COLOR_ID_RED>;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&led_power_en>;
-+		};
-+		blue_led: blue {
-+			gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
-+			linux,default-trigger = "heartbeat";
-+			function = LED_FUNCTION_HEARTBEAT;
-+			color = <LED_COLOR_ID_BLUE>;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&led_work_en>;
-+		};
-+	};
-+
-+	pcie20_3v3: pcie20-3v3-regulator {
-+		compatible = "regulator-fixed";
-+		enable-active-high;
-+		gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pcie20_3v3_en>;
-+		regulator-name = "pcie20_3v3";
-+		regulator-always-on;
-+		regulator-boot-on;
-+	};
-+
-+	rk809-sound {
-+		compatible = "simple-audio-card";
-+		simple-audio-card,format = "i2s";
-+		simple-audio-card,name = "ODROID-M1-FRONT";
-+		simple-audio-card,mclk-fs = <256>;
-+		status = "okay";
-+
-+		simple-audio-card,cpu {
-+			sound-dai = <&i2s1_8ch>;
-+		};
-+
-+		simple-audio-card,codec {
-+			sound-dai = <&rk809>;
-+		};
-+	};
-+
-+	vcc3v3_sys: vcc3v3-sys {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc3v3_sys";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+
-+	vcc5v_dcin: vcc5v-dcin {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc-5v";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+	};
-+
-+	vcc5v0_sys: vcc5v0-sys {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc5v0_sys";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		vin-supply = <&vcc5v_dcin>;
-+	};
-+
-+	vcc5v0_host: vcc5v0-host-regulator {
-+		compatible = "regulator-fixed";
-+		enable-active-high;
-+		gpio = <&gpio3 RK_PB0 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&vcc5v0_host_en>;
-+		regulator-name = "vcc5v0_host";
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+
-+	vcc5v0_usb_otg: vcc5v0-otg-regulator {
-+		compatible = "regulator-fixed";
-+		enable-active-high;
-+		gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&vcc5v0_usb_otg_en>;
-+		regulator-name = "vcc5v0_usb_otg";
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+
-+	vcc5v0_usb_host: vcc5v0-usb3-regulator {
-+		compatible = "regulator-fixed";
-+		enable-active-high;
-+		gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&vcc5v0_usb_host_en>;
-+		regulator-name = "vcc5v0_usb_host";
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+};
-+
-+&combphy1 {
-+	phy-supply = <&vcc5v0_usb_host>;
-+	status = "okay";
-+};
-+
-+&combphy2 {
-+	status = "okay";
-+};
-+
-+&cpu0 {
-+	cpu-supply = <&vdd_cpu>;
-+};
-+
-+&cpu1 {
-+	cpu-supply = <&vdd_cpu>;
-+};
-+
-+&cpu2 {
-+	cpu-supply = <&vdd_cpu>;
-+};
-+
-+&cpu3 {
-+	cpu-supply = <&vdd_cpu>;
-+};
-+
-+&display_subsystem {
-+    status = "okay";
-+};
-+
-+&gmac1 {
-+	assigned-clocks = <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1_RGMII_SPEED>, <&cru SCLK_GMAC1>;
-+	assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>, <&cru SCLK_GMAC1>, <&gmac1_clkin>;
-+	clock_in_out = "input";
-+	phy-supply = <&vcc_3v3>;
-+	phy-mode = "rgmii";
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&gmac1m1_miim
-+		     &gmac1m1_tx_bus2
-+		     &gmac1m1_rx_bus2
-+		     &gmac1m1_rgmii_clk
-+		     &gmac1m1_rgmii_bus
-+		     &gmac1m1_clkinout>;
-+	snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
-+	snps,reset-active-low;
-+	/* Reset time is 20ms, 100ms for rtl8211f */
-+	snps,reset-delays-us = <0 20000 100000>;
-+	tx_delay = <0x4f>;
-+	rx_delay = <0x2d>;
-+	phy-handle = <&rgmii_phy1>;
-+	status = "okay";
-+};
-+
-+&gpio0 {
-+	gpio-line-names =
-+		/* GPIO0_A0-A3 */
-+		"", "", "", "",
-+		/* GPIO0_A4-A7 */
-+		"", "", "", "",
-+
-+		/* GPIO0_B0-B3 */
-+		"", "", "", "PIN_28",
-+		/* GPIO0_B4-B7 */
-+		"PIN_27", "PIN_33", "PIN_7", "",
-+
-+		/* GPIO0_C0-C3 */
-+		"PIN_11", "PIN_13", "PIN_15", "",
-+		/* GPIO0_C4-C7 */
-+		"", "", "", "",
-+
-+		/* GPIO0_D0-D3 */
-+		"", "", "", "",
-+		/* GPIO0_D4-D7 */
-+		"", "", "", "";
-+};
-+
-+&gpio1 {
-+	gpio-line-names =
-+		/* GPIO1_A0-A3 */
-+		"", "", "", "",
-+		/* GPIO1_A4-A7 */
-+		"", "", "", "",
-+
-+		/* GPIO1_B0-B3 */
-+		"", "", "", "",
-+		/* GPIO1_B4-B7 */
-+		"", "", "", "",
-+
-+		/* GPIO1_C0-C3 */
-+		"", "", "", "",
-+		/* GPIO1_C4-C7 */
-+		"", "", "", "",
-+
-+		/* GPIO1_D0-D3 */
-+		"", "", "", "",
-+		/* GPIO1_D4-D7 */
-+		"", "", "", "";
-+};
-+
-+&gpio2 {
-+	gpio-line-names =
-+		/* GPIO2_A0-A3 */
-+		"", "", "", "PIN_10",
-+		/* GPIO2_A4-A7 */
-+		"PIN_8", "PINN_35", "PIN_36", "PIN_12",
-+
-+		/* GPIO2_B0-B3 */
-+		"PIN_22", "PIN_26", "PIN_32", "",
-+		/* GPIO2_B4-B7 */
-+		"", "PIN_16", "PIN_18", "PIN_31",
-+
-+		/* GPIO2_C0-C3 */
-+		"PIN_29", "", "", "",
-+		/* GPIO2_C4-C7 */
-+		"", "", "", "",
-+
-+		/* GPIO2_D0-D3 */
-+		"", "", "", "",
-+		/* GPIO2_D4-D7 */
-+		"", "", "", "";
-+};
-+
-+&gpio3 {
-+	gpio-line-names =
-+		/* GPIO3_A0-A3 */
-+		"", "PIN_24", "", "",
-+		/* GPIO3_A4-A7 */
-+		"", "", "", "",
-+
-+		/* GPIO3_B0-B3 */
-+		"", "", "", "EXTPIN_13",
-+		/* GPIO3_B4-B7 */
-+		"EXTPIN_14", "PIN_5", "PIN_3", "",
-+
-+		/* GPIO3_C0-C3 */
-+		"", "PIN_19", "PIN_21", "PIN_23",
-+		/* GPIO3_C4-C7 */
-+		"EXTPIN_11", "EXTPIN_12", "", "",
-+
-+		/* GPIO3_D0-D3 */
-+		"", "", "", "",
-+		/* GPIO3_D4-D7 */
-+		"", "", "", "";
-+};
-+
-+&gpio4 {
-+	gpio-line-names =
-+		/* GPIO4_A0-A3 */
-+		"", "", "", "",
-+		/* GPIO4_A4-A7 */
-+		"", "", "", "",
-+
-+		/* GPIO4_B0-B3 */
-+		"", "", "", "",
-+		/* GPIO4_B4-B7 */
-+		"", "", "", "",
-+
-+		/* GPIO4_C0-C3 */
-+		"", "", "", "",
-+		/* GPIO4_C4-C7 */
-+		"", "", "", "",
-+
-+		/* GPIO4_D0-D3 */
-+		"", "", "", "",
-+		/* GPIO4_D4-D7 */
-+		"", "", "", "";
-+};
-+
-+&gpu {
-+	mali-supply = <&vdd_gpu>;
-+	status = "okay";
-+};
-+
-+&hdmi {
-+	avdd-0v9-supply = <&vdda0v9_image>;
-+	avdd-1v8-supply = <&vcca1v8_image>;
-+	status = "okay";
-+};
-+
-+&hdmi_in {
-+	hdmi_in_vp0: endpoint {
-+		remote-endpoint = <&vp0_out_hdmi>;
-+	};
-+};
-+
-+&hdmi_out {
-+	hdmi_out_con: endpoint {
-+		remote-endpoint = <&hdmi_con_in>;
-+	};
-+};
-+
-+&hdmi_sound {
-+	simple-audio-card,name = "ODROID-M1-HDMI";
-+	status = "okay";
-+};
-+
-+&i2c0 {
-+	status = "okay";
-+	vdd_cpu: tcs4525@1c {
-+		compatible = "tcs,tcs452x";
-+		reg = <0x1c>;
-+		vin-supply = <&vcc5v0_sys>;
-+		regulator-compatible = "fan53555-reg";
-+		regulator-name = "vdd_cpu";
-+		regulator-min-microvolt = <712500>;
-+		regulator-max-microvolt = <1390000>;
-+		regulator-init-microvolt = <900000>;
-+		regulator-ramp-delay = <2300>;
-+		fcs,suspend-voltage-selector = <1>;
-+		regulator-boot-on;
-+		regulator-always-on;
-+		regulator-state-mem {
-+			regulator-off-in-suspend;
-+		};
-+	};
-+
-+	rk809: pmic@20 {
-+		compatible = "rockchip,rk809";
-+		reg = <0x20>;
-+		interrupt-parent = <&gpio0>;
-+		interrupts = <RK_PA3 IRQ_TYPE_LEVEL_LOW>;
-+		assigned-clocks = <&cru I2S1_MCLKOUT_TX>;
-+		assigned-clock-parents = <&cru CLK_I2S1_8CH_TX>;
-+		#clock-cells = <1>;
-+		clock-names = "mclk";
-+		clocks = <&cru I2S1_MCLKOUT_TX>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pmic_int>, <&i2s1m0_mclk>;
-+		rockchip,system-power-controller;
-+		#sound-dai-cells = <0>;
-+		vcc1-supply = <&vcc3v3_sys>;
-+		vcc2-supply = <&vcc3v3_sys>;
-+		vcc3-supply = <&vcc3v3_sys>;
-+		vcc4-supply = <&vcc3v3_sys>;
-+		vcc5-supply = <&vcc3v3_sys>;
-+		vcc6-supply = <&vcc3v3_sys>;
-+		vcc7-supply = <&vcc3v3_sys>;
-+		vcc8-supply = <&vcc3v3_sys>;
-+		vcc9-supply = <&vcc3v3_sys>;
-+		wakeup-source;
-+
-+		regulators {
-+			vdd_logic: DCDC_REG1 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <500000>;
-+				regulator-max-microvolt = <1350000>;
-+				regulator-init-microvolt = <900000>;
-+				regulator-ramp-delay = <6001>;
-+				regulator-initial-mode = <0x2>;
-+				regulator-name = "vdd_logic";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vdd_gpu: DCDC_REG2 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <500000>;
-+				regulator-max-microvolt = <1350000>;
-+				regulator-init-microvolt = <900000>;
-+				regulator-ramp-delay = <6001>;
-+				regulator-initial-mode = <0x2>;
-+				regulator-name = "vdd_gpu";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vcc_ddr: DCDC_REG3 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-initial-mode = <0x2>;
-+				regulator-name = "vcc_ddr";
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+				};
-+			};
-+
-+			vdd_npu: DCDC_REG4 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <500000>;
-+				regulator-max-microvolt = <1350000>;
-+				regulator-init-microvolt = <900000>;
-+				regulator-ramp-delay = <6001>;
-+				regulator-initial-mode = <0x2>;
-+				regulator-name = "vdd_npu";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vdda0v9_image: LDO_REG1 {
-+				regulator-boot-on;
-+				regulator-always-on;
-+				regulator-min-microvolt = <900000>;
-+				regulator-max-microvolt = <900000>;
-+				regulator-name = "vdda0v9_image";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vdda_0v9: LDO_REG2 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <900000>;
-+				regulator-max-microvolt = <900000>;
-+				regulator-name = "vdda_0v9";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vdda0v9_pmu: LDO_REG3 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <900000>;
-+				regulator-max-microvolt = <900000>;
-+				regulator-name = "vdda0v9_pmu";
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <900000>;
-+				};
-+			};
-+
-+			vccio_acodec: LDO_REG4 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <3000000>;
-+				regulator-max-microvolt = <3000000>;
-+				regulator-name = "vccio_acodec";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vccio_sd: LDO_REG5 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-name = "vccio_sd";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vcc3v3_pmu: LDO_REG6 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <3300000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-name = "vcc3v3_pmu";
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <3300000>;
-+				};
-+			};
-+
-+			vcca_1v8: LDO_REG7 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcca_1v8";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vcca1v8_ddr: LDO_REG8 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcca1v8_pmu";
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <1800000>;
-+				};
-+			};
-+
-+			vcca1v8_image: LDO_REG9 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcca1v8_image";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vcc_1v8: DCDC_REG5 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcc_1v8";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vcc_3v3: SWITCH_REG1 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-name = "vcc_3v3";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vcc3v3_sd: SWITCH_REG2 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-name = "vcc3v3_sd";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+		};
-+	};
-+};
-+
-+&i2c2 {
-+	status = "disabled";
-+
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c2m1_xfer>;
-+
-+	clock-frequency = <400000>;
-+};
-+
-+&i2c3 {
-+	status = "disabled";
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c3m1_xfer>;
-+};
-+
-+&i2s0_8ch {
-+	status = "okay";
-+};
-+
-+&i2s1_8ch {
-+	status = "okay";
-+	rockchip,clk-trcm = <1>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2s1m0_sclktx
-+		     &i2s1m0_lrcktx
-+		     &i2s1m0_sdi0
-+		     &i2s1m0_sdo0>;
-+};
-+
-+&mdio1 {
-+	rgmii_phy1: phy@0 {
-+		compatible = "ethernet-phy-ieee802.3-c22";
-+		reg = <0x0>;
-+	};
-+};
-+
-+&pcie2x1 {
-+	reset-gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>;
-+	vpcie3v3-supply = <&pcie20_3v3>;
-+	pinctrl-0 = <&pcie20m2_pins>;
-+	status = "okay";
-+};
-+
-+&pinctrl {
-+	gmac1 {
-+		gmac1m1_miim: gmac1m1-miim {
-+			rockchip,pins =
-+				/* gmac1_mdcm1 */
-+				<4 RK_PB6 3 &pcfg_pull_none_drv_level_15>,
-+				/* gmac1_mdiom1 */
-+				<4 RK_PB7 3 &pcfg_pull_none_drv_level_15>;
-+		};
-+
-+		gmac1m1_clkinout: gmac1m1-clkinout {
-+			rockchip,pins =
-+				/* gmac1_mclkinoutm1 */
-+				<4 RK_PC1 3 &pcfg_pull_none_drv_level_15>;
-+		};
-+
-+		gmac1m1_rx_bus2: gmac1m1-rx-bus2 {
-+			rockchip,pins =
-+				/* gmac1_rxd0m1 */
-+				<4 RK_PA7 3 &pcfg_pull_none_drv_level_15>,
-+				/* gmac1_rxd1m1 */
-+				<4 RK_PB0 3 &pcfg_pull_none_drv_level_15>,
-+				/* gmac1_rxdvcrsm1 */
-+				<4 RK_PB1 3 &pcfg_pull_none_drv_level_15>;
-+		};
-+
-+		gmac1m1_tx_bus2: gmac1m1-tx-bus2 {
-+			rockchip,pins =
-+				/* gmac1_txd0m1 */
-+				<4 RK_PA4 3 &pcfg_pull_none_drv_level_15>,
-+				/* gmac1_txd1m1 */
-+				<4 RK_PA5 3 &pcfg_pull_none_drv_level_15>,
-+				/* gmac1_txenm1 */
-+				<4 RK_PA6 3 &pcfg_pull_none_drv_level_15>;
-+		};
-+
-+		gmac1m1_rgmii_clk: gmac1m1-rgmii-clk {
-+			rockchip,pins =
-+				/* gmac1_rxclkm1 */
-+				<4 RK_PA3 3 &pcfg_pull_none_drv_level_15>,
-+				/* gmac1_txclkm1 */
-+				<4 RK_PA0 3 &pcfg_pull_none_drv_level_15>;
-+		};
-+
-+		gmac1m1_rgmii_bus: gmac1m1-rgmii-bus {
-+			rockchip,pins =
-+				/* gmac1_rxd2m1 */
-+				<4 RK_PA1 3 &pcfg_pull_none_drv_level_15>,
-+				/* gmac1_rxd3m1 */
-+				<4 RK_PA2 3 &pcfg_pull_none_drv_level_15>,
-+				/* gmac1_txd2m1 */
-+				<3 RK_PD6 3 &pcfg_pull_none_drv_level_15>,
-+				/* gmac1_txd3m1 */
-+				<3 RK_PD7 3 &pcfg_pull_none_drv_level_15>;
-+		};
-+	};
-+
-+	leds {
-+		led_power_en: led_power_en {
-+			rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+		led_work_en: led_work_en {
-+			rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	pcie {
-+		pcie20_3v3_en: pcie20-3v3-en {
-+			rockchip,pins = <2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	pmic {
-+		pmic_int: pmic_int {
-+			rockchip,pins =
-+				<0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
-+		};
-+	};
-+
-+	usb {
-+		vcc5v0_host_en: vcc5v0-host-en {
-+			rockchip,pins = <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+
-+		vcc5v0_usb_otg_en: vcc5v0-otg-en {
-+			rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+
-+		vcc5v0_usb_host_en: vcc5v0-usb3-en {
-+			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+};
-+
-+&pmu_io_domains {
-+	pmuio1-supply = <&vcc3v3_pmu>;
-+	pmuio2-supply = <&vcc3v3_pmu>;
-+	vccio1-supply = <&vccio_acodec>;
-+	vccio2-supply = <&vcc_1v8>;
-+	vccio3-supply = <&vccio_sd>;
-+	vccio4-supply = <&vcc_3v3>;
-+	vccio5-supply = <&vcc_3v3>;
-+	vccio6-supply = <&vcc_3v3>;
-+	vccio7-supply = <&vcc_3v3>;
-+	status = "okay";
-+};
-+
-+&pwm1 {
-+	status = "disabled";
-+	pinctrl-0 = <&pwm1m1_pins>;
-+};
-+
-+&saradc {
-+	vref-supply = <&vcca_1v8>;
-+	status = "okay";
-+};
-+
-+&sdhci {
-+	bus-width = <8>;
-+	max-frequency = <200000000>;
-+	non-removable;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe &emmc_rstnout>;
-+	vmmc-supply = <&vcc_3v3>;
-+	vqmmc-supply = <&vcc_1v8>;
-+	status = "okay";
-+};
-+
-+&sdmmc0 {
-+	bus-width = <4>;
-+	cap-sd-highspeed;
-+	cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
-+	disable-wp;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd &sdmmc0_det>;
-+	sd-uhs-sdr104;
-+	vmmc-supply = <&vcc3v3_sys>;
-+	vqmmc-supply = <&vccio_sd>;
-+	status = "okay";
-+};
-+
-+&tsadc {
-+	status = "okay";
-+};
-+
-+&uart1 {
-+	dma-names = "tx", "rx";
-+	/* uart1 uart1-with-ctsrts */
-+	pinctrl-0 = <&uart1m1_xfer>;
-+	pinctrl-1 = <&uart1m1_xfer &uart1m1_ctsn &uart1m1_rtsn>;
-+	status = "disabled";
-+};
-+
-+&uart2 {
-+	status = "okay";
-+};
-+
-+&usb_host0_ehci {
-+	status = "okay";
-+};
-+
-+&usb_host0_ohci {
-+	status = "okay";
-+};
-+
-+&usb_host0_xhci {
-+	dr_mode = "otg";
-+	status = "okay";
-+};
-+
-+&usb_host1_ehci {
-+	status = "okay";
-+};
-+
-+&usb_host1_ohci {
-+	status = "okay";
-+};
-+
-+&usb_host1_xhci {
-+	status = "okay";
-+};
-+
-+&usb2phy0 {
-+	status = "okay";
-+};
-+
-+&usb2phy0_host {
-+	phy-supply = <&vcc5v0_usb_host>;
-+	status = "okay";
-+};
-+
-+&usb2phy0_otg {
-+	vbus-supply = <&vcc5v0_usb_otg>;
-+	status = "okay";
-+};
-+
-+&usb2phy1 {
-+	status = "okay";
-+};
-+
-+&usb2phy1_host {
-+	phy-supply = <&vcc5v0_host>;
-+	status = "okay";
-+};
-+
-+&usb2phy1_otg {
-+	phy-supply = <&vcc5v0_host>;
-+	status = "okay";
-+};
-+
-+&vop {
-+	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
-+	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
-+	status = "okay";
-+};
-+
-+&vop_mmu {
-+	status = "okay";
-+};
-+
-+&vp0 {
-+	vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
-+		reg = <ROCKCHIP_VOP2_EP_HDMI0>;
-+		remote-endpoint = <&hdmi_in_vp0>;
-+	};
-+};
--- 
-2.40.1
-

buildroot-external/board/hardkernel/odroid-m1s/patches/linux/0002-arm64-dts-clean-up-as-required-for-mainline-linux.patch

@@ -1,335 +0,0 @@
-From eb02261dd6c88a7fcf3c28e59a7976905815fa6b Mon Sep 17 00:00:00 2001
-From: Tim Lunn <tim@feathertop.org>
-Date: Sun, 28 Jan 2024 18:55:57 +1100
-Subject: [PATCH] arm64: dts: clean up as required for mainline linux
-
----
- .../boot/dts/rockchip/rk3566-odroid-m1s.dts   | 212 +++---------------
- 1 file changed, 27 insertions(+), 185 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-index 1cad9217c374..cbf2495901d7 100644
---- a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-@@ -18,12 +18,8 @@ / {
- 
- 	aliases {
- 		ethernet1 = &gmac1;
--		i2c0 = &i2c3;
--		i2c3 = &i2c0;
- 		mmc0 = &sdhci;
- 		mmc1 = &sdmmc0;
--		serial0 = &uart1;
--		serial1 = &uart0;
- 	};
- 
- 	chosen: chosen {
-@@ -52,7 +48,7 @@ leds {
- 		compatible = "gpio-leds";
- 		status = "okay";
- 
--		red_led: red {
-+		red_led: led-0 {
- 			gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_LOW>;
- 			linux,default-trigger = "default-on";
- 			function = LED_FUNCTION_POWER;
-@@ -60,7 +56,7 @@ red_led: red {
- 			pinctrl-names = "default";
- 			pinctrl-0 = <&led_power_en>;
- 		};
--		blue_led: blue {
-+		blue_led: led-1 {
- 			gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
- 			linux,default-trigger = "heartbeat";
- 			function = LED_FUNCTION_HEARTBEAT;
-@@ -97,6 +93,25 @@ simple-audio-card,codec {
- 		};
- 	};
- 
-+	spdif_dit: spdif-dit {
-+		compatible = "linux,spdif-dit";
-+		#sound-dai-cells = <0>;
-+		status = "disabled";
-+	};
-+
-+	spdif_sound: spdif-sound {
-+		compatible = "simple-audio-card";
-+		status = "disabled";
-+
-+		simple-audio-card,cpu {
-+			sound-dai = <&spdif>;
-+		};
-+
-+		simple-audio-card,codec {
-+			sound-dai = <&spdif_dit>;
-+		};
-+	};
-+
- 	vcc3v3_sys: vcc3v3-sys {
- 		compatible = "regulator-fixed";
- 		regulator-name = "vcc3v3_sys";
-@@ -164,7 +179,6 @@ vcc5v0_usb_host: vcc5v0-usb3-regulator {
- };
- 
- &combphy1 {
--	phy-supply = <&vcc5v0_usb_host>;
- 	status = "okay";
- };
- 
-@@ -215,121 +229,6 @@ &gmac1m1_rgmii_bus
- 	status = "okay";
- };
- 
--&gpio0 {
--	gpio-line-names =
--		/* GPIO0_A0-A3 */
--		"", "", "", "",
--		/* GPIO0_A4-A7 */
--		"", "", "", "",
--
--		/* GPIO0_B0-B3 */
--		"", "", "", "PIN_28",
--		/* GPIO0_B4-B7 */
--		"PIN_27", "PIN_33", "PIN_7", "",
--
--		/* GPIO0_C0-C3 */
--		"PIN_11", "PIN_13", "PIN_15", "",
--		/* GPIO0_C4-C7 */
--		"", "", "", "",
--
--		/* GPIO0_D0-D3 */
--		"", "", "", "",
--		/* GPIO0_D4-D7 */
--		"", "", "", "";
--};
--
--&gpio1 {
--	gpio-line-names =
--		/* GPIO1_A0-A3 */
--		"", "", "", "",
--		/* GPIO1_A4-A7 */
--		"", "", "", "",
--
--		/* GPIO1_B0-B3 */
--		"", "", "", "",
--		/* GPIO1_B4-B7 */
--		"", "", "", "",
--
--		/* GPIO1_C0-C3 */
--		"", "", "", "",
--		/* GPIO1_C4-C7 */
--		"", "", "", "",
--
--		/* GPIO1_D0-D3 */
--		"", "", "", "",
--		/* GPIO1_D4-D7 */
--		"", "", "", "";
--};
--
--&gpio2 {
--	gpio-line-names =
--		/* GPIO2_A0-A3 */
--		"", "", "", "PIN_10",
--		/* GPIO2_A4-A7 */
--		"PIN_8", "PINN_35", "PIN_36", "PIN_12",
--
--		/* GPIO2_B0-B3 */
--		"PIN_22", "PIN_26", "PIN_32", "",
--		/* GPIO2_B4-B7 */
--		"", "PIN_16", "PIN_18", "PIN_31",
--
--		/* GPIO2_C0-C3 */
--		"PIN_29", "", "", "",
--		/* GPIO2_C4-C7 */
--		"", "", "", "",
--
--		/* GPIO2_D0-D3 */
--		"", "", "", "",
--		/* GPIO2_D4-D7 */
--		"", "", "", "";
--};
--
--&gpio3 {
--	gpio-line-names =
--		/* GPIO3_A0-A3 */
--		"", "PIN_24", "", "",
--		/* GPIO3_A4-A7 */
--		"", "", "", "",
--
--		/* GPIO3_B0-B3 */
--		"", "", "", "EXTPIN_13",
--		/* GPIO3_B4-B7 */
--		"EXTPIN_14", "PIN_5", "PIN_3", "",
--
--		/* GPIO3_C0-C3 */
--		"", "PIN_19", "PIN_21", "PIN_23",
--		/* GPIO3_C4-C7 */
--		"EXTPIN_11", "EXTPIN_12", "", "",
--
--		/* GPIO3_D0-D3 */
--		"", "", "", "",
--		/* GPIO3_D4-D7 */
--		"", "", "", "";
--};
--
--&gpio4 {
--	gpio-line-names =
--		/* GPIO4_A0-A3 */
--		"", "", "", "",
--		/* GPIO4_A4-A7 */
--		"", "", "", "",
--
--		/* GPIO4_B0-B3 */
--		"", "", "", "",
--		/* GPIO4_B4-B7 */
--		"", "", "", "",
--
--		/* GPIO4_C0-C3 */
--		"", "", "", "",
--		/* GPIO4_C4-C7 */
--		"", "", "", "",
--
--		/* GPIO4_D0-D3 */
--		"", "", "", "",
--		/* GPIO4_D4-D7 */
--		"", "", "", "";
--};
--
- &gpu {
- 	mali-supply = <&vdd_gpu>;
- 	status = "okay";
-@@ -368,7 +267,6 @@ vdd_cpu: tcs4525@1c {
- 		regulator-name = "vdd_cpu";
- 		regulator-min-microvolt = <712500>;
- 		regulator-max-microvolt = <1390000>;
--		regulator-init-microvolt = <900000>;
- 		regulator-ramp-delay = <2300>;
- 		fcs,suspend-voltage-selector = <1>;
- 		regulator-boot-on;
-@@ -409,7 +307,6 @@ vdd_logic: DCDC_REG1 {
- 				regulator-boot-on;
- 				regulator-min-microvolt = <500000>;
- 				regulator-max-microvolt = <1350000>;
--				regulator-init-microvolt = <900000>;
- 				regulator-ramp-delay = <6001>;
- 				regulator-initial-mode = <0x2>;
- 				regulator-name = "vdd_logic";
-@@ -423,7 +320,6 @@ vdd_gpu: DCDC_REG2 {
- 				regulator-boot-on;
- 				regulator-min-microvolt = <500000>;
- 				regulator-max-microvolt = <1350000>;
--				regulator-init-microvolt = <900000>;
- 				regulator-ramp-delay = <6001>;
- 				regulator-initial-mode = <0x2>;
- 				regulator-name = "vdd_gpu";
-@@ -447,7 +343,6 @@ vdd_npu: DCDC_REG4 {
- 				regulator-boot-on;
- 				regulator-min-microvolt = <500000>;
- 				regulator-max-microvolt = <1350000>;
--				regulator-init-microvolt = <900000>;
- 				regulator-ramp-delay = <6001>;
- 				regulator-initial-mode = <0x2>;
- 				regulator-name = "vdd_npu";
-@@ -587,6 +482,9 @@ regulator-state-mem {
- 				};
- 			};
- 		};
-+		codec {
-+			rockchip,mic-in-differential;
-+		};
- 	};
- };
- 
-@@ -611,7 +509,7 @@ &i2s0_8ch {
- 
- &i2s1_8ch {
- 	status = "okay";
--	rockchip,clk-trcm = <1>;
-+	rockchip,trcm-sync-tx-only;
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&i2s1m0_sclktx
- 		     &i2s1m0_lrcktx
-@@ -620,7 +518,7 @@ &i2s1m0_sdi0
- };
- 
- &mdio1 {
--	rgmii_phy1: phy@0 {
-+	rgmii_phy1: ethernet-phy@0 {
- 		compatible = "ethernet-phy-ieee802.3-c22";
- 		reg = <0x0>;
- 	};
-@@ -634,62 +532,6 @@ &pcie2x1 {
- };
- 
- &pinctrl {
--	gmac1 {
--		gmac1m1_miim: gmac1m1-miim {
--			rockchip,pins =
--				/* gmac1_mdcm1 */
--				<4 RK_PB6 3 &pcfg_pull_none_drv_level_15>,
--				/* gmac1_mdiom1 */
--				<4 RK_PB7 3 &pcfg_pull_none_drv_level_15>;
--		};
--
--		gmac1m1_clkinout: gmac1m1-clkinout {
--			rockchip,pins =
--				/* gmac1_mclkinoutm1 */
--				<4 RK_PC1 3 &pcfg_pull_none_drv_level_15>;
--		};
--
--		gmac1m1_rx_bus2: gmac1m1-rx-bus2 {
--			rockchip,pins =
--				/* gmac1_rxd0m1 */
--				<4 RK_PA7 3 &pcfg_pull_none_drv_level_15>,
--				/* gmac1_rxd1m1 */
--				<4 RK_PB0 3 &pcfg_pull_none_drv_level_15>,
--				/* gmac1_rxdvcrsm1 */
--				<4 RK_PB1 3 &pcfg_pull_none_drv_level_15>;
--		};
--
--		gmac1m1_tx_bus2: gmac1m1-tx-bus2 {
--			rockchip,pins =
--				/* gmac1_txd0m1 */
--				<4 RK_PA4 3 &pcfg_pull_none_drv_level_15>,
--				/* gmac1_txd1m1 */
--				<4 RK_PA5 3 &pcfg_pull_none_drv_level_15>,
--				/* gmac1_txenm1 */
--				<4 RK_PA6 3 &pcfg_pull_none_drv_level_15>;
--		};
--
--		gmac1m1_rgmii_clk: gmac1m1-rgmii-clk {
--			rockchip,pins =
--				/* gmac1_rxclkm1 */
--				<4 RK_PA3 3 &pcfg_pull_none_drv_level_15>,
--				/* gmac1_txclkm1 */
--				<4 RK_PA0 3 &pcfg_pull_none_drv_level_15>;
--		};
--
--		gmac1m1_rgmii_bus: gmac1m1-rgmii-bus {
--			rockchip,pins =
--				/* gmac1_rxd2m1 */
--				<4 RK_PA1 3 &pcfg_pull_none_drv_level_15>,
--				/* gmac1_rxd3m1 */
--				<4 RK_PA2 3 &pcfg_pull_none_drv_level_15>,
--				/* gmac1_txd2m1 */
--				<3 RK_PD6 3 &pcfg_pull_none_drv_level_15>,
--				/* gmac1_txd3m1 */
--				<3 RK_PD7 3 &pcfg_pull_none_drv_level_15>;
--		};
--	};
--
- 	leds {
- 		led_power_en: led_power_en {
- 			rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
-@@ -825,7 +667,7 @@ &usb2phy0_host {
- };
- 
- &usb2phy0_otg {
--	vbus-supply = <&vcc5v0_usb_otg>;
-+	phy-supply = <&vcc5v0_usb_otg>;
- 	status = "okay";
- };
- 
--- 
-2.40.1
-

buildroot-external/board/hardkernel/odroid-m1s/patches/linux/0003-arm64-dts-fix-vdd_cpu-regulator-for-mainline.patch

@@ -1,43 +0,0 @@
-From 641ec8e05726d42c8ec7fa3bda1d8a64f126b475 Mon Sep 17 00:00:00 2001
-From: Tim Lunn <tim@feathertop.org>
-Date: Fri, 12 Jan 2024 22:32:56 +1100
-Subject: [PATCH] arm64: dts: fix vdd_cpu regulator for mainline
-
----
- .../arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-index cbf2495901d7..a5d9216b544b 100644
---- a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-@@ -259,18 +259,19 @@ &hdmi_sound {
- 
- &i2c0 {
- 	status = "okay";
--	vdd_cpu: tcs4525@1c {
--		compatible = "tcs,tcs452x";
-+
-+	vdd_cpu: regulator@1c {
-+		compatible = "tcs,tcs4525";
- 		reg = <0x1c>;
--		vin-supply = <&vcc5v0_sys>;
--		regulator-compatible = "fan53555-reg";
-+		fcs,suspend-voltage-selector = <1>;
- 		regulator-name = "vdd_cpu";
-+		regulator-always-on;
-+		regulator-boot-on;
- 		regulator-min-microvolt = <712500>;
- 		regulator-max-microvolt = <1390000>;
- 		regulator-ramp-delay = <2300>;
--		fcs,suspend-voltage-selector = <1>;
--		regulator-boot-on;
--		regulator-always-on;
-+		vin-supply = <&vcc3v3_sys>;
-+
- 		regulator-state-mem {
- 			regulator-off-in-suspend;
- 		};
--- 
-2.40.1
-

buildroot-external/board/hardkernel/odroid-m1s/patches/linux/0005-Remove-deprecated-snps-reset-properties.patch

@@ -1,51 +0,0 @@
-From b4d16cd88ec2701dcb15b9519a79288ea5d2bfec Mon Sep 17 00:00:00 2001
-From: Tim Lunn <tim@feathertop.org>
-Date: Sat, 3 Feb 2024 23:40:16 +1100
-Subject: [PATCH] Remove deprecated snps,reset properties
-
----
- arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-index b8adfd7024f9..e755d00b1d4f 100644
---- a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-@@ -192,8 +192,9 @@ &gmac1 {
- 	assigned-clocks = <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1_RGMII_SPEED>, <&cru SCLK_GMAC1>;
- 	assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>, <&cru SCLK_GMAC1>, <&gmac1_clkin>;
- 	clock_in_out = "input";
--	phy-supply = <&vcc_3v3>;
-+	phy-handle = <&rgmii_phy1>;
- 	phy-mode = "rgmii";
-+	phy-supply = <&vcc_3v3>;
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&gmac1m1_miim
- 		     &gmac1m1_tx_bus2
-@@ -201,13 +202,8 @@ &gmac1m1_rx_bus2
- 		     &gmac1m1_rgmii_clk
- 		     &gmac1m1_rgmii_bus
- 		     &gmac1m1_clkinout>;
--	snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
--	snps,reset-active-low;
--	/* Reset time is 20ms, 100ms for rtl8211f */
--	snps,reset-delays-us = <0 20000 100000>;
- 	tx_delay = <0x4f>;
- 	rx_delay = <0x2d>;
--	phy-handle = <&rgmii_phy1>;
- 	status = "okay";
- };
- 
-@@ -504,6 +500,9 @@ &mdio1 {
- 	rgmii_phy1: ethernet-phy@0 {
- 		compatible = "ethernet-phy-ieee802.3-c22";
- 		reg = <0x0>;
-+		reset-assert-us = <20000>;
-+		reset-deassert-us = <100000>;
-+		reset-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
- 	};
- };
- 
--- 
-2.40.1
-

buildroot-external/board/hardkernel/odroid-m1s/patches/uboot/0002-Apply-fixes-for-mainline-u-boot.patch

@@ -1,48 +0,0 @@
-From ed61d0b5f18bf333ff7f35fc8546dd58d227b12f Mon Sep 17 00:00:00 2001
-From: Tim Lunn <tim@feathertop.org>
-Date: Sat, 3 Feb 2024 18:38:49 +1100
-Subject: [PATCH] Apply fixes for mainline u-boot
-
----
- arch/arm/dts/rk3566-odroid-m1s.dts  | 6 +-----
- configs/odroid-m1s-rk3566_defconfig | 1 -
- 2 files changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/arch/arm/dts/rk3566-odroid-m1s.dts b/arch/arm/dts/rk3566-odroid-m1s.dts
-index 73e29d80c7..2dba07ba19 100644
---- a/arch/arm/dts/rk3566-odroid-m1s.dts
-+++ b/arch/arm/dts/rk3566-odroid-m1s.dts
-@@ -17,12 +17,8 @@
- 
- 	aliases {
- 		ethernet0 = &gmac1;
--		i2c0 = &i2c3;
--		i2c3 = &i2c0;
- 		mmc0 = &sdhci;
- 		mmc1 = &sdmmc0;
--		serial0 = &uart1;
--		serial1 = &uart0;
- 	};
- 
- 	chosen {
-@@ -578,7 +574,7 @@
- 	disable-wp;
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd &sdmmc0_det>;
--	sd-uhs-sdr50;
-+	sd-uhs-sdr104;
- 	vmmc-supply = <&vcc3v3_sd>;
- 	vqmmc-supply = <&vccio_sd>;
- 	status = "okay";
-diff --git a/configs/odroid-m1s-rk3566_defconfig b/configs/odroid-m1s-rk3566_defconfig
-index d70a10dc08..61b6962063 100644
---- a/configs/odroid-m1s-rk3566_defconfig
-+++ b/configs/odroid-m1s-rk3566_defconfig
-@@ -106,4 +106,3 @@ CONFIG_USB_DWC3=y
- CONFIG_USB_DWC3_GENERIC=y
- CONFIG_FS_CRAMFS=y
- CONFIG_ERRNO_STR=y
--CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x0800
--- 
-2.40.1
-

buildroot-external/board/hardkernel/odroid-m1s/patches/uboot/0003-Improve-reliability-of-eMMC.patch

@@ -1,44 +0,0 @@
-From 2a1d8f586799e4166e802babcce18c9980aa1f44 Mon Sep 17 00:00:00 2001
-From: Tim Lunn <tim@feathertop.org>
-Date: Thu, 1 Feb 2024 17:50:46 +1100
-Subject: [PATCH] Improve reliability of eMMC
-
-Cherry-picked from:
-20240126232615.6826-2-jonas@kwiboo.se
----
- arch/arm/dts/rk3566-odroid-m1s-u-boot.dtsi | 4 ----
- configs/odroid-m1s-rk3566_defconfig        | 2 ++
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/dts/rk3566-odroid-m1s-u-boot.dtsi b/arch/arm/dts/rk3566-odroid-m1s-u-boot.dtsi
-index 33a1d142b8..04d0cd17ef 100644
---- a/arch/arm/dts/rk3566-odroid-m1s-u-boot.dtsi
-+++ b/arch/arm/dts/rk3566-odroid-m1s-u-boot.dtsi
-@@ -14,11 +14,7 @@
- 
- &sdhci {
- 	cap-mmc-highspeed;
--	mmc-ddr-1_8v;
- 	mmc-hs200-1_8v;
--	mmc-hs400-1_8v;
--	mmc-hs400-enhanced-strobe;
--	pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>;
- };
- 
- &uart2 {
-diff --git a/configs/odroid-m1s-rk3566_defconfig b/configs/odroid-m1s-rk3566_defconfig
-index 61b6962063..7920ef224d 100644
---- a/configs/odroid-m1s-rk3566_defconfig
-+++ b/configs/odroid-m1s-rk3566_defconfig
-@@ -70,6 +70,8 @@ CONFIG_ROCKCHIP_GPIO=y
- CONFIG_SYS_I2C_ROCKCHIP=y
- CONFIG_MISC=y
- CONFIG_SUPPORT_EMMC_RPMB=y
-+CONFIG_MMC_HS200_SUPPORT=y
-+CONFIG_SPL_MMC_HS200_SUPPORT=y
- CONFIG_MMC_DW=y
- CONFIG_MMC_DW_ROCKCHIP=y
- CONFIG_MMC_SDHCI=y
--- 
-2.40.1
-

buildroot-external/board/hardkernel/odroid-m1s/patches/uboot/0004-Fix-ethernet-properties.patch

@@ -1,52 +0,0 @@
-From 65a304151817626157e7be4e7e1581cdddca2a02 Mon Sep 17 00:00:00 2001
-From: Tim Lunn <tim@feathertop.org>
-Date: Sat, 3 Feb 2024 23:42:47 +1100
-Subject: [PATCH] Fix ethernet properties
-
----
- arch/arm/dts/rk3566-odroid-m1s.dts | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm/dts/rk3566-odroid-m1s.dts b/arch/arm/dts/rk3566-odroid-m1s.dts
-index 2dba07ba19..73b545109d 100644
---- a/arch/arm/dts/rk3566-odroid-m1s.dts
-+++ b/arch/arm/dts/rk3566-odroid-m1s.dts
-@@ -197,10 +197,9 @@
- };
- 
- &gmac1 {
--	assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>;
--	assigned-clock-rates = <0>, <125000000>;
--	assigned-clocks = <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1>;
--	clock_in_out = "output";
-+	assigned-clocks = <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1_RGMII_SPEED>, <&cru SCLK_GMAC1>;
-+	assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>, <&cru SCLK_GMAC1>, <&gmac1_clkin>;
-+	clock_in_out = "input";
- 	phy-handle = <&rgmii_phy1>;
- 	phy-mode = "rgmii";
- 	phy-supply = <&vcc3v3_sys>;
-@@ -211,10 +210,9 @@
- 		     &gmac1m1_rgmii_clk
- 		     &gmac1m1_rgmii_bus
- 		     &gmac1m1_clkinout>;
--	status = "okay";
--
- 	tx_delay = <0x4f>;
- 	rx_delay = <0x2d>;
-+	status = "okay";
- };
- 
- &gpu {
-@@ -496,6 +494,9 @@
- 	rgmii_phy1: ethernet-phy@0 {
- 		compatible = "ethernet-phy-ieee802.3-c22";
- 		reg = <0x0>;
-+		reset-assert-us = <20000>;
-+		reset-deassert-us = <100000>;
-+		reset-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
- 	};
- };
- 
--- 
-2.40.1
-

buildroot-external/board/hardkernel/odroid-m1s/uboot-boot.ush

@@ -23,8 +23,8 @@ test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=t
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro rootwait"
-setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro rootwait"
+setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd ro rootwait"
+setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 ro rootwait"
 
 part number ${devtype} ${devnum} hassos-boot boot_partnum
 

buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush

@@ -25,8 +25,8 @@ test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=t
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
-setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait"
+setenv bootargs_a "root=PARTUUID=48617373-06 ro rootwait"
+setenv bootargs_b "root=PARTUUID=48617373-08 ro rootwait"
 
 # Load environment from haos-config.txt
 if test -e mmc ${devnum}:1 haos-config.txt; then

buildroot-external/board/hardkernel/odroid-xu4/patches/linux/0001-ODROID-XU4-regulator-s2mps11-add-ethernet-power-rese.patch

@@ -1,8 +1,11 @@
-From c51639443d3c90127a77f1534e39dd01fac1577f Mon Sep 17 00:00:00 2001
+From d4ec3799c0773b3a6d3d90f4b16eec1f50e4b032 Mon Sep 17 00:00:00 2001
 From: memeka <mihailescu2m@gmail.com>
 Date: Fri, 18 Jan 2019 14:36:21 +1030
 Subject: [PATCH] ODROID-XU4: regulator: s2mps11: add ethernet power reset in
  shutdown function
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 Ethernet device cannot be detected on warm boot sometimes. This patch is
 to add the power reset routines for ethernet device using PMIC. Then
@@ -11,15 +14,17 @@ ethernet device can be reset hardware-wise.
 Change-Id: Iffbe2966da7e4679f63b91ab79241167391792df
 Signed-off-by: Brian Kim <brian.kim@hardkernel.com>
 Signed-off-by: Marian Mihailescu <mihailescu2m@gmail.com>
+[Updated patch for Linux 6.11+ after scoped memory allocation refactor]
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
 ---
- drivers/regulator/s2mps11.c | 55 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 55 insertions(+)
+ drivers/regulator/s2mps11.c | 56 +++++++++++++++++++++++++++++++++++++
+ 1 file changed, 56 insertions(+)
 
 diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
-index 570b61420f3a..286b606660a4 100644
+index 7dcf92af8f15e..f08f6f494fe0b 100644
 --- a/drivers/regulator/s2mps11.c
 +++ b/drivers/regulator/s2mps11.c
-@@ -1117,6 +1117,57 @@ static const struct regulator_desc s2mpu02_regulators[] = {
+@@ -1118,6 +1118,57 @@ static const struct regulator_desc s2mpu02_regulators[] = {
  	regulator_desc_s2mpu02_buck7(7),
  };
  
@@ -77,7 +82,7 @@ index 570b61420f3a..286b606660a4 100644
  static int s2mps11_pmic_probe(struct platform_device *pdev)
  {
  	struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent);
-@@ -1219,6 +1270,10 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
+@@ -1219,6 +1270,11 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
  		}
  	}
  
@@ -85,6 +90,7 @@ index 570b61420f3a..286b606660a4 100644
 +	s2mps11_pmic_ethonoff(pdev, false);
 +	mdelay(10);
 +	s2mps11_pmic_ethonoff(pdev, true);
- out:
- 	kfree(rdata);
++
+ 	return 0;
+ }
  

buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush

@@ -27,8 +27,8 @@ test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=t
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
-setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait"
+setenv bootargs_a "root=PARTUUID=48617373-06 ro rootwait"
+setenv bootargs_b "root=PARTUUID=48617373-08 ro rootwait"
 
 # Load extraargs
 fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline

buildroot-external/board/hardkernel/patches-meson/uboot/0001-HACK-mmc-meson-gx-limit-f_max-to-24-MHz-on-the-first.patch

@@ -0,0 +1,81 @@
+From f63ef87b9a9bf9997aa4017f8380567b20a1810c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
+Date: Thu, 7 Nov 2024 12:39:02 +0100
+Subject: [PATCH] HACK: mmc: meson-gx: limit f_max to 24 MHz on the first try
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+To initialize some eMMCs cards properly, ODROID N2 needed to have
+maximum clock rate limited to 24 MHz. This was working good until ODROID
+released eMMC modules with Kingson chips which do not initialize at the
+limited frequency at all - instead it seems it's best for the if
+no limit is set (which would result in using 52 MHz anyway).
+
+Instead of hard-limiting the frequency, add a boolean flag that caps the
+frequency to the proven 24 MHz, and if mmc_select_mode_and_width fails,
+remove this cap and use f_max set to 100 MHz, as limited in upstream
+U-Boot.
+
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
+---
+ drivers/mmc/meson_gx_mmc.c |  2 ++
+ drivers/mmc/mmc.c          | 11 +++++++++++
+ include/mmc.h              |  2 ++
+ 3 files changed, 15 insertions(+)
+
+diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
+index 5852b24c6d2..0e0265de359 100644
+--- a/drivers/mmc/meson_gx_mmc.c
++++ b/drivers/mmc/meson_gx_mmc.c
+@@ -282,6 +282,8 @@ static int meson_mmc_probe(struct udevice *dev)
+ 	cfg->b_max = 511; /* max 512 - 1 blocks */
+ 	cfg->name = dev->name;
+ 
++	mmc->meson_gx_f_max_hack = true;
++
+ 	mmc->priv = pdata;
+ 	upriv->mmc = mmc;
+ 
+diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
+index 799586891af..85b6210f220 100644
+--- a/drivers/mmc/mmc.c
++++ b/drivers/mmc/mmc.c
+@@ -1694,6 +1694,10 @@ int mmc_set_clock(struct mmc *mmc, uint clock, bool disable)
+ 			clock = mmc->cfg->f_min;
+ 	}
+ 
++	/* Apply 24 MHz limit that fixes issues with some cards on meson. */
++	if (mmc->meson_gx_f_max_hack && clock > 24000000)
++		clock = 24000000;
++
+ 	mmc->clock = clock;
+ 	mmc->clk_disable = disable;
+ 
+@@ -2701,6 +2705,13 @@ static int mmc_startup(struct mmc *mmc)
+ 		if (err)
+ 			return err;
+ 		err = mmc_select_mode_and_width(mmc, mmc->card_caps);
++		if (err && mmc->meson_gx_f_max_hack) {
++			/* Some eMMCs (namely Kingston) do not initialize at limited frequency. */
++			printf("Card failed to initialize at %d Hz, disabling meson_gx hack.\n",
++			       mmc->clock);
++			mmc->meson_gx_f_max_hack = false;
++			err = mmc_select_mode_and_width(mmc, mmc->card_caps);
++		}
+ 	}
+ #endif
+ 	if (err)
+diff --git a/include/mmc.h b/include/mmc.h
+index e4b960b7294..5ad40cf2ed1 100644
+--- a/include/mmc.h
++++ b/include/mmc.h
+@@ -760,6 +760,8 @@ struct mmc {
+ 	enum bus_mode user_speed_mode; /* input speed mode from user */
+ 
+ 	CONFIG_IS_ENABLED(CYCLIC, (struct cyclic_info cyclic));
++
++	bool meson_gx_f_max_hack;
+ };
+ 
+ #if CONFIG_IS_ENABLED(DM_MMC)

buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-g12b-add-power-button-support.patch

@@ -1,4 +1,4 @@
-From e780a5f405a02e3102c471415f7b0ad73a5cc036 Mon Sep 17 00:00:00 2001
+From 8286ad3b1e761138e3c574160a5e1a2d6ed06084 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 11 Jan 2021 11:20:48 +0100
 Subject: [PATCH] arm64: dts: meson: g12b: add power button support
@@ -13,7 +13,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 11 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
-index 9e12a34b2840..c27eae6488ce 100644
+index 09d959aefb184..6be653ac77fac 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
 @@ -38,6 +38,17 @@ fan: gpio-fan {

buildroot-external/board/hardkernel/patches/linux/0002-arm64-dts-meson-g12b-add-GPIO-fan-support.patch

@@ -1,4 +1,4 @@
-From cff7ba94733d9103487d87a6474e2ab026bd718c Mon Sep 17 00:00:00 2001
+From 6835f658a2c21d38730c1280587cf3768a82ad60 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 11 Jan 2021 11:38:54 +0100
 Subject: [PATCH] arm64: dts: meson: g12b: add GPIO fan support
@@ -13,7 +13,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 11 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
-index c27eae6488ce..db8a2dfaf0b3 100644
+index 6be653ac77fac..10dd23a3b44bc 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
 @@ -49,6 +49,17 @@ power-button {

buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch

@@ -1,4 +1,4 @@
-From 8d781fc504780a3aa8ef751724e3749c2bfda7a9 Mon Sep 17 00:00:00 2001
+From 297031995dabde203581d555e9ddd91a50d155dc Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 11 Jan 2021 15:53:55 +0100
 Subject: [PATCH] arm64: dts: meson: g12b: odroid-n2: add fan as cooling device
@@ -17,7 +17,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 38 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
-index db8a2dfaf0b3..843e66332369 100644
+index 10dd23a3b44bc..13624c6522abc 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
 @@ -245,6 +245,44 @@ &clkc_audio {

buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-add-uart_A-node.patch

@@ -1,4 +1,4 @@
-From 01ac730fa92a030690a7701c9b8781bc4ef7bcae Mon Sep 17 00:00:00 2001
+From 742764eb039d8d96aa43afeb62a89b122073bb98 Mon Sep 17 00:00:00 2001
 From: Hyeonki Hong <hhk7734@gmail.com>
 Date: Fri, 27 Mar 2020 17:05:22 +0900
 Subject: [PATCH] arm64: dts: meson: add uart_A node
@@ -12,7 +12,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 7 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
-index 843e66332369..61caadd679e2 100644
+index 13624c6522abc..6a1330b40cf4d 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
 @@ -12,6 +12,7 @@

buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch

@@ -1,4 +1,4 @@
-From f5676219e12b48a0f591e911797304fae05ca78c Mon Sep 17 00:00:00 2001
+From bb0da00e7b89510fb66c7a8a1acf16d9f58a45fe Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 29 Apr 2021 21:32:43 +0200
 Subject: [PATCH] arm64: dts: meson: add i2c2 node to ODROID N2/N2+
@@ -13,11 +13,11 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 6 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-index 91c9769fda20..ececc6b17639 100644
+index 3bca8023638d4..45f6dada0edee 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-@@ -248,6 +248,12 @@ usb-hub-hog {
- 	};
+@@ -264,6 +264,12 @@ &gpio {
+ 		"PIN_36"; /* GPIOX_19 */
  };
  
 +&i2c2 {

buildroot-external/board/hardkernel/patches/linux/0006-ODROID-C4-arm64-dts-add-uart_A-node.patch

@@ -1,4 +1,4 @@
-From 1c9c3ca476adf09884295e9f8298288ea497e5ac Mon Sep 17 00:00:00 2001
+From 37b8576e97c3a130160bd5908220c67b2258a443 Mon Sep 17 00:00:00 2001
 From: Hyeonki Hong <hhk7734@gmail.com>
 Date: Tue, 1 Mar 2022 21:51:50 +0100
 Subject: [PATCH] ODROID-C4: arm64/dts: add uart_A node
@@ -8,7 +8,7 @@ Subject: [PATCH] ODROID-C4: arm64/dts: add uart_A node
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
-index 1db2327bbd13..e67869fbb460 100644
+index 7b0e9817a615d..a41fc1cfdeead 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
 @@ -10,8 +10,9 @@
@@ -22,7 +22,7 @@ index 1db2327bbd13..e67869fbb460 100644
  	};
  
  	chosen {
-@@ -449,6 +450,12 @@ &tohdmitx {
+@@ -453,6 +454,12 @@ &tohdmitx {
  	status = "okay";
  };
  

buildroot-external/board/hardkernel/patches/linux/0007-ODROID-C4-arm64-dts-add-i2c2-i2c3-node.patch

@@ -1,4 +1,4 @@
-From 9cd343da01d9b69ad33444105208949775c909b4 Mon Sep 17 00:00:00 2001
+From 837c71af687b26385467b5c1e58208de325f6d26 Mon Sep 17 00:00:00 2001
 From: Hyeonki Hong <hhk7734@gmail.com>
 Date: Tue, 1 Mar 2022 21:53:32 +0100
 Subject: [PATCH] ODROID-C4: arm64/dts: add i2c2, i2c3 node
@@ -8,7 +8,7 @@ Subject: [PATCH] ODROID-C4: arm64/dts: add i2c2, i2c3 node
  1 file changed, 53 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
-index e67869fbb460..90d2eea7fe24 100644
+index a41fc1cfdeead..ceb8a182820fd 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
 @@ -11,6 +11,8 @@
@@ -20,7 +20,7 @@ index e67869fbb460..90d2eea7fe24 100644
  		serial0 = &uart_AO;
  		serial1 = &uart_A;
  	};
-@@ -386,6 +388,57 @@ &ir {
+@@ -390,6 +392,57 @@ &ir {
  	pinctrl-names = "default";
  };
  

buildroot-external/board/hardkernel/patches/linux/0008-arm64-dts-amlogic-add-uartA-uartC-to-ODROID-C2.patch

@@ -1,4 +1,4 @@
-From 299d45dd82df026c0164e170d476b56eada4aa77 Mon Sep 17 00:00:00 2001
+From 94625c724799c8082ab0f195e1799f88b352203d Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Wed, 15 Feb 2023 20:15:07 +0100
 Subject: [PATCH] arm64: dts: amlogic: add uartA/uartC to ODROID-C2
@@ -9,7 +9,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 14 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
-index e6d2de7c45a9..c6a38d890db5 100644
+index 959bd8d77a82e..557ad0cf8f975 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
 @@ -17,6 +17,8 @@ / {
@@ -21,7 +21,7 @@ index e6d2de7c45a9..c6a38d890db5 100644
  		ethernet0 = &ethmac;
  	};
  
-@@ -383,6 +385,18 @@ &uart_AO {
+@@ -387,6 +389,18 @@ &uart_AO {
  	pinctrl-names = "default";
  };
  

buildroot-external/board/hardkernel/patches/linux/0009-arm64-dts-amlogic-meson-gx-add-missing-pins-for-I2C-.patch

@@ -1,4 +1,4 @@
-From 61a378b42a2f61589cc62ff85334dd607014cb6d Mon Sep 17 00:00:00 2001
+From 2ee967384a0062b0de6a4259a9d9c839e11b1120 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Wed, 15 Feb 2023 20:16:29 +0100
 Subject: [PATCH] arm64: dts: amlogic: meson-gx: add missing pins for I2C A/B
@@ -9,10 +9,10 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 4 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
-index 12ef6e81c8bd..90ae81493de2 100644
+index ed00e67e6923a..460a21a4f551a 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
-@@ -333,6 +333,8 @@ &hwrng {
+@@ -339,6 +339,8 @@ &hwrng {
  
  &i2c_A {
  	clocks = <&clkc CLKID_I2C>;
@@ -21,7 +21,7 @@ index 12ef6e81c8bd..90ae81493de2 100644
  };
  
  &i2c_AO {
-@@ -341,6 +343,8 @@ &i2c_AO {
+@@ -347,6 +349,8 @@ &i2c_AO {
  
  &i2c_B {
  	clocks = <&clkc CLKID_I2C>;

buildroot-external/board/hardkernel/patches/uboot/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch

@@ -1,26 +0,0 @@
-From 11f015e13ef0442b6d2bb734954291abde415f73 Mon Sep 17 00:00:00 2001
-From: Neil Armstrong <narmstrong@baylibre.com>
-Date: Mon, 2 Sep 2019 15:42:04 +0200
-Subject: [PATCH] HACK: mmc: meson-gx: limit to 24MHz
-
-Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
----
- drivers/mmc/meson_gx_mmc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
-index fcf4f03d1e..6ded4b619b 100644
---- a/drivers/mmc/meson_gx_mmc.c
-+++ b/drivers/mmc/meson_gx_mmc.c
-@@ -279,7 +279,7 @@ static int meson_mmc_probe(struct udevice *dev)
- 	cfg->host_caps = MMC_MODE_8BIT | MMC_MODE_4BIT |
- 			MMC_MODE_HS_52MHz | MMC_MODE_HS;
- 	cfg->f_min = DIV_ROUND_UP(SD_EMMC_CLKSRC_24M, CLK_MAX_DIV);
--	cfg->f_max = 100000000; /* 100 MHz */
-+	cfg->f_max = SD_EMMC_CLKSRC_24M;
- 	cfg->b_max = 511; /* max 512 - 1 blocks */
- 	cfg->name = dev->name;
- 
--- 
-2.43.0
-

buildroot-external/board/khadas/kernel-vim.config

@@ -296,7 +296,6 @@ CONFIG_TCG_TIS_I2C_INFINEON=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
-CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_MESON=y
 CONFIG_I2C_RK3X=y
@@ -332,7 +331,6 @@ CONFIG_GPIO_MAX732X=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_MAX77620=y
-CONFIG_POWER_RESET_BRCMSTB=y
 CONFIG_POWER_RESET_XGENE=y
 CONFIG_POWER_RESET_SYSCON=y
 CONFIG_SYSCON_REBOOT_MODE=y
@@ -546,7 +544,6 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_LEDS_TRIGGER_PANIC=y
-CONFIG_LEDS_TRIGGER_AUDIO=m
 CONFIG_EDAC=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1307=m
@@ -587,7 +584,6 @@ CONFIG_HWSPINLOCK=y
 CONFIG_ARM_SMMU=y
 CONFIG_ARM_SMMU_V3=y
 CONFIG_REMOTEPROC=y
-CONFIG_SOC_BRCMSTB=y
 CONFIG_SOC_TI=y
 CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
 CONFIG_EXTCON_USB_GPIO=y

buildroot-external/board/khadas/vim3/uboot-boot.ush

@@ -1,17 +1,17 @@
 
 ###########################################
 
-part start mmc ${devnum} 9 mmc_env
-mmc dev ${devnum}
+part start ${devtype} ${devnum} 9 mmc_env
+${devtype} dev ${devnum}
 setenv loadbootstate " \
     echo 'loading env...'; \
-    mmc read ${ramdisk_addr_r} ${mmc_env} 0x10; \
+    ${devtype} read ${ramdisk_addr_r} ${mmc_env} 0x10; \
     env import -c ${ramdisk_addr_r} 0x2000;"
 
 setenv storebootstate " \
     echo 'storing env...'; \
     env export -c -s 0x2000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT MACHINE_ID; \
-    mmc write ${ramdisk_addr_r} ${mmc_env} 0x10;"
+    ${devtype} write ${ramdisk_addr_r} ${mmc_env} 0x10;"
 
 run loadbootstate
 test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
@@ -25,35 +25,35 @@ test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=t
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
-setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait"
+setenv bootargs_a "root=PARTUUID=48617373-06 ro rootwait"
+setenv bootargs_b "root=PARTUUID=48617373-08 ro rootwait"
 
 # Load environment from haos-config.txt
-if test -e mmc ${devnum}:1 haos-config.txt; then
-  fatload mmc ${devnum}:1 ${ramdisk_addr_r} haos-config.txt
+if test -e ${devtype} ${devnum}:1 haos-config.txt; then
+  fatload ${devtype} ${devnum}:1 ${ramdisk_addr_r} haos-config.txt
   env import -t ${ramdisk_addr_r} ${filesize}
 fi
 
 # Load extraargs
-fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
+fileenv ${devtype} ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
 
 # Load device tree
 setenv fdtfile "meson-g12b-s922x-khadas-vim3.dtb"
 echo "Loading standard device tree ${fdtfile}"
-fatload mmc ${devnum}:1 ${fdt_addr_r} ${fdtfile}
+fatload ${devtype} ${devnum}:1 ${fdt_addr_r} ${fdtfile}
 fdt addr ${fdt_addr_r}
 
 # load dt overlays
 fdt resize 65536
 for overlay_file in ${overlays}; do
-  if fatload mmc ${devnum}:1 ${ramdisk_addr_r} overlays/${overlay_file}.dtbo; then
+  if fatload ${devtype} ${devnum}:1 ${ramdisk_addr_r} overlays/${overlay_file}.dtbo; then
     echo "Applying kernel provided DT overlay ${overlay_file}.dtbo"
     fdt apply ${ramdisk_addr_r} || setenv overlay_error "true"
   fi
 done
 if test "${overlay_error}" = "true"; then
   echo "Error applying DT overlays, restoring original DT"
-  fatload mmc ${devnum}:1 ${fdt_addr_r} ${fdtfile}
+  fatload ${devtype} ${devnum}:1 ${fdt_addr_r} ${fdtfile}
 fi
 
 # logical volumes get numbered after physical ones.
@@ -74,7 +74,7 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
     if test ${BOOT_A_LEFT} -gt 0; then
       setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1
       echo "Trying to boot slot A, ${BOOT_A_LEFT} attempts remaining. Loading kernel ..."
-      if load mmc ${devnum}:5 ${kernel_addr_r} Image; then
+      if load ${devtype} ${devnum}:5 ${kernel_addr_r} Image; then
           setenv bootargs "${bootargs_hassos} ${bootargs_a} rauc.slot=A ${cmdline}"
       fi
     fi
@@ -82,7 +82,7 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
     if test ${BOOT_B_LEFT} -gt 0; then
       setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1
       echo "Trying to boot slot B, ${BOOT_B_LEFT} attempts remaining. Loading kernel ..."
-      if load mmc ${devnum}:7 ${kernel_addr_r} Image; then
+      if load ${devtype} ${devnum}:7 ${kernel_addr_r} Image; then
           setenv bootargs "${bootargs_hassos} ${bootargs_b} rauc.slot=B ${cmdline}"
       fi
     fi

buildroot-external/board/nabucasa/green/cmdline.txt

@@ -1 +1 @@
-console=tty0
+console=ttyS2,1500000n8 console=tty0

buildroot-external/board/nabucasa/green/patches/linux/0001-arm64-dts-rockchip-Add-NabuCasa-Green-board.patch

@@ -1,4 +1,4 @@
-From 9b1367f47f2e790f155d4aab39878233eedf7b22 Mon Sep 17 00:00:00 2001
+From 015fa4136338919a43c1c6e47e8c07679cefbaa2 Mon Sep 17 00:00:00 2001
 From: Zhangqun Ming <north_sea@qq.com>
 Date: Thu, 6 Jul 2023 10:05:04 +0000
 Subject: [PATCH] arm64: dts: rockchip: Add NabuCasa Green board
@@ -8,30 +8,32 @@ Content-Transfer-Encoding: 8bit
 
 [Replaced custom rk860x driver with upstream fan53555]
 Signed-off-by: Jan Čermák <sairon@sairon.cz>
+[Enabled Rockchip RNG from rk356x.dtsi]
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
 ---
  arch/arm64/boot/dts/rockchip/Makefile         |   1 +
- .../boot/dts/rockchip/rk3566-ha-green.dts     | 684 ++++++++++++++++++
- 2 files changed, 685 insertions(+)
+ .../boot/dts/rockchip/rk3566-ha-green.dts     | 688 ++++++++++++++++++
+ 2 files changed, 689 insertions(+)
  create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
 
 diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
-index e7728007fd1b..475becd793ac 100644
+index 09423070c9928..1f5a9d690648f 100644
 --- a/arch/arm64/boot/dts/rockchip/Makefile
 +++ b/arch/arm64/boot/dts/rockchip/Makefile
-@@ -75,6 +75,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353ps.dtb
+@@ -83,6 +83,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353ps.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353v.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353vs.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg503.dtb
 +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-ha-green.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-odroid-m1s.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-orangepi-3b-v1.1.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-orangepi-3b-v2.1.dtb
 diff --git a/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
 new file mode 100644
-index 000000000000..b5e4a67b3fc7
+index 0000000000000..d6a86cc57b65e
 --- /dev/null
 +++ b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
-@@ -0,0 +1,684 @@
+@@ -0,0 +1,688 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/*
 + * Copyright (c) 2023 Seeed Co., Ltd.
@@ -559,6 +561,10 @@ index 000000000000..b5e4a67b3fc7
 +	status = "okay";
 +};
 +
++&rng {
++	status = "okay";
++};
++
 +&saradc {
 +	vref-supply = <&vcca_1v8>;
 +	status = "okay";

buildroot-external/board/nabucasa/green/patches/linux/0002-drivers-mfd-rk808-set-PWRON_LP_OFF_TIME-12s.patch

@@ -1,4 +1,4 @@
-From be773999495258994d1df04448a4de43d58db9c4 Mon Sep 17 00:00:00 2001
+From 8bd12039ef70b3b78a588da61f6680cee40b65cf Mon Sep 17 00:00:00 2001
 From: Zhangqun Ming <north_sea@qq.com>
 Date: Wed, 12 Jul 2023 02:33:03 +0000
 Subject: [PATCH] drivers: mfd: rk808: set PWRON_LP_OFF_TIME 12s
@@ -9,10 +9,10 @@ Subject: [PATCH] drivers: mfd: rk808: set PWRON_LP_OFF_TIME 12s
  2 files changed, 6 insertions(+)
 
 diff --git a/drivers/mfd/rk8xx-core.c b/drivers/mfd/rk8xx-core.c
-index a577f950c632..418a4506c99e 100644
+index 39ab114ea669d..c7a639b25231f 100644
 --- a/drivers/mfd/rk8xx-core.c
 +++ b/drivers/mfd/rk8xx-core.c
-@@ -232,6 +232,7 @@ static const struct rk808_reg_data rk817_pre_init_reg[] = {
+@@ -263,6 +263,7 @@ static const struct rk808_reg_data rk817_pre_init_reg[] = {
  	{RK817_GPIO_INT_CFG, RK817_INT_POL_MSK, RK817_INT_POL_L},
  	{RK817_SYS_CFG(1), RK817_HOTDIE_TEMP_MSK | RK817_TSD_TEMP_MSK,
  					   RK817_HOTDIE_105 | RK817_TSD_140},
@@ -21,10 +21,10 @@ index a577f950c632..418a4506c99e 100644
  
  static const struct rk808_reg_data rk818_pre_init_reg[] = {
 diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h
-index 78e167a92483..0bd7031966d6 100644
+index 69cbea78b430b..2a9563caa3e24 100644
 --- a/include/linux/mfd/rk808.h
 +++ b/include/linux/mfd/rk808.h
-@@ -1052,6 +1052,11 @@ enum rk809_reg_id {
+@@ -1195,6 +1195,11 @@ enum rk809_reg_id {
  #define RK817_ON_SOURCE_REG		0xf5
  #define RK817_OFF_SOURCE_REG		0xf6
  

buildroot-external/board/nabucasa/green/patches/linux/0003-arch-arm64-dts-green-Remove-spiflash-partitions.patch

@@ -1,4 +1,4 @@
-From 41026603d639007895de1f48437813f78edb62ea Mon Sep 17 00:00:00 2001
+From c0430945cd4a6a5b4072662b44cb6a44d3f7ecc2 Mon Sep 17 00:00:00 2001
 From: Zhangqun Ming <north_sea@qq.com>
 Date: Sat, 15 Jul 2023 08:28:16 +0000
 Subject: [PATCH] arch: arm64: dts: green: Remove spiflash partitions
@@ -8,10 +8,10 @@ Subject: [PATCH] arch: arm64: dts: green: Remove spiflash partitions
  1 file changed, 2 insertions(+), 29 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
-index b5e4a67b3fc7..debb9459a5aa 100644
+index d6a86cc57b65e..6336fe758819f 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
-@@ -565,36 +565,9 @@ &sfc {
+@@ -569,36 +569,9 @@ &sfc {
  	flash@0 {
  		compatible = "jedec,spi-nor";
  		reg = <0>;

buildroot-external/board/nabucasa/green/patches/linux/0004-Input-rk805-pwrkey-reverse-polarity-of-pwrkey.patch

@@ -1,4 +1,4 @@
-From 0c8b1453993f15715836123bfc7c164e568913f2 Mon Sep 17 00:00:00 2001
+From c3f803f835db301e586127b061bd473fb61ec13a Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Wed, 19 Jul 2023 10:08:06 +0200
 Subject: [PATCH] Input: rk805-pwrkey: reverse polarity of pwrkey
@@ -12,7 +12,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/input/misc/rk805-pwrkey.c b/drivers/input/misc/rk805-pwrkey.c
-index 76873aa005b4..139419033c84 100644
+index 76873aa005b41..139419033c84a 100644
 --- a/drivers/input/misc/rk805-pwrkey.c
 +++ b/drivers/input/misc/rk805-pwrkey.c
 @@ -19,7 +19,7 @@ static irqreturn_t pwrkey_fall_irq(int irq, void *_pwr)

buildroot-external/board/nabucasa/green/patches/linux/0005-green-emmc-use-HS200-mode.patch

@@ -1,4 +1,4 @@
-From 858d26179ee3a06fc7ebadf2c49dc337a7a98485 Mon Sep 17 00:00:00 2001
+From 3d75827d0318c792d4d7a68d7d7076deee3e7ad3 Mon Sep 17 00:00:00 2001
 From: zhangcy <chengyu.zhang@seeed.cc>
 Date: Mon, 14 Aug 2023 01:27:34 +0000
 Subject: [PATCH] green: emmc use HS200 mode
@@ -8,10 +8,10 @@ Subject: [PATCH] green: emmc use HS200 mode
  1 file changed, 1 insertion(+)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
-index debb9459a5aa..e4b1e80641b9 100644
+index 6336fe758819f..61083a9885a78 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
-@@ -532,6 +532,7 @@ &saradc {
+@@ -536,6 +536,7 @@ &saradc {
  
  &sdhci {
  	bus-width = <8>;

buildroot-external/board/nabucasa/green/patches/linux/0006-arch-arm64-dts-green-Improve-LED-representation.patch

@@ -1,4 +1,4 @@
-From 6b926b041e939655d3a88202bde32f4901459a65 Mon Sep 17 00:00:00 2001
+From 6219da5138cdcdd0186187e8591010bbda5dc8a9 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Mon, 4 Sep 2023 22:36:10 +0200
 Subject: [PATCH] arch: arm64: dts: green: Improve LED representation
@@ -9,7 +9,7 @@ Fix color and use labels/node names according to the LEDs functionality.
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
-index e4b1e80641b9..1d0db11db3e0 100644
+index 61083a9885a78..df260be4211d9 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts
 @@ -48,16 +48,18 @@ hdmi_con_in: endpoint {

buildroot-external/board/nabucasa/green/patches/uboot/0001-arch-arm-dts-Add-NabuCasa-Green-board.patch

@@ -1,33 +1,35 @@
-From 501ac314ef709d6ecac3047310d5e48a473df638 Mon Sep 17 00:00:00 2001
+From 99fdcac59b4c993dcac1869e8372dc895ffa0ae5 Mon Sep 17 00:00:00 2001
 From: Zhangqun Ming <north_sea@qq.com>
 Date: Thu, 6 Jul 2023 10:06:35 +0000
 Subject: [PATCH] arch: arm: dts: Add NabuCasa Green board
 
 ---
- arch/arm/dts/Makefile                    |   1 +
+ arch/arm/dts/Makefile                    |   3 +
  arch/arm/dts/rk3566-ha-green-u-boot.dtsi |  28 +
  arch/arm/dts/rk3566-ha-green.dts         | 685 +++++++++++++++++++++++
  configs/green_defconfig                  |  74 +++
- 4 files changed, 788 insertions(+)
+ 4 files changed, 790 insertions(+)
  create mode 100644 arch/arm/dts/rk3566-ha-green-u-boot.dtsi
  create mode 100644 arch/arm/dts/rk3566-ha-green.dts
  create mode 100644 configs/green_defconfig
 
 diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index 9d28a485be..f78839f9cc 100644
+index 6ad59aeed5f..92c6fa54caa 100644
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
-@@ -172,6 +172,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
+@@ -87,6 +87,9 @@ dtb-$(CONFIG_ROCKCHIP_RK3368) += \
+ 	rk3368-geekbox.dtb \
+ 	rk3368-px5-evb.dtb \
+ 
++dtb-$(CONFIG_ROCKCHIP_RK3568) += \
++	rk3566-ha-green.dtb
++
+ dtb-$(CONFIG_ARCH_S5P4418) += \
+ 	s5p4418-nanopi2.dtb
  
- dtb-$(CONFIG_ROCKCHIP_RK3568) += \
- 	rk3566-anbernic-rgxx3.dtb \
-+	rk3566-ha-green.dtb \
- 	rk3566-quartz64-a.dtb \
- 	rk3566-quartz64-b.dtb \
- 	rk3566-radxa-cm3-io.dtb \
 diff --git a/arch/arm/dts/rk3566-ha-green-u-boot.dtsi b/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
 new file mode 100644
-index 0000000000..83fa66d591
+index 00000000000..83fa66d591e
 --- /dev/null
 +++ b/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
 @@ -0,0 +1,28 @@
@@ -61,7 +63,7 @@ index 0000000000..83fa66d591
 +};
 diff --git a/arch/arm/dts/rk3566-ha-green.dts b/arch/arm/dts/rk3566-ha-green.dts
 new file mode 100644
-index 0000000000..15d2b73433
+index 00000000000..15d2b734338
 --- /dev/null
 +++ b/arch/arm/dts/rk3566-ha-green.dts
 @@ -0,0 +1,685 @@
@@ -752,7 +754,7 @@ index 0000000000..15d2b73433
 +};
 diff --git a/configs/green_defconfig b/configs/green_defconfig
 new file mode 100644
-index 0000000000..0617d308aa
+index 00000000000..0617d308aa2
 --- /dev/null
 +++ b/configs/green_defconfig
 @@ -0,0 +1,74 @@
@@ -830,6 +832,3 @@ index 0000000000..0617d308aa
 +CONFIG_SYSRESET=y
 +# CONFIG_BINMAN_FDT is not set
 +CONFIG_ERRNO_STR=y
--- 
-2.43.0
-

buildroot-external/board/nabucasa/green/patches/uboot/0002-configs-green-Support-USB-boot.patch

@@ -1,4 +1,4 @@
-From 6441bdb22a25649ff8fd69aa8f8a7285d9c37266 Mon Sep 17 00:00:00 2001
+From 634b3b17d96b6def645b15b379fbe617620e6665 Mon Sep 17 00:00:00 2001
 From: Zhangqun Ming <north_sea@qq.com>
 Date: Fri, 14 Jul 2023 14:13:39 +0000
 Subject: [PATCH] configs: green: Support USB boot
@@ -8,7 +8,7 @@ Subject: [PATCH] configs: green: Support USB boot
  1 file changed, 36 insertions(+), 16 deletions(-)
 
 diff --git a/configs/green_defconfig b/configs/green_defconfig
-index 0617d308aa..14960b67d2 100644
+index 0617d308aa2..14960b67d26 100644
 --- a/configs/green_defconfig
 +++ b/configs/green_defconfig
 @@ -6,48 +6,54 @@ CONFIG_TEXT_BASE=0x00a00000
@@ -112,6 +112,3 @@ index 0617d308aa..14960b67d2 100644
 +CONFIG_USB_OHCI_GENERIC=y
 +CONFIG_USB_DWC3=y
  CONFIG_ERRNO_STR=y
--- 
-2.43.0
-

buildroot-external/board/nabucasa/green/patches/uboot/0003-arch-arm-dts-rk3566-green-boot-order.patch

@@ -1,4 +1,4 @@
-From d8b8b614d19dbb3fa004677a2c2e50b685a80192 Mon Sep 17 00:00:00 2001
+From 80fc442a51ecab7b822145561421e3adff899bc9 Mon Sep 17 00:00:00 2001
 From: Zhangqun Ming <north_sea@qq.com>
 Date: Fri, 14 Jul 2023 14:14:10 +0000
 Subject: [PATCH] arch: arm: dts: rk3566: green: boot order
@@ -9,7 +9,7 @@ Subject: [PATCH] arch: arm: dts: rk3566: green: boot order
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/dts/rk3566-ha-green-u-boot.dtsi b/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
-index 83fa66d591..7f2ed298ce 100644
+index 83fa66d591e..7f2ed298ce3 100644
 --- a/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
 +++ b/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
 @@ -9,7 +9,7 @@
@@ -33,7 +33,7 @@ index 83fa66d591..7f2ed298ce 100644
  	clock-frequency = <24000000>;
  	bootph-all;
 diff --git a/arch/arm/dts/rk3566-ha-green.dts b/arch/arm/dts/rk3566-ha-green.dts
-index 15d2b73433..bf0f81c3a1 100644
+index 15d2b734338..bf0f81c3a15 100644
 --- a/arch/arm/dts/rk3566-ha-green.dts
 +++ b/arch/arm/dts/rk3566-ha-green.dts
 @@ -563,7 +563,7 @@
@@ -45,6 +45,3 @@ index 15d2b73433..bf0f81c3a1 100644
  		compatible = "jedec,spi-nor";
  		reg = <0>;
  		spi-max-frequency = <100000000>;
--- 
-2.43.0
-

buildroot-external/board/nabucasa/green/patches/uboot/0004-arch-arm-dts-green-spi-nor-uboot.patch

@@ -1,4 +1,4 @@
-From e14d7d56b293ba01c5b73a4b3483795d78c75172 Mon Sep 17 00:00:00 2001
+From 107a4b9bf7d335de4a6dc7e6097a1f38fdab38c7 Mon Sep 17 00:00:00 2001
 From: Zhangqun Ming <north_sea@qq.com>
 Date: Sat, 15 Jul 2023 08:46:09 +0000
 Subject: [PATCH] arch: arm: dts: green: spi nor uboot
@@ -10,7 +10,7 @@ Subject: [PATCH] arch: arm: dts: green: spi nor uboot
  3 files changed, 91 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm/dts/rk3566-ha-green-u-boot.dtsi b/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
-index 7f2ed298ce..fa98078fce 100644
+index 7f2ed298ce3..fa98078fce2 100644
 --- a/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
 +++ b/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
 @@ -13,15 +13,96 @@
@@ -123,7 +123,7 @@ index 7f2ed298ce..fa98078fce 100644
 +};
 \ No newline at end of file
 diff --git a/arch/arm/dts/rk3566-ha-green.dts b/arch/arm/dts/rk3566-ha-green.dts
-index bf0f81c3a1..ea9d358099 100644
+index bf0f81c3a15..ea9d358099b 100644
 --- a/arch/arm/dts/rk3566-ha-green.dts
 +++ b/arch/arm/dts/rk3566-ha-green.dts
 @@ -566,8 +566,8 @@
@@ -138,7 +138,7 @@ index bf0f81c3a1..ea9d358099 100644
  
  		partitions {
 diff --git a/configs/green_defconfig b/configs/green_defconfig
-index 14960b67d2..5f94c06279 100644
+index 14960b67d26..5f94c062798 100644
 --- a/configs/green_defconfig
 +++ b/configs/green_defconfig
 @@ -68,6 +68,8 @@ CONFIG_MMC_SDHCI_SDMA=y
@@ -150,6 +150,3 @@ index 14960b67d2..5f94c06279 100644
  CONFIG_ETH_DESIGNWARE=y
  CONFIG_GMAC_ROCKCHIP=y
  CONFIG_PHY_ROCKCHIP_INNO_USB2=y
--- 
-2.43.0
-

buildroot-external/board/nabucasa/green/patches/uboot/0005-board-green-add-Green-board-to-read-board-specific-E.patch

@@ -1,4 +1,4 @@
-From acec57c77e10230fc32820046301cb2a59c431d4 Mon Sep 17 00:00:00 2001
+From c1b3736623b9a6e5d027ca202dbc53b7eb7e4662 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 17 Aug 2023 17:38:13 +0200
 Subject: [PATCH] board: green: add Green board to read board specific EEPROM
@@ -12,17 +12,17 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  arch/arm/mach-rockchip/rk3568/Kconfig |  7 +++
  board/nabucasa/ha-green/Kconfig       | 15 +++++++
  board/nabucasa/ha-green/Makefile      |  3 ++
- board/nabucasa/ha-green/ha-green.c    | 65 +++++++++++++++++++++++++++
+ board/nabucasa/ha-green/ha-green.c    | 64 +++++++++++++++++++++++++++
  configs/green_defconfig               |  3 ++
  include/configs/ha-green.h            | 11 +++++
- 7 files changed, 111 insertions(+)
+ 7 files changed, 110 insertions(+)
  create mode 100644 board/nabucasa/ha-green/Kconfig
  create mode 100644 board/nabucasa/ha-green/Makefile
  create mode 100644 board/nabucasa/ha-green/ha-green.c
  create mode 100644 include/configs/ha-green.h
 
 diff --git a/arch/arm/dts/rk3566-ha-green.dts b/arch/arm/dts/rk3566-ha-green.dts
-index ea9d358099..91afadf0e6 100644
+index ea9d358099b..91afadf0e65 100644
 --- a/arch/arm/dts/rk3566-ha-green.dts
 +++ b/arch/arm/dts/rk3566-ha-green.dts
 @@ -449,6 +449,13 @@
@@ -40,7 +40,7 @@ index ea9d358099..91afadf0e6 100644
  
  &i2s0_8ch {
 diff --git a/arch/arm/mach-rockchip/rk3568/Kconfig b/arch/arm/mach-rockchip/rk3568/Kconfig
-index baa51349f4..42652dec03 100644
+index ce327ed6f9e..5f675b11491 100644
 --- a/arch/arm/mach-rockchip/rk3568/Kconfig
 +++ b/arch/arm/mach-rockchip/rk3568/Kconfig
 @@ -17,6 +17,12 @@ config TARGET_ANBERNIC_RGXX3_RK3566
@@ -56,17 +56,17 @@ index baa51349f4..42652dec03 100644
  config TARGET_ODROID_M1_RK3568
  	bool "ODROID-M1"
  	help
-@@ -44,6 +50,7 @@ config SYS_MALLOC_F_LEN
- source "board/rockchip/evb_rk3568/Kconfig"
+@@ -81,6 +87,7 @@ source "board/rockchip/evb_rk3568/Kconfig"
  source "board/anbernic/rgxx3_rk3566/Kconfig"
  source "board/hardkernel/odroid_m1/Kconfig"
+ source "board/hardkernel/odroid_m1s/Kconfig"
 +source "board/nabucasa/ha-green/Kconfig"
  source "board/pine64/quartz64_rk3566/Kconfig"
- 
- endif
+ source "board/powkiddy/x55/Kconfig"
+ source "board/qnap/ts433/Kconfig"
 diff --git a/board/nabucasa/ha-green/Kconfig b/board/nabucasa/ha-green/Kconfig
 new file mode 100644
-index 0000000000..863afd4363
+index 00000000000..863afd43632
 --- /dev/null
 +++ b/board/nabucasa/ha-green/Kconfig
 @@ -0,0 +1,15 @@
@@ -87,7 +87,7 @@ index 0000000000..863afd4363
 +endif
 diff --git a/board/nabucasa/ha-green/Makefile b/board/nabucasa/ha-green/Makefile
 new file mode 100644
-index 0000000000..bf711fe8c4
+index 00000000000..bf711fe8c44
 --- /dev/null
 +++ b/board/nabucasa/ha-green/Makefile
 @@ -0,0 +1,3 @@
@@ -96,10 +96,10 @@ index 0000000000..bf711fe8c4
 +obj-y    += ha-green.o
 diff --git a/board/nabucasa/ha-green/ha-green.c b/board/nabucasa/ha-green/ha-green.c
 new file mode 100644
-index 0000000000..b9a0c32441
+index 00000000000..3f0ede747bc
 --- /dev/null
 +++ b/board/nabucasa/ha-green/ha-green.c
-@@ -0,0 +1,65 @@
+@@ -0,0 +1,64 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright 2023 Nabu Casa, Inc.
@@ -109,7 +109,6 @@ index 0000000000..b9a0c32441
 +#include <errno.h>
 +#include <dm/device.h>
 +#include <dm/uclass.h>
-+#include <common.h>
 +#include <dm.h>
 +#include <eeprom.h>
 +#include <env.h>
@@ -166,7 +165,7 @@ index 0000000000..b9a0c32441
 +	return 0;
 +}
 diff --git a/configs/green_defconfig b/configs/green_defconfig
-index 5f94c06279..a97391f295 100644
+index 5f94c062798..a97391f2954 100644
 --- a/configs/green_defconfig
 +++ b/configs/green_defconfig
 @@ -16,6 +16,7 @@ CONFIG_SPL_ROCKCHIP_COMMON_BOARD=y
@@ -188,7 +187,7 @@ index 5f94c06279..a97391f295 100644
  CONFIG_MMC_DW_ROCKCHIP=y
 diff --git a/include/configs/ha-green.h b/include/configs/ha-green.h
 new file mode 100644
-index 0000000000..e42d9c8e8c
+index 00000000000..e42d9c8e8c9
 --- /dev/null
 +++ b/include/configs/ha-green.h
 @@ -0,0 +1,11 @@
@@ -203,6 +202,3 @@ index 0000000000..e42d9c8e8c
 +#include <configs/rk3568_common.h>
 +
 +#endif
--- 
-2.43.0
-

buildroot-external/board/nabucasa/green/patches/uboot/0006-green-spl-loader-uboot-order-sd-emmc-spi_nor.patch

@@ -1,4 +1,4 @@
-From 51f1bdec59b8f62ac00a37e97a7bb8ebfc9f61d7 Mon Sep 17 00:00:00 2001
+From 6ae9e30259812a3cbc8d4990a5acfe459053a225 Mon Sep 17 00:00:00 2001
 From: syan <syan.cham@gmail.com>
 Date: Mon, 31 Jul 2023 09:39:55 +0000
 Subject: [PATCH] green: spl loader uboot order: sd-emmc-spi_nor
@@ -8,7 +8,7 @@ Subject: [PATCH] green: spl loader uboot order: sd-emmc-spi_nor
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/dts/rk3566-ha-green-u-boot.dtsi b/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
-index fa98078fce..48d7b61513 100644
+index fa98078fce2..48d7b615137 100644
 --- a/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
 +++ b/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
 @@ -9,7 +9,7 @@
@@ -20,6 +20,3 @@ index fa98078fce..48d7b61513 100644
  	};
  };
  
--- 
-2.43.0
-

buildroot-external/board/nabucasa/green/patches/uboot/0007-green-Fix-SPI-Flash-alias.patch

@@ -1,4 +1,4 @@
-From 0142d1a99d2aa4a6dad7181dcd74958b2ee0fe31 Mon Sep 17 00:00:00 2001
+From b6c7fc08198300d8620f9896db468e0e50e8838a Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Thu, 17 Aug 2023 17:51:07 +0200
 Subject: [PATCH] green: Fix SPI Flash alias
@@ -12,7 +12,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/configs/green_defconfig b/configs/green_defconfig
-index a97391f295..71c9257d7d 100644
+index a97391f2954..71c9257d7d4 100644
 --- a/configs/green_defconfig
 +++ b/configs/green_defconfig
 @@ -55,6 +55,7 @@ CONFIG_CMD_REGULATOR=y
@@ -38,6 +38,3 @@ index a97391f295..71c9257d7d 100644
  CONFIG_ETH_DESIGNWARE=y
  CONFIG_GMAC_ROCKCHIP=y
  CONFIG_PHY_ROCKCHIP_INNO_USB2=y
--- 
-2.43.0
-

buildroot-external/board/nabucasa/green/patches/uboot/0008-arch-arm-dts-green-drop-SPI-NOR-flash-partitions.patch

@@ -1,4 +1,4 @@
-From 846df62342a4904a91aace66e9204ae3ed4ca0af Mon Sep 17 00:00:00 2001
+From 71ad7d9b73ff14283e61fbb1d3d214982f8c9967 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Fri, 18 Aug 2023 10:06:24 +0200
 Subject: [PATCH] arch: arm: dts: green: drop SPI NOR flash partitions
@@ -8,7 +8,7 @@ Subject: [PATCH] arch: arm: dts: green: drop SPI NOR flash partitions
  1 file changed, 27 deletions(-)
 
 diff --git a/arch/arm/dts/rk3566-ha-green.dts b/arch/arm/dts/rk3566-ha-green.dts
-index 91afadf0e6..68d836911e 100644
+index 91afadf0e65..68d836911ec 100644
 --- a/arch/arm/dts/rk3566-ha-green.dts
 +++ b/arch/arm/dts/rk3566-ha-green.dts
 @@ -576,33 +576,6 @@
@@ -45,6 +45,3 @@ index 91afadf0e6..68d836911e 100644
  	};
  };
  
--- 
-2.43.0
-

buildroot-external/board/nabucasa/green/patches/uboot/0009-green-Do-not-use-eMMC-DDR52-mode-enable-HS200.patch

@@ -1,7 +1,7 @@
-From 766d53ce6143b7e5f09a5f478e328cf8a1f183d4 Mon Sep 17 00:00:00 2001
+From bda29ba9030c8ad9aa245d68033a83106de4f633 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
 Date: Wed, 12 Jun 2024 15:20:46 +0200
-Subject: [PATCH] green: Do not use eMMC DDR52 mode
+Subject: [PATCH] green: Do not use eMMC DDR52 mode, enable HS200
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -11,15 +11,18 @@ DDR52 mode is used. Disable this mode and other HS modes, keep only
 HS200 which works reliably with the eMMC used on Green. For more details
 see the upstream commit and mailing list discussion [1].
 
+Also enable HS200 support in defconfig.
+
 [1] https://patchwork.ozlabs.org/project/uboot/patch/20240204205312.2342868-2-jonas@kwiboo.se/
 
 Signed-off-by: Jan Čermák <sairon@sairon.cz>
 ---
  arch/arm/dts/rk3566-ha-green-u-boot.dtsi | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
+ configs/green_defconfig                  | 2 ++
+ 2 files changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/arch/arm/dts/rk3566-ha-green-u-boot.dtsi b/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
-index 48d7b61513..8dc1585aac 100644
+index 48d7b615137..8dc1585aacd 100644
 --- a/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
 +++ b/arch/arm/dts/rk3566-ha-green-u-boot.dtsi
 @@ -71,10 +71,7 @@
@@ -40,3 +43,16 @@ index 48d7b61513..8dc1585aac 100644
 -};
 \ No newline at end of file
 +};
+diff --git a/configs/green_defconfig b/configs/green_defconfig
+index 71c9257d7d4..7b5a7056868 100644
+--- a/configs/green_defconfig
++++ b/configs/green_defconfig
+@@ -65,6 +65,8 @@ CONFIG_MISC=y
+ CONFIG_I2C_EEPROM=y
+ CONFIG_SYS_I2C_EEPROM_ADDR=0x0
+ CONFIG_SUPPORT_EMMC_RPMB=y
++CONFIG_MMC_HS200_SUPPORT=y
++CONFIG_SPL_MMC_HS200_SUPPORT=y
+ CONFIG_MMC_DW=y
+ CONFIG_MMC_DW_ROCKCHIP=y
+ CONFIG_MMC_SDHCI=y

buildroot-external/board/nabucasa/green/patches/uboot/0010-arch-arm64-dts-green-Improve-LED-representation.patch

@@ -0,0 +1,52 @@
+From 2bdc5718a00ce5cb9c1fa27c8a1ff6893b016455 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
+Date: Tue, 13 Aug 2024 17:51:29 +0200
+Subject: [PATCH] arch: arm64: dts: green: Improve LED representation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix color and use labels/node names according to the LEDs functionality.
+
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
+Co-authored-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm/dts/rk3566-ha-green.dts | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm/dts/rk3566-ha-green.dts b/arch/arm/dts/rk3566-ha-green.dts
+index 68d836911ec..c3adc599049 100644
+--- a/arch/arm/dts/rk3566-ha-green.dts
++++ b/arch/arm/dts/rk3566-ha-green.dts
+@@ -48,16 +48,18 @@
+ 	leds {
+ 		compatible = "gpio-leds";
+ 
+-		led_power: led-0 {
++		led_power: led-power {
++			label = "power";
+ 			gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
+ 			function = LED_FUNCTION_POWER;
+-			color = <LED_COLOR_ID_RED>;
++			color = <LED_COLOR_ID_WHITE>;
+ 			default-state = "keep";
+ 			linux,default-trigger = "default-on";
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&led_power_pin>;
+ 		};
+-		led_act: led-1 {
++		led_act: led-activity {
++			label = "activity";
+ 			gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
+ 			function = LED_FUNCTION_ACTIVITY;
+ 			color = <LED_COLOR_ID_GREEN>;
+@@ -65,7 +67,8 @@
+ 			pinctrl-names = "default";
+ 			pinctrl-0 = <&led_act_pin>;
+ 		};
+-		led_user: led-2 {
++		led_user: led-user {
++			label = "user";
+ 			gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
+ 			function = LED_FUNCTION_HEARTBEAT;
+ 			color = <LED_COLOR_ID_YELLOW>;

buildroot-external/board/nabucasa/green/patches/uboot/0011-configs-green-fix-bss-and-stack-address-and-disable-.patch

@@ -0,0 +1,93 @@
+From a05b87fa8cd6716a07514c64d8816272418d74e8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
+Date: Fri, 14 Feb 2025 18:09:29 +0100
+Subject: [PATCH] configs: green: fix bss and stack address and disable
+ OF_UPSTREAM
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some addresses defined in Green defconfig are wrong after upstream
+changes [1] for Rockchip platform present since U-Boot 2024.04+. Remove
+them to apply upstream changes and disable OF_UPSTREAM, as we don't have
+upstream device tree for Green. Also refresh the defconfig
+
+[1] https://lore.kernel.org/u-boot/20240302191629.322562-1-jonas@kwiboo.se/
+
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
+---
+ configs/green_defconfig | 21 +++------------------
+ 1 file changed, 3 insertions(+), 18 deletions(-)
+
+diff --git a/configs/green_defconfig b/configs/green_defconfig
+index 7b5a7056868..1f61c172f01 100644
+--- a/configs/green_defconfig
++++ b/configs/green_defconfig
+@@ -2,27 +2,20 @@ CONFIG_ARM=y
+ CONFIG_SKIP_LOWLEVEL_INIT=y
+ CONFIG_COUNTER_FREQUENCY=24000000
+ CONFIG_ARCH_ROCKCHIP=y
+-CONFIG_TEXT_BASE=0x00a00000
+-CONFIG_SPL_LIBCOMMON_SUPPORT=y
+-CONFIG_SPL_LIBGENERIC_SUPPORT=y
+ CONFIG_NR_DRAM_BANKS=2
+-CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+-CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc00000
+ CONFIG_SF_DEFAULT_SPEED=24000000
+ CONFIG_SF_DEFAULT_MODE=0x2000
+ CONFIG_DEFAULT_DEVICE_TREE="rk3566-ha-green"
+ CONFIG_ROCKCHIP_RK3568=y
+-CONFIG_SPL_ROCKCHIP_COMMON_BOARD=y
+ CONFIG_ROCKCHIP_SPI_IMAGE=y
+ CONFIG_SPL_SERIAL=y
+-CONFIG_SPL_STACK_R_ADDR=0x600000
+ CONFIG_TARGET_NABU_CASA_HA_GREEN_RK3566=y
+-CONFIG_SPL_STACK=0x400000
++CONFIG_SYS_LOAD_ADDR=0xc00800
++CONFIG_SF_DEFAULT_BUS=4
+ CONFIG_DEBUG_UART_BASE=0xFE660000
+ CONFIG_DEBUG_UART_CLOCK=24000000
+ CONFIG_SPL_SPI_FLASH_SUPPORT=y
+ CONFIG_SPL_SPI=y
+-CONFIG_SYS_LOAD_ADDR=0xc00800
+ CONFIG_DEBUG_UART=y
+ CONFIG_FIT=y
+ CONFIG_FIT_VERBOSE=y
+@@ -34,12 +27,7 @@ CONFIG_DEFAULT_FDT_FILE="rockchip/rk3566-ha-green.dtb"
+ CONFIG_DISPLAY_BOARDINFO_LATE=y
+ CONFIG_SPL_MAX_SIZE=0x40000
+ CONFIG_SPL_PAD_TO=0x7f8000
+-CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
+-CONFIG_SPL_BSS_START_ADDR=0x4000000
+-CONFIG_SPL_BSS_MAX_SIZE=0x4000
+ # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+-# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
+-CONFIG_SPL_STACK_R=y
+ CONFIG_SPL_SPI_LOAD=y
+ CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000
+ CONFIG_SPL_ATF=y
+@@ -54,6 +42,7 @@ CONFIG_CMD_REGULATOR=y
+ # CONFIG_SPL_DOS_PARTITION is not set
+ CONFIG_SPL_OF_CONTROL=y
+ CONFIG_OF_LIVE=y
++# CONFIG_OF_UPSTREAM is not set
+ CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+ CONFIG_SPL_DM_SEQ_ALIAS=y
+ CONFIG_SPL_REGMAP=y
+@@ -63,16 +52,12 @@ CONFIG_ROCKCHIP_GPIO=y
+ CONFIG_SYS_I2C_ROCKCHIP=y
+ CONFIG_MISC=y
+ CONFIG_I2C_EEPROM=y
+-CONFIG_SYS_I2C_EEPROM_ADDR=0x0
+ CONFIG_SUPPORT_EMMC_RPMB=y
+-CONFIG_MMC_HS200_SUPPORT=y
+-CONFIG_SPL_MMC_HS200_SUPPORT=y
+ CONFIG_MMC_DW=y
+ CONFIG_MMC_DW_ROCKCHIP=y
+ CONFIG_MMC_SDHCI=y
+ CONFIG_MMC_SDHCI_SDMA=y
+ CONFIG_MMC_SDHCI_ROCKCHIP=y
+-CONFIG_SF_DEFAULT_BUS=4
+ CONFIG_SPI_FLASH_SFDP_SUPPORT=y
+ CONFIG_SPI_FLASH_GIGADEVICE=y
+ CONFIG_SPI_FLASH_MACRONIX=y

buildroot-external/board/nabucasa/green/uboot-boot.ush

@@ -27,9 +27,39 @@ test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=t
 # HassOS bootargs
 setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 rootwait systemd.machine_id=${MACHINE_ID} fsck.repair=yes ${BOOT_CONDITION}"
 
+i2c dev 0
+setenv check_btn_pressed ' \
+    i2c read 0x20 0xf0.1 1 ${loadaddr}; \
+    setexpr PWRON_STS *${loadaddr} \\\& 0x80; \
+    test ${PWRON_STS} -eq 0x0;'
+
+# Check if button is held for device wipe
+setenv counter 0
+while test ${counter} -lt 2; do
+  if run check_btn_pressed; then
+    echo "Reset button pressed for ${counter} seconds"
+    setexpr counter ${counter} + 1
+
+    if test ${counter} -eq 2; then
+      led user on
+      echo "Waiting for button to be released"
+      while run check_btn_pressed; do
+        sleep 0.5
+      done
+      echo "Proceeding with device wipe"
+      setenv bootargs_hassos "${bootargs_hassos} haos.wipe=1"
+    else
+      sleep 1
+    fi
+  else
+    # U-Boot has no break statement :')
+    setenv counter 2
+  fi
+done
+
 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro"
-setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro"
+setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd ro"
+setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 ro"
 
 part number ${devtype} ${devnum} hassos-boot boot_partnum
 

buildroot-external/board/nabucasa/green/uboot.config

@@ -0,0 +1,3 @@
+CONFIG_LED=y
+CONFIG_LED_GPIO=y
+CONFIG_CMD_LED=y

buildroot-external/board/pc/generic-x86-64/erofs-compress-hints.txt

@@ -0,0 +1,3 @@
+# assumed -zlz4hc,12:lzma,9 for optimal compression
+16384   1 usr/lib/firmware/
+16384   1 usr/lib/modules/

buildroot-external/board/pc/generic-x86-64/hassos-hook.sh

@@ -9,14 +9,10 @@ function hassos_pre_image() {
 
     cp "${BOARD_DIR}/../grub.cfg" "${EFIPART_DATA}/EFI/BOOT/grub.cfg"
     cp "${BOARD_DIR}/cmdline.txt" "${EFIPART_DATA}/cmdline.txt"
-    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv-A" create
-    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv-A" set ORDER="A B"
-    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv-A" set A_OK=1
-    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv-A" set A_TRY=0
-    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv-B" create
-    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv-B" set ORDER="B A"
-    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv-B" set B_OK=1
-    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv-B" set B_TRY=0
+    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" create
+    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" set ORDER="A B"
+    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" set A_OK=1
+    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" set A_TRY=0
 
     cp -r "${EFIPART_DATA}/"* "${BOOT_DATA}/"
 }

buildroot-external/board/pc/generic-x86-64/kernel.config

@@ -55,24 +55,12 @@ CONFIG_SND_HDA_I915=y
 CONFIG_SND_SOC=m
 
 CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
-CONFIG_SND_SOC_INTEL_SST=m
 CONFIG_SND_SOC_INTEL_CATPT=m
 CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
 CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
 CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
-CONFIG_SND_SOC_INTEL_SKYLAKE=m
-CONFIG_SND_SOC_INTEL_SKL=m
-CONFIG_SND_SOC_INTEL_APL=m
-CONFIG_SND_SOC_INTEL_KBL=m
-CONFIG_SND_SOC_INTEL_GLK=m
-CONFIG_SND_SOC_INTEL_CNL=m
-CONFIG_SND_SOC_INTEL_CFL=m
-CONFIG_SND_SOC_INTEL_CML_H=m
-CONFIG_SND_SOC_INTEL_CML_LP=m
-CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
-CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
-CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
+CONFIG_SND_SOC_INTEL_AVS=m
 CONFIG_SND_SOC_INTEL_MACH=y
 CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
 CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
@@ -160,7 +148,6 @@ CONFIG_EDAC_IGEN6=m
 
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_MUX=y
 CONFIG_I2C_TINY_USB=m
@@ -172,3 +159,6 @@ CONFIG_DLN2_ADC=m
 
 CONFIG_IIO=m
 CONFIG_BMP280=m
+
+# Required for some PCIe devices such as ath12k
+CONFIG_IRQ_REMAP=y

buildroot-external/board/pc/generic-x86-64/patches/grub2/0001-Revert-efi-Use-generic-EFI-loader-for-x86_64-and-i38.patch

@@ -1,302 +0,0 @@
-From f983d53d6ddbe1d30b5ad9c2ff280881ebed19e4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
-Date: Tue, 23 Apr 2024 16:14:12 +0200
-Subject: [PATCH] Revert "efi: Use generic EFI loader for x86_64 and i386"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit cfbfae1aef0694b416aa199291cfef7596cdfc20.
-
-The generic EFI loader doesn't play well with boards based on Intel
-NM10, and possibly some more AMD based boards. Reverting this page
-before a proper fix is found is the only way to boot system with GRUB
-2.12 on those systems.
-
-Makefile.am is only modified to prevent autoreconf from running, since
-GRUB is built from the release tarball and doesn't use autotools.
-
-Signed-off-by: Jan Čermák <sairon@sairon.cz>
----
- grub-core/Makefile.am         |  2 ++
- grub-core/Makefile.core.am    |  4 +--
- grub-core/Makefile.core.def   |  2 --
- grub-core/Makefile.in         |  6 ++---
- grub-core/loader/efi/linux.c  | 49 ++++-------------------------------
- grub-core/loader/i386/linux.c |  8 ------
- include/grub/efi/efi.h        |  2 +-
- 7 files changed, 12 insertions(+), 61 deletions(-)
-
-diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index f18550c..f09a770 100644
---- a/grub-core/Makefile.am
-+++ b/grub-core/Makefile.am
-@@ -516,3 +516,5 @@ windowsdir: $(PROGRAMS) $(starfield_DATA) $(platform_DATA)
- 	for x in $(platform_DATA); do \
- 		cp -fp $$x $(windowsdir)/$(target_cpu)-$(platform)/$$x; \
- 	done
-+
-+# no autoreconf, please | added by 'Revert "efi: Use generic EFI loader for x86_64 and i386"' patch
-diff --git a/grub-core/Makefile.core.am b/grub-core/Makefile.core.am
-index 20efe61..b8a28bd 100644
---- a/grub-core/Makefile.core.am
-+++ b/grub-core/Makefile.core.am
-@@ -15107,7 +15107,7 @@ endif
- if COND_i386_efi
- platform_PROGRAMS += linux.module
- MODULE_FILES += linux.module$(EXEEXT)
--linux_module_SOURCES  = lib/cmdline.c loader/efi/linux.c loader/i386/linux.c loader/linux.c  ## platform sources
-+linux_module_SOURCES  = lib/cmdline.c loader/i386/linux.c loader/linux.c  ## platform sources
- nodist_linux_module_SOURCES  =  ## platform nodist sources
- linux_module_LDADD  = 
- linux_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
-@@ -15222,7 +15222,7 @@ endif
- if COND_x86_64_efi
- platform_PROGRAMS += linux.module
- MODULE_FILES += linux.module$(EXEEXT)
--linux_module_SOURCES  = lib/cmdline.c loader/efi/linux.c loader/i386/linux.c loader/linux.c  ## platform sources
-+linux_module_SOURCES  = lib/cmdline.c loader/i386/linux.c loader/linux.c  ## platform sources
- nodist_linux_module_SOURCES  =  ## platform nodist sources
- linux_module_LDADD  = 
- linux_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 1571421..db5800e 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -1854,8 +1854,6 @@ module = {
-   loongarch64 = loader/efi/linux.c;
-   riscv32 = loader/efi/linux.c;
-   riscv64 = loader/efi/linux.c;
--  i386_efi = loader/efi/linux.c;
--  x86_64_efi = loader/efi/linux.c;
-   emu = loader/emu/linux.c;
-   common = loader/linux.c;
-   common = lib/cmdline.c;
-diff --git a/grub-core/Makefile.in b/grub-core/Makefile.in
-index ce6601f..98ef33f 100644
---- a/grub-core/Makefile.in
-+++ b/grub-core/Makefile.in
-@@ -12351,7 +12351,6 @@ am__linux_module_SOURCES_DIST = lib/cmdline.c loader/efi/linux.c \
- @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_loongarch64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@	loader/i386/linux_module-xen.$(OBJEXT) \
- @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_loongarch64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@	loader/linux_module-linux.$(OBJEXT)
- @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_loongarch64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@am_linux_module_OBJECTS = lib/linux_module-cmdline.$(OBJEXT) \
--@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_loongarch64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@	loader/efi/linux_module-linux.$(OBJEXT) \
- @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_loongarch64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@	loader/i386/linux_module-linux.$(OBJEXT) \
- @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_loongarch64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@	loader/linux_module-linux.$(OBJEXT)
- @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_loongarch64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@am_linux_module_OBJECTS = lib/linux_module-cmdline.$(OBJEXT) \
-@@ -12402,7 +12401,6 @@ am__linux_module_SOURCES_DIST = lib/cmdline.c loader/efi/linux.c \
- @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@	loader/i386/linux_module-linux.$(OBJEXT) \
- @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@	loader/linux_module-linux.$(OBJEXT)
- @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@am_linux_module_OBJECTS = lib/linux_module-cmdline.$(OBJEXT) \
--@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@	loader/efi/linux_module-linux.$(OBJEXT) \
- @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@	loader/i386/linux_module-linux.$(OBJEXT) \
- @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@	loader/linux_module-linux.$(OBJEXT)
- @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@am_linux_module_OBJECTS = lib/linux_module-cmdline.$(OBJEXT) \
-@@ -24164,7 +24162,7 @@ setjmp_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
- @COND_arm_uboot_TRUE@linux_module_SOURCES = lib/cmdline.c loader/arm/linux.c loader/linux.c  ## platform sources
- @COND_emu_TRUE@linux_module_SOURCES = lib/cmdline.c loader/emu/linux.c loader/linux.c  ## platform sources
- @COND_i386_coreboot_TRUE@linux_module_SOURCES = lib/cmdline.c loader/i386/linux.c loader/linux.c  ## platform sources
--@COND_i386_efi_TRUE@linux_module_SOURCES = lib/cmdline.c loader/efi/linux.c loader/i386/linux.c loader/linux.c  ## platform sources
-+@COND_i386_efi_TRUE@linux_module_SOURCES = lib/cmdline.c loader/i386/linux.c loader/linux.c  ## platform sources
- @COND_i386_ieee1275_TRUE@linux_module_SOURCES = lib/cmdline.c loader/i386/linux.c loader/linux.c  ## platform sources
- @COND_i386_multiboot_TRUE@linux_module_SOURCES = lib/cmdline.c loader/i386/linux.c loader/linux.c  ## platform sources
- @COND_i386_pc_TRUE@linux_module_SOURCES = lib/cmdline.c lib/i386/pc/vesa_modes_table.c loader/i386/linux.c loader/linux.c  ## platform sources
-@@ -24180,7 +24178,7 @@ setjmp_module_DEPENDENCIES = $(TARGET_OBJ2ELF)
- @COND_riscv32_efi_TRUE@linux_module_SOURCES = lib/cmdline.c loader/efi/linux.c loader/linux.c  ## platform sources
- @COND_riscv64_efi_TRUE@linux_module_SOURCES = lib/cmdline.c loader/efi/linux.c loader/linux.c  ## platform sources
- @COND_sparc64_ieee1275_TRUE@linux_module_SOURCES = lib/cmdline.c loader/linux.c loader/sparc64/ieee1275/linux.c  ## platform sources
--@COND_x86_64_efi_TRUE@linux_module_SOURCES = lib/cmdline.c loader/efi/linux.c loader/i386/linux.c loader/linux.c  ## platform sources
-+@COND_x86_64_efi_TRUE@linux_module_SOURCES = lib/cmdline.c loader/i386/linux.c loader/linux.c  ## platform sources
- @COND_x86_64_xen_TRUE@linux_module_SOURCES = lib/cmdline.c loader/i386/xen.c loader/linux.c  ## platform sources
- @COND_arm64_efi_TRUE@nodist_linux_module_SOURCES = ## platform nodist sources
- @COND_arm_coreboot_TRUE@nodist_linux_module_SOURCES = ## platform nodist sources
-diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index bfbd95a..f1806d8 100644
---- a/grub-core/loader/efi/linux.c
-+++ b/grub-core/loader/efi/linux.c
-@@ -70,12 +70,6 @@ static initrd_media_device_path_t initrd_lf2_device_path = {
-   }
- };
- 
--extern grub_err_t
--grub_cmd_linux_x86_legacy (grub_command_t cmd, int argc, char *argv[]);
--
--extern grub_err_t
--grub_cmd_initrd_x86_legacy (grub_command_t cmd, int argc, char *argv[]);
--
- static grub_efi_status_t __grub_efi_api
- grub_efi_initrd_load_file2 (grub_efi_load_file2_t *this,
-                             grub_efi_device_path_t *device_path,
-@@ -135,7 +129,6 @@ grub_arch_efi_linux_load_image_header (grub_file_t file,
-   return GRUB_ERR_NONE;
- }
- 
--#if !defined(__i386__) && !defined(__x86_64__)
- static grub_err_t
- finalize_params_linux (void)
- {
-@@ -180,7 +173,6 @@ failure:
-   grub_fdt_unload();
-   return grub_error(GRUB_ERR_BAD_OS, "failed to install/update FDT");
- }
--#endif
- 
- grub_err_t
- grub_arch_efi_linux_boot_image (grub_addr_t addr, grub_size_t size, char *args)
-@@ -250,10 +242,8 @@ unload:
- static grub_err_t
- grub_linux_boot (void)
- {
--#if !defined(__i386__) && !defined(__x86_64__)
-   if (finalize_params_linux () != GRUB_ERR_NONE)
-     return grub_errno;
--#endif
- 
-   return grub_arch_efi_linux_boot_image ((grub_addr_t) kernel_addr,
- 					 kernel_size, linux_args);
-@@ -274,9 +264,7 @@ grub_linux_unload (void)
-   if (kernel_addr)
-     grub_efi_free_pages ((grub_addr_t) kernel_addr,
- 			 GRUB_EFI_BYTES_TO_PAGES (kernel_size));
--#if !defined(__i386__) && !defined(__x86_64__)
-   grub_fdt_unload ();
--#endif
- 
-   if (initrd_lf2_handle != NULL)
-     {
-@@ -292,7 +280,6 @@ grub_linux_unload (void)
-   return GRUB_ERR_NONE;
- }
- 
--#if !defined(__i386__) && !defined(__x86_64__)
- /*
-  * As per linux/Documentation/arm/Booting
-  * ARM initrd needs to be covered by kernel linear mapping,
-@@ -328,7 +315,6 @@ allocate_initrd_mem (int initrd_pages)
- 				       GRUB_EFI_ALLOCATE_MAX_ADDRESS,
- 				       GRUB_EFI_LOADER_DATA);
- }
--#endif
- 
- static grub_efi_status_t __grub_efi_api
- grub_efi_initrd_load_file2 (grub_efi_load_file2_t *this,
-@@ -370,8 +356,8 @@ static grub_err_t
- grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
- 		 int argc, char *argv[])
- {
--  int __attribute__ ((unused)) initrd_size, initrd_pages;
--  void *__attribute__ ((unused)) initrd_mem = NULL;
-+  int initrd_size, initrd_pages;
-+  void *initrd_mem = NULL;
-   grub_efi_boot_services_t *b = grub_efi_system_table->boot_services;
-   grub_efi_status_t status;
- 
-@@ -381,11 +367,6 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
-       goto fail;
-     }
- 
--#if defined(__i386__) || defined(__x86_64__)
--  if (!initrd_use_loadfile2)
--    return grub_cmd_initrd_x86_legacy (cmd, argc, argv);
--#endif
--
-   if (!loaded)
-     {
-       grub_error (GRUB_ERR_BAD_ARGUMENT,
-@@ -421,7 +402,6 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
-       return GRUB_ERR_NONE;
-     }
- 
--#if !defined(__i386__) && !defined(__x86_64__)
-   initrd_size = grub_get_initrd_size (&initrd_ctx);
-   grub_dprintf ("linux", "Loading initrd\n");
- 
-@@ -435,19 +415,17 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
-     }
- 
-   if (grub_initrd_load (&initrd_ctx, initrd_mem))
--    {
--      grub_efi_free_pages ((grub_addr_t) initrd_mem, initrd_pages);
--      goto fail;
--    }
-+    goto fail;
- 
-   initrd_start = (grub_addr_t) initrd_mem;
-   initrd_end = initrd_start + initrd_size;
-   grub_dprintf ("linux", "[addr=%p, size=0x%x]\n",
- 		(void *) initrd_start, initrd_size);
--#endif
- 
-  fail:
-   grub_initrd_close (&initrd_ctx);
-+  if (initrd_mem && !initrd_start)
-+    grub_efi_free_pages ((grub_addr_t) initrd_mem, initrd_pages);
- 
-   return grub_errno;
- }
-@@ -491,24 +469,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
-   kernel_size = grub_file_size (file);
- 
-   if (grub_arch_efi_linux_load_image_header (file, &lh) != GRUB_ERR_NONE)
--#if !defined(__i386__) && !defined(__x86_64__)
-     goto fail;
--#else
--    goto fallback;
--
--  if (!initrd_use_loadfile2)
--    {
--      /*
--       * This is a EFI stub image but it is too old to implement the LoadFile2
--       * based initrd loading scheme, and Linux/x86 does not support the DT
--       * based method either. So fall back to the x86-specific loader that
--       * enters Linux in EFI mode but without going through its EFI stub.
--       */
--fallback:
--      grub_file_close (file);
--      return grub_cmd_linux_x86_legacy (cmd, argc, argv);
--    }
--#endif
- 
-   grub_loader_unset();
- 
-diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index 977757f..459b201 100644
---- a/grub-core/loader/i386/linux.c
-+++ b/grub-core/loader/i386/linux.c
-@@ -1148,7 +1148,6 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
-   return grub_errno;
- }
- 
--#ifndef GRUB_MACHINE_EFI
- static grub_command_t cmd_linux, cmd_initrd;
- 
- GRUB_MOD_INIT(linux)
-@@ -1165,10 +1164,3 @@ GRUB_MOD_FINI(linux)
-   grub_unregister_command (cmd_linux);
-   grub_unregister_command (cmd_initrd);
- }
--#else
--extern grub_err_t __attribute__((alias("grub_cmd_linux")))
--grub_cmd_linux_x86_legacy (grub_command_t cmd, int argc, char *argv[]);
--
--extern grub_err_t __attribute__((alias("grub_cmd_initrd")))
--grub_cmd_initrd_x86_legacy (grub_command_t cmd, int argc, char *argv[]);
--#endif
-diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index a5cd99e..11b5ce4 100644
---- a/include/grub/efi/efi.h
-+++ b/include/grub/efi/efi.h
-@@ -125,12 +125,12 @@ EXPORT_FUNC (grub_efi_find_configuration_table) (const grub_guid_t *target_guid)
- #if defined(__arm__) || defined(__aarch64__) || defined(__riscv) || defined(__loongarch__)
- void *EXPORT_FUNC(grub_efi_get_firmware_fdt)(void);
- grub_err_t EXPORT_FUNC(grub_efi_get_ram_base)(grub_addr_t *);
--#endif
- #include <grub/file.h>
- grub_err_t grub_arch_efi_linux_load_image_header(grub_file_t file,
-                                                 struct linux_arch_kernel_header *lh);
- grub_err_t grub_arch_efi_linux_boot_image(grub_addr_t addr, grub_size_t size,
-                                            char *args);
-+#endif
- 
- grub_addr_t grub_efi_section_addr (const char *section);
- 

buildroot-external/board/pc/grub.cfg

@@ -77,9 +77,9 @@ menuentry "Slot B (OK=$B_OK TRY=$B_TRY)" {
 }
 
 menuentry "Slot A (rescue shell)" {
-    linux (${boothd},gpt2)/bzImage root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd $default_cmdline $cmdline rauc.slot=A systemd.unit=recovery.target
+    linux (${boothd},gpt2)/bzImage root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd $default_cmdline $cmdline rauc.slot=A systemd.unit=recovery.target debug
 }
 
 menuentry "Slot B (rescue shell)" {
-    linux (${boothd},gpt4)/bzImage root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 $default_cmdline $cmdline rauc.slot=B systemd.unit=recovery.target
+    linux (${boothd},gpt4)/bzImage root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 $default_cmdline $cmdline rauc.slot=B systemd.unit=recovery.target debug
 }

buildroot-external/board/pc/ova/hassos-hook.sh

@@ -9,14 +9,10 @@ function hassos_pre_image() {
 
     cp "${BOARD_DIR}/../grub.cfg" "${EFIPART_DATA}/EFI/BOOT/grub.cfg"
     cp "${BOARD_DIR}/cmdline.txt" "${EFIPART_DATA}/cmdline.txt"
-    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv-A" create
-    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv-A" set ORDER="A B"
-    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv-A" set A_OK=1
-    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv-A" set A_TRY=0
-    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv-B" create
-    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv-B" set ORDER="B A"
-    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv-B" set B_OK=1
-    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv-B" set B_TRY=0
+    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" create
+    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" set ORDER="A B"
+    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" set A_OK=1
+    grub-editenv "${EFIPART_DATA}/EFI/BOOT/grubenv" set A_TRY=0
 
     cp -r "${EFIPART_DATA}/"* "${BOOT_DATA}/"
 }

buildroot-external/board/pc/ova/kernel.config

@@ -21,6 +21,8 @@ CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_VMWARE_VMCI=y
 CONFIG_VMWARE_BALLOON=y
 CONFIG_VMWARE_PVSCSI=y
+# VMWare has optional ES1371 sound card emulation
+CONFIG_SND_ENS1371=m
 
 # These options are for LXD Guest Support
 CONFIG_NET_9P=m
@@ -88,6 +90,8 @@ CONFIG_FB_EFI=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 
+CONFIG_DRM_I915=m
+
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_SDHCI=y
@@ -124,4 +128,18 @@ CONFIG_DWMAC_INTEL=m
 CONFIG_I6300ESB_WDT=y
 
 CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_MUX=y
+CONFIG_I2C_TINY_USB=m
+
+CONFIG_I2C_DLN2=m
+CONFIG_GPIO_DLN2=m
+CONFIG_MFD_DLN2=m
+CONFIG_DLN2_ADC=m
+
+CONFIG_IIO=m
+CONFIG_BMP280=m
+
+# Required for some PCIe devices such as ath12k
+CONFIG_IRQ_REMAP=y

buildroot-external/board/pc/patches/linux/0001-iwlwifi-Make-missed-beacon-timeout-configurable.patch

@@ -1,94 +0,0 @@
-From 5712a20822709d1cd744a435eba5d9c8ef91a834 Mon Sep 17 00:00:00 2001
-From: Zachary Michaels <mikezackles@gmail.com>
-Date: Thu, 7 Jan 2021 08:13:11 -0800
-Subject: [PATCH] iwlwifi: Make missed beacon timeout configurable
-
-Makes the beacon timeout a module parameter, allowing the original default (16
-missed beacons) to be kept while also enabling users that experience problems to
-increase the timeout.
-
-See https://bugzilla.kernel.org/show_bug.cgi?id=203709
-
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- drivers/net/wireless/intel/iwlwifi/iwl-drv.c       | 4 ++++
- drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 2 ++
- drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c  | 3 ++-
- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h       | 1 -
- 4 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
-index fb5e254757e7..2db7032ea269 100644
---- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
-+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
-@@ -1866,6 +1866,7 @@ struct iwl_mod_params iwlwifi_mod_params = {
- 	.power_level = IWL_POWER_INDEX_1,
- 	.uapsd_disable = IWL_DISABLE_UAPSD_BSS | IWL_DISABLE_UAPSD_P2P_CLIENT,
- 	.enable_ini = ENABLE_INI,
-+	.beacon_timeout = 16,
- 	/* the rest are 0 by default */
- };
- IWL_EXPORT_SYMBOL(iwlwifi_mod_params);
-@@ -1982,6 +1983,9 @@ module_param_named(enable_ini, iwlwifi_mod_params.enable_ini, uint, 0444);
- MODULE_PARM_DESC(enable_ini,
- 		 "0:disable, 1-15:FW_DBG_PRESET Values, 16:enabled without preset value defined,"
- 		 "Debug INI TLV FW debug infrastructure (default: 16)");
-+module_param_named(beacon_timeout, iwlwifi_mod_params.beacon_timeout, uint, 0644);
-+MODULE_PARM_DESC(beacon_timeout,
-+		 "Number of missed beacons before disconnecting (default: 16)");
- 
- /*
-  * set bt_coex_active to true, uCode will do kill/defer
-diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h b/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h
-index 1cf26ab4f488..ba50b7d21744 100644
---- a/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h
-+++ b/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h
-@@ -63,6 +63,7 @@ enum iwl_uapsd_disable {
-  * @remove_when_gone: remove an inaccessible device from the PCIe bus.
-  * @enable_ini: enable new FW debug infratructure (INI TLVs)
-  * @disable_11be: disable EHT capabilities, default = false.
-+ * @beacon_timeout: number of missed beacons before disconnect, default = 16
-  */
- struct iwl_mod_params {
- 	int swcrypto;
-@@ -86,6 +87,7 @@ struct iwl_mod_params {
- 	bool remove_when_gone;
- 	u32 enable_ini;
- 	bool disable_11be;
-+	u32 beacon_timeout;
- };
- 
- static inline bool iwl_enable_rx_ampdu(void)
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
-index 9c97691e6038..56c0f98d12b5 100644
---- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
-@@ -8,6 +8,7 @@
- #include <linux/crc32.h>
- #include <net/mac80211.h>
- #include "iwl-io.h"
-+#include "iwl-modparams.h"
- #include "iwl-prph.h"
- #include "fw-api.h"
- #include "mvm.h"
-@@ -1614,7 +1615,7 @@ void iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm,
- 	 * TODO: the threshold should be adjusted based on latency conditions,
- 	 * and/or in case of a CS flow on one of the other AP vifs.
- 	 */
--	if (rx_missed_bcon > IWL_MVM_MISSED_BEACONS_THRESHOLD_LONG)
-+	if (rx_missed_bcon > iwlwifi_mod_params.beacon_timeout)
- 		iwl_mvm_connection_loss(mvm, vif, "missed beacons");
- 	else if (rx_missed_bcon_since_rx > IWL_MVM_MISSED_BEACONS_THRESHOLD)
- 		ieee80211_beacon_loss(vif);
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
-index 218f3bc31104..4f112ecdf704 100644
---- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
-@@ -41,7 +41,6 @@
- /* RSSI offset for WkP */
- #define IWL_RSSI_OFFSET 50
- #define IWL_MVM_MISSED_BEACONS_THRESHOLD 8
--#define IWL_MVM_MISSED_BEACONS_THRESHOLD_LONG 16
- 
- /* A TimeUnit is 1024 microsecond */
- #define MSEC_TO_TU(_msec)	(_msec*1000/1024)

buildroot-external/board/pc/patches/linux/0001-r8169-add-support-for-RTL8125D.patch

@@ -0,0 +1,154 @@
+From f0fb974644a132ecc4bd2dc5cce9622435d0ec13 Mon Sep 17 00:00:00 2001
+From: Heiner Kallweit <hkallweit1@gmail.com>
+Date: Thu, 24 Oct 2024 22:42:33 +0200
+Subject: [PATCH] r8169: add support for RTL8125D
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This adds support for new chip version RTL8125D, which can be found on
+boards like Gigabyte X870E AORUS ELITE WIFI7. Firmware rtl8125d-1.fw
+for this chip version is available in linux-firmware already.
+
+Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
+Reviewed-by: Simon Horman <horms@kernel.org>
+Link: https://patch.msgid.link/d0306912-e88e-4c25-8b5d-545ae8834c0c@gmail.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f75d1fbe7809bc5ed134204b920fd9e2fc5db1df
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
+---
+ drivers/net/ethernet/realtek/r8169.h          |  1 +
+ drivers/net/ethernet/realtek/r8169_main.c     | 23 +++++++++++++------
+ .../net/ethernet/realtek/r8169_phy_config.c   | 10 ++++++++
+ 3 files changed, 27 insertions(+), 7 deletions(-)
+
+diff --git a/drivers/net/ethernet/realtek/r8169.h b/drivers/net/ethernet/realtek/r8169.h
+index e2db944e6fa8b..be4c9622618d8 100644
+--- a/drivers/net/ethernet/realtek/r8169.h
++++ b/drivers/net/ethernet/realtek/r8169.h
+@@ -68,6 +68,7 @@ enum mac_version {
+ 	/* support for RTL_GIGA_MAC_VER_60 has been removed */
+ 	RTL_GIGA_MAC_VER_61,
+ 	RTL_GIGA_MAC_VER_63,
++	RTL_GIGA_MAC_VER_64,
+ 	RTL_GIGA_MAC_VER_65,
+ 	RTL_GIGA_MAC_VER_66,
+ 	RTL_GIGA_MAC_NONE
+diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
+index 5ed2818bac257..1cbde7ebd6f30 100644
+--- a/drivers/net/ethernet/realtek/r8169_main.c
++++ b/drivers/net/ethernet/realtek/r8169_main.c
+@@ -55,6 +55,7 @@
+ #define FIRMWARE_8107E_2	"rtl_nic/rtl8107e-2.fw"
+ #define FIRMWARE_8125A_3	"rtl_nic/rtl8125a-3.fw"
+ #define FIRMWARE_8125B_2	"rtl_nic/rtl8125b-2.fw"
++#define FIRMWARE_8125D_1	"rtl_nic/rtl8125d-1.fw"
+ #define FIRMWARE_8126A_2	"rtl_nic/rtl8126a-2.fw"
+ #define FIRMWARE_8126A_3	"rtl_nic/rtl8126a-3.fw"
+ 
+@@ -138,6 +139,7 @@ static const struct {
+ 	[RTL_GIGA_MAC_VER_61] = {"RTL8125A",		FIRMWARE_8125A_3},
+ 	/* reserve 62 for CFG_METHOD_4 in the vendor driver */
+ 	[RTL_GIGA_MAC_VER_63] = {"RTL8125B",		FIRMWARE_8125B_2},
++	[RTL_GIGA_MAC_VER_64] = {"RTL8125D",		FIRMWARE_8125D_1},
+ 	[RTL_GIGA_MAC_VER_65] = {"RTL8126A",		FIRMWARE_8126A_2},
+ 	[RTL_GIGA_MAC_VER_66] = {"RTL8126A",		FIRMWARE_8126A_3},
+ };
+@@ -707,6 +709,7 @@ MODULE_FIRMWARE(FIRMWARE_8168FP_3);
+ MODULE_FIRMWARE(FIRMWARE_8107E_2);
+ MODULE_FIRMWARE(FIRMWARE_8125A_3);
+ MODULE_FIRMWARE(FIRMWARE_8125B_2);
++MODULE_FIRMWARE(FIRMWARE_8125D_1);
+ MODULE_FIRMWARE(FIRMWARE_8126A_2);
+ MODULE_FIRMWARE(FIRMWARE_8126A_3);
+ 
+@@ -2098,10 +2101,7 @@ static void rtl_set_eee_txidle_timer(struct rtl8169_private *tp)
+ 		tp->tx_lpi_timer = timer_val;
+ 		r8168_mac_ocp_write(tp, 0xe048, timer_val);
+ 		break;
+-	case RTL_GIGA_MAC_VER_61:
+-	case RTL_GIGA_MAC_VER_63:
+-	case RTL_GIGA_MAC_VER_65:
+-	case RTL_GIGA_MAC_VER_66:
++	case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_66:
+ 		tp->tx_lpi_timer = timer_val;
+ 		RTL_W16(tp, EEE_TXIDLE_TIMER_8125, timer_val);
+ 		break;
+@@ -2233,6 +2233,9 @@ static enum mac_version rtl8169_get_mac_version(u16 xid, bool gmii)
+ 		{ 0x7cf, 0x64a,	RTL_GIGA_MAC_VER_66 },
+ 		{ 0x7cf, 0x649,	RTL_GIGA_MAC_VER_65 },
+ 
++		/* 8125D family. */
++		{ 0x7cf, 0x688,	RTL_GIGA_MAC_VER_64 },
++
+ 		/* 8125B family. */
+ 		{ 0x7cf, 0x641,	RTL_GIGA_MAC_VER_63 },
+ 
+@@ -2500,9 +2503,7 @@ static void rtl_init_rxcfg(struct rtl8169_private *tp)
+ 	case RTL_GIGA_MAC_VER_61:
+ 		RTL_W32(tp, RxConfig, RX_FETCH_DFLT_8125 | RX_DMA_BURST);
+ 		break;
+-	case RTL_GIGA_MAC_VER_63:
+-	case RTL_GIGA_MAC_VER_65:
+-	case RTL_GIGA_MAC_VER_66:
++	case RTL_GIGA_MAC_VER_63 ... RTL_GIGA_MAC_VER_66:
+ 		RTL_W32(tp, RxConfig, RX_FETCH_DFLT_8125 | RX_DMA_BURST |
+ 			RX_PAUSE_SLOT_ON);
+ 		break;
+@@ -3814,6 +3815,12 @@ static void rtl_hw_start_8125b(struct rtl8169_private *tp)
+ 	rtl_hw_start_8125_common(tp);
+ }
+ 
++static void rtl_hw_start_8125d(struct rtl8169_private *tp)
++{
++	rtl_set_def_aspm_entry_latency(tp);
++	rtl_hw_start_8125_common(tp);
++}
++
+ static void rtl_hw_start_8126a(struct rtl8169_private *tp)
+ {
+ 	rtl_set_def_aspm_entry_latency(tp);
+@@ -3862,6 +3869,7 @@ static void rtl_hw_config(struct rtl8169_private *tp)
+ 		[RTL_GIGA_MAC_VER_53] = rtl_hw_start_8117,
+ 		[RTL_GIGA_MAC_VER_61] = rtl_hw_start_8125a_2,
+ 		[RTL_GIGA_MAC_VER_63] = rtl_hw_start_8125b,
++		[RTL_GIGA_MAC_VER_64] = rtl_hw_start_8125d,
+ 		[RTL_GIGA_MAC_VER_65] = rtl_hw_start_8126a,
+ 		[RTL_GIGA_MAC_VER_66] = rtl_hw_start_8126a,
+ 	};
+@@ -3879,6 +3887,7 @@ static void rtl_hw_start_8125(struct rtl8169_private *tp)
+ 	/* disable interrupt coalescing */
+ 	switch (tp->mac_version) {
+ 	case RTL_GIGA_MAC_VER_61:
++	case RTL_GIGA_MAC_VER_64:
+ 		for (i = 0xa00; i < 0xb00; i += 4)
+ 			RTL_W32(tp, i, 0);
+ 		break;
+diff --git a/drivers/net/ethernet/realtek/r8169_phy_config.c b/drivers/net/ethernet/realtek/r8169_phy_config.c
+index cf29b12084826..d09b2a41cd062 100644
+--- a/drivers/net/ethernet/realtek/r8169_phy_config.c
++++ b/drivers/net/ethernet/realtek/r8169_phy_config.c
+@@ -1104,6 +1104,15 @@ static void rtl8125b_hw_phy_config(struct rtl8169_private *tp,
+ 	rtl8125b_config_eee_phy(phydev);
+ }
+ 
++static void rtl8125d_hw_phy_config(struct rtl8169_private *tp,
++				   struct phy_device *phydev)
++{
++	r8169_apply_firmware(tp);
++	rtl8125_legacy_force_mode(phydev);
++	rtl8168g_disable_aldps(phydev);
++	rtl8125b_config_eee_phy(phydev);
++}
++
+ static void rtl8126a_hw_phy_config(struct rtl8169_private *tp,
+ 				   struct phy_device *phydev)
+ {
+@@ -1160,6 +1169,7 @@ void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev,
+ 		[RTL_GIGA_MAC_VER_53] = rtl8117_hw_phy_config,
+ 		[RTL_GIGA_MAC_VER_61] = rtl8125a_2_hw_phy_config,
+ 		[RTL_GIGA_MAC_VER_63] = rtl8125b_hw_phy_config,
++		[RTL_GIGA_MAC_VER_64] = rtl8125d_hw_phy_config,
+ 		[RTL_GIGA_MAC_VER_65] = rtl8126a_hw_phy_config,
+ 		[RTL_GIGA_MAC_VER_66] = rtl8126a_hw_phy_config,
+ 	};

buildroot-external/board/pc/patches/linux/0002-net-phy-realtek-merge-the-drivers-for-internal-NBase.patch

@@ -0,0 +1,143 @@
+From acc8d5ec4b6cdbf0a9625a9f9d3710b52555f3b2 Mon Sep 17 00:00:00 2001
+From: Heiner Kallweit <hkallweit1@gmail.com>
+Date: Tue, 15 Oct 2024 07:47:14 +0200
+Subject: [PATCH] net: phy: realtek: merge the drivers for internal NBase-T
+ PHY's
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The Realtek RTL8125/RTL8126 NBase-T MAC/PHY chips have internal PHY's
+which are register-compatible, at least for the registers we use here.
+So let's use just one PHY driver to support all of them.
+These internal PHY's exist also as external C45 PHY's, but on the
+internal PHY's no access to MMD registers is possible. This can be
+used to differentiate between the internal and external version.
+
+As a side effect the drivers for two now external-only drivers don't
+require read_mmd/write_mmd hooks any longer.
+
+Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
+Link: https://patch.msgid.link/c57081a6-811f-4571-ab35-34f4ca6de9af@gmail.com
+Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f87a17ed3b51fba4dfdd8f8b643b5423a85fc551
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
+---
+ drivers/net/phy/realtek.c | 53 +++++++++++++++++++++++++++++++--------
+ 1 file changed, 43 insertions(+), 10 deletions(-)
+
+diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
+index 166f6a7283731..830a0d337de5d 100644
+--- a/drivers/net/phy/realtek.c
++++ b/drivers/net/phy/realtek.c
+@@ -92,6 +92,7 @@
+ 
+ #define RTL_GENERIC_PHYID			0x001cc800
+ #define RTL_8211FVD_PHYID			0x001cc878
++#define RTL_8221B				0x001cc840
+ #define RTL_8221B_VB_CG				0x001cc849
+ #define RTL_8221B_VN_CG				0x001cc84a
+ #define RTL_8251B				0x001cc862
+@@ -1040,6 +1041,23 @@ static bool rtlgen_supports_2_5gbps(struct phy_device *phydev)
+ 	return val >= 0 && val & MDIO_PMA_SPEED_2_5G;
+ }
+ 
++/* On internal PHY's MMD reads over C22 always return 0.
++ * Check a MMD register which is known to be non-zero.
++ */
++static bool rtlgen_supports_mmd(struct phy_device *phydev)
++{
++	int val;
++
++	phy_lock_mdio_bus(phydev);
++	__phy_write(phydev, MII_MMD_CTRL, MDIO_MMD_PCS);
++	__phy_write(phydev, MII_MMD_DATA, MDIO_PCS_EEE_ABLE);
++	__phy_write(phydev, MII_MMD_CTRL, MDIO_MMD_PCS | MII_MMD_CTRL_NOINCR);
++	val = __phy_read(phydev, MII_MMD_DATA);
++	phy_unlock_mdio_bus(phydev);
++
++	return val > 0;
++}
++
+ static int rtlgen_match_phy_device(struct phy_device *phydev)
+ {
+ 	return phydev->phy_id == RTL_GENERIC_PHYID &&
+@@ -1049,7 +1067,8 @@ static int rtlgen_match_phy_device(struct phy_device *phydev)
+ static int rtl8226_match_phy_device(struct phy_device *phydev)
+ {
+ 	return phydev->phy_id == RTL_GENERIC_PHYID &&
+-	       rtlgen_supports_2_5gbps(phydev);
++	       rtlgen_supports_2_5gbps(phydev) &&
++	       rtlgen_supports_mmd(phydev);
+ }
+ 
+ static int rtlgen_is_c45_match(struct phy_device *phydev, unsigned int id,
+@@ -1061,6 +1080,11 @@ static int rtlgen_is_c45_match(struct phy_device *phydev, unsigned int id,
+ 		return !is_c45 && (id == phydev->phy_id);
+ }
+ 
++static int rtl8221b_match_phy_device(struct phy_device *phydev)
++{
++	return phydev->phy_id == RTL_8221B && rtlgen_supports_mmd(phydev);
++}
++
+ static int rtl8221b_vb_cg_c22_match_phy_device(struct phy_device *phydev)
+ {
+ 	return rtlgen_is_c45_match(phydev, RTL_8221B_VB_CG, false);
+@@ -1081,9 +1105,21 @@ static int rtl8221b_vn_cg_c45_match_phy_device(struct phy_device *phydev)
+ 	return rtlgen_is_c45_match(phydev, RTL_8221B_VN_CG, true);
+ }
+ 
+-static int rtl8251b_c22_match_phy_device(struct phy_device *phydev)
++static int rtl_internal_nbaset_match_phy_device(struct phy_device *phydev)
+ {
+-	return rtlgen_is_c45_match(phydev, RTL_8251B, false);
++	if (phydev->is_c45)
++		return false;
++
++	switch (phydev->phy_id) {
++	case RTL_GENERIC_PHYID:
++	case RTL_8221B:
++	case RTL_8251B:
++		break;
++	default:
++		return false;
++	}
++
++	return rtlgen_supports_2_5gbps(phydev) && !rtlgen_supports_mmd(phydev);
+ }
+ 
+ static int rtl8251b_c45_match_phy_device(struct phy_device *phydev)
+@@ -1345,10 +1381,8 @@ static struct phy_driver realtek_drvs[] = {
+ 		.resume		= rtlgen_resume,
+ 		.read_page	= rtl821x_read_page,
+ 		.write_page	= rtl821x_write_page,
+-		.read_mmd	= rtl822x_read_mmd,
+-		.write_mmd	= rtl822x_write_mmd,
+ 	}, {
+-		PHY_ID_MATCH_EXACT(0x001cc840),
++		.match_phy_device = rtl8221b_match_phy_device,
+ 		.name		= "RTL8226B_RTL8221B 2.5Gbps PHY",
+ 		.get_features	= rtl822x_get_features,
+ 		.config_aneg	= rtl822x_config_aneg,
+@@ -1359,8 +1393,6 @@ static struct phy_driver realtek_drvs[] = {
+ 		.resume		= rtlgen_resume,
+ 		.read_page	= rtl821x_read_page,
+ 		.write_page	= rtl821x_write_page,
+-		.read_mmd	= rtl822x_read_mmd,
+-		.write_mmd	= rtl822x_write_mmd,
+ 	}, {
+ 		PHY_ID_MATCH_EXACT(0x001cc838),
+ 		.name           = "RTL8226-CG 2.5Gbps PHY",
+@@ -1438,8 +1470,9 @@ static struct phy_driver realtek_drvs[] = {
+ 		.read_page      = rtl821x_read_page,
+ 		.write_page     = rtl821x_write_page,
+ 	}, {
+-		.match_phy_device = rtl8251b_c22_match_phy_device,
+-		.name           = "RTL8126A-internal 5Gbps PHY",
++		.match_phy_device = rtl_internal_nbaset_match_phy_device,
++		.name           = "Realtek Internal NBASE-T PHY",
++		.flags		= PHY_IS_INTERNAL,
+ 		.get_features   = rtl822x_get_features,
+ 		.config_aneg    = rtl822x_config_aneg,
+ 		.read_status    = rtl822x_read_status,

buildroot-external/board/pc/patches/linux/0003-net-phy-realtek-add-RTL8125D-internal-PHY.patch

@@ -0,0 +1,36 @@
+From 7ab842c714924784cae4b6ab229997905b096b4f Mon Sep 17 00:00:00 2001
+From: Heiner Kallweit <hkallweit1@gmail.com>
+Date: Thu, 17 Oct 2024 18:01:13 +0200
+Subject: [PATCH] net: phy: realtek: add RTL8125D-internal PHY
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The first boards show up with Realtek's RTL8125D. This MAC/PHY chip
+comes with an integrated 2.5Gbps PHY with ID 0x001cc841. It's not
+clear yet whether there's an external version of this PHY and how
+Realtek calls it, therefore use the numeric id for now.
+
+Link: https://lore.kernel.org/netdev/2ada65e1-5dfa-456c-9334-2bc51272e9da@gmail.com/T/
+Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
+Message-ID: <7d2924de-053b-44d2-a479-870dc3878170@gmail.com>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: Andrew Lunn <andrew@lunn.ch>
+Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8989bad541133c43550bff2b80edbe37b8fb9659
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
+---
+ drivers/net/phy/realtek.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
+index 830a0d337de5d..8ce5705af69c5 100644
+--- a/drivers/net/phy/realtek.c
++++ b/drivers/net/phy/realtek.c
+@@ -1114,6 +1114,7 @@ static int rtl_internal_nbaset_match_phy_device(struct phy_device *phydev)
+ 	case RTL_GENERIC_PHYID:
+ 	case RTL_8221B:
+ 	case RTL_8251B:
++	case 0x001cc841:
+ 		break;
+ 	default:
+ 		return false;

buildroot-external/board/raspberrypi/cmdline.txt

@@ -1 +1 @@
-dwc_otg.lpm_enable=0 console=tty0 usb-storage.quirks=174c:55aa:u,2109:0715:u,152d:0578:u,152d:0579:u,152d:1561:u,174c:0829:u,14b0:0206:u,174c:225c:u,7825:a2a4:u,152d:0562:u,125f:a88a:u
+dwc_otg.lpm_enable=0 console=tty0 usb-storage.quirks=174c:55aa:u,2109:0715:u,152d:0578:u,152d:0579:u,152d:1561:u,174c:0829:u,14b0:0206:u,174c:225c:u,7825:a2a4:u,152d:0562:u,125f:a88a:u,152d:a583:u,152d:a578:u

buildroot-external/board/raspberrypi/config.txt

@@ -71,6 +71,10 @@ kernel=u-boot.bin
 # Enable audio (loads snd_bcm2835)
 dtparam=audio=on
 
+[pi3]
+# Added to fix #3965
+initial_turbo=0
+
 [pi4]
 # Enable DRM VC4 V3D driver on top of the dispmanx display stack
 dtoverlay=vc4-fkms-v3d

buildroot-external/board/raspberrypi/kernel.config

@@ -7,3 +7,6 @@ CONFIG_LOCALVERSION="-haos-raspi"
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_ACTIVITY=y
+
+# do not use RPi in-tree driver, use one from BR package instead
+# CONFIG_MEDIA_PCI_HAILO is not set

buildroot-external/board/raspberrypi/patches/linux/0003-dts-bcm2712-rpi-Disable-CQE-for-CM5-eMMC-to-work-aro.patch

@@ -0,0 +1,32 @@
+From ec7a5ea27ef759c67225b1616e4266bcff0d7fb4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@sairon.cz>
+Date: Tue, 14 Jan 2025 18:27:20 +0100
+Subject: [PATCH] dts: bcm2712-rpi: Disable CQE for CM5 eMMC to work around FS
+ lockups
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+With CQE enabled, HAOS first boot often fails during swap file initilization,
+and leaves hanging on all I/O access. For some reason, this only happens when
+an ext4lazyinit on the accessed partition hasn't been finished yet. Before the
+real solution is found, disable CQE at the cost of a small performance cost.
+
+Signed-off-by: Jan Čermák <sairon@sairon.cz>
+---
+ arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi
+index 099d14ecf19a4..d49fc876cccc1 100644
+--- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi
++++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi
+@@ -339,7 +339,7 @@ &sdio1 {
+ 	mmc-hs400-1_8v;
+ 	mmc-hs400-enhanced-strobe;
+ 	broken-cd;
+-	supports-cqe = <1>;
++	supports-cqe = <0>;
+ 	status = "okay";
+ };
+ 

buildroot-external/board/raspberrypi/patches/linux/0004-ipv6-annotate-data-races-around-cnf.forwarding.patch

@@ -0,0 +1,198 @@
+From 93ddda43441baefd98267c671ce2ec7e5527906b Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <edumazet@google.com>
+Date: Wed, 28 Feb 2024 13:54:30 +0000
+Subject: [PATCH] ipv6: annotate data-races around cnf.forwarding
+
+idev->cnf.forwarding and net->ipv6.devconf_all->forwarding
+might be read locklessly, add appropriate READ_ONCE()
+and WRITE_ONCE() annotations.
+
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Reviewed-by: Jiri Pirko <jiri@nvidia.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/usb/cdc_mbim.c |  2 +-
+ include/net/ipv6.h         |  8 +++++---
+ net/core/filter.c          |  2 +-
+ net/ipv6/addrconf.c        | 10 ++++++----
+ net/ipv6/ip6_output.c      |  2 +-
+ net/ipv6/ndisc.c           | 11 ++++++-----
+ net/ipv6/route.c           |  4 ++--
+ 7 files changed, 22 insertions(+), 17 deletions(-)
+
+diff --git a/drivers/net/usb/cdc_mbim.c b/drivers/net/usb/cdc_mbim.c
+index cd4083e0b3b9e..e13e4920ee9b2 100644
+--- a/drivers/net/usb/cdc_mbim.c
++++ b/drivers/net/usb/cdc_mbim.c
+@@ -339,7 +339,7 @@ static void do_neigh_solicit(struct usbnet *dev, u8 *buf, u16 tci)
+ 	in6_dev = in6_dev_get(netdev);
+ 	if (!in6_dev)
+ 		goto out;
+-	is_router = !!in6_dev->cnf.forwarding;
++	is_router = !!READ_ONCE(in6_dev->cnf.forwarding);
+ 	in6_dev_put(in6_dev);
+ 
+ 	/* ipv6_stub != NULL if in6_dev_get returned an inet6_dev */
+diff --git a/include/net/ipv6.h b/include/net/ipv6.h
+index c6932d1a3fa80..0185ca1617c1a 100644
+--- a/include/net/ipv6.h
++++ b/include/net/ipv6.h
+@@ -534,13 +534,15 @@ static inline int ipv6_hopopt_jumbo_remove(struct sk_buff *skb)
+ 	return 0;
+ }
+ 
+-static inline bool ipv6_accept_ra(struct inet6_dev *idev)
++static inline bool ipv6_accept_ra(const struct inet6_dev *idev)
+ {
++	s32 accept_ra = READ_ONCE(idev->cnf.accept_ra);
++
+ 	/* If forwarding is enabled, RA are not accepted unless the special
+ 	 * hybrid mode (accept_ra=2) is enabled.
+ 	 */
+-	return idev->cnf.forwarding ? idev->cnf.accept_ra == 2 :
+-	    idev->cnf.accept_ra;
++	return READ_ONCE(idev->cnf.forwarding) ? accept_ra == 2 :
++		accept_ra;
+ }
+ 
+ #define IPV6_FRAG_HIGH_THRESH	(4 * 1024*1024)	/* 4194304 */
+diff --git a/net/core/filter.c b/net/core/filter.c
+index 5881944f1681c..4288f45ff54ce 100644
+--- a/net/core/filter.c
++++ b/net/core/filter.c
+@@ -6021,7 +6021,7 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
+ 		return -ENODEV;
+ 
+ 	idev = __in6_dev_get_safely(dev);
+-	if (unlikely(!idev || !idev->cnf.forwarding))
++	if (unlikely(!idev || !READ_ONCE(idev->cnf.forwarding)))
+ 		return BPF_FIB_LKUP_RET_FWD_DISABLED;
+ 
+ 	if (flags & BPF_FIB_LOOKUP_OUTPUT) {
+diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
+index 8360939acf85a..12c0b1e85cea1 100644
+--- a/net/ipv6/addrconf.c
++++ b/net/ipv6/addrconf.c
+@@ -547,7 +547,8 @@ static int inet6_netconf_fill_devconf(struct sk_buff *skb, int ifindex,
+ 		goto out;
+ 
+ 	if ((all || type == NETCONFA_FORWARDING) &&
+-	    nla_put_s32(skb, NETCONFA_FORWARDING, devconf->forwarding) < 0)
++	    nla_put_s32(skb, NETCONFA_FORWARDING,
++			READ_ONCE(devconf->forwarding)) < 0)
+ 		goto nla_put_failure;
+ #ifdef CONFIG_IPV6_MROUTE
+ 	if ((all || type == NETCONFA_MC_FORWARDING) &&
+@@ -865,7 +866,8 @@ static void addrconf_forward_change(struct net *net, __s32 newf)
+ 		idev = __in6_dev_get(dev);
+ 		if (idev) {
+ 			int changed = (!idev->cnf.forwarding) ^ (!newf);
+-			idev->cnf.forwarding = newf;
++
++			WRITE_ONCE(idev->cnf.forwarding, newf);
+ 			if (changed)
+ 				dev_forward_change(idev);
+ 		}
+@@ -882,7 +884,7 @@ static int addrconf_fixup_forwarding(struct ctl_table *table, int *p, int newf)
+ 
+ 	net = (struct net *)table->extra2;
+ 	old = *p;
+-	*p = newf;
++	WRITE_ONCE(*p, newf);
+ 
+ 	if (p == &net->ipv6.devconf_dflt->forwarding) {
+ 		if ((!newf) ^ (!old))
+@@ -897,7 +899,7 @@ static int addrconf_fixup_forwarding(struct ctl_table *table, int *p, int newf)
+ 	if (p == &net->ipv6.devconf_all->forwarding) {
+ 		int old_dflt = net->ipv6.devconf_dflt->forwarding;
+ 
+-		net->ipv6.devconf_dflt->forwarding = newf;
++		WRITE_ONCE(net->ipv6.devconf_dflt->forwarding, newf);
+ 		if ((!newf) ^ (!old_dflt))
+ 			inet6_netconf_notify_devconf(net, RTM_NEWNETCONF,
+ 						     NETCONFA_FORWARDING,
+diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
+index 2341a4373bb94..46c0dfa8c6f88 100644
+--- a/net/ipv6/ip6_output.c
++++ b/net/ipv6/ip6_output.c
+@@ -508,7 +508,7 @@ int ip6_forward(struct sk_buff *skb)
+ 	u32 mtu;
+ 
+ 	idev = __in6_dev_get_safely(dev_get_by_index_rcu(net, IP6CB(skb)->iif));
+-	if (net->ipv6.devconf_all->forwarding == 0)
++	if (READ_ONCE(net->ipv6.devconf_all->forwarding) == 0)
+ 		goto error;
+ 
+ 	if (skb->pkt_type != PACKET_HOST)
+diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
+index 23b46b5705c53..bd73484de3818 100644
+--- a/net/ipv6/ndisc.c
++++ b/net/ipv6/ndisc.c
+@@ -905,7 +905,7 @@ static enum skb_drop_reason ndisc_recv_ns(struct sk_buff *skb)
+ 		}
+ 
+ 		if (ipv6_chk_acast_addr(net, dev, &msg->target) ||
+-		    (idev->cnf.forwarding &&
++		    (READ_ONCE(idev->cnf.forwarding) &&
+ 		     (net->ipv6.devconf_all->proxy_ndp || idev->cnf.proxy_ndp) &&
+ 		     (is_router = pndisc_is_router(&msg->target, dev)) >= 0)) {
+ 			if (!(NEIGH_CB(skb)->flags & LOCALLY_ENQUEUED) &&
+@@ -931,7 +931,7 @@ static enum skb_drop_reason ndisc_recv_ns(struct sk_buff *skb)
+ 	}
+ 
+ 	if (is_router < 0)
+-		is_router = idev->cnf.forwarding;
++		is_router = READ_ONCE(idev->cnf.forwarding);
+ 
+ 	if (dad) {
+ 		ndisc_send_na(dev, &in6addr_linklocal_allnodes, &msg->target,
+@@ -1082,7 +1082,7 @@ static enum skb_drop_reason ndisc_recv_na(struct sk_buff *skb)
+ 	 * Note that we don't do a (daddr == all-routers-mcast) check.
+ 	 */
+ 	new_state = msg->icmph.icmp6_solicited ? NUD_REACHABLE : NUD_STALE;
+-	if (!neigh && lladdr && idev && idev->cnf.forwarding) {
++	if (!neigh && lladdr && idev && READ_ONCE(idev->cnf.forwarding)) {
+ 		if (accept_untracked_na(dev, saddr)) {
+ 			neigh = neigh_create(&nd_tbl, &msg->target, dev);
+ 			new_state = NUD_STALE;
+@@ -1102,7 +1102,8 @@ static enum skb_drop_reason ndisc_recv_na(struct sk_buff *skb)
+ 		 * has already sent a NA to us.
+ 		 */
+ 		if (lladdr && !memcmp(lladdr, dev->dev_addr, dev->addr_len) &&
+-		    net->ipv6.devconf_all->forwarding && net->ipv6.devconf_all->proxy_ndp &&
++		    READ_ONCE(net->ipv6.devconf_all->forwarding) &&
++		    net->ipv6.devconf_all->proxy_ndp &&
+ 		    pneigh_lookup(&nd_tbl, net, &msg->target, dev, 0)) {
+ 			/* XXX: idev->cnf.proxy_ndp */
+ 			goto out;
+@@ -1150,7 +1151,7 @@ static enum skb_drop_reason ndisc_recv_rs(struct sk_buff *skb)
+ 	}
+ 
+ 	/* Don't accept RS if we're not in router mode */
+-	if (!idev->cnf.forwarding)
++	if (!READ_ONCE(idev->cnf.forwarding))
+ 		goto out;
+ 
+ 	/*
+diff --git a/net/ipv6/route.c b/net/ipv6/route.c
+index fc5c534620253..4a0b12651777b 100644
+--- a/net/ipv6/route.c
++++ b/net/ipv6/route.c
+@@ -2215,7 +2215,7 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table,
+ 
+ 	strict |= flags & RT6_LOOKUP_F_IFACE;
+ 	strict |= flags & RT6_LOOKUP_F_IGNORE_LINKSTATE;
+-	if (net->ipv6.devconf_all->forwarding == 0)
++	if (READ_ONCE(net->ipv6.devconf_all->forwarding) == 0)
+ 		strict |= RT6_LOOKUP_F_REACHABLE;
+ 
+ 	rcu_read_lock();
+@@ -4146,7 +4146,7 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bu
+ 	in6_dev = __in6_dev_get(skb->dev);
+ 	if (!in6_dev)
+ 		return;
+-	if (in6_dev->cnf.forwarding || !in6_dev->cnf.accept_redirects)
++	if (READ_ONCE(in6_dev->cnf.forwarding) || !in6_dev->cnf.accept_redirects)
+ 		return;
+ 
+ 	/* RFC2461 8.1:

buildroot-external/board/raspberrypi/patches/linux/0005-misc-rp1-pio-Error-out-on-incompatible-firmware.patch

@@ -0,0 +1,44 @@
+From ab1d73e2b5101689fcd1737e588119b4fde3a5ff Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Mon, 3 Feb 2025 14:44:08 +0000
+Subject: [PATCH] misc: rp1-pio: Error out on incompatible firmware
+
+If the RP1 firmware has reported an error then return that from the PIO
+probe function, otherwise defer the probing.
+
+Link: https://github.com/raspberrypi/linux/issues/6642
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ drivers/misc/rp1-pio.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/misc/rp1-pio.c b/drivers/misc/rp1-pio.c
+index dbf69279e313d..7e875811509f8 100644
+--- a/drivers/misc/rp1-pio.c
++++ b/drivers/misc/rp1-pio.c
+@@ -1268,8 +1268,10 @@ static int rp1_pio_probe(struct platform_device *pdev)
+ 		return dev_err_probe(dev, pdev->id, "alias is missing\n");
+ 
+ 	fw = devm_rp1_firmware_get(dev, dev->of_node);
+-	if (IS_ERR_OR_NULL(fw))
+-		return dev_err_probe(dev, -ENOENT, "failed to contact RP1 firmware\n");
++	if (!fw)
++		return dev_err_probe(dev, -EPROBE_DEFER, "failed to find RP1 firmware driver\n");
++	if (IS_ERR(fw))
++		return dev_err_probe(dev, PTR_ERR(fw), "failed to contact RP1 firmware\n");
+ 	ret = rp1_firmware_get_feature(fw, FOURCC_PIO, &op_base, &op_count);
+ 	if (ret < 0)
+ 		return ret;
+@@ -1346,6 +1348,11 @@ static void rp1_pio_remove(struct platform_device *pdev)
+ 
+ 	if (g_pio == pio)
+ 		g_pio = NULL;
++
++	device_destroy(pio->dev_class, pio->dev_num);
++	cdev_del(&pio->cdev);
++	class_destroy(pio->dev_class);
++	unregister_chrdev_region(pio->dev_num, 1);
+ }
+ 
+ static const struct of_device_id rp1_pio_ids[] = {

buildroot-external/board/raspberrypi/patches/linux/0006-firmware-rp1-Linger-on-firmware-failure.patch

@@ -0,0 +1,105 @@
+From b1bcedb44c54a65a8e494158385eb23199572217 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Mon, 3 Feb 2025 14:51:52 +0000
+Subject: [PATCH] firmware: rp1: Linger on firmware failure
+
+To avoid pointless retries, let the probe function succeed if the
+firmware interface is configured correctly but the firmware is
+incompatible. The value of the private drvdata field holds the outcome.
+
+Link: https://github.com/raspberrypi/linux/issues/6642
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ drivers/firmware/rp1.c | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/drivers/firmware/rp1.c b/drivers/firmware/rp1.c
+index 0b0760ca77764..a258452c8b33e 100644
+--- a/drivers/firmware/rp1.c
++++ b/drivers/firmware/rp1.c
+@@ -114,7 +114,8 @@ static void rp1_firmware_delete(struct kref *kref)
+ 
+ void rp1_firmware_put(struct rp1_firmware *fw)
+ {
+-	kref_put(&fw->consumers, rp1_firmware_delete);
++	if (!IS_ERR_OR_NULL(fw))
++		kref_put(&fw->consumers, rp1_firmware_delete);
+ }
+ EXPORT_SYMBOL_GPL(rp1_firmware_put);
+ 
+@@ -157,7 +158,7 @@ struct rp1_firmware *rp1_firmware_get(struct device_node *client)
+ 	const char *match = rp1_firmware_of_match[0].compatible;
+ 	struct platform_device *pdev;
+ 	struct device_node *fwnode;
+-	struct rp1_firmware *fw;
++	struct rp1_firmware *fw = NULL;
+ 
+ 	if (!client)
+ 		return NULL;
+@@ -166,17 +167,17 @@ struct rp1_firmware *rp1_firmware_get(struct device_node *client)
+ 		return NULL;
+ 	if (!of_device_is_compatible(fwnode, match)) {
+ 		of_node_put(fwnode);
+-		return NULL;
++		return ERR_PTR(-ENXIO);
+ 	}
+ 
+ 	pdev = of_find_device_by_node(fwnode);
+ 	of_node_put(fwnode);
+ 
+ 	if (!pdev)
+-		goto err_exit;
++		return ERR_PTR(-ENXIO);
+ 
+ 	fw = platform_get_drvdata(pdev);
+-	if (!fw)
++	if (IS_ERR_OR_NULL(fw))
+ 		goto err_exit;
+ 
+ 	if (!kref_get_unless_zero(&fw->consumers))
+@@ -188,7 +189,7 @@ struct rp1_firmware *rp1_firmware_get(struct device_node *client)
+ 
+ err_exit:
+ 	put_device(&pdev->dev);
+-	return NULL;
++	return fw;
+ }
+ EXPORT_SYMBOL_GPL(rp1_firmware_get);
+ 
+@@ -204,8 +205,8 @@ struct rp1_firmware *devm_rp1_firmware_get(struct device *dev, struct device_nod
+ 	int ret;
+ 
+ 	fw = rp1_firmware_get(client);
+-	if (!fw)
+-		return NULL;
++	if (IS_ERR_OR_NULL(fw))
++		return fw;
+ 
+ 	ret = devm_add_action_or_reset(dev, devm_rp1_firmware_put, fw);
+ 	if (ret)
+@@ -270,19 +271,18 @@ static int rp1_firmware_probe(struct platform_device *pdev)
+ 	init_completion(&fw->c);
+ 	kref_init(&fw->consumers);
+ 
+-	platform_set_drvdata(pdev, fw);
+-
+ 	ret = rp1_firmware_message(fw, GET_FIRMWARE_VERSION,
+ 				   NULL, 0, &version, sizeof(version));
+ 	if (ret == sizeof(version)) {
+ 		dev_info(dev, "RP1 Firmware version %08x%08x%08x%08x%08x\n",
+ 			 version[0], version[1], version[2], version[3], version[4]);
+-		ret = 0;
+-	} else if (ret >= 0) {
+-		ret = -EIO;
++		platform_set_drvdata(pdev, fw);
++	} else {
++		rp1_firmware_put(fw);
++		platform_set_drvdata(pdev, ERR_PTR(-ENOENT));
+ 	}
+ 
+-	return ret;
++	return 0;
+ }
+ 
+ static int rp1_firmware_remove(struct platform_device *pdev)

buildroot-external/board/raspberrypi/patches/linux/0007-mailbox-rp1-Don-t-claim-channels-in-of_xlate.patch

@@ -0,0 +1,32 @@
+From 97e6955cef61340165e8ec276084841d335335e9 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Tue, 4 Feb 2025 13:18:45 +0000
+Subject: [PATCH] mailbox: rp1: Don't claim channels in of_xlate
+
+The of_xlate method saves the calculated event mask in the con_priv
+field. It also rejects subsequent attempt to use that channel because
+the mask is non-zero, which causes a repeated instantiation of a client
+driver to fail.
+
+The of_xlate method is not meant to be a point of resource acquisition.
+Leave the con_priv initialisation, but drop the test that it was
+previously zero.
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ drivers/mailbox/rp1-mailbox.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/drivers/mailbox/rp1-mailbox.c b/drivers/mailbox/rp1-mailbox.c
+index bf71db1dd9fae..0e8af098b62b2 100644
+--- a/drivers/mailbox/rp1-mailbox.c
++++ b/drivers/mailbox/rp1-mailbox.c
+@@ -133,8 +133,6 @@ static struct mbox_chan *rp1_mbox_xlate(struct mbox_controller *mbox,
+ 		return ERR_PTR(-EINVAL);
+ 
+ 	chan = &mbox->chans[doorbell];
+-	if (chan->con_priv)
+-		return ERR_PTR(-EBUSY);
+ 
+ 	chan->con_priv = (void *)(uintptr_t)(1 << doorbell);
+ 

buildroot-external/board/raspberrypi/patches/linux/0008-misc-rp1-pio-Demote-fw-probe-error-to-warning.patch

@@ -0,0 +1,34 @@
+From c8cf0694d8ecd5acaa03c26fc404e66dea9308fd Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Tue, 25 Feb 2025 12:16:33 +0000
+Subject: [PATCH] misc: rp1-pio: Demote fw probe error to warning
+
+Support for the RP1 firmware mailbox API is rolling out to Pi 5 EEPROM
+images. For most users, the fact that the PIO is not available is no
+cause for alarm. Change the message to a warning, so that it does not
+appear with "quiet" in cmdline.txt.
+
+Link: https://github.com/raspberrypi/linux/issues/6642
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ drivers/misc/rp1-pio.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/misc/rp1-pio.c b/drivers/misc/rp1-pio.c
+index 7e875811509f8..a04dc8edcf5b8 100644
+--- a/drivers/misc/rp1-pio.c
++++ b/drivers/misc/rp1-pio.c
+@@ -1270,8 +1270,10 @@ static int rp1_pio_probe(struct platform_device *pdev)
+ 	fw = devm_rp1_firmware_get(dev, dev->of_node);
+ 	if (!fw)
+ 		return dev_err_probe(dev, -EPROBE_DEFER, "failed to find RP1 firmware driver\n");
+-	if (IS_ERR(fw))
+-		return dev_err_probe(dev, PTR_ERR(fw), "failed to contact RP1 firmware\n");
++	if (IS_ERR(fw)) {
++		dev_warn(dev, "failed to contact RP1 firmware\n");
++		return PTR_ERR(fw);
++	}
+ 	ret = rp1_firmware_get_feature(fw, FOURCC_PIO, &op_base, &op_count);
+ 	if (ret < 0)
+ 		return ret;