Make sure to upload correct image files in release pipeline (#1353)

The images have been renamed from hassos to haos. Make sure to upload
the correct files.

.github/ISSUE_TEMPLATE.md

@@ -17,7 +17,7 @@ Describe the Homme Assistant image you are using and the hardare environemnt
 - [ ] Raspberry Pi [1/2/3/4]
 - [ ] ODROID [C2/C4/N2(+)/XU4]
 - [ ] ASUS Tinker [S]
-- [ ] Intel NUC (or compatible)
+- [ ] Generic x86-64 (like Intel NUC)
 - [ ] OVA (Open Virtualization Applicance, on Intel NUC or any other hardware, please add the Hypervisor you are using)
 
 **Home Assistant OS release:**
@@ -50,5 +50,5 @@ Describe the Homme Assistant image you are using and the hardare environemnt
 <!--
 - Is the problem reproducible?
 - Has this been working before (is this a regression?)
-- Has there been attempt to rule out harware issues? (different SD card etc.)
+- Has there been attempt to rule out hardware issues? (different SD card etc.)
 -->

.github/release-drafter.yml

@@ -7,12 +7,14 @@ categories:
     label: 'board/raspberrypi'
   - title: 'Open Virtual Appliance'
     label: 'board/ova'
-  - title: 'Intel NUC'
-    label: 'board/intel-nuc'
+  - title: 'Generic x86-64'
+    label: 'board/generic-x86-64'
   - title: 'Hardkernel ODROID'
-    label: 'board/hardkernel'
+    label: 'board/odroid'
   - title: 'ASUS Tinker'
     label: 'board/tinker'
+filter-by-commitish: true
+commitish: dev
 template: |
   ## Changes
 

.github/workflows/dev.yml

@@ -37,7 +37,7 @@ jobs:
       matrix:
         board:
           - {"name": "ova", "output": "ova", "runner": "x86-64-runner"}
-          - {"name": "intel_nuc", "output": "intel-nuc", "runner": "x86-64-runner"}
+          - {"name": "generic_x86_64", "output": "generic-x86-64", "runner": "x86-64-runner"}
           - {"name": "odroid_c2", "output": "odroid-c2", "runner": "aarch64-runner"}
           - {"name": "odroid_c4", "output": "odroid-c4", "runner": "aarch64-runner"}
           - {"name": "odroid_n2", "output": "odroid-n2", "runner": "aarch64-runner"}
@@ -74,7 +74,7 @@ jobs:
           docker run --rm --privileged -v "${GITHUB_WORKSPACE}:/build" \
             -e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \
             -v "${{ matrix.board.runner }}-build-cache:/cache" \
-            haos-builder make VERSION_DEV=${{ needs.version.outputs.version_dev }} ${{ matrix.board.name }}
+            haos-builder make BUILDDIR=/build VERSION_DEV=${{ needs.version.outputs.version_dev }} ${{ matrix.board.name }}
 
       - name: Upload images
         uses: appleboy/scp-action@master
@@ -87,3 +87,23 @@ jobs:
           target: ${{ secrets.DEV_TARGET_PATH }}/${{ needs.version.outputs.version_main }}.${{ needs.version.outputs.version_dev }}/
           strip_components: 1
 
+  bump_version:
+    name: Bump dev version to ${{ needs.version.outputs.version_main }}.${{ needs.version.outputs.version_dev }}
+    needs: [ build, version ]
+    runs-on: [ "ubuntu-20.04" ]
+
+    steps:
+    - name: Initialize git
+      uses: home-assistant/actions/helpers/git-init@master
+      with:
+        name: ${{ secrets.GIT_NAME }}
+        email: ${{ secrets.GIT_EMAIL }}
+        token: ${{ secrets.GIT_TOKEN }}
+
+    - name: Bump Home Assistant OS dev version
+      uses: home-assistant/actions/helpers/version-push@master
+      with:
+        key: "hassos[]"
+        key-description: "Home Assistant OS"
+        version: ${{ needs.version.outputs.version_main }}.${{ needs.version.outputs.version_dev }}
+        channel: "dev"

.github/workflows/release.yml

@@ -12,6 +12,7 @@ jobs:
     runs-on: [ "ubuntu-20.04" ]
     outputs:
       version: ${{ steps.version_check.outputs.version }}
+      version_dev: ${{ steps.version_check.outputs.version_dev }}
     steps:
       - uses: actions/checkout@v2
       - name: Validate version
@@ -19,11 +20,18 @@ jobs:
         run: |
           major=$(cat ${GITHUB_WORKSPACE}/buildroot-external/meta | grep VERSION_MAJOR | cut -d'=' -f2)
           build=$(cat ${GITHUB_WORKSPACE}/buildroot-external/meta | grep VERSION_BUILD | cut -d'=' -f2)
-          if [ "${major}.${build}" != "${{ github.event.release.tag_name }}" ]; then
+          tag_major=$(echo "${{ github.event.release.tag_name }}" | cut -d '.' -f 1)
+          tag_build=$(echo "${{ github.event.release.tag_name }}" | cut -d '.' -f 2)
+          tag_dev=$(echo "${{ github.event.release.tag_name }}" | cut -d '.' -f 3)
+          if [ "${major}.${build}" != "${tag_major}.${tag_build}" ]; then
             echo "Version number in Buildroot metadata is does not match tag (${major}.${build} vs ${{ github.event.release.tag_name }})."
             exit 1
           fi
-          echo "::set-output name=version::${major}.${build}"
+          if [ "" != "${tag_dev}" ]; then
+            echo "Note: Release build with custom dev part: ${tag_dev}."
+          fi
+          echo "::set-output name=version::${major}.${build}.${tag_dev}"
+          echo "::set-output name=version_dev::${tag_dev}"
 
   build:
     name: Release build for ${{ matrix.board.name }}
@@ -32,7 +40,7 @@ jobs:
       matrix:
         board:
           - {"name": "ova", "output": "ova", "runner": "x86-64-runner"}
-          - {"name": "intel_nuc", "output": "intel-nuc", "runner": "x86-64-runner"}
+          - {"name": "generic_x86_64", "output": "generic-x86-64", "runner": "x86-64-runner"}
           - {"name": "odroid_c2", "output": "odroid-c2", "runner": "aarch64-runner"}
           - {"name": "odroid_c4", "output": "odroid-c4", "runner": "aarch64-runner"}
           - {"name": "odroid_n2", "output": "odroid-n2", "runner": "aarch64-runner"}
@@ -69,7 +77,7 @@ jobs:
           docker run --rm --privileged -v "${GITHUB_WORKSPACE}:/build" \
             -e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \
             -v "${{ matrix.board.runner }}-build-cache:/cache" \
-            haos-builder make VERSION_DEV="" ${{ matrix.board.name }}
+            haos-builder make BUILDDIR=/build VERSION_DEV=${{ needs.validate_release.outputs.version_dev }} ${{ matrix.board.name }}
 
       - name: Upload disk image
         if: ${{ matrix.board.name != 'ova' }}
@@ -78,8 +86,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.img.xz
-          asset_name: hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.img.xz
+          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.img.xz
+          asset_name: haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.img.xz
           asset_content_type: application/x-xz
 
       - name: Upload rauc update
@@ -88,10 +96,21 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.raucb
-          asset_name: hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.raucb
+          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.raucb
+          asset_name: haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.raucb
           asset_content_type: application/octet-stream
 
+      - name: Upload ova image
+        if: ${{ matrix.board.name == 'ova' }}
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.ova
+          asset_name: haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.ova
+          asset_content_type: application/x-tar
+
       - name: Upload qcow2 image
         if: ${{ matrix.board.name == 'ova' }}
         uses: actions/upload-release-asset@v1
@@ -99,8 +118,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.qcow2.xz
-          asset_name: hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.qcow2.xz
+          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.qcow2.xz
+          asset_name: haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.qcow2.xz
           asset_content_type: application/x-xz
 
       - name: Upload vdi image
@@ -110,9 +129,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vdi.xz
-          asset_name: hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vdi.xz
-          asset_content_type: application/x-xz
+          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vdi.zip
+          asset_name: haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vdi.zip
+          asset_content_type: application/zip
 
       - name: Upload vhdx image
         if: ${{ matrix.board.name == 'ova' }}
@@ -121,9 +140,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vhdx.xz
-          asset_name: hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vhdx.xz
-          asset_content_type: application/x-xz
+          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vhdx.zip
+          asset_name: haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vhdx.zip
+          asset_content_type: application/zip
 
       - name: Upload vmdk image
         if: ${{ matrix.board.name == 'ova' }}
@@ -132,9 +151,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ github.workspace }}/release/hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vmdk.xz
-          asset_name: hassos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vmdk.xz
-          asset_content_type: application/x-xz
+          asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vmdk.zip
+          asset_name: haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vmdk.zip
+          asset_content_type: application/zip
 
   bump_version:
     name: Bump dev version to ${{ needs.validate_release.outputs.version }}
@@ -149,10 +168,10 @@ jobs:
         email: ${{ secrets.GIT_EMAIL }}
         token: ${{ secrets.GIT_TOKEN }}
 
-    - name: Bump Home Assistant OS dev version
+    - name: Bump Home Assistant OS beta version
       uses: home-assistant/actions/helpers/version-push@master
       with:
         key: "hassos[]"
         key-description: "Home Assistant OS"
         version: ${{ needs.validate_release.outputs.version }}
-        channel: "dev"
+        channel: "beta"

Dockerfile

@@ -36,6 +36,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         rsync \
         sudo \
         unzip \
+        zip \
         wget \
         qemu-utils \
         openssh-client \

Documentation/boards/README.md

@@ -17,12 +17,12 @@ The following boards/devices are supported:
   - Odroid-C4 (_experimental_)
   - Odroid-N2
   - Odroid-XU4
-- Intel NUC
+- Generic x86-64 (UEFI, not suited for virtualization)
   - Intel NUC5CPYH
   - Intel NUC6CAYH
   - Intel NUC10I3FNK2
   - Gigabyte GB-BPCE-3455
-  - Others recent Intel NUC computers are likely to work too, only those listed above have been tested.
+  - Computers supporting x64-64 architecture and UEFI boot should generally work
 - Asus
   - Tinker Board
 - Virtual appliance (x86_64/UEFI):
@@ -39,17 +39,17 @@ Notes:
 
 |Board|Build|Config|Docs|
 |-----|----|------|----|
-|Pi4B 32-bit |`make rpi4`      |[rpi4](../../buildroot-external/configs/rpi4_defconfig)|[raspberrypi](./raspberrypi/)|
-|Pi4B 64-bit |`make rpi4_64`   |[rpi4_64](../../buildroot-external/configs/rpi4_64_defconfig)|[raspberrypi](./raspberrypi/)|
-|Pi3B 32-bit |`make rpi3`      |[rpi3](../../buildroot-external/configs/rpi3_defconfig)|[raspberrypi](./raspberrypi/)|
-|Pi3B 64-bit |`make rpi3_64`   |[rpi3_64](../../buildroot-external/configs/rpi3_64_defconfig)|[raspberrypi](./raspberrypi/)|
-|Pi2         |`make rpi2`      |[rpi2](../../buildroot-external/configs/rpi2_defconfig)|[raspberrypi](./raspberrypi/)|
-|Pi Zero     |`make rpi0_w`    |[rpi0_w](../../buildroot-external/configs/rpi0_w_defconfig)|[raspberrypi](./raspberrypi/)|
-|Pi          |`make rpi`       |[rpi](../../buildroot-external/configs/rpi_defconfig)|[raspberrypi](./raspberrypi/)|
-|Odroid-C2   |`make odroid_c2` |[odroid_c2](../../buildroot-external/configs/odroid_c2_defconfig)|[hardkernel](./hardkernel/)|
-|Odroid-C4   |`make odroid_c4` |[odroid_c4](../../buildroot-external/configs/odroid_c4_defconfig)|[hardkernel](./hardkernel/)|
-|Odroid-N2   |`make odroid_n2` |[odroid_n2](../../buildroot-external/configs/odroid_n2_defconfig)|[hardkernel](./hardkernel/)|
-|Odroid-XU4  |`make odroid_xu4`|[odroid_xu4](../../buildroot-external/configs/odroid_xu4_defconfig)|[hardkernel](./hardkernel/)|
-|NUC         |`make intel_nuc` |[intel_nuc](../../buildroot-external/configs/intel_nuc_defconfig)|[intel](./intel/)|
-|Tinker Board|`make tinker`    |[tinker](../../buildroot-external/configs/tinker_defconfig)|[asus](./asus/)|
-|OVA         |`make ova`       |[ova](../../buildroot-external/configs/ova_defconfig)|[ova](./ova/)|
+|Pi4B 32-bit    |`make rpi4`           |[rpi4](../../buildroot-external/configs/rpi4_defconfig)|[raspberrypi](./raspberrypi/)|
+|Pi4B 64-bit    |`make rpi4_64`        |[rpi4_64](../../buildroot-external/configs/rpi4_64_defconfig)|[raspberrypi](./raspberrypi/)|
+|Pi3B 32-bit    |`make rpi3`           |[rpi3](../../buildroot-external/configs/rpi3_defconfig)|[raspberrypi](./raspberrypi/)|
+|Pi3B 64-bit    |`make rpi3_64`        |[rpi3_64](../../buildroot-external/configs/rpi3_64_defconfig)|[raspberrypi](./raspberrypi/)|
+|Pi2            |`make rpi2`           |[rpi2](../../buildroot-external/configs/rpi2_defconfig)|[raspberrypi](./raspberrypi/)|
+|Pi Zero        |`make rpi0_w`         |[rpi0_w](../../buildroot-external/configs/rpi0_w_defconfig)|[raspberrypi](./raspberrypi/)|
+|Pi             |`make rpi`            |[rpi](../../buildroot-external/configs/rpi_defconfig)|[raspberrypi](./raspberrypi/)|
+|Odroid-C2      |`make odroid_c2`      |[odroid_c2](../../buildroot-external/configs/odroid_c2_defconfig)|[hardkernel](./hardkernel/)|
+|Odroid-C4      |`make odroid_c4`      |[odroid_c4](../../buildroot-external/configs/odroid_c4_defconfig)|[hardkernel](./hardkernel/)|
+|Odroid-N2      |`make odroid_n2`      |[odroid_n2](../../buildroot-external/configs/odroid_n2_defconfig)|[hardkernel](./hardkernel/)|
+|Odroid-XU4     |`make odroid_xu4`     |[odroid_xu4](../../buildroot-external/configs/odroid_xu4_defconfig)|[hardkernel](./hardkernel/)|
+|Tinker Board   |`make tinker`         |[tinker](../../buildroot-external/configs/tinker_defconfig)|[asus](./asus/)|
+|Generic x86-64 |`make generic_x86_64` |[generic_x86_64](../../buildroot-external/configs/generic_x86_64_defconfig)|[generic-x86-64](./generic-x86-64/)|
+|OVA            |`make ova`            |[ova](../../buildroot-external/configs/ova_defconfig)|[ova](./ova/)|

Documentation/boards/generic-x86-64/README.md

@@ -0,0 +1,61 @@
+# Generic x86-64
+
+## Supported Hardware
+
+This board configuration aims to support most x86-64 systems with UEFI boot. The
+main aim is to support Intel NUC mini PCs and similar systems. Hardware it has
+been tested with is listed below.
+
+## Tested Hardware
+
+| Device                | Release Date | Support | Config      |
+|-----------------------|--------------|---------|-------------|
+| Intel NUC5CPYH        | Q3 2015      | yes     | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
+| Intel NUC6CAYH        | Q4 2016      | yes     | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
+| Intel NUC7i3DNHE	| Q3 2017      | yes     | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
+| Intel NUC10i3FNK2     | Q4 2019      | yes     | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
+| Gigabyte GB-BPCE-3455 | 2017         | yes*    | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
+
+\* needs 'nomodeset' in cmdline.txt if you want a console
+
+
+## Requirements
+
+- x86-64 support
+- UEFI boot
+- SATA/AHCI or eMMC storage
+- Supported NIC:
+  - Intel Gigabit NIC (e1000, igb - via Linux mainline)
+  - Intel PCIe Gigabit NIC (e1000e - via out-of-tree module in *buildroot-external/package/intel-e1000e*)
+  - Realtek Gigabit NIC (r8169)
+  - Intel Wireless Wifi 802.11ac (iwlwifi, see below)
+
+## Wifi
+
+The following cards are supported:
+
+- Intel Wireless 3160
+- Intel Wireless 7260
+- Intel Wireless 7265
+- Intel Wireless-AC 3165
+- Intel Wireless-AC 3168
+- Intel Wireless-AC 8260
+- Intel Wireless-AC 8265
+- Intel Wireless-AC 9260
+- Intel Wireless-AC 9461
+- Intel Wireless-AC 9462
+- Intel Wireless-AC 9560
+
+## Bluetooth
+
+Bluetooth is untested.
+
+## Installation
+
+Make sure secure boot is disabled in the UEFI BIOS settings.
+
+Currently there is no shiny installation method. Checklist:
+- Boot PC to live environment using PXE or USB
+- Copy or download the Home Assistant OS image into your live environment
+- unxz the image and dd to the local hard disk
+- Reboot

Documentation/boards/hardkernel/README.md

@@ -10,3 +10,17 @@
 | ODROID-N2      | 2019          | yes          | [odroid_n2](../../../buildroot-external/configs/odroid_n2_defconfig) |
 
 See separate documentation for each board.
+
+## Connectivity devices
+
+### Wi-Fi
+
+The following devices have been tested on Home Assistant OS 5.8:
+
+- [Bluetooth Module 2](https://www.hardkernel.com/shop/bluetooth-module-2/)
+- [WiFi Module 3](https://www.hardkernel.com/shop/wifi-module-3/)
+
+The [WiFi Module 5A](https://www.hardkernel.com/shop/wifi-module-5a/) is not
+recommended as there is no upstream driver support available. The driver
+currently compatible with recent Linux kernel version seems to have issues
+connecting to 5GHz networks.

Documentation/boards/hardkernel/odroid-n2.md

@@ -12,3 +12,7 @@ eg. `console=ttyAML0,115200n8 console=tty0`
 ## GPIO
 
 Refer to [the odroid wiki](https://wiki.odroid.com/odroid-n2/hardware/expansion_connectors).
+At this point not all functionality is supported by the upstream kernel used
+by Home Assistant OS.
+
+The GPIO on pin 11 is used as a low active power button input.

Documentation/boards/intel/README.md

@@ -1,56 +0,0 @@
-# Intel NUC
-
-## Supported Hardware
-
-This board configuration supports the Intel NUC mini PCs and compatibles. It should work for most recent NUC computers and, because this is a UEFI based image, it should in fact work with for any x86-64 based computer with UEFI. Hardware it has been tested with is listed below.
-
-## Tested Hardware
-
-| Device                | Release Date | Support | Config      |
-|-----------------------|--------------|---------|-------------|
-| Intel NUC5CPYH        | Q3 2015      | yes     | [intel_nuc](../../../buildroot-external/configs/intel_nuc_defconfig) |
-| Intel NUC6CAYH        | Q4 2016      | yes     | [intel_nuc](../../../buildroot-external/configs/intel_nuc_defconfig) |
-| Intel NUC10i3FNK2     | Q4 2019      | yes     | [intel_nuc](../../../buildroot-external/configs/intel_nuc_defconfig) |
-| Gigabyte GB-BPCE-3455 | 2017         | yes*    | [intel_nuc](../../../buildroot-external/configs/intel_nuc_defconfig) |
-
-\* needs 'nomodeset' in cmdline.txt if you want a console
-
-
-## Requirements
-
-- x86-64 support
-- UEFI boot
-- SATA/AHCI storage
-- Supported NIC:
-  - Intel Gigabit NIC (e1000, igb - via Linux mainline)
-  - Intel PCIe Gigabit NIC (e1000e - via out-of-tree module in *buildroot-external/package/intel-e1000e*)
-  - Realtek Gigabit NIC (r8169)
-  - Intel Wireless Wifi 802.11ac (iwlwifi, see below)
-
-## Wifi
-
-The following cards are supported:
-
-- Intel Wireless 3160
-- Intel Wireless 7260
-- Intel Wireless 7265
-- Intel Wireless-AC 3165
-- Intel Wireless-AC 3168
-- Intel Wireless-AC 8260
-- Intel Wireless-AC 8265
-- Intel Wireless-AC 9260
-- Intel Wireless-AC 9461
-- Intel Wireless-AC 9462
-- Intel Wireless-AC 9560
-
-## Bluetooth
-
-Bluetooth is untested.
-
-## Installation
-
-Currently there is no shiny installation method. Checklist:
-- Boot PC to live-environment using PXE or USB
-- Copy or download the hassos image into your live environment
-- zcat the image to local harddisk
-- Reboot

Documentation/boards/raspberrypi/README.md

@@ -37,9 +37,11 @@ USB mass storage boot is available on Raspberry Pi 4 (64-bit only), 3B, 3B+, 3A+
 
 For Raspberry 3B, 3A+ and 2B v1.2, to enable USB boot, add `program_usb_boot_mode=1` into `config.txt`. Note that this **permanently** alters the one-time programmable memory of the device.
 
-For Raspberry 4, make sure to update the bootloader to a stable release
-supporting USB mass storage boot (see
-[bcm2711_bootloader_config.md](https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2711_bootloader_config.md#usbmassstorageboot). If no SD card is used add `sd_poll_once=on` to `dtparam` in `config.txt` (comma separated). This gets rid of `mmc0: timeout waiting for hardware interrupt` kernel errors.
+For Raspberry 4
+
+* Make sure to update the bootloader to a stable release supporting USB mass storage boot (see [bcm2711_bootloader_config.md](https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2711_bootloader_config.md#usbmassstorageboot)). 
+* If no SD card is used add `sd_poll_once=on` to `dtparam` in `config.txt` (comma separated). This gets rid of `mmc0: timeout waiting for hardware interrupt` kernel errors.
+* If install still fails, then your SSD likely needs quirks enabled to work correctly (see [Finding the VID and PID of your USB SSD](https://www.raspberrypi.org/forums/viewtopic.php?t=245931)). Once you find your adapter's ID, add the quirks parameter in `cmdline.txt`. 
 
 For more information see [RaspberryPi](https://www.raspberrypi.org/documentation/hardware/raspberrypi/bootmodes/msd.md).
 

Documentation/kernel.md

@@ -1,19 +1,19 @@
 
 # Kernel Version
 
-Default Kernel tree: 5.4
+Default Kernel tree: 5.10
 
 | Board | Version |
 |-------|---------|
-| Open Virtual Appliance | 5.4.80 |
-| Raspberry Pi | 5.4.79 |
-| Raspberry Pi 0-W | 5.4.79 |
-| Raspberry Pi 2 | 5.4.79 |
-| Raspberry Pi 3 | 5.4.79 |
-| Raspberry Pi 4 | 5.4.79 |
-| Tinker Board | 5.4.80 |
-| Odroid-C2 | 5.9.11 |
-| Odroid-C4 | 5.9.11 |
-| Odroid-N2 | 5.9.11 |
-| Odroid-XU4 | 5.9.11 |
-| Intel NUC | 5.4.80 |
+| Open Virtual Appliance | 5.10.33 |
+| Raspberry Pi | v5.10.17 |
+| Raspberry Pi 0-W | v5.10.17 |
+| Raspberry Pi 2 | v5.10.17 |
+| Raspberry Pi 3 | v5.10.17 |
+| Raspberry Pi 4 | v5.10.17 |
+| Tinker Board | 5.10.33 |
+| Odroid-C2 | 5.10.33 |
+| Odroid-C4 | 5.10.33 |
+| Odroid-N2 | 5.10.33 |
+| Odroid-XU4 | 5.10.33 |
+| Generic x86-64 | 5.10.33 |

Documentation/network.md

@@ -4,23 +4,49 @@ Home Assistant Operating System uses NetworkManager to control the host network.
 
 ## Configure network
 
-Only a manual configuration using NetworkManager connection files is supported. Without a configuration file, the device will use DHCP by default. These network connection files can be placed on a USB drive and imported to the host as described in [Configuration][configuration-usb].
+By default the device will be in DHCP state.
 
-## Configuration examples
+Basic network settings can be set through the Supervisor frontend in the System
+tab. Advanced configurations such as VLAN are also available through the
+`ha network` CLI command.
 
-You can read the [NetworkManager manual][nm-manual] or find many configuration examples across the internet. Keep in mind that the system is read-only. If you don't want the IP address to change on every boot, you should modify the UUID property to a generic [UUID4][uuid]. Inside the `\CONFIG\network\` directory on the USB drive or SD card, create a file called `my-network` and add the appropriate contents below:
+To restore the default configuration the `ha network` CLI command can be used as
+well:
+
+```
+ha network update default --ipv4-method auto
+```
+
+If more advanced network settings are required network connection files can be
+placed on a USB drive and imported to the host as described in
+[Configuration][configuration-usb].
+
+## Manual Network Configuration
+
+If the frontend or `ha network` CLI cannot meet your use case, it is still
+possible to configure the underlying NetworkManager manually.
+
+You can read the [NetworkManager manual][nm-manual] or find many configuration
+examples across the internet. Note that changes to `NetworkManager.conf` are
+not supported currently, only connection keyfiles are supported. Keep in mind
+that the system is read-only. If you don't want the IP address to change on
+every boot, you should modify the UUID property to a generic [UUID4][uuid].
+Inside the `\CONFIG\network\` directory on the USB drive or SD card, create a
+file called `my-network` and add the appropriate contents below:
 
 **NOTE: Please make sure to save this file with UNIX line endings (LF, and not Windows' default CRLF endings). You can do this using Notepad these days!**
 
 ### Default
 
-A preinstalled connection profile is provided by default:
+A preinstalled connection profile for wired network is active by default:
 
 ```ini
 [connection]
-id=my-network
+id=Home Assistant OS default
 uuid=f62bf7c2-e565-49ff-bbfc-a4cf791e6add
 type=802-3-ethernet
+llmnr=2
+mdns=2
 
 [ipv4]
 method=auto
@@ -37,6 +63,8 @@ method=auto
 id=my-network
 uuid=d55162b4-6152-4310-9312-8f4c54d86afa
 type=802-3-ethernet
+llmnr=2
+mdns=2
 
 [ipv4]
 method=auto
@@ -90,14 +118,16 @@ For `address`, the value before the semicolon is the IP address and subnet prefi
 
 ### Reset network
 
-If you want to reset the network configuration back to the default DHCP settings, use the following commands on the host:
+If you want to reset the network configuration back to the default connection
+profile using DHCP, use the following commands on the host console:
 
 ```bash
-# rm /etc/NetworkManager/system-connections/*
-# cp /usr/share/system-connections/* /etc/NetworkManager/system-connections/
-# nmcli con reload
+# rm -r /mnt/overlay/etc/NetworkManager/system-connections
+# reboot
 ```
 
+Home Assistant OS will recreate the default connection profile during boot.
+
 ### Powersave
 
 If you have trouble with powersave then apply the following changes:
@@ -110,7 +140,7 @@ powersave=0
 
 ## Using `nmcli` to set a static IPv4 address
 
-Log into the the HassOS base system via a console:
+Log into the the Home Assistant OS base system via a console:
 
 ```bash
 Welcome to Home Assistant
@@ -121,13 +151,13 @@ homeassistant login:
 
 From there you use the `nmcli` configuration tool.
 
-- `# nmcli con show` will list the "HassOS default" connection in use.
-- `# nmcli con show "HassOS default"` will list all the properties of the connection.
+- `# nmcli con show` will list the "Home Assistant OS default" connection in use.
+- `# nmcli con show "Home Assistant OS default"` will list all the properties of the connection.
 
-To start editing the configuration setting for "HassOS default":
+To start editing the configuration setting for "Home Assistant OS default":
 
 ```bash
-# nmcli con edit "HassOS default"
+# nmcli con edit "Home Assistant OS default"
 ```
 
 To add your static IP address (select 'yes' for manual method);
@@ -150,6 +180,6 @@ If you now view the default connection `cat /etc/NetworkManager/system-connectio
 
 Doing a `nmcli con reload` does not always work, so restart the virtual machine or the physical system.
 
-[nm-manual]: https://developer.gnome.org/NetworkManager/stable/NetworkManager.conf.html
+[nm-manual]: https://developer.gnome.org/NetworkManager/stable/manpages.html
 [configuration-usb]: configuration.md
 [uuid]: https://www.uuidgenerator.net/

Documentation/partition.md

@@ -34,7 +34,9 @@ A visual representation looks like this:
 
 Sometime the bootloader part can look different because there can be firmware or SPLs for boot the CPU on the SoC.
 
-## Data
+## Data disk
+
+![Data-Disk preview](./usb-disk.png)
 
 The data partition is the only partition with real I/O. It will be expanded automatically at boot to the full size of the disk.
 
@@ -58,6 +60,18 @@ $ datactl move /dev/sdx
 ```
 
 Enter "yes" to confirm the operation. This will prepare the disk, however, the
-actual move will be running on next reboot. Once complete, the external drive
+actual move will be running on next reboot. This will make the first boot significantly longer than usual; please be patient. Reboot with the following command:
+```sh
+$ ha host reboot
+```
+
+Once complete, the external drive
 will contain the data and will need to be plugged in to successfully boot Home
-Assistant OS.
+Assistant.
+
+## Check if the move was succesful.
+Within the Home Assistant interface you won't see if the move was succesful. To check this, go to your host console again (as described above) and enter:
+```sh
+$ systemctl status mnt-data.mount
+```
+If the data partition was moved to your USB drive you should see ```sh Active: active (mounted)  ``` in the output. Also, it will show, which drive got mounted as /mnt/data (```sh Where ``` and ```sh what ``` section of the output)

Makefile

@@ -1,7 +1,8 @@
-RELEASE_DIR = /build/release
+BUILDDIR:=$(shell pwd)
+RELEASE_DIR = $(BUILDDIR)/release
 
-BUILDROOT=/build/buildroot
-BUILDROOT_EXTERNAL=/build/buildroot-external
+BUILDROOT=$(BUILDDIR)/buildroot
+BUILDROOT_EXTERNAL=$(BUILDDIR)/buildroot-external
 DEFCONFIG_DIR = $(BUILDROOT_EXTERNAL)/configs
 VERSION_DATE := $(shell date --utc +'%Y%m%d')
 VERSION_DEV := "dev$(VERSION_DATE)"
@@ -32,7 +33,7 @@ $(TARGETS_CONFIG): %-config:
 $(TARGETS): %: $(RELEASE_DIR) %-config
 	@echo "build $@"
 	$(MAKE) -C $(BUILDROOT) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) VERSION_DEV=$(VERSION_DEV)
-	cp -f $(O)/images/hassos_* $(RELEASE_DIR)/
+	cp -f $(O)/images/haos_* $(RELEASE_DIR)/
 
 	# Do not clean when building for one target
 ifneq ($(words $(filter $(TARGETS),$(MAKECMDGOALS))), 1)

buildroot-external/Config.in

@@ -5,3 +5,9 @@ source "$BR2_EXTERNAL_HASSOS_PATH/package/hardkernel-boot/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/qemu-guest-agent/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/intel-e1000e/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/rpi-eeprom/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/rtl8812au/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/os-agent/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/udisks2/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/eq3_char_loop/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/generic_raw_uart/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/rpi-rf-mod/Config.in"

buildroot-external/board/asus/hassos-hook.sh

@@ -10,6 +10,10 @@ function hassos_pre_image() {
         "${BINARIES_DIR}/rk3288-tinker.dtb" \
         "${BINARIES_DIR}/rk3288-tinker-s.dtb"
 
+    mkdir -p "${BOOT_DATA}/overlays"
+    cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/"
+    cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
+
     echo "console=tty1" > "${BOOT_DATA}/cmdline.txt"
 
     # SPL

buildroot-external/board/asus/tinker/boot-env.txt

@@ -0,0 +1,2 @@
+# Uncomment this to enable GPIO support for RPI-RF-MOD/HM-MOD-RPI-PCB
+#overlays=rpi-rf-mod

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

@@ -2109,7 +2109,7 @@ CONFIG_ATH10K_USB=m
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_WCN36XX=m
 # CONFIG_WCN36XX_DEBUGFS is not set
-CONFIG_RTL8188EU=m
+# CONFIG_ATH11K is not set
 CONFIG_WLAN_VENDOR_ATMEL=y
 CONFIG_AT76C50X_USB=m
 CONFIG_WLAN_VENDOR_BROADCOM=y
@@ -2130,50 +2130,14 @@ CONFIG_HOSTAP=y
 CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 # CONFIG_P54_COMMON is not set
-CONFIG_WLAN_VENDOR_MARVELL=y
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_LIBERTAS_SPI=m
-# CONFIG_LIBERTAS_DEBUG is not set
-# CONFIG_LIBERTAS_MESH is not set
-CONFIG_LIBERTAS_THINFIRM=y
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_MWIFIEX=y
-CONFIG_MWIFIEX_SDIO=y
-CONFIG_MWIFIEX_USB=m
-CONFIG_WLAN_VENDOR_MEDIATEK=y
-CONFIG_MT7601U=m
-CONFIG_MT76_CORE=m
-CONFIG_MT76_LEDS=y
-CONFIG_MT76_USB=m
-CONFIG_MT76x2_COMMON=m
-CONFIG_MT76x0U=m
-CONFIG_MT76x2U=m
-CONFIG_WLAN_VENDOR_RALINK=y
-CONFIG_RT2X00=y
-CONFIG_RT2500USB=y
-CONFIG_RT73USB=y
-CONFIG_RT2800USB=y
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2800_LIB=y
-CONFIG_RT2X00_LIB_USB=y
-CONFIG_RT2X00_LIB=y
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_LIB_DEBUGFS is not set
-# CONFIG_RT2X00_DEBUG is not set
+# CONFIG_WLAN_VENDOR_MARVELL is not set
+# CONFIG_WLAN_VENDOR_MEDIATEK is not set
+# CONFIG_WLAN_VENDOR_MICROCHIP is not set
+# CONFIG_WLAN_VENDOR_RALINK is not set
 CONFIG_WLAN_VENDOR_REALTEK=y
 CONFIG_RTL8187=m
 CONFIG_RTL8187_LEDS=y
-CONFIG_RTL_CARDS=m
+CONFIG_RTL_CARDS=y
 CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
 CONFIG_RTLWIFI_USB=m
@@ -2183,9 +2147,9 @@ CONFIG_RTL8XXXU=y
 # CONFIG_RTL8XXXU_UNTESTED is not set
 CONFIG_WLAN_VENDOR_RSI=y
 # CONFIG_RSI_91X is not set
-CONFIG_WLAN_VENDOR_ST=y
+# CONFIG_WLAN_VENDOR_ST is not set
 # CONFIG_CW1200 is not set
-CONFIG_WLAN_VENDOR_TI=y
+# CONFIG_WLAN_VENDOR_TI is not set
 # CONFIG_WL1251 is not set
 # CONFIG_WL12XX is not set
 # CONFIG_WL18XX is not set

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

@@ -0,0 +1,55 @@
+From 3f3c4cd047234fb94de4d6b701d05ff0450890cf Mon Sep 17 00:00:00 2001
+Message-Id: <3f3c4cd047234fb94de4d6b701d05ff0450890cf.1613588152.git.stefan@agner.ch>
+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
+ RK3288"
+
+This reverts commit 3425fe335c29310f6628faf9a7947d07f32d8962.
+---
+ arch/arm/boot/dts/rk3288.dtsi | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
+index 8fa80facc8cd..8636d95c45e1 100644
+--- a/arch/arm/boot/dts/rk3288.dtsi
++++ b/arch/arm/boot/dts/rk3288.dtsi
+@@ -422,8 +422,6 @@ uart0: serial@ff180000 {
+ 		reg-io-width = <4>;
+ 		clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>;
+ 		clock-names = "baudclk", "apb_pclk";
+-		dmas = <&dmac_peri 1>, <&dmac_peri 2>;
+-		dma-names = "tx", "rx";
+ 		pinctrl-names = "default";
+ 		pinctrl-0 = <&uart0_xfer>;
+ 		status = "disabled";
+@@ -437,8 +435,6 @@ uart1: serial@ff190000 {
+ 		reg-io-width = <4>;
+ 		clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>;
+ 		clock-names = "baudclk", "apb_pclk";
+-		dmas = <&dmac_peri 3>, <&dmac_peri 4>;
+-		dma-names = "tx", "rx";
+ 		pinctrl-names = "default";
+ 		pinctrl-0 = <&uart1_xfer>;
+ 		status = "disabled";
+@@ -465,8 +461,6 @@ uart3: serial@ff1b0000 {
+ 		reg-io-width = <4>;
+ 		clocks = <&cru SCLK_UART3>, <&cru PCLK_UART3>;
+ 		clock-names = "baudclk", "apb_pclk";
+-		dmas = <&dmac_peri 7>, <&dmac_peri 8>;
+-		dma-names = "tx", "rx";
+ 		pinctrl-names = "default";
+ 		pinctrl-0 = <&uart3_xfer>;
+ 		status = "disabled";
+@@ -480,8 +474,6 @@ uart4: serial@ff1c0000 {
+ 		reg-io-width = <4>;
+ 		clocks = <&cru SCLK_UART4>, <&cru PCLK_UART4>;
+ 		clock-names = "baudclk", "apb_pclk";
+-		dmas = <&dmac_peri 9>, <&dmac_peri 10>;
+-		dma-names = "tx", "rx";
+ 		pinctrl-names = "default";
+ 		pinctrl-0 = <&uart4_xfer>;
+ 		status = "disabled";
+-- 
+2.30.1
+

buildroot-external/board/asus/tinker/patches/linux/1010-ARM-DTSI-rk3288-Adding-missing-EDP-power-domain.patch

@@ -1,27 +0,0 @@
-From ac220d592aa38b9b717d36f7bb93f7be5a08f6b3 Mon Sep 17 00:00:00 2001
-From: Myy Miouyouyou <myy@miouyouyou.fr>
-Date: Thu, 19 Oct 2017 21:43:51 +0200
-Subject: [PATCH 14/28] ARM: DTSI: rk3288.dtsi: Adding missing EDP power domain
-
-Imported from Rockchip 4.4 kernel patches.
-
-Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
----
- arch/arm/boot/dts/rk3288.dtsi | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
-index 14ef8202..10ecebb4 100644
---- a/arch/arm/boot/dts/rk3288.dtsi
-+++ b/arch/arm/boot/dts/rk3288.dtsi
-@@ -1105,6 +1105,7 @@
- 		interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
- 		clocks = <&cru SCLK_EDP>, <&cru PCLK_EDP_CTRL>;
- 		clock-names = "dp", "pclk";
-+		power-domains = <&power RK3288_PD_VIO>;
- 		phys = <&edp_phy>;
- 		phy-names = "dp";
- 		resets = <&cru SRST_EDP>;
--- 
-2.11.0
-

buildroot-external/board/asus/tinker/patches/linux/1011-ARM-DTSI-rk3288-Adding-missing-VOPB-registers.patch

@@ -1,28 +0,0 @@
-From c5af6798c9a411b3f550f463182a4b4904a21ec2 Mon Sep 17 00:00:00 2001
-From: Myy Miouyouyou <myy@miouyouyou.fr>
-Date: Thu, 19 Oct 2017 21:51:14 +0200
-Subject: [PATCH 16/28] ARM: DTSI: rk3288.dtsi: Adding missing VOPB registers
-
-Imported from @wzyy2 patches... I think...
-
-Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
----
- arch/arm/boot/dts/rk3288.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
-index 455446f6..125f8835 100644
---- a/arch/arm/boot/dts/rk3288.dtsi
-+++ b/arch/arm/boot/dts/rk3288.dtsi
-@@ -987,7 +987,7 @@
- 
- 	vopb: vop@ff930000 {
- 		compatible = "rockchip,rk3288-vop";
--		reg = <0x0 0xff930000 0x0 0x19c>;
-+		reg = <0x0 0xff930000 0x0 0x19c>, <0x0 0xff931000 0x0 0x1000>;
- 		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
- 		clocks = <&cru ACLK_VOP0>, <&cru DCLK_VOP0>, <&cru HCLK_VOP0>;
- 		clock-names = "aclk_vop", "dclk_vop", "hclk_vop";
--- 
-2.11.0
-

buildroot-external/board/asus/tinker/patches/linux/1012-ARM-DTSI-rk3288-Fixed-the-SPDIF-node-address.patch

@@ -1,31 +0,0 @@
-From a0602b2724893de7ac9b4190a7a6bb66458da2d5 Mon Sep 17 00:00:00 2001
-From: Myy Miouyouyou <myy@miouyouyou.fr>
-Date: Thu, 19 Oct 2017 21:54:37 +0200
-Subject: [PATCH 17/28] ARM: DTSI: rk3288.dtsi: Fixed the SPDIF node address
-
-Now, the typo is only in the name of the node itself, not in the
-actual registers addresses definition.
-
-Still, this ought to be fixed one day !
-
-Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
----
- arch/arm/boot/dts/rk3288.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
-index 125f8835..e5d3d3c9 100644
---- a/arch/arm/boot/dts/rk3288.dtsi
-+++ b/arch/arm/boot/dts/rk3288.dtsi
-@@ -922,7 +922,7 @@
- 		status = "disabled";
- 	};
- 
--	spdif: sound@ff88b0000 {
-+	spdif: sound@ff8b0000 {
- 		compatible = "rockchip,rk3288-spdif", "rockchip,rk3066-spdif";
- 		reg = <0x0 0xff8b0000 0x0 0x10000>;
- 		#sound-dai-cells = <0>;
--- 
-2.11.0
-

buildroot-external/board/asus/tinker/patches/linux/1013-ARM-DTS-rk3288-tinker-Enabling-SDIO-and-Wifi.patch

@@ -0,0 +1,98 @@
+From d5d5c53173c484a13cda62a537cbf75a5df4b0e4 Mon Sep 17 00:00:00 2001
+From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
+Date: Mon, 5 Nov 2018 21:58:56 +0100
+Subject: [PATCH] ARM: DTS: rk3288-tinker: Enabling SDIO and Wifi
+
+Adding the appropriate nodes in order to exploit the WiFi capabilities
+of the board.
+Since these capabilities are provided through SDIO, and the SDIO
+nodes were not defined, these were added too.
+
+These seems to depend on each other so they are added in one big
+patch.
+
+Split if necessary.
+
+Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
+---
+ arch/arm/boot/dts/rk3288-tinker.dts | 62 +++++++++++++++++++++++++++++++++++++
+ 1 file changed, 62 insertions(+)
+
+diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
+index 1e43527aa..d4df13bed 100644
+--- a/arch/arm/boot/dts/rk3288-tinker.dts
++++ b/arch/arm/boot/dts/rk3288-tinker.dts
+@@ -6,8 +6,70 @@
+ /dts-v1/;
+ 
+ #include "rk3288-tinker.dtsi"
++#include <dt-bindings/clock/rockchip,rk808.h>
+ 
+ / {
+ 	model = "Rockchip RK3288 Asus Tinker Board";
+ 	compatible = "asus,rk3288-tinker", "rockchip,rk3288";
++
++	/* This is essential to get SDIO devices working.
++	   The Wifi depends on SDIO ! */
++	sdio_pwrseq: sdio-pwrseq {
++		compatible = "mmc-pwrseq-simple";
++		clocks = <&rk808 RK808_CLKOUT1>;
++		clock-names = "ext_clock";
++		pinctrl-names = "default";
++		pinctrl-0 = <&chip_enable_h>, <&wifi_enable_h>;
++
++		/*
++		 * On the module itself this is one of these (depending
++		 * on the actual card populated):
++		 * - SDIO_RESET_L_WL_REG_ON
++		 * - PDN (power down when low)
++		 */
++		reset-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>, <&gpio4 27 GPIO_ACTIVE_LOW>;
++	};
++
++	wireless-wlan {
++		compatible = "wlan-platdata";
++		rockchip,grf = <&grf>;
++		sdio_vref = <1800>;
++		status = "okay";
++		wifi_chip_type = "8723bs";
++		WIFI,host_wake_irq = <&gpio4 30 GPIO_ACTIVE_HIGH>;
++	};
++};
++
++&io_domains {
++	wifi-supply = <&vcc_18>;
++};
++
++&pinctrl {
++	sdio-pwrseq {
++		wifi_enable_h: wifienable-h {
++			rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_none>;
++		};
++
++		chip_enable_h: chip-enable-h {
++			rockchip,pins = <4 27 RK_FUNC_GPIO &pcfg_pull_none>;
++		};
++	};
++};
++
++&sdio0 {
++	bus-width = <4>;
++	cap-sd-highspeed;
++	cap-sdio-irq;
++	clock-frequency = <50000000>;
++	clock-freq-min-max = <200000 50000000>;
++	disable-wp;
++	keep-power-in-suspend;
++	mmc-pwrseq = <&sdio_pwrseq>;
++	non-removable;
++	num-slots = <1>;
++	pinctrl-names = "default";
++	pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
++	sd-uhs-sdr104;
++	status = "okay";
++	supports-sdio;
+ };
+-- 
+2.16.4
+

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

@@ -18,7 +18,7 @@ index aa107ee41..3da1c830f 100644
  				regulator-always-on;
  				regulator-boot-on;
  				regulator-min-microvolt = <750000>;
--				regulator-max-microvolt = <1350000>;
+-				regulator-max-microvolt = <1400000>;
 +				regulator-max-microvolt = <1450000>;
  				regulator-name = "vdd_arm";
  				regulator-ramp-delay = <6000>;

buildroot-external/board/asus/tinker/patches/linux/1016-ARM-DTSI-rk3288-tinker-Setting-up-the-SD-regulators.patch

@@ -1,31 +0,0 @@
-From 3dacea70a8e434008f5b1f119a7f7da9aebc772c Mon Sep 17 00:00:00 2001
-From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
-Date: Mon, 5 Nov 2018 20:18:58 +0100
-Subject: [PATCH] ARM: DTSI: rk3288-tinker: Setting up the SD regulators
-
-Some are needed and some are not. Playing with these parameters is
-required to get reboot working on these boards.
-
-I still can't believe that these boards can't soft reset correctly.
-
-Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
----
- arch/arm/boot/dts/rk3288-tinker.dtsi | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
-index 3da1c830f..dd1090728 100644
---- a/arch/arm/boot/dts/rk3288-tinker.dtsi
-+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
-@@ -254,7 +254,8 @@
- 			};
- 
- 			vccio_sd: LDO_REG5 {
-+				regulator-always-on;
- 				regulator-boot-on;
- 				regulator-min-microvolt = <1800000>;
- 				regulator-max-microvolt = <3300000>;
- 				regulator-name = "vccio_sd";
--- 
-2.16.4
-

buildroot-external/board/asus/tinker/patches/linux/1019-ARM-DTSI-rk3288-tinker-Defining-SDMMC-properties.patch

@@ -1,33 +0,0 @@
-From 487db7cefc9861fdaf30579c378a98f0360690ae Mon Sep 17 00:00:00 2001
-From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
-Date: Mon, 5 Nov 2018 20:27:14 +0100
-Subject: [PATCH] ARM: DTSI: rk3288-tinker: Defining SDMMC properties
-
-I never knew if these properties were required to fix the dreaded
-reboot issue...
-
-Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
----
- arch/arm/boot/dts/rk3288-tinker.dtsi | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
-index dd1090728..8edd6f681 100644
---- a/arch/arm/boot/dts/rk3288-tinker.dtsi
-+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
-@@ -436,7 +436,12 @@
- 	disable-wp;			/* wp not hooked up */
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
-+	sd-uhs-sdr12;
-+	sd-uhs-sdr25;
-+	sd-uhs-sdr50;
-+	sd-uhs-sdr104;
- 	status = "okay";
-+	supports-sd;
- 	vmmc-supply = <&vcc33_sd>;
- 	vqmmc-supply = <&vccio_sd>;
- };
--- 
-2.16.4
-

buildroot-external/board/asus/tinker/patches/linux/1020-ARM-DTSI-rk3288-Set-the-VPU-MMU-power-domains.patch

@@ -1,48 +0,0 @@
-From d3d3fe433d9038dcd1a98f4d6711c0777ed06703 Mon Sep 17 00:00:00 2001
-From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
-Date: Mon, 25 Jun 2018 17:08:32 +0200
-Subject: [PATCH 26/26] ARM: DTSI: rk3288: Set the VPU MMU power domains
-
-Without that, the auto-activation of the VPU hardware IOMMU fails
-when enabling the hardware, before the "probe" phase of its device
-driver.
-
-Basically, when loading a "of_platform" device driver targeting
-the VPU devices, you'll get these errors without this patch :
-
-[12753.996950] rk_iommu ff9c0440.iommu: Error during raw reset. MMU_DTE_ADDR is not functioning
-[12754.007483] rk_iommu ff9c0440.iommu: Disable stall request timed out, status: 0xffffffff
-[12754.026652] rk_iommu ff9c0440.iommu: Disable paging request timed out, status: 0xffffffff
-[12754.045975] rk_iommu ff9c0440.iommu: Disable stall request timed out, status: 0xffffffff
-
-When using this patch, the errors disappear.
-
-This seems to be due to the IOMMU device sharing the same power domain
-than the device.
-When loading an "of_platform" driver, the kernel logic seems to try
-enabling the associated IOMMU device before letting the driver handles
-anything with the actual VPU hardware.
-It appears that setting the power domain of the VPU IOMMU nodes let the
-IOMMU driver enable the IOMMU shared power domain, and make the IOMMU
-device useable.
-
-Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
----
- arch/arm/boot/dts/rk3288.dtsi | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
-index 45ec4e89..46e1b8e2 100644
---- a/arch/arm/boot/dts/rk3288.dtsi
-+++ b/arch/arm/boot/dts/rk3288.dtsi
-@@ -1262,6 +1263,7 @@
- 		interrupt-names = "hevc_mmu";
- 		clocks = <&cru ACLK_HEVC>, <&cru HCLK_HEVC>;
- 		clock-names = "aclk", "iface";
-+		power-domains = <&power RK3288_PD_HEVC>;
- 		#iommu-cells = <0>;
- 		status = "disabled";
- 	};
--- 
-2.16.4
-

buildroot-external/board/asus/tinker/patches/linux/1023-dts-rk3288-support-for-dedicating-npll-to-a-vop.patch

@@ -1,46 +0,0 @@
-From 4ab4f88649468dada5d609e1a6f8a71a7d5610c9 Mon Sep 17 00:00:00 2001
-From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
-Date: Sat, 29 Sep 2018 02:48:59 +0200
-Subject: [PATCH 4/6] dts: rk3288: support for dedicating npll to a vop
-
-This patch is taken from Urja Rannikko ( @urjaman ) patchset here :
-https://github.com/urjaman/arch-c201/blob/master/linux-c201/0020-RK3288-HDMI-clock-hacks-combined.patch
-https://www.spinics.net/lists/arm-kernel/msg673156.html
-
-The original description was :
-
-    Add the VOP DCLKs to the assigned clocks list so their
-    parents can be set in the dts include files for
-    devices that do dedicate npll to a vop.
-
-https://www.spinics.net/lists/arm-kernel/msg673162.html
-
-Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
----
- arch/arm/boot/dts/rk3288.dtsi | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
-index d23c7fa55..ff04aab5e 100644
---- a/arch/arm/boot/dts/rk3288.dtsi
-+++ b/arch/arm/boot/dts/rk3288.dtsi
-@@ -867,12 +867,14 @@
- 		rockchip,grf = <&grf>;
- 		#clock-cells = <1>;
- 		#reset-cells = <1>;
--		assigned-clocks = <&cru PLL_GPLL>, <&cru PLL_CPLL>,
-+		assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>,
-+				  <&cru PLL_GPLL>, <&cru PLL_CPLL>,
- 				  <&cru PLL_NPLL>, <&cru ACLK_CPU>,
- 				  <&cru HCLK_CPU>, <&cru PCLK_CPU>,
- 				  <&cru ACLK_PERI>, <&cru HCLK_PERI>,
- 				  <&cru PCLK_PERI>;
--		assigned-clock-rates = <594000000>, <400000000>,
-+		assigned-clock-rates = <0>, <0>,
-+				       <594000000>, <400000000>,
- 				       <500000000>, <300000000>,
- 				       <150000000>, <75000000>,
- 				       <300000000>, <150000000>,
--- 
-2.16.4
-

buildroot-external/board/asus/tinker/patches/linux/2002-clk-rockchip-add-all-known-operating-points-to-the-a.patch

@@ -1,50 +0,0 @@
-From e0c5a419cf5464cd02996431afa98e3b22dc6801 Mon Sep 17 00:00:00 2001
-From: Myy <myy@miouyouyou.fr>
-Date: Mon, 17 Jul 2017 23:14:48 +0000
-Subject: [PATCH] clk: rockchip: add all known operating points to the allowed
- CPU freqs
-
-Patch from Willy Tarreau
-
-Original commit message :
-At least 1920 MHz runs stable on the MiQi even on openssl speed -multi 4,
-which is by far the most intensive workload, and 1992/2016 work fine on
-the CS-008 until it starts to heat too much. So add all of them so that
-the device tree can simply manipulate them.
-
-Signed-off-by: Myy <myy@miouyouyou.fr>
----
- drivers/clk/rockchip/clk-rk3288.c | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
-index 753c649..fd2058f 100644
---- a/drivers/clk/rockchip/clk-rk3288.c
-+++ b/drivers/clk/rockchip/clk-rk3288.c
-@@ -145,6 +145,23 @@ static struct rockchip_pll_rate_table rk3288_pll_rates[] = {
- 	}
- 
- static struct rockchip_cpuclk_rate_table rk3288_cpuclk_rates[] __initdata = {
-+	RK3288_CPUCLK_RATE(2208000000U, 1, 3, 1, 3, 3),
-+	RK3288_CPUCLK_RATE(2184000000U, 1, 3, 1, 3, 3),
-+	RK3288_CPUCLK_RATE(2160000000U, 1, 3, 1, 3, 3),
-+	RK3288_CPUCLK_RATE(2136000000, 1, 3, 1, 3, 3),
-+	RK3288_CPUCLK_RATE(2112000000, 1, 3, 1, 3, 3),
-+	RK3288_CPUCLK_RATE(2088000000, 1, 3, 1, 3, 3),
-+	RK3288_CPUCLK_RATE(2064000000, 1, 3, 1, 3, 3),
-+	RK3288_CPUCLK_RATE(2040000000, 1, 3, 1, 3, 3),
-+	RK3288_CPUCLK_RATE(2016000000, 1, 3, 1, 3, 3),
-+	RK3288_CPUCLK_RATE(1992000000, 1, 3, 1, 3, 3),
-+	RK3288_CPUCLK_RATE(1968000000, 1, 3, 1, 3, 3),
-+	RK3288_CPUCLK_RATE(1944000000, 1, 3, 1, 3, 3),
-+	RK3288_CPUCLK_RATE(1920000000, 1, 3, 1, 3, 3),
-+	RK3288_CPUCLK_RATE(1896000000, 1, 3, 1, 3, 3),
-+	RK3288_CPUCLK_RATE(1872000000, 1, 3, 1, 3, 3),
-+	RK3288_CPUCLK_RATE(1848000000, 1, 3, 1, 3, 3),
-+	RK3288_CPUCLK_RATE(1824000000, 1, 3, 1, 3, 3),
- 	RK3288_CPUCLK_RATE(1800000000, 1, 3, 1, 3, 3),
- 	RK3288_CPUCLK_RATE(1704000000, 1, 3, 1, 3, 3),
- 	RK3288_CPUCLK_RATE(1608000000, 1, 3, 1, 3, 3),
--- 
-2.10.2
-

buildroot-external/board/asus/tinker/patches/linux/2006-soc-rockchip-power-domain-export-idle-request.patch

@@ -1,74 +0,0 @@
-From e7b60b10cf3fd2f4374ab26c314383121c27fe82 Mon Sep 17 00:00:00 2001
-From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
-Date: Tue, 22 Jan 2019 21:24:37 +0100
-Subject: [PATCH] soc: rockchip: power-domain: export idle request for RKMPP
-
-This function, and the added header, are required by the RKMPP driver,
-provided by Randy Li. However, I can't attest that the provided code
-is correct.
-
-Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
----
- drivers/soc/rockchip/pm_domains.c | 23 +++++++++++++++++++++++
- include/soc/rockchip/pm_domains.h | 15 +++++++++++++++
- 2 files changed, 38 insertions(+)
- create mode 100644 include/soc/rockchip/pm_domains.h
-
-diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c
-index 847c7c482..3e2e252cb 100644
---- a/drivers/soc/rockchip/pm_domains.c
-+++ b/drivers/soc/rockchip/pm_domains.c
-@@ -199,6 +199,29 @@ static int rockchip_pmu_set_idle_request(struct rockchip_pm_domain *pd,
- 	return 0;
- }
- 
-+int rockchip_pmu_idle_request(struct device *dev, bool idle)
-+{
-+	struct generic_pm_domain *genpd;
-+	struct rockchip_pm_domain *pd;
-+	int ret;
-+
-+	if (IS_ERR_OR_NULL(dev))
-+		return -EINVAL;
-+
-+	if (IS_ERR_OR_NULL(dev->pm_domain))
-+		return -EINVAL;
-+
-+	genpd = pd_to_genpd(dev->pm_domain);
-+	pd = to_rockchip_pd(genpd);
-+
-+	mutex_lock(&pd->pmu->mutex);
-+	ret = rockchip_pmu_set_idle_request(pd, idle);
-+	mutex_unlock(&pd->pmu->mutex);
-+
-+	return ret;
-+}
-+EXPORT_SYMBOL(rockchip_pmu_idle_request);
-+
- static int rockchip_pmu_save_qos(struct rockchip_pm_domain *pd)
- {
- 	int i;
-diff --git a/include/soc/rockchip/pm_domains.h b/include/soc/rockchip/pm_domains.h
-new file mode 100644
-index 000000000..720b3314e
---- /dev/null
-+++ b/include/soc/rockchip/pm_domains.h
-@@ -0,0 +1,15 @@
-+/*
-+ * pm_domain.h - Definitions and headers related to device power domains.
-+ *
-+ * Copyright (C) 2017 Randy Li <ayaka@soulik.info>.
-+ *
-+ * This file is released under the GPLv2.
-+ */
-+
-+#ifndef _LINUX_ROCKCHIP_PM_H
-+#define _LINUX_ROCKCHIP_PM_H
-+#include <linux/device.h>
-+
-+int rockchip_pmu_idle_request(struct device *dev, bool idle);
-+
-+#endif /* _LINUX_ROCKCHIP_PM_H */
--- 
-2.16.4
-

buildroot-external/board/asus/tinker/patches/linux/2007-drivers-wifi-ath9k-reverse-do-not-use-bulk-on-EP3-and-EP4.patch

@@ -1,101 +0,0 @@
-FROM: Solidhal <hal@halemmerich.com>
-
-This patch reverses commit 2b721118b7821107757eb1d37af4b60e877b27e7, as can bee seen here:
-https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2b721118b7821107757eb1d37af4b60e877b27e7
-
-This commit caused issues on veyron speedy with ath9k and dwc2 drivers. Any ath9k device (ar9271) 
-would intermittently work, most of the time ending in errors as can bee seen here:
-https://github.com/SolidHal/PrawnOS/issues/38
-This commit fixes that issue.
-This is only a temporary work around while a permenant fix is found, as this commit seems to only cause issues
-with dwc2
-
-diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
---- b/drivers/net/wireless/ath/ath9k/hif_usb.c
-+++ a/drivers/net/wireless/ath/ath9k/hif_usb.c
-@@ -115,10 +115,10 @@
- 	cmd->skb = skb;
- 	cmd->hif_dev = hif_dev;
- 
-+	usb_fill_bulk_urb(urb, hif_dev->udev,
-+			 usb_sndbulkpipe(hif_dev->udev, USB_REG_OUT_PIPE),
--	usb_fill_int_urb(urb, hif_dev->udev,
--			 usb_sndintpipe(hif_dev->udev, USB_REG_OUT_PIPE),
- 			 skb->data, skb->len,
-+			 hif_usb_regout_cb, cmd);
--			 hif_usb_regout_cb, cmd, 1);
- 
- 	usb_anchor_urb(urb, &hif_dev->regout_submitted);
- 	ret = usb_submit_urb(urb, GFP_KERNEL);
-@@ -735,11 +735,11 @@
- 
- 		rx_buf->skb = nskb;
- 
-+		usb_fill_bulk_urb(urb, hif_dev->udev,
-+				 usb_rcvbulkpipe(hif_dev->udev,
--		usb_fill_int_urb(urb, hif_dev->udev,
--				 usb_rcvintpipe(hif_dev->udev,
- 						 USB_REG_IN_PIPE),
- 				 nskb->data, MAX_REG_IN_BUF_SIZE,
-+				 ath9k_hif_usb_reg_in_cb, nskb);
--				 ath9k_hif_usb_reg_in_cb, rx_buf, 1);
- 	}
- 
- resubmit:
-@@ -909,11 +909,11 @@
- 		rx_buf->hif_dev = hif_dev;
- 		rx_buf->skb = skb;
- 
-+		usb_fill_bulk_urb(urb, hif_dev->udev,
-+				  usb_rcvbulkpipe(hif_dev->udev,
--		usb_fill_int_urb(urb, hif_dev->udev,
--				  usb_rcvintpipe(hif_dev->udev,
- 						  USB_REG_IN_PIPE),
- 				  skb->data, MAX_REG_IN_BUF_SIZE,
-+				  ath9k_hif_usb_reg_in_cb, skb);
--				  ath9k_hif_usb_reg_in_cb, rx_buf, 1);
- 
- 		/* Anchor URB */
- 		usb_anchor_urb(urb, &hif_dev->reg_in_submitted);
-@@ -1031,7 +1031,9 @@
- 
- static int ath9k_hif_usb_dev_init(struct hif_device_usb *hif_dev)
- {
-+	struct usb_host_interface *alt = &hif_dev->interface->altsetting[0];
-+	struct usb_endpoint_descriptor *endp;
-+	int ret, idx;
--	int ret;
- 
- 	ret = ath9k_hif_usb_download_fw(hif_dev);
- 	if (ret) {
-@@ -1041,6 +1043,20 @@
- 		return ret;
- 	}
- 
-+	/* On downloading the firmware to the target, the USB descriptor of EP4
-+	 * is 'patched' to change the type of the endpoint to Bulk. This will
-+	 * bring down CPU usage during the scan period.
-+	 */
-+	for (idx = 0; idx < alt->desc.bNumEndpoints; idx++) {
-+		endp = &alt->endpoint[idx].desc;
-+		if ((endp->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
-+				== USB_ENDPOINT_XFER_INT) {
-+			endp->bmAttributes &= ~USB_ENDPOINT_XFERTYPE_MASK;
-+			endp->bmAttributes |= USB_ENDPOINT_XFER_BULK;
-+			endp->bInterval = 0;
-+		}
-+	}
-+
- 	/* Alloc URBs */
- 	ret = ath9k_hif_usb_alloc_urbs(hif_dev);
- 	if (ret) {
-@@ -1252,7 +1268,7 @@
- 	if (!buf)
- 		return;
- 
-+	ret = usb_bulk_msg(udev, usb_sndbulkpipe(udev, USB_REG_OUT_PIPE),
--	ret = usb_interrupt_msg(udev, usb_sndintpipe(udev, USB_REG_OUT_PIPE),
- 			   buf, 4, NULL, USB_MSG_TIMEOUT);
- 	if (ret)
- 		dev_err(&udev->dev, "ath9k_htc: USB reboot failed\n");
-

buildroot-external/board/asus/tinker/patches/linux/2008-clk-rockchip-rk3288-Support-for-dedicating-NPLL-to-a.patch

@@ -1,178 +0,0 @@
-From e03d074b8ec00718337e7373e991912f6b6f9a52 Mon Sep 17 00:00:00 2001
-From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
-Date: Mon, 5 Nov 2018 19:53:43 +0100
-Subject: [PATCH] clk: rockchip: rk3288: Support for dedicating NPLL to a VOP
-
-This patch is taken from Urja Rannikko ( @urjaman ) patchset here :
-https://github.com/urjaman/arch-c201/blob/master/linux-c201/0020-RK3288-HDMI-clock-hacks-combined.patch
-https://www.spinics.net/lists/arm-kernel/msg673156.html
-
-I'm not really sure what this does exactly. It basically sets the
-parent clock of the newly added clocks, if the newly added property
-"rockchip,npll-for-vop" is detected and set.
-
-I have no clear idea how HDMI Neuronal PLL (and PLL in general) work,
-so I cannot comment on what it's doing and if it's a good idea in
-general.
-
-Now, I still have to test if that patch does anything useful on
-RK3288 boards. If it doesn't, I might just throw it away on next
-versions.
-
-Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
----
- drivers/clk/rockchip/clk-rk3288.c | 68 ++++++++++++++++++++++++++++++++-------
- drivers/clk/rockchip/clk.h        |  3 ++
- 2 files changed, 59 insertions(+), 12 deletions(-)
-
-diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
-index 13b38cb89..0d8b99b6b 100644
---- a/drivers/clk/rockchip/clk-rk3288.c
-+++ b/drivers/clk/rockchip/clk-rk3288.c
-@@ -215,10 +215,13 @@ PNAME(mux_ddrphy_p)		= { "dpll_ddr", "gpll_ddr" };
- PNAME(mux_aclk_cpu_src_p)	= { "cpll_aclk_cpu", "gpll_aclk_cpu" };
- 
- PNAME(mux_pll_src_cpll_gpll_p)		= { "cpll", "gpll" };
--PNAME(mux_pll_src_npll_cpll_gpll_p)	= { "npll", "cpll", "gpll" };
--PNAME(mux_pll_src_cpll_gpll_npll_p)	= { "cpll", "gpll", "npll" };
-+PNAME_ED(mux_pll_src_npll_cpll_gpll_p)	= { "npll", "cpll", "gpll" };
-+
-+PNAME_ED(mux_pll_src_cgn_pll_nonvop_p)	= { "cpll", "gpll", "npll" };
-+PNAME_ED(mux_pll_src_cgn_pll_vop0_p) = { "cpll", "gpll", "npll" };
-+PNAME_ED(mux_pll_src_cgn_pll_vop1_p) = { "cpll", "gpll", "npll" };
- PNAME(mux_pll_src_cpll_gpll_usb480m_p)	= { "cpll", "gpll", "unstable:usbphy480m_src" };
--PNAME(mux_pll_src_cpll_gll_usb_npll_p)	= { "cpll", "gpll", "unstable:usbphy480m_src", "npll" };
-+PNAME_ED(mux_pll_src_cpll_gll_usb_npll_p) = { "cpll", "gpll", "usbphy480m_src", "npll" };
- 
- PNAME(mux_mmc_src_p)	= { "cpll", "gpll", "xin24m", "xin24m" };
- PNAME(mux_i2s_pre_p)	= { "i2s_src", "i2s_frac", "ext_i2s", "xin12m" };
-@@ -464,24 +467,24 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
- 			RK3288_CLKSEL_CON(30), 14, 2, MFLAGS, 8, 5, DFLAGS,
- 			RK3288_CLKGATE_CON(3), 4, GFLAGS),
- 
--	COMPOSITE(DCLK_VOP0, "dclk_vop0", mux_pll_src_cpll_gpll_npll_p, 0,
-+	COMPOSITE(DCLK_VOP0, "dclk_vop0", mux_pll_src_cgn_pll_vop0_p, 0,
- 			RK3288_CLKSEL_CON(27), 0, 2, MFLAGS, 8, 8, DFLAGS,
- 			RK3288_CLKGATE_CON(3), 1, GFLAGS),
--	COMPOSITE(DCLK_VOP1, "dclk_vop1", mux_pll_src_cpll_gpll_npll_p, 0,
-+	COMPOSITE(DCLK_VOP1, "dclk_vop1", mux_pll_src_cgn_pll_vop1_p, 0,
- 			RK3288_CLKSEL_CON(29), 6, 2, MFLAGS, 8, 8, DFLAGS,
- 			RK3288_CLKGATE_CON(3), 3, GFLAGS),
- 
- 	COMPOSITE_NODIV(SCLK_EDP_24M, "sclk_edp_24m", mux_edp_24m_p, 0,
- 			RK3288_CLKSEL_CON(28), 15, 1, MFLAGS,
- 			RK3288_CLKGATE_CON(3), 12, GFLAGS),
--	COMPOSITE(SCLK_EDP, "sclk_edp", mux_pll_src_cpll_gpll_npll_p, 0,
-+	COMPOSITE(SCLK_EDP, "sclk_edp", mux_pll_src_cgn_pll_nonvop_p, 0,
- 			RK3288_CLKSEL_CON(28), 6, 2, MFLAGS, 0, 6, DFLAGS,
- 			RK3288_CLKGATE_CON(3), 13, GFLAGS),
- 
--	COMPOSITE(SCLK_ISP, "sclk_isp", mux_pll_src_cpll_gpll_npll_p, 0,
-+	COMPOSITE(SCLK_ISP, "sclk_isp", mux_pll_src_cgn_pll_nonvop_p, 0,
- 			RK3288_CLKSEL_CON(6), 6, 2, MFLAGS, 0, 6, DFLAGS,
- 			RK3288_CLKGATE_CON(3), 14, GFLAGS),
--	COMPOSITE(SCLK_ISP_JPE, "sclk_isp_jpe", mux_pll_src_cpll_gpll_npll_p, 0,
-+	COMPOSITE(SCLK_ISP_JPE, "sclk_isp_jpe", mux_pll_src_cgn_pll_nonvop_p, 0,
- 			RK3288_CLKSEL_CON(6), 14, 2, MFLAGS, 8, 6, DFLAGS,
- 			RK3288_CLKGATE_CON(3), 15, GFLAGS),
- 
-@@ -490,16 +493,16 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
- 	GATE(SCLK_HDMI_CEC, "sclk_hdmi_cec", "xin32k", 0,
- 			RK3288_CLKGATE_CON(5), 11, GFLAGS),
- 
--	COMPOSITE(ACLK_HEVC, "aclk_hevc", mux_pll_src_cpll_gpll_npll_p, 0,
-+	COMPOSITE(ACLK_HEVC, "aclk_hevc", mux_pll_src_cgn_pll_nonvop_p, 0,
- 			RK3288_CLKSEL_CON(39), 14, 2, MFLAGS, 8, 5, DFLAGS,
- 			RK3288_CLKGATE_CON(13), 13, GFLAGS),
- 	DIV(HCLK_HEVC, "hclk_hevc", "aclk_hevc", 0,
- 			RK3288_CLKSEL_CON(40), 12, 2, DFLAGS),
- 
--	COMPOSITE(SCLK_HEVC_CABAC, "sclk_hevc_cabac", mux_pll_src_cpll_gpll_npll_p, 0,
-+	COMPOSITE(SCLK_HEVC_CABAC, "sclk_hevc_cabac", mux_pll_src_cgn_pll_nonvop_p, 0,
- 			RK3288_CLKSEL_CON(42), 6, 2, MFLAGS, 0, 5, DFLAGS,
- 			RK3288_CLKGATE_CON(13), 14, GFLAGS),
--	COMPOSITE(SCLK_HEVC_CORE, "sclk_hevc_core", mux_pll_src_cpll_gpll_npll_p, 0,
-+	COMPOSITE(SCLK_HEVC_CORE, "sclk_hevc_core", mux_pll_src_cgn_pll_nonvop_p, 0,
- 			RK3288_CLKSEL_CON(42), 14, 2, MFLAGS, 8, 5, DFLAGS,
- 			RK3288_CLKGATE_CON(13), 15, GFLAGS),
- 
-@@ -573,7 +576,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
- 	COMPOSITE(0, "sclk_tspout", mux_tspout_p, 0,
- 			RK3288_CLKSEL_CON(35), 14, 2, MFLAGS, 8, 5, DFLAGS,
- 			RK3288_CLKGATE_CON(4), 11, GFLAGS),
--	COMPOSITE(0, "sclk_tsp", mux_pll_src_cpll_gpll_npll_p, 0,
-+	COMPOSITE(0, "sclk_tsp", mux_pll_src_cgn_pll_nonvop_p, 0,
- 			RK3288_CLKSEL_CON(35), 6, 2, MFLAGS, 0, 5, DFLAGS,
- 			RK3288_CLKGATE_CON(4), 10, GFLAGS),
- 
-@@ -933,5 +936,6 @@ static void __init rk3288_clk_init(struct device_node *np)
- {
- 	struct rockchip_clk_provider *ctx;
-+	s32 npll_vop = -1;
- 
- 	rk3288_cru_base = of_iomap(np, 0);
- 	if (!rk3288_cru_base) {
-@@ -940,6 +944,46 @@ static void __init rk3288_clk_init(struct device_node *np)
- 		return;
- 	}
- 
-+	if (!of_property_read_s32(np, "rockchip,npll-for-vop", &npll_vop)) {
-+		if ((npll_vop < -1) || (npll_vop > 1)) {
-+			pr_warn("%s: invalid VOP to dedicate NPLL to: %d\n",
-+				__func__, npll_vop);
-+		} else if (npll_vop >= 0) {
-+			unsigned int vop_clk_id;
-+			const char ** npll_names;
-+			const char ** non_npll_names;
-+			int i;
-+
-+			/* Firstly, not-VOP needs to not use npll */
-+			mux_pll_src_npll_cpll_gpll_p[0] = "dummy_npll";
-+			mux_pll_src_cgn_pll_nonvop_p[2] = "dummy_npll";
-+			mux_pll_src_cpll_gll_usb_npll_p[3] = "dummy_npll";
-+
-+			/* Then the npll VOP needs to only use npll, and the other one not use npll. */
-+			if (npll_vop) {
-+				vop_clk_id = DCLK_VOP1;
-+				npll_names = mux_pll_src_cgn_pll_vop1_p;
-+				non_npll_names = mux_pll_src_cgn_pll_vop0_p;
-+			} else {
-+				vop_clk_id = DCLK_VOP0;
-+				npll_names = mux_pll_src_cgn_pll_vop0_p;
-+				non_npll_names = mux_pll_src_cgn_pll_vop1_p;
-+			}
-+			npll_names[0] = "dummy_cpll";
-+			npll_names[1] = "dummy_gpll";
-+			non_npll_names[2] = "dummy_npll";
-+
-+			/* Lastly the npll-dedicated-VOP needs to be able to control npll. */
-+			for (i = 0; i < ARRAY_SIZE(rk3288_clk_branches); i++) {
-+				if (rk3288_clk_branches[i].id == vop_clk_id) {
-+					rk3288_clk_branches[i].flags |= CLK_SET_RATE_PARENT;
-+					break;
-+				}
-+			}
-+			pr_debug("%s: npll dedicated for VOP %d\n", __func__, npll_vop);
-+		}
-+	}
-+
- 	ctx = rockchip_clk_init(np, rk3288_cru_base, CLK_NR_CLKS);
- 	if (IS_ERR(ctx)) {
- 		pr_err("%s: rockchip clk init failed\n", __func__);
-diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h
-index 6b53fff4c..dbda9d281 100644
---- a/drivers/clk/rockchip/clk.h
-+++ b/drivers/clk/rockchip/clk.h
-@@ -382,6 +382,9 @@ struct clk *rockchip_clk_register_muxgrf(const char *name,
- 
- #define PNAME(x) static const char *const x[] __initconst
- 
-+/* For when you want to be able to modify the pointers. */
-+#define PNAME_ED(x) static const char * x[] __initdata
-+
- enum rockchip_clk_branch_type {
- 	branch_composite,
- 	branch_mux,
--- 
-2.16.4
-

buildroot-external/board/asus/tinker/patches/linux/2009-drm-dw_hdmi-rockchip-better-clock-selection-logic-an.patch

@@ -1,434 +0,0 @@
-From 6c86916e81fa18394d9b57b4af44f9948e100e96 Mon Sep 17 00:00:00 2001
-From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
-Date: Sat, 29 Sep 2018 03:02:10 +0200
-Subject: [PATCH 6/6] drm: dw_hdmi-rockchip: better clock selection logic and
- dts-based rate list
-
-This patch is taken from Urja Rannikko ( @urjaman ) patchset here :
-https://github.com/urjaman/arch-c201/blob/master/linux-c201/0020-RK3288-HDMI-clock-hacks-combined.patch
-https://www.spinics.net/lists/arm-kernel/msg673156.html
-
-The original description was :
-    This contains traces of the following commits from the ChromeOS 3.14
-    tree, which improve RF/EMI performance and detach the clock selection
-    logic from the HDMI PHY configurations, plus support for configuring
-    the allowed clock rates via device tree as they are dependent on
-    PLL configuration and maybe even the PCB layout and other hardware things,
-    eg. interference to wifi or such (EMI).
-
-    Rates that were allowed previous to this patch are added as the fallback
-    list if no dts configuration exists.
-
-    CHROMIUM: drm: rockchip/dw_hdmi-rockchip: Adjust rockchip_mpll_cfg for 146.25
-    CHROMIUM: drm: rockchip/dw_hdmi-rockchip: expand the informal mpll config
-    CHROMIUM: drm: rockchip/dw_hdmi-rockchip: add slop to more tables
-    CHROMIUM: drm: rockchip/dw_hdmi-rockchip: redo rockchip hdmi to allow slop
-    CHROMIUM: drm: rockchip/dw_hdmi-rockchip: Use auto-generated tables
-    CHROMIUM: drm: rockchip/dw_hdmi-rockchip: Fixup the clock to be what we expect
-    CHROMIUM: drm/rockchip: hdmi: adjust cklvl & txlvl for RF/EMI
-    CHROMIUM: drm: rockchip/dw_hdmi-rockchip: Set cur_ctr to 0 always
-    CHROMIUM: drm: rockchip/dw_hdmi-rockchip: Decrease slop
-
-https://www.spinics.net/lists/arm-kernel/msg673163.html
-
-This is the patch that takes into account the new property
-"rockchip,hdmi-rates-hz" that allows the definition of the HDMI
-frequencies in the DTS file.
-This also change a lot of HDMI frequencies definition, so that
-*will* require some extensive testing.
-
-Still, if it works fine, this should make tinkering the HDMI
-frequencies easier, in case you have a very special HDMI screen.
-
-Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
----
-diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
-index cdc304d4c..91c7dc07b 100644
---- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
-+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
-@@ -73,122 +73,141 @@ struct rockchip_hdmi {
- 	struct clk *grf_clk;
- 	struct dw_hdmi *hdmi;
- 	struct phy *phy;
-+	u32* rates;
-+	u32 rates_cnt;
- };
- 
-+#define CLK_SLOP(clk)		((clk) / 1000)
-+#define CLK_PLUS_SLOP(clk)	((clk) + CLK_SLOP(clk))
-+
- #define to_rockchip_hdmi(x)	container_of(x, struct rockchip_hdmi, x)
- 
-+/* These were the rates allowed by the driver before rates list in device tree,
-+ * so keep them around as a fallback */
-+static const u32 dw_hdmi_fallback_rates[] = {
-+	27000000,
-+	36000000,
-+	40000000,
-+	54000000,
-+	65000000,
-+	66000000,
-+	74250000,
-+	83500000,
-+	106500000,
-+	108000000,
-+	146250000,
-+	148500000
-+};
-+
- static const struct dw_hdmi_mpll_config rockchip_mpll_cfg[] = {
- 	{
--		27000000, {
--			{ 0x00b3, 0x0000},
--			{ 0x2153, 0x0000},
--			{ 0x40f3, 0x0000}
-+		30666000, {
-+			{ 0x00b3, 0x0000 },
-+			{ 0x2153, 0x0000 },
-+			{ 0x40f3, 0x0000 },
-+		},
-+	},  {
-+		36800000, {
-+			{ 0x00b3, 0x0000 },
-+			{ 0x2153, 0x0000 },
-+			{ 0x40a2, 0x0001 },
- 		},
--	}, {
--		36000000, {
--			{ 0x00b3, 0x0000},
--			{ 0x2153, 0x0000},
--			{ 0x40f3, 0x0000}
-+	},  {
-+		46000000, {
-+			{ 0x00b3, 0x0000 },
-+			{ 0x2142, 0x0001 },
-+			{ 0x40a2, 0x0001 },
- 		},
--	}, {
--		40000000, {
--			{ 0x00b3, 0x0000},
--			{ 0x2153, 0x0000},
--			{ 0x40f3, 0x0000}
-+	},  {
-+		61333000, {
-+			{ 0x0072, 0x0001 },
-+			{ 0x2142, 0x0001 },
-+			{ 0x40a2, 0x0001 },
- 		},
--	}, {
--		54000000, {
--			{ 0x0072, 0x0001},
--			{ 0x2142, 0x0001},
--			{ 0x40a2, 0x0001},
-+	},  {
-+		73600000, {
-+			{ 0x0072, 0x0001 },
-+			{ 0x2142, 0x0001 },
-+			{ 0x4061, 0x0002 },
- 		},
--	}, {
--		65000000, {
--			{ 0x0072, 0x0001},
--			{ 0x2142, 0x0001},
--			{ 0x40a2, 0x0001},
-+	},  {
-+		92000000, {
-+			{ 0x0072, 0x0001 },
-+			{ 0x2145, 0x0002 },
-+			{ 0x4061, 0x0002 },
- 		},
--	}, {
--		66000000, {
--			{ 0x013e, 0x0003},
--			{ 0x217e, 0x0002},
--			{ 0x4061, 0x0002}
-+	},  {
-+		122666000, {
-+			{ 0x0051, 0x0002 },
-+			{ 0x2145, 0x0002 },
-+			{ 0x4061, 0x0002 },
- 		},
--	}, {
--		74250000, {
--			{ 0x0072, 0x0001},
--			{ 0x2145, 0x0002},
--			{ 0x4061, 0x0002}
-+	},  {
-+		147200000, {
-+			{ 0x0051, 0x0002 },
-+			{ 0x2145, 0x0002 },
-+			{ 0x4064, 0x0003 },
- 		},
--	}, {
--		83500000, {
--			{ 0x0072, 0x0001},
-+	},  {
-+		184000000, {
-+			{ 0x0051, 0x0002 },
-+			{ 0x214c, 0x0003 },
-+			{ 0x4064, 0x0003 },
- 		},
--	}, {
--		108000000, {
--			{ 0x0051, 0x0002},
--			{ 0x2145, 0x0002},
--			{ 0x4061, 0x0002}
-+	},  {
-+		226666000, {
-+			{ 0x0040, 0x0003 },
-+			{ 0x214c, 0x0003 },
-+			{ 0x4064, 0x0003 },
- 		},
--	}, {
--		106500000, {
--			{ 0x0051, 0x0002},
--			{ 0x2145, 0x0002},
--			{ 0x4061, 0x0002}
-+	},  {
-+		272000000, {
-+			{ 0x0040, 0x0003 },
-+			{ 0x214c, 0x0003 },
-+			{ 0x5a64, 0x0003 },
- 		},
--	}, {
--		146250000, {
--			{ 0x0051, 0x0002},
--			{ 0x2145, 0x0002},
--			{ 0x4061, 0x0002}
-+	},  {
-+		340000000, {
-+			{ 0x0040, 0x0003 },
-+			{ 0x3b4c, 0x0003 },
-+			{ 0x5a64, 0x0003 },
- 		},
--	}, {
--		148500000, {
--			{ 0x0051, 0x0003},
--			{ 0x214c, 0x0003},
--			{ 0x4064, 0x0003}
-+	},  {
-+		600000000, {
-+			{ 0x1a40, 0x0003 },
-+			{ 0x3b4c, 0x0003 },
-+			{ 0x5a64, 0x0003 },
- 		},
--	}, {
-+	},  {
- 		~0UL, {
--			{ 0x00a0, 0x000a },
--			{ 0x2001, 0x000f },
--			{ 0x4002, 0x000f },
-+			{ 0x0000, 0x0000 },
-+			{ 0x0000, 0x0000 },
-+			{ 0x0000, 0x0000 },
- 		},
- 	}
- };
- 
- static const struct dw_hdmi_curr_ctrl rockchip_cur_ctr[] = {
--	/*      pixelclk    bpp8    bpp10   bpp12 */
-+	/*      pixelclk     bpp8    bpp10   bpp12 */
- 	{
--		40000000,  { 0x0018, 0x0018, 0x0018 },
--	}, {
--		65000000,  { 0x0028, 0x0028, 0x0028 },
--	}, {
--		66000000,  { 0x0038, 0x0038, 0x0038 },
--	}, {
--		74250000,  { 0x0028, 0x0038, 0x0038 },
--	}, {
--		83500000,  { 0x0028, 0x0038, 0x0038 },
--	}, {
--		146250000, { 0x0038, 0x0038, 0x0038 },
--	}, {
--		148500000, { 0x0000, 0x0038, 0x0038 },
--	}, {
--		~0UL,      { 0x0000, 0x0000, 0x0000},
--	}
-+		600000000, { 0x0000, 0x0000, 0x0000 },
-+	},  {
-+		~0UL,      { 0x0000, 0x0000, 0x0000 },
-+	},
- };
- 
- static const struct dw_hdmi_phy_config rockchip_phy_config[] = {
- 	/*pixelclk   symbol   term   vlev*/
--	{ 74250000,  0x8009, 0x0004, 0x0272},
--	{ 148500000, 0x802b, 0x0004, 0x028d},
--	{ 297000000, 0x8039, 0x0005, 0x028d},
--	{ ~0UL,	     0x0000, 0x0000, 0x0000}
-+	{ CLK_PLUS_SLOP(74250000),  0x8009, 0x0004, 0x0272},
-+	{ CLK_PLUS_SLOP(165000000), 0x802b, 0x0004, 0x0209},
-+	{ CLK_PLUS_SLOP(297000000), 0x8039, 0x0005, 0x028d},
-+	{ ~0UL,	                    0x0000, 0x0000, 0x0000}
- };
- 
- static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi)
- {
- 	struct device_node *np = hdmi->dev->of_node;
-+	int rates_cnt;
- 
- 	hdmi->regmap = syscon_regmap_lookup_by_phandle(np, "rockchip,grf");
- 	if (IS_ERR(hdmi->regmap)) {
-@@ -216,26 +235,55 @@ static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi)
- 		return PTR_ERR(hdmi->grf_clk);
- 	}
- 
-+	if ((rates_cnt = of_property_count_u32_elems(np, "rockchip,hdmi-rates-hz")) > 0) {
-+		int rv;
-+		u32 *rates = devm_kmalloc_array(hdmi->dev, rates_cnt, sizeof(u32), GFP_KERNEL);
-+		if (!rates)
-+			return -ENOMEM;
-+		rv = of_property_read_u32_array(np, "rockchip,hdmi-rates-hz", rates, rates_cnt);
-+		if (rv)
-+			return rv;
-+		hdmi->rates = rates;
-+		hdmi->rates_cnt = rates_cnt;
-+	} else {
-+		rates_cnt = ARRAY_SIZE(dw_hdmi_fallback_rates);
-+		hdmi->rates = devm_kmalloc_array(hdmi->dev, rates_cnt, sizeof(u32), GFP_KERNEL);
-+		if (!hdmi->rates)
-+			return -ENOMEM;
-+		memcpy(hdmi->rates, dw_hdmi_fallback_rates, rates_cnt * sizeof(u32));
-+		hdmi->rates_cnt = rates_cnt;
-+	}
-+
-+
- 	return 0;
- }
- 
- static enum drm_mode_status
--dw_hdmi_rockchip_mode_valid(struct drm_connector *connector,
-+dw_hdmi_rockchip_encoder_mode_valid(struct drm_encoder *encoder,
- 			    const struct drm_display_mode *mode)
- {
--	const struct dw_hdmi_mpll_config *mpll_cfg = rockchip_mpll_cfg;
-+	struct rockchip_hdmi *hdmi = to_rockchip_hdmi(encoder);
- 	int pclk = mode->clock * 1000;
--	bool valid = false;
-+	int num_rates = hdmi->rates_cnt;
- 	int i;
- 
--	for (i = 0; mpll_cfg[i].mpixelclock != (~0UL); i++) {
--		if (pclk == mpll_cfg[i].mpixelclock) {
--			valid = true;
--			break;
--		}
-+	/*
-+	 * Pixel clocks we support are always < 2GHz and so fit in an
-+	 * int.  We should make sure source rate does too so we don't get
-+	 * overflow when we multiply by 1000.
-+	 */
-+	if (mode->clock > INT_MAX / 1000)
-+		return MODE_BAD;
-+
-+	for (i = 0; i < num_rates; i++) {
-+		int slop = CLK_SLOP(pclk);
-+
-+		if ((pclk >= hdmi->rates[i] - slop) &&
-+		    (pclk <= hdmi->rates[i] + slop))
-+			return MODE_OK;
- 	}
- 
--	return (valid) ? MODE_OK : MODE_BAD;
-+	return MODE_BAD;
- }
- 
- static const struct drm_encoder_funcs dw_hdmi_rockchip_encoder_funcs = {
-@@ -251,7 +299,39 @@ dw_hdmi_rockchip_encoder_mode_fixup(struct drm_encoder *encoder,
- 				    const struct drm_display_mode *mode,
- 				    struct drm_display_mode *adj_mode)
- {
--	return true;
-+	struct rockchip_hdmi *hdmi = to_rockchip_hdmi(encoder);
-+	int pclk = adj_mode->clock * 1000;
-+	int best_diff = INT_MAX;
-+	int best_clock = 0;
-+	int slop;
-+	int i;
-+
-+	/* Pick the best clock */
-+	for (i = 0; i < hdmi->rates_cnt; i++) {
-+		int diff = hdmi->rates[i] - pclk;
-+
-+		if (diff < 0)
-+			diff = -diff;
-+		if (diff < best_diff) {
-+			best_diff = diff;
-+			best_clock = hdmi->rates[i];
-+
-+			/* Bail early if we're exact */
-+			if (best_diff == 0)
-+				return true;
-+		}
-+	}
-+
-+	/* Double check that it's OK */
-+	slop = CLK_SLOP(pclk);
-+	if ((pclk >= best_clock - slop) && (pclk <= best_clock + slop)) {
-+		adj_mode->clock = DIV_ROUND_UP(best_clock, 1000);
-+		return true;
-+	}
-+
-+	/* Shoudn't be here; we should have said rate wasn't valid */
-+	dev_warn(hdmi->dev, "tried to set invalid rate %d\n", adj_mode->clock);
-+	return false;
- }
- 
- static void dw_hdmi_rockchip_encoder_mode_set(struct drm_encoder *encoder,
-@@ -307,6 +387,7 @@ dw_hdmi_rockchip_encoder_atomic_check(struct drm_encoder *encoder,
- }
- 
- static const struct drm_encoder_helper_funcs dw_hdmi_rockchip_encoder_helper_funcs = {
-+	.mode_valid = dw_hdmi_rockchip_encoder_mode_valid,
- 	.mode_fixup = dw_hdmi_rockchip_encoder_mode_fixup,
- 	.mode_set   = dw_hdmi_rockchip_encoder_mode_set,
- 	.enable     = dw_hdmi_rockchip_encoder_enable,
-@@ -406,7 +487,6 @@ static struct rockchip_hdmi_chip_data rk3228_chip_data = {
- };
- 
- static const struct dw_hdmi_plat_data rk3228_hdmi_drv_data = {
--	.mode_valid = dw_hdmi_rockchip_mode_valid,
- 	.mpll_cfg = rockchip_mpll_cfg,
- 	.cur_ctr = rockchip_cur_ctr,
- 	.phy_config = rockchip_phy_config,
-@@ -423,7 +503,6 @@ static struct rockchip_hdmi_chip_data rk3288_chip_data = {
- };
- 
- static const struct dw_hdmi_plat_data rk3288_hdmi_drv_data = {
--	.mode_valid = dw_hdmi_rockchip_mode_valid,
- 	.mpll_cfg   = rockchip_mpll_cfg,
- 	.cur_ctr    = rockchip_cur_ctr,
- 	.phy_config = rockchip_phy_config,
-@@ -443,7 +522,6 @@ static struct rockchip_hdmi_chip_data rk3328_chip_data = {
- };
- 
- static const struct dw_hdmi_plat_data rk3328_hdmi_drv_data = {
--	.mode_valid = dw_hdmi_rockchip_mode_valid,
- 	.mpll_cfg = rockchip_mpll_cfg,
- 	.cur_ctr = rockchip_cur_ctr,
- 	.phy_config = rockchip_phy_config,
-@@ -460,7 +538,6 @@ static struct rockchip_hdmi_chip_data rk3399_chip_data = {
- };
- 
- static const struct dw_hdmi_plat_data rk3399_hdmi_drv_data = {
--	.mode_valid = dw_hdmi_rockchip_mode_valid,
- 	.mpll_cfg   = rockchip_mpll_cfg,
- 	.cur_ctr    = rockchip_cur_ctr,
- 	.phy_config = rockchip_phy_config,
-@@ -558,6 +635,7 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
- 	 */
- 	if (IS_ERR(hdmi->hdmi)) {
- 		ret = PTR_ERR(hdmi->hdmi);
-+		devm_kfree(hdmi->dev, hdmi->rates);
- 		drm_encoder_cleanup(encoder);
- 		clk_disable_unprepare(hdmi->vpll_clk);
- 	}
-@@ -570,6 +648,7 @@ static void dw_hdmi_rockchip_unbind(struct device *dev, struct device *master,
- {
- 	struct rockchip_hdmi *hdmi = dev_get_drvdata(dev);
- 
-+	devm_kfree(hdmi->dev, hdmi->rates);
- 	dw_hdmi_unbind(hdmi->hdmi);
- 	clk_disable_unprepare(hdmi->vpll_clk);
- }

buildroot-external/board/asus/tinker/patches/linux/2013-spi-Added-support-for-Tinkerboard-s-SPI-interface.patch

@@ -1,22 +0,0 @@
-From d4d128324b8f8a9f5c441203d94703e41fa07df3 Mon Sep 17 00:00:00 2001
-From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
-Date: Mon, 5 Nov 2018 19:57:56 +0100
-Subject: [PATCH] spi: Added support for Tinkerboard's SPI interface
-
-Imported from ARMbian
-
-Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
----
-
-diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
-index 255786f2e..3a3f2e6fd 100644
---- a/drivers/spi/spidev.c
-+++ b/drivers/spi/spidev.c
-@@ -665,6 +665,7 @@ static const struct of_device_id spidev_dt_ids[] = {
- 	{ .compatible = "lwn,bk4" },
- 	{ .compatible = "dh,dhcom-board" },
- 	{ .compatible = "menlo,m53cpld" },
-+	{ .compatible = "rockchip,spi_tinker" },
- 	{},
- };
- MODULE_DEVICE_TABLE(of, spidev_dt_ids);

buildroot-external/board/asus/tinker/patches/linux/261_gpiomem_driver.patch

@@ -1,395 +0,0 @@
-diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
-index e5b7ef1a5..f88c913ff 100644
---- a/arch/arm/boot/dts/rk3288-tinker.dtsi
-+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
-@@ -544,3 +544,6 @@
- &wdt {
- 	status = "okay";
- };
-+&gpiomem {
-+    status = "okay";
-+};
-diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
-index f3ca55496..14bbcb192 100644
---- a/arch/arm/boot/dts/rk3288.dtsi
-+++ b/arch/arm/boot/dts/rk3288.dtsi
-@@ -1418,6 +1418,12 @@
- 		interrupts = <GIC_PPI 9 0xf04>;
- 	};
- 
-+	gpiomem: rk3288-gpiomem@ff750000 {
-+		compatible = "rockchip,rk3288-gpiomem";
-+		reg = <0x0 0xff750000 0x0 0x1000>;
-+		status = "disabled";
-+	};
-+
- 	pinctrl: pinctrl {
- 		compatible = "rockchip,rk3288-pinctrl";
- 		rockchip,grf = <&grf>;
-
-diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index 3143db5..9c18b74 100644
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -5,6 +5,7 @@
- menu "Character devices"
- 
- source "drivers/tty/Kconfig"
-+source "drivers/char/rockchip/Kconfig"
- 
- config DEVMEM
- 	bool "/dev/mem virtual device support"
-diff --git a/drivers/char/Makefile b/drivers/char/Makefile
-index d8a7579..290cb32 100644
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -51,6 +51,8 @@ obj-$(CONFIG_PS3_FLASH)		+= ps3flash.o
- obj-$(CONFIG_JS_RTC)		+= js-rtc.o
- js-rtc-y = rtc.o
- 
-+obj-$(CONFIG_ARCH_ROCKCHIP)	+= rockchip/
-+
- obj-$(CONFIG_XILLYBUS)		+= xillybus/
- obj-$(CONFIG_POWERNV_OP_PANEL)	+= powernv-op-panel.o
- obj-$(CONFIG_ADI)		+= adi.o
-diff --git a/drivers/char/rockchip/Kconfig b/drivers/char/rockchip/Kconfig
-new file mode 100644
-index 0000000..6e97486
---- /dev/null
-+++ b/drivers/char/rockchip/Kconfig
-@@ -0,0 +1,16 @@
-+#
-+# Broadcom char driver config
-+#
-+
-+menuconfig RK_CHAR_DRIVERS
-+	bool "Rockchip Char Drivers"
-+	help
-+	  Rockchip's char drivers
-+
-+config RK3288_DEVGPIOMEM
-+	tristate "/dev/gpiomem rootless GPIO access via mmap() on the RK3288"
-+	default y
-+	help
-+		Provides users with root-free access to the GPIO registers
-+		on the 3288. Calling mmap(/dev/gpiomem) will map the GPIO
-+		register page to the user's pointer.
-\ No newline at end of file
-diff --git a/drivers/char/rockchip/Makefile b/drivers/char/rockchip/Makefile
-new file mode 100644
-index 0000000..2287ec2
---- /dev/null
-+++ b/drivers/char/rockchip/Makefile
-@@ -0,0 +1 @@
-+obj-$(CONFIG_RK3288_DEVGPIOMEM)+= rk3288-gpiomem.o
-\ No newline at end of file
-diff --git a/drivers/char/rockchip/rk3288-gpiomem.c b/drivers/char/rockchip/rk3288-gpiomem.c
-new file mode 100644
-index 0000000..984471c
---- /dev/null
-+++ b/drivers/char/rockchip/rk3288-gpiomem.c
-@@ -0,0 +1,303 @@
-+/**
-+ * GPIO memory device driver
-+ *
-+ * Creates a chardev /dev/gpiomem which will provide user access to
-+ * the rk3288's GPIO registers when it is mmap()'d.
-+ * No longer need root for user GPIO access, but without relaxing permissions
-+ * on /dev/mem.
-+ *
-+ * Written by Luke Wren <luke@raspberrypi.org>
-+ * Copyright (c) 2015, Raspberry Pi (Trading) Ltd.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions, and the following disclaimer,
-+ *    without modification.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The names of the above-listed copyright holders may not be used
-+ *    to endorse or promote products derived from this software without
-+ *    specific prior written permission.
-+ *
-+ * ALTERNATIVELY, this software may be distributed under the terms of the
-+ * GNU General Public License ("GPL") version 2, as published by the Free
-+ * Software Foundation.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/platform_device.h>
-+#include <linux/mm.h>
-+#include <linux/slab.h>
-+#include <linux/cdev.h>
-+#include <linux/pagemap.h>
-+#include <linux/io.h>
-+
-+#define DEVICE_NAME "rk3288-gpiomem"
-+#define DRIVER_NAME "gpiomem-rk3288"
-+#define DEVICE_MINOR 0
-+
-+struct rk3288_gpiomem_instance {
-+	unsigned long gpio_regs_phys;
-+	struct device *dev;
-+};
-+
-+static struct cdev rk3288_gpiomem_cdev;
-+static dev_t rk3288_gpiomem_devid;
-+static struct class *rk3288_gpiomem_class;
-+static struct device *rk3288_gpiomem_dev;
-+static struct rk3288_gpiomem_instance *inst;
-+
-+
-+/****************************************************************************
-+*
-+*   GPIO mem chardev file ops
-+*
-+***************************************************************************/
-+
-+static int rk3288_gpiomem_open(struct inode *inode, struct file *file)
-+{
-+	int dev = iminor(inode);
-+	int ret = 0;
-+
-+	if (dev != DEVICE_MINOR) {
-+		dev_err(inst->dev, "Unknown minor device: %d", dev);
-+		ret = -ENXIO;
-+	}
-+	return ret;
-+}
-+
-+static int rk3288_gpiomem_release(struct inode *inode, struct file *file)
-+{
-+	int dev = iminor(inode);
-+	int ret = 0;
-+
-+	if (dev != DEVICE_MINOR) {
-+		dev_err(inst->dev, "Unknown minor device %d", dev);
-+		ret = -ENXIO;
-+	}
-+	return ret;
-+}
-+
-+static const struct vm_operations_struct rk3288_gpiomem_vm_ops = {
-+#ifdef CONFIG_HAVE_IOREMAP_PROT
-+	.access = generic_access_phys
-+#endif
-+};
-+static int address_is_allowed(unsigned long pfn, unsigned long size)
-+{
-+    unsigned long address = pfn << PAGE_SHIFT;
-+
-+    dev_info(inst->dev, "address_is_allowed.pfn: 0x%08lx", address);
-+
-+    switch(address) {
-+
-+        case 0xff750000:
-+        case 0xff760000:
-+        case 0xff780000:
-+        case 0xff790000:
-+        case 0xff7a0000:
-+        case 0xff7b0000:
-+        case 0xff7c0000:
-+        case 0xff7d0000:
-+        case 0xff7e0000:
-+        case 0xff7f0000:
-+        case 0xff7f2000:
-+        case 0xff770000:
-+        case 0xff730000:
-+        case 0xff680000:
-+            dev_info(inst->dev, "address_is_allowed.return 1");
-+            return 1;
-+            break; 
-+        default :
-+            dev_info(inst->dev, "address_is_allowed.return 0");
-+	        return 0;
-+    }
-+}
-+
-+static int rk3288_gpiomem_mmap(struct file *file, struct vm_area_struct *vma)
-+{
-+
-+    size_t size;
-+
-+	size = vma->vm_end - vma->vm_start;
-+
-+
-+	if (!address_is_allowed(vma->vm_pgoff, size))
-+		return -EPERM;
-+
-+	vma->vm_page_prot = phys_mem_access_prot(file, vma->vm_pgoff,
-+						 size,
-+						 vma->vm_page_prot);
-+
-+	vma->vm_ops =  &rk3288_gpiomem_vm_ops;
-+
-+	/* Remap-pfn-range will mark the range VM_IO */
-+	if (remap_pfn_range(vma,
-+			    vma->vm_start,
-+			    vma->vm_pgoff,
-+			    size,
-+			    vma->vm_page_prot)) {
-+		return -EAGAIN;
-+	}
-+
-+	return 0;
-+}
-+
-+static const struct file_operations
-+rk3288_gpiomem_fops = {
-+	.owner = THIS_MODULE,
-+	.open = rk3288_gpiomem_open,
-+	.release = rk3288_gpiomem_release,
-+	.mmap = rk3288_gpiomem_mmap,
-+};
-+
-+static int rk3288_gpiomem_dev_uevent(struct device *dev, struct kobj_uevent_env *env)
-+{
-+    add_uevent_var(env, "DEVMODE=%#o", 0666);
-+    return 0;
-+}
-+
-+ /****************************************************************************
-+*
-+*   Probe and remove functions
-+*
-+***************************************************************************/
-+
-+
-+static int rk3288_gpiomem_probe(struct platform_device *pdev)
-+{
-+	int err;
-+	void *ptr_err;
-+	struct device *dev = &pdev->dev;
-+	struct resource *ioresource;
-+
-+	/* Allocate buffers and instance data */
-+
-+	inst = kzalloc(sizeof(struct rk3288_gpiomem_instance), GFP_KERNEL);
-+
-+	if (!inst) {
-+		err = -ENOMEM;
-+		goto failed_inst_alloc;
-+	}
-+
-+	inst->dev = dev;
-+
-+	ioresource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (ioresource) {
-+		inst->gpio_regs_phys = ioresource->start;
-+	} else {
-+		dev_err(inst->dev, "failed to get IO resource");
-+		err = -ENOENT;
-+		goto failed_get_resource;
-+	}
-+
-+	/* Create character device entries */
-+
-+	err = alloc_chrdev_region(&rk3288_gpiomem_devid,
-+				  DEVICE_MINOR, 1, DEVICE_NAME);
-+	if (err != 0) {
-+		dev_err(inst->dev, "unable to allocate device number");
-+		goto failed_alloc_chrdev;
-+	}
-+	cdev_init(&rk3288_gpiomem_cdev, &rk3288_gpiomem_fops);
-+	rk3288_gpiomem_cdev.owner = THIS_MODULE;
-+	err = cdev_add(&rk3288_gpiomem_cdev, rk3288_gpiomem_devid, 1);
-+	if (err != 0) {
-+		dev_err(inst->dev, "unable to register device");
-+		goto failed_cdev_add;
-+	}
-+
-+	/* Create sysfs entries */
-+
-+	rk3288_gpiomem_class = class_create(THIS_MODULE, DEVICE_NAME);
-+	ptr_err = rk3288_gpiomem_class;
-+	if (IS_ERR(ptr_err))
-+		goto failed_class_create;
-+	rk3288_gpiomem_class->dev_uevent = rk3288_gpiomem_dev_uevent;
-+	rk3288_gpiomem_dev = device_create(rk3288_gpiomem_class, NULL,
-+					rk3288_gpiomem_devid, NULL,
-+					"gpiomem");
-+	ptr_err = rk3288_gpiomem_dev;
-+	if (IS_ERR(ptr_err))
-+		goto failed_device_create;
-+
-+	dev_info(inst->dev, "Initialised: Registers at 0x%08lx",
-+		inst->gpio_regs_phys);
-+
-+	return 0;
-+
-+failed_device_create:
-+	class_destroy(rk3288_gpiomem_class);
-+failed_class_create:
-+	cdev_del(&rk3288_gpiomem_cdev);
-+	err = PTR_ERR(ptr_err);
-+failed_cdev_add:
-+	unregister_chrdev_region(rk3288_gpiomem_devid, 1);
-+failed_alloc_chrdev:
-+failed_get_resource:
-+	kfree(inst);
-+failed_inst_alloc:
-+	dev_err(inst->dev, "could not load rk3288_gpiomem");
-+	return err;
-+}
-+
-+static int rk3288_gpiomem_remove(struct platform_device *pdev)
-+{
-+	struct device *dev = inst->dev;
-+
-+	kfree(inst);
-+	device_destroy(rk3288_gpiomem_class, rk3288_gpiomem_devid);
-+	class_destroy(rk3288_gpiomem_class);
-+	cdev_del(&rk3288_gpiomem_cdev);
-+	unregister_chrdev_region(rk3288_gpiomem_devid, 1);
-+
-+	dev_info(dev, "GPIO mem driver removed - OK");
-+	return 0;
-+}
-+
-+ /****************************************************************************
-+*
-+*   Register the driver with device tree
-+*
-+***************************************************************************/
-+
-+static const struct of_device_id rk3288_gpiomem_of_match[] = {
-+	{.compatible = "rockchip,rk3288-gpiomem",},
-+	{ /* sentinel */ },
-+};
-+
-+MODULE_DEVICE_TABLE(of, rk3288_gpiomem_of_match);
-+
-+static struct platform_driver rk3288_gpiomem_driver = {
-+	.probe = rk3288_gpiomem_probe,
-+	.remove = rk3288_gpiomem_remove,
-+	.driver = {
-+		   .name = DRIVER_NAME,
-+		   .owner = THIS_MODULE,
-+		   .of_match_table = rk3288_gpiomem_of_match,
-+		   },
-+};
-+
-+module_platform_driver(rk3288_gpiomem_driver);
-+
-+MODULE_ALIAS("platform:gpiomem-rk3288");
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("gpiomem driver for accessing GPIO from userspace");
-+MODULE_AUTHOR("Luke Wren <luke@raspberrypi.org>");
-\ No newline at end of file

buildroot-external/board/asus/tinker/patches/linux/3000_DTS_rearrange_thermal_zones.patch

@@ -1,32 +0,0 @@
-diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
-index bc3601a..37ae378 100644
---- a/arch/arm/boot/dts/rk3288.dtsi
-+++ b/arch/arm/boot/dts/rk3288.dtsi
-@@ -467,13 +467,6 @@
- 	};
- 
- 	thermal-zones {
--		reserve_thermal: reserve_thermal {
--			polling-delay-passive = <1000>; /* milliseconds */
--			polling-delay = <5000>; /* milliseconds */
--
--			thermal-sensors = <&tsadc 0>;
--		};
--
- 		cpu_thermal: cpu_thermal {
- 			polling-delay-passive = <100>; /* milliseconds */
- 			polling-delay = <5000>; /* milliseconds */
-@@ -539,6 +532,13 @@
- 				};
- 			};
- 		};
-+
-+		reserve_thermal: reserve_thermal {
-+			polling-delay-passive = <1000>; /* milliseconds */
-+			polling-delay = <5000>; /* milliseconds */
-+
-+			thermal-sensors = <&tsadc 0>;
-+		};
- 	};
- 
- 	tsadc: tsadc@ff280000 {

buildroot-external/board/asus/tinker/patches/linux/RK3288-1.8GHz-and-boost.patch

@@ -1,80 +0,0 @@
-diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
-index 58bd91539..9c0dac199 100644
---- a/arch/arm/boot/dts/rk3288.dtsi
-+++ b/arch/arm/boot/dts/rk3288.dtsi
-@@ -153,6 +153,75 @@
- 			opp-hz = /bits/ 64 <1608000000>;
- 			opp-microvolt = <1350000>;
- 		};
-+		opp@1704000000 {
-+			opp-hz = /bits/ 64 <1704000000>;
-+			opp-microvolt = <1350000>;
-+		};
-+		opp@1800000000 {
-+			opp-hz = /bits/ 64 <1800000000>;
-+			opp-microvolt = <1400000>;
-+		};
-+		/* boot-only frequencies below */
-+		opp@1896000000 {
-+			opp-hz = /bits/ 64 <1896000000>;
-+			opp-microvolt = <1425000>;
-+			turbo-mode;
-+		};
-+		opp@1920000000 {
-+			opp-hz = /bits/ 64 <1920000000>;
-+			opp-microvolt = <1425000>;
-+			turbo-mode;
-+		};
-+		opp@1992000000 {
-+			opp-hz = /bits/ 64 <1992000000>;
-+			opp-microvolt = <1450000>;
-+			turbo-mode;
-+		};
-+		opp@2016000000 {
-+			opp-hz = /bits/ 64 <2016000000>;
-+			opp-microvolt = <1475000>;
-+			turbo-mode;
-+		};
-+		opp@2040000000 {
-+			opp-hz = /bits/ 64 <2040000000>;
-+			opp-microvolt = <1475000>;
-+			turbo-mode;
-+		};
-+		opp@2064000000 {
-+			opp-hz = /bits/ 64 <2064000000>;
-+			opp-microvolt = <1475000>;
-+			turbo-mode;
-+		};
-+		opp@2088000000 {
-+			opp-hz = /bits/ 64 <2088000000>;
-+			opp-microvolt = <1500000>;
-+			turbo-mode;
-+		};
-+		opp@2112000000 {
-+			opp-hz = /bits/ 64 <2112000000>;
-+			opp-microvolt = <1500000>;
-+			turbo-mode;
-+		};
-+		opp@2136000000 {
-+			opp-hz = /bits/ 64 <2136000000>;
-+			opp-microvolt = <1500000>;
-+			turbo-mode;
-+		};
-+		opp@2160000000 {
-+			opp-hz = /bits/ 64 <2160000000>;
-+			opp-microvolt = <1500000>;
-+			turbo-mode;
-+		};
-+		opp@2184000000 {
-+			opp-hz = /bits/ 64 <2184000000>;
-+			opp-microvolt = <1500000>;
-+			turbo-mode;
-+		};
-+		opp@2208000000 {
-+			opp-hz = /bits/ 64 <2208000000>;
-+			opp-microvolt = <1500000>;
-+			turbo-mode;
-+		};
- 	};
- 
- 	amba {

buildroot-external/board/asus/tinker/patches/linux/brcmfmac-add-ap6330-firmware.patch

@@ -1,23 +0,0 @@
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-index a907d7b06..ec71996c7 100644
---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-@@ -619,13 +619,17 @@ BRCMF_FW_DEF(4354, "brcmfmac4354-sdio");
- BRCMF_FW_DEF(4356, "brcmfmac4356-sdio");
- BRCMF_FW_DEF(4373, "brcmfmac4373-sdio");
- 
-+/* AMPAK */
-+BRCMF_FW_DEF(AP6330, "brcmfmac-ap6330-sdio");
-+
- static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
- 	BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),
- 	BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0x0000001F, 43241B0),
- 	BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0x00000020, 43241B4),
- 	BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0xFFFFFFC0, 43241B5),
- 	BRCMF_FW_ENTRY(BRCM_CC_4329_CHIP_ID, 0xFFFFFFFF, 4329),
--	BRCMF_FW_ENTRY(BRCM_CC_4330_CHIP_ID, 0xFFFFFFFF, 4330),
-+	BRCMF_FW_ENTRY(BRCM_CC_4330_CHIP_ID, 0xFFFFFFEF, 4330),
-+	BRCMF_FW_ENTRY(BRCM_CC_4330_CHIP_ID, 0x10, AP6330),
- 	BRCMF_FW_ENTRY(BRCM_CC_4334_CHIP_ID, 0xFFFFFFFF, 4334),
- 	BRCMF_FW_ENTRY(BRCM_CC_43340_CHIP_ID, 0xFFFFFFFF, 43340),
- 	BRCMF_FW_ENTRY(BRCM_CC_43341_CHIP_ID, 0xFFFFFFFF, 43340),

buildroot-external/board/asus/tinker/patches/linux/general-adjust-tinker-dts-hdmi-sound.patch

@@ -1,13 +0,0 @@
-diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
-index 01be2bca9..5439e29e0 100644
---- a/arch/arm/boot/dts/rk3288-tinker.dtsi
-+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
-@@ -64,7 +64,7 @@
- 	sound {
- 		compatible = "simple-audio-card";
- 		simple-audio-card,format = "i2s";
--		simple-audio-card,name = "rockchip,tinker-codec";
-+		simple-audio-card,name = "DW-I2S-HDMI";
- 		simple-audio-card,mclk-fs = <512>;
- 
- 		simple-audio-card,codec {

buildroot-external/board/asus/tinker/patches/linux/general-fix-reboot-from-kwiboo.patch

@@ -1,19 +0,0 @@
-diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
-index 5bd58b95d..48ebe081f 100644
---- a/drivers/mmc/core/core.c
-+++ b/drivers/mmc/core/core.c
-@@ -1684,6 +1684,14 @@ void mmc_power_off(struct mmc_host *host)
- 	if (host->ios.power_mode == MMC_POWER_OFF)
- 		return;
- 
-+        mmc_set_initial_signal_voltage(host);
-+
-+        /*
-+         * This delay should be sufficient to allow the power supply
-+         * to reach the minimum voltage.
-+         */
-+        mmc_delay(host->ios.power_delay_ms);
-+
- 	mmc_pwrseq_power_off(host);
- 
- 	host->ios.clock = 0;

buildroot-external/board/asus/tinker/patches/linux/remove-broken-dtb.patch

@@ -1,22 +0,0 @@
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index a98dee2ae..d3cef7033 100644
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -916,17 +916,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
- 	rk3288-rock2-square.dtb \
- 	rk3288-tinker.dtb \
- 	rk3288-tinker-s.dtb \
--	rk3288-veyron-brain.dtb \
--	rk3288-veyron-fievel.dtb \
--	rk3288-veyron-jaq.dtb \
--	rk3288-veyron-jerry.dtb \
--	rk3288-veyron-mickey.dtb \
--	rk3288-veyron-mighty.dtb \
--	rk3288-veyron-minnie.dtb \
--	rk3288-veyron-pinky.dtb \
--	rk3288-veyron-speedy.dtb \
--	rk3288-veyron-tiger.dtb \
- 	rk3288-vyasa.dtb
- dtb-$(CONFIG_ARCH_S3C24XX) += \
- 	s3c2416-smdk2416.dtb
- dtb-$(CONFIG_ARCH_S3C64XX) += \

buildroot-external/board/asus/tinker/patches/uboot/0001-SPL-modify-load-address-of-U-Boot.patch

@@ -1,8 +1,8 @@
-From cd1aac268ff58eea28153bbabfb33abc2df52b1f Mon Sep 17 00:00:00 2001
-Message-Id: <cd1aac268ff58eea28153bbabfb33abc2df52b1f.1602103621.git.stefan@agner.ch>
+From 983121a741192153492a61befc0e0fc61b9f8b14 Mon Sep 17 00:00:00 2001
+Message-Id: <983121a741192153492a61befc0e0fc61b9f8b14.1617731428.git.stefan@agner.ch>
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Fri, 24 Apr 2020 12:41:50 +0000
-Subject: [PATCH 1/4] SPL: modify load address of U-Boot
+Subject: [PATCH 1/2] SPL: modify load address of U-Boot
 
 Default load address of U-Boot is at sector 16384, which is where HAOS
 has its first partition. Use 0x2000 (8192) instead.
@@ -15,7 +15,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  2 files changed, 2 insertions(+)
 
 diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
-index d459c7f50d..e0682ed479 100644
+index 8686a66d13..c3363821dd 100644
 --- a/configs/tinker-rk3288_defconfig
 +++ b/configs/tinker-rk3288_defconfig
 @@ -88,3 +88,4 @@ CONFIG_VIDEO_ROCKCHIP=y
@@ -24,7 +24,7 @@ index d459c7f50d..e0682ed479 100644
  CONFIG_ERRNO_STR=y
 +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x2000
 diff --git a/configs/tinker-s-rk3288_defconfig b/configs/tinker-s-rk3288_defconfig
-index 68411d863b..1a285baf73 100644
+index 22714833cc..f5dd23577c 100644
 --- a/configs/tinker-s-rk3288_defconfig
 +++ b/configs/tinker-s-rk3288_defconfig
 @@ -90,3 +90,4 @@ CONFIG_DISPLAY_ROCKCHIP_HDMI=y
@@ -33,5 +33,5 @@ index 68411d863b..1a285baf73 100644
  CONFIG_ERRNO_STR=y
 +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x2000
 -- 
-2.28.0
+2.31.1
 

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

@@ -1,10 +1,10 @@
-From 549d98c233b2a8b7cd4b0d4eb9652ad60a8a0f75 Mon Sep 17 00:00:00 2001
-Message-Id: <549d98c233b2a8b7cd4b0d4eb9652ad60a8a0f75.1602103621.git.stefan@agner.ch>
-In-Reply-To: <cd1aac268ff58eea28153bbabfb33abc2df52b1f.1602103621.git.stefan@agner.ch>
-References: <cd1aac268ff58eea28153bbabfb33abc2df52b1f.1602103621.git.stefan@agner.ch>
+From f9195bc5cb18f71117f6efc1c352209e62c53706 Mon Sep 17 00:00:00 2001
+Message-Id: <f9195bc5cb18f71117f6efc1c352209e62c53706.1617731428.git.stefan@agner.ch>
+In-Reply-To: <983121a741192153492a61befc0e0fc61b9f8b14.1617731428.git.stefan@agner.ch>
+References: <983121a741192153492a61befc0e0fc61b9f8b14.1617731428.git.stefan@agner.ch>
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Fri, 24 Apr 2020 11:37:55 +0000
-Subject: [PATCH 4/4] pmic: enable LDO2 vcc33_mipi at bootup
+Subject: [PATCH 2/2] pmic: enable LDO2 vcc33_mipi at bootup
 
 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 ---
@@ -64,5 +64,5 @@ index f85209c649..6fa1bb0c66 100644
 +}
 +#endif
 -- 
-2.28.0
+2.31.1
 

buildroot-external/board/asus/tinker/patches/uboot/0002-rockchip-dts-tinker-move-i2c-node-to-shared-device-t.patch

@@ -1,55 +0,0 @@
-From d49ad12ee89d0d64f1f594bcad7de0e4f9631add Mon Sep 17 00:00:00 2001
-Message-Id: <d49ad12ee89d0d64f1f594bcad7de0e4f9631add.1602103621.git.stefan@agner.ch>
-In-Reply-To: <cd1aac268ff58eea28153bbabfb33abc2df52b1f.1602103621.git.stefan@agner.ch>
-References: <cd1aac268ff58eea28153bbabfb33abc2df52b1f.1602103621.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Fri, 4 Sep 2020 15:40:55 +0200
-Subject: [PATCH 2/4] rockchip: dts: tinker: move i2c node to shared device
- tree
-
-The I2C EEPROM is present on Tinker Board S as well. Move the i2c node
-to the shared, U-Boot specific rk3288-tinker-u-boot.dtsi device tree.
-
-Cc: Jonas Karlman <jonas@kwiboo.se>
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- arch/arm/dts/rk3288-tinker-u-boot.dtsi | 7 +++++++
- arch/arm/dts/rk3288-tinker.dts         | 7 -------
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
-index 732aa4f91f..3d169906fd 100644
---- a/arch/arm/dts/rk3288-tinker-u-boot.dtsi
-+++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
-@@ -17,6 +17,13 @@
- 	rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>;
- };
- 
-+&i2c2 {
-+    m24c08@50 {
-+        compatible = "at,24c08", "i2c-eeprom";
-+        reg = <0x50>;
-+    };
-+};
-+
- &pinctrl {
- 	u-boot,dm-pre-reloc;
- };
-diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts
-index 4b8405fd82..338670123b 100644
---- a/arch/arm/dts/rk3288-tinker.dts
-+++ b/arch/arm/dts/rk3288-tinker.dts
-@@ -35,10 +35,3 @@
- 	vbus-supply = <&vcc5v0_host>;
- 	status = "okay";
- };
--
--&i2c2 {
--    m24c08@50 {
--        compatible = "at,24c08", "i2c-eeprom";
--        reg = <0x50>;
--    };
--};
--- 
-2.28.0
-

buildroot-external/board/asus/tinker/patches/uboot/0003-rockchip-dts-tinker-remove-unnecessary-node.patch

@@ -1,34 +0,0 @@
-From 07a02625ba95f68ba670b4c1cc98567acb390195 Mon Sep 17 00:00:00 2001
-Message-Id: <07a02625ba95f68ba670b4c1cc98567acb390195.1602103621.git.stefan@agner.ch>
-In-Reply-To: <cd1aac268ff58eea28153bbabfb33abc2df52b1f.1602103621.git.stefan@agner.ch>
-References: <cd1aac268ff58eea28153bbabfb33abc2df52b1f.1602103621.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Fri, 4 Sep 2020 15:44:38 +0200
-Subject: [PATCH 3/4] rockchip: dts: tinker: remove unnecessary node
-
-The property reg-shift with the same value is present in the base
-device tree already. Remove unnecessary node from rk3288-tinker.dts.
-
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- arch/arm/dts/rk3288-tinker.dts | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts
-index 338670123b..8b1848c310 100644
---- a/arch/arm/dts/rk3288-tinker.dts
-+++ b/arch/arm/dts/rk3288-tinker.dts
-@@ -27,10 +27,6 @@
- 	status = "okay";
- };
- 
--&uart2 {
--	reg-shift = <2>;
--};
--
- &usb_host1 {
- 	vbus-supply = <&vcc5v0_host>;
- 	status = "okay";
--- 
-2.28.0
-

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

@@ -23,14 +23,37 @@ setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=ap
 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"
 
+# 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
+  env import -t ${ramdisk_addr_r} ${filesize}
+fi
+
 # Load extraargs
 fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
 
 # Load device tree
 if test "$devnum" = "0"; then
-  fatload mmc ${devnum}:1 ${fdt_addr_r} rk3288-tinker-s.dtb
+  setenv fdtfile "rk3288-tinker-s.dtb"
 else
-  fatload mmc ${devnum}:1 ${fdt_addr_r} rk3288-tinker.dtb
+  setenv fdtfile "rk3288-tinker.dtb"
+fi
+
+echo "Loading standard device tree ${fdtfile}"
+fatload mmc ${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
+    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}
 fi
 
 setenv bootargs

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

@@ -1,2 +1,3 @@
 # CONFIG_USB_STORAGE is not set
 # CONFIG_DOS_PARTITION is not set
+CONFIG_OF_LIBFDT_OVERLAY=y

buildroot-external/board/hardkernel/odroid-c2/boot-env.txt

@@ -0,0 +1,2 @@
+# Uncomment this to enable GPIO support for RPI-RF-MOD/HM-MOD-RPI-PCB
+#overlays=rpi-rf-mod

buildroot-external/board/hardkernel/odroid-c2/hassos-hook.sh

@@ -10,6 +10,10 @@ function hassos_pre_image() {
     cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr"
     cp "${BINARIES_DIR}/meson-gxbb-odroidc2.dtb" "${BOOT_DATA}/meson-gxbb-odroidc2.dtb"
 
+    mkdir -p "${BOOT_DATA}/overlays"
+    cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/"
+    cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
+
     echo "console=tty0 console=ttyAML0,115200n8" > "${BOOT_DATA}/cmdline.txt"
 
     # SPL

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

@@ -25,9 +25,33 @@ setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=ap
 setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
 setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs 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
+  env import -t ${ramdisk_addr_r} ${filesize}
+fi
+
 # Load extraargs
 fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
-fatload mmc ${devnum}:1 ${fdt_addr_r} meson-gxbb-odroidc2.dtb
+
+# Load device tree
+setenv fdtfile "meson-gxbb-odroidc2.dtb"
+echo "Loading standard device tree ${fdtfile}"
+fatload mmc ${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
+    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}
+fi
 
 # logical volumes get numbered after physical ones.
 # 1. boot

buildroot-external/board/hardkernel/odroid-c4/boot-env.txt

@@ -0,0 +1,2 @@
+# Uncomment this to enable GPIO support for RPI-RF-MOD/HM-MOD-RPI-PCB
+#overlays=rpi-rf-mod

buildroot-external/board/hardkernel/odroid-c4/hassos-hook.sh

@@ -9,6 +9,10 @@ function hassos_pre_image() {
     cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr"
     cp "${BINARIES_DIR}/meson-sm1-odroid-c4.dtb" "${BOOT_DATA}/meson-sm1-odroid-c4.dtb"
 
+    mkdir -p "${BOOT_DATA}/overlays"
+    cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/"
+    cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
+
     echo "console=tty0 console=ttyAML0,115200n8" > "${BOOT_DATA}/cmdline.txt"
 
     # SPL

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

@@ -25,9 +25,33 @@ setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=ap
 setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
 setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs 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
+  env import -t ${ramdisk_addr_r} ${filesize}
+fi
+
 # Load extraargs
 fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
-fatload mmc ${devnum}:1 ${fdt_addr_r} meson-sm1-odroid-c4.dtb
+
+# Load device tree
+setenv fdtfile "meson-sm1-odroid-c4.dtb"
+echo "Loading standard device tree ${fdtfile}"
+fatload mmc ${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
+    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}
+fi
 
 # logical volumes get numbered after physical ones.
 # 1. boot

buildroot-external/board/hardkernel/odroid-n2/boot-env.txt

@@ -0,0 +1,2 @@
+# Uncomment this to enable GPIO support for RPI-RF-MOD/HM-MOD-RPI-PCB
+#overlays=rpi-rf-mod

buildroot-external/board/hardkernel/odroid-n2/hassos-hook.sh

@@ -9,6 +9,10 @@ function hassos_pre_image() {
     cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr"
     cp "${BINARIES_DIR}"/*.dtb "${BOOT_DATA}/"
 
+    mkdir -p "${BOOT_DATA}/overlays"
+    cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/"
+    cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
+
     echo "console=tty0 console=ttyAML0,115200n8" > "${BOOT_DATA}/cmdline.txt"
 
     # SPL

buildroot-external/board/hardkernel/odroid-n2/kernel.config

@@ -1 +1,7 @@
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+
+CONFIG_THERMAL_GOV_BANG_BANG=y
+CONFIG_SENSORS_GPIO_FAN=y
+
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_GPIO_POLLED=y

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

@@ -25,12 +25,37 @@ setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=ap
 setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
 setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs 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
+  env import -t ${ramdisk_addr_r} ${filesize}
+fi
+
 # Load extraargs
 fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
-if test "${board_rev}" = "c"; then
-  fatload mmc ${devnum}:1 ${fdt_addr_r} meson-g12b-odroid-n2-plus.dtb
+
+# Load device tree
+if test "${soc_rev}" = "c"; then
+  setenv fdtfile "meson-g12b-odroid-n2-plus.dtb"
 else
-  fatload mmc ${devnum}:1 ${fdt_addr_r} meson-g12b-odroid-n2.dtb
+  setenv fdtfile "meson-g12b-odroid-n2.dtb"
+fi
+
+echo "Loading standard device tree ${fdtfile}"
+fatload mmc ${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
+    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}
 fi
 
 # logical volumes get numbered after physical ones.

buildroot-external/board/hardkernel/odroid-n2/uboot.config

@@ -2,3 +2,4 @@ CONFIG_DOS_PARTITION=y
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_USB_STORAGE is not set
 CONFIG_DISPLAY_BOARDINFO=y
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y

buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-aliases-t.patch

@@ -0,0 +1,53 @@
+From cdfb8eea4103e537898073dc3f7bf8f75cec5efb Mon Sep 17 00:00:00 2001
+Message-Id: <cdfb8eea4103e537898073dc3f7bf8f75cec5efb.1619725559.git.stefan@agner.ch>
+From: Christian Hewitt <christianshewitt@gmail.com>
+Date: Mon, 11 Jan 2021 13:58:31 +0000
+Subject: [PATCH 1/8] arm64: dts: meson: add i2c3/rtc nodes and rtc aliases to
+ ODROID-N2 dtsi
+
+Enable the onboard pcf8563 rtc hardware on ODROID N2/N2+ boards via the
+common dtsi. Also add aliases to ensure vrtc does not claim /dev/rtc0.
+
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+Link: https://lore.kernel.org/r/20210111135831.2218-1-christianshewitt@gmail.com
+---
+ .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi     | 14 ++++++++++++++
+ 1 file changed, 14 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 39a09661c5f6..b78be3e6974d 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+@@ -13,6 +13,8 @@ / {
+ 	aliases {
+ 		serial0 = &uart_AO;
+ 		ethernet0 = &ethmac;
++		rtc0 = &rtc;
++		rtc1 = &vrtc;
+ 	};
+ 
+ 	dioo2133: audio-amplifier-0 {
+@@ -478,6 +480,18 @@ &ir {
+ 	linux,rc-map-name = "rc-odroid";
+ };
+ 
++&i2c3 {
++	status = "okay";
++	pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
++	pinctrl-names = "default";
++
++	rtc: rtc@51 {
++		compatible = "nxp,pcf8563";
++		reg = <0x51>;
++		wakeup-source;
++	};
++};
++
+ &pwm_ab {
+ 	pinctrl-0 = <&pwm_a_e_pins>;
+ 	pinctrl-names = "default";
+-- 
+2.31.1
+

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

@@ -0,0 +1,37 @@
+From 8b2ab165b2ed529f74b242159648893d53272c24 Mon Sep 17 00:00:00 2001
+Message-Id: <8b2ab165b2ed529f74b242159648893d53272c24.1619725559.git.stefan@agner.ch>
+In-Reply-To: <cdfb8eea4103e537898073dc3f7bf8f75cec5efb.1619725559.git.stefan@agner.ch>
+References: <cdfb8eea4103e537898073dc3f7bf8f75cec5efb.1619725559.git.stefan@agner.ch>
+From: Hyeonki Hong <hhk7734@gmail.com>
+Date: Wed, 7 Apr 2021 04:26:08 +0000
+Subject: [PATCH 2/8] arm64: dts: meson: add saradc node to ODROID N2/N2+
+
+Add the meson saradc node to the ODROID N2/N2+ common dtsi.
+
+Signed-off-by: Hyeonki Hong <hhk7734@gmail.com>
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+Link: https://lore.kernel.org/r/20210407042609.9736-3-christianshewitt@gmail.com
+---
+ arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 5 +++++
+ 1 file changed, 5 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 b78be3e6974d..8a5e132c4b79 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+@@ -508,6 +508,11 @@ &pwm_AO_cd {
+ 	status = "okay";
+ };
+ 
++&saradc {
++	status = "okay";
++	vref-supply = <&vddao_1v8>;
++};
++
+ /* SD card */
+ &sd_emmc_b {
+ 	status = "okay";
+-- 
+2.31.1
+

buildroot-external/board/hardkernel/patches/linux/0002-dt-bindings-arm-amlogic-add-support-for-the-ODROID-N.patch

@@ -1,36 +0,0 @@
-From 258f03fa4fd897a61b5861df1f809e234711dd49 Mon Sep 17 00:00:00 2001
-Message-Id: <258f03fa4fd897a61b5861df1f809e234711dd49.1606829302.git.stefan@agner.ch>
-In-Reply-To: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-References: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-From: Christian Hewitt <christianshewitt@gmail.com>
-Date: Tue, 15 Sep 2020 17:24:31 +0200
-Subject: [PATCH 2/7] dt-bindings: arm: amlogic: add support for the ODROID-N2+
-
-HardKernel ODROID-N2+ uses a revised Amlogic S922X v2 chip that supports
-higher cpu clock speeds than the original ODROID-N2.
-
-Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
-Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-Signed-off-by: Kevin Hilman <khilman@baylibre.com>
-Acked-by: Rob Herring <robh@kernel.org>
-Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
-Link: https://lore.kernel.org/r/20200915152432.30616-3-narmstrong@baylibre.com
----
- Documentation/devicetree/bindings/arm/amlogic.yaml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
-index 5eba9f48823e..12ba8d074370 100644
---- a/Documentation/devicetree/bindings/arm/amlogic.yaml
-+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
-@@ -153,6 +153,7 @@ properties:
-               - azw,gtking
-               - azw,gtking-pro
-               - hardkernel,odroid-n2
-+              - hardkernel,odroid-n2-plus
-               - khadas,vim3
-               - ugoos,am6
-           - const: amlogic,s922x
--- 
-2.29.2
-

buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch

@@ -0,0 +1,78 @@
+From 602012d9081be7a54d2d6cee59035ae019dd3bb4 Mon Sep 17 00:00:00 2001
+Message-Id: <602012d9081be7a54d2d6cee59035ae019dd3bb4.1619725559.git.stefan@agner.ch>
+In-Reply-To: <cdfb8eea4103e537898073dc3f7bf8f75cec5efb.1619725559.git.stefan@agner.ch>
+References: <cdfb8eea4103e537898073dc3f7bf8f75cec5efb.1619725559.git.stefan@agner.ch>
+From: Hyeonki Hong <hhk7734@gmail.com>
+Date: Wed, 7 Apr 2021 04:26:09 +0000
+Subject: [PATCH 3/8] arm64: dts: meson: add GPIO line names to ODROID N2/N2+
+
+Add GPIO line-name identifiers to the ODROID N2/N2+ common dtsi.
+
+Signed-off-by: Hyeonki Hong <hhk7734@gmail.com>
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+Link: https://lore.kernel.org/r/20210407042609.9736-4-christianshewitt@gmail.com
+---
+ .../dts/amlogic/meson-g12b-odroid-n2.dtsi     | 45 +++++++++++++++++++
+ 1 file changed, 45 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 8a5e132c4b79..41b2f9c96b5f 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+@@ -446,6 +446,51 @@ &frddr_c {
+ };
+ 
+ &gpio {
++	gpio-line-names =
++		/* GPIOZ */
++		"", "", "", "", "", "", "", "",
++		"", "", "", "", "", "", "", "",
++		/* GPIOH */
++		"", "", "", "", "", "", "", "",
++		"",
++		/* BOOT */
++		"", "", "", "", "", "", "", "",
++		"", "", "", "", "", "", "", "",
++		/* GPIOC */
++		"", "", "", "", "", "", "", "",
++		/* GPIOA */
++		"PIN_44", /* GPIOA_0 */
++		"PIN_46", /* GPIOA_1 */
++		"PIN_45", /* GPIOA_2 */
++		"PIN_47", /* GPIOA_3 */
++		"PIN_26", /* GPIOA_4 */
++		"", "", "", "", "", "",
++		"PIN_42", /* GPIOA_11 */
++		"PIN_32", /* GPIOA_12 */
++		"PIN_7",  /* GPIOA_13 */
++		"PIN_27", /* GPIOA_14 */
++		"PIN_28", /* GPIOA_15 */
++		/* GPIOX */
++		"PIN_16", /* GPIOX_0 */
++		"PIN_18", /* GPIOX_1 */
++		"PIN_22", /* GPIOX_2 */
++		"PIN_11", /* GPIOX_3 */
++		"PIN_13", /* GPIOX_4 */
++		"PIN_33", /* GPIOX_5 */
++		"PIN_35", /* GPIOX_6 */
++		"PIN_15", /* GPIOX_7 */
++		"PIN_19", /* GPIOX_8 */
++		"PIN_21", /* GPIOX_9 */
++		"PIN_24", /* GPIOX_10 */
++		"PIN_23", /* GPIOX_11 */
++		"PIN_8",  /* GPIOX_12 */
++		"PIN_10", /* GPIOX_13 */
++		"PIN_29", /* GPIOX_14 */
++		"PIN_31", /* GPIOX_15 */
++		"PIN_12", /* GPIOX_16 */
++		"PIN_3",  /* GPIOX_17 */
++		"PIN_5",  /* GPIOX_18 */
++		"PIN_36"; /* GPIOX_19 */
+ 	/*
+ 	 * WARNING: The USB Hub on the Odroid-N2 needs a reset signal
+ 	 * to be turned high in order to be detected by the USB Controller
+-- 
+2.31.1
+

buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-add-support-for-the-ODROID-N2.patch

@@ -1,78 +0,0 @@
-From 6cfaddae585e5a87c5253c932b8d58e153159f6b Mon Sep 17 00:00:00 2001
-Message-Id: <6cfaddae585e5a87c5253c932b8d58e153159f6b.1606829302.git.stefan@agner.ch>
-In-Reply-To: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-References: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-From: Christian Hewitt <christianshewitt@gmail.com>
-Date: Tue, 15 Sep 2020 17:24:32 +0200
-Subject: [PATCH 3/7] arm64: dts: meson: add support for the ODROID-N2+
-
-HardKernel ODROID-N2+ uses an Amlogic S922X rev. C chip capable of higher
-clock speeds than the original ODROID-N2.
-
-The rev. C support a slighly higher VDDCPU_A & VDDCPU_B voltages and supports
-the same OPPs as the Amlogic A311D SoC from the same G12B family.
-
-Suggested-by: Dongjin Kim <tobetter@hardkernel.com>
-Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
-Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-Signed-off-by: Kevin Hilman <khilman@baylibre.com>
-Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
-Link: https://lore.kernel.org/r/20200915152432.30616-4-narmstrong@baylibre.com
----
- arch/arm64/boot/dts/amlogic/Makefile          |  1 +
- .../dts/amlogic/meson-g12b-odroid-n2-plus.dts | 31 +++++++++++++++++++
- 2 files changed, 32 insertions(+)
- create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
-
-diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
-index 4e2239ffcaa5..b0b3d6791499 100644
---- a/arch/arm64/boot/dts/amlogic/Makefile
-+++ b/arch/arm64/boot/dts/amlogic/Makefile
-@@ -8,6 +8,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb
-+dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb
-diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
-new file mode 100644
-index 000000000000..5de2815ba99d
---- /dev/null
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
-@@ -0,0 +1,31 @@
-+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-+/*
-+ * Copyright (c) 2019 BayLibre, SAS
-+ * Author: Neil Armstrong <narmstrong@baylibre.com>
-+ */
-+
-+/dts-v1/;
-+
-+/* The Amlogic S922X Rev. C supports the same OPPs as the A311D variant */
-+#include "meson-g12b-a311d.dtsi"
-+#include "meson-g12b-odroid-n2.dtsi"
-+
-+/ {
-+	compatible = "hardkernel,odroid-n2-plus", "amlogic,s922x", "amlogic,g12b";
-+	model = "Hardkernel ODROID-N2Plus";
-+};
-+
-+&vddcpu_a {
-+	regulator-min-microvolt = <680000>;
-+	regulator-max-microvolt = <1040000>;
-+
-+	pwms = <&pwm_AO_cd 1 1500 0>;
-+};
-+
-+&vddcpu_b {
-+	regulator-min-microvolt = <680000>;
-+	regulator-max-microvolt = <1040000>;
-+
-+	pwms = <&pwm_AO_cd 1 1500 0>;
-+};
-+
--- 
-2.29.2
-

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

@@ -0,0 +1,42 @@
+From 0a70fbc9a556737d3f70a1a194ba7be280b007c5 Mon Sep 17 00:00:00 2001
+Message-Id: <0a70fbc9a556737d3f70a1a194ba7be280b007c5.1619725559.git.stefan@agner.ch>
+In-Reply-To: <cdfb8eea4103e537898073dc3f7bf8f75cec5efb.1619725559.git.stefan@agner.ch>
+References: <cdfb8eea4103e537898073dc3f7bf8f75cec5efb.1619725559.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Mon, 11 Jan 2021 11:20:48 +0100
+Subject: [PATCH 4/8] arm64: dts: meson: g12b: add power button support
+
+Add power button support on J2 pin 11 (GPIOX_3 on the SoC side). The
+GPIO is low active, e.g. when connecting with pin 9 (GND) a power
+button press is triggered.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 11 +++++++++++
+ 1 file changed, 11 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 41b2f9c96b5f..4b6bb7e74e25 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+@@ -39,6 +39,17 @@ emmc_pwrseq: emmc-pwrseq {
+ 		reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
+ 	};
+ 
++	gpio-keys-polled {
++		compatible = "gpio-keys-polled";
++		poll-interval = <100>;
++
++		power-button {
++			label = "power";
++			linux,code = <KEY_POWER>;
++			gpios = <&gpio GPIOX_3 GPIO_ACTIVE_LOW>;
++		};
++	};
++
+ 	leds {
+ 		compatible = "gpio-leds";
+ 
+-- 
+2.31.1
+

buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-odroid-n2-plus-fix-vddcpu_a-pwm.patch

@@ -1,42 +0,0 @@
-From 47f804dc970e2b1f71f1f032a0da2ef3b8315be0 Mon Sep 17 00:00:00 2001
-Message-Id: <47f804dc970e2b1f71f1f032a0da2ef3b8315be0.1606829302.git.stefan@agner.ch>
-In-Reply-To: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-References: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-From: Jerome Brunet <jbrunet@baylibre.com>
-Date: Fri, 23 Oct 2020 11:41:39 +0200
-Subject: [PATCH 4/7] arm64: dts: meson: odroid-n2 plus: fix vddcpu_a pwm
-
-On the odroid N2 plus, cpufreq is not available due to an error on the cpu
-regulators. vddcpu a and b get the same PWM. The one provided to vddcpu A
-is incorrect. Because vddcpu B PWM is busy the regulator cannot register:
-
-> pwm-regulator regulator-vddcpu-b: Failed to get PWM: -16
-
-Like on the odroid n2, use PWM A out of GPIOE_2 for vddcpu A to fix the
-problem
-
-Fixes: 98d24896ee11 ("arm64: dts: meson: add support for the ODROID-N2+")
-Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
-Acked-by: Neil Armstrong <narmstrong@baylibre.com>
-Signed-off-by: Kevin Hilman <khilman@baylibre.com>
-Link: https://lore.kernel.org/r/20201023094139.809379-1-jbrunet@baylibre.com
----
- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
-index 5de2815ba99d..ce1198ad34e4 100644
---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
-@@ -19,7 +19,7 @@ &vddcpu_a {
- 	regulator-min-microvolt = <680000>;
- 	regulator-max-microvolt = <1040000>;
- 
--	pwms = <&pwm_AO_cd 1 1500 0>;
-+	pwms = <&pwm_ab 0 1500 0>;
- };
- 
- &vddcpu_b {
--- 
-2.29.2
-

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

@@ -1,52 +0,0 @@
-From 2c15ad491233a80d61c811a944b86067e2e74686 Mon Sep 17 00:00:00 2001
-Message-Id: <2c15ad491233a80d61c811a944b86067e2e74686.1606829302.git.stefan@agner.ch>
-In-Reply-To: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-References: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Mon, 16 Nov 2020 23:11:02 +0100
-Subject: [PATCH 5/7] arm64: dts: meson: add RTC to ODROID-N2 boards
-
-All ODROID-N2 boards come with a NXP PCF8563TS RTC connected to I2C bus
-3. This is the RTC which is connected to the on-board RTC backup battery.
-Use it as primary RTC.
-
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi     | 14 ++++++++++++++
- 1 file changed, 14 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 6982632ae646..40390feba053 100644
---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-@@ -13,6 +13,8 @@ / {
- 	aliases {
- 		serial0 = &uart_AO;
- 		ethernet0 = &ethmac;
-+		rtc0 = &board_rtc;
-+		rtc1 = &vrtc;
- 	};
- 
- 	dioo2133: audio-amplifier-0 {
-@@ -471,6 +473,18 @@ hdmi_tx_tmds_out: endpoint {
- 	};
- };
- 
-+&i2c3 {
-+	status = "okay";
-+	pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
-+	pinctrl-names = "default";
-+	clock-frequency = <400000>;
-+
-+	board_rtc: rtc@51 {
-+		compatible = "nxp,pcf8563";
-+		reg = <0x51>;
-+	};
-+};
-+
- &ir {
- 	status = "okay";
- 	pinctrl-0 = <&remote_input_ao_pins>;
--- 
-2.29.2
-

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

@@ -0,0 +1,42 @@
+From 8a4a640d1b8dea977795de3f49b6ea3a791e401a Mon Sep 17 00:00:00 2001
+Message-Id: <8a4a640d1b8dea977795de3f49b6ea3a791e401a.1619725559.git.stefan@agner.ch>
+In-Reply-To: <cdfb8eea4103e537898073dc3f7bf8f75cec5efb.1619725559.git.stefan@agner.ch>
+References: <cdfb8eea4103e537898073dc3f7bf8f75cec5efb.1619725559.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Mon, 11 Jan 2021 11:38:54 +0100
+Subject: [PATCH 5/8] arm64: dts: meson: g12b: add GPIO fan support
+
+Add simple GPIO fan node to support a fan on GPIO J8. Unfortunately the
+pad used to control the fan does not support real PWM, hence the RPM
+cannot be modulated.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 11 +++++++++++
+ 1 file changed, 11 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 4b6bb7e74e25..e8a3ede698b5 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+@@ -39,6 +39,17 @@ emmc_pwrseq: emmc-pwrseq {
+ 		reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
+ 	};
+ 
++	/*
++	 * 5V 80x80x10.8mm cooling fan from Hardkernel shop.
++	 */
++	fan0: gpio-fan {
++		#cooling-cells = <2>;
++		compatible = "gpio-fan";
++		gpio-fan,speed-map = <0 0 1600 1>;
++		gpios = <&gpio_ao GPIOAO_10 GPIO_ACTIVE_HIGH>;
++		status = "okay";
++	};
++
+ 	gpio-keys-polled {
+ 		compatible = "gpio-keys-polled";
+ 		poll-interval = <100>;
+-- 
+2.31.1
+

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

@@ -0,0 +1,74 @@
+From eee30c74e72b6092b5e30c4744a4f1d7d9526403 Mon Sep 17 00:00:00 2001
+Message-Id: <eee30c74e72b6092b5e30c4744a4f1d7d9526403.1619725559.git.stefan@agner.ch>
+In-Reply-To: <cdfb8eea4103e537898073dc3f7bf8f75cec5efb.1619725559.git.stefan@agner.ch>
+References: <cdfb8eea4103e537898073dc3f7bf8f75cec5efb.1619725559.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Mon, 11 Jan 2021 15:53:55 +0100
+Subject: [PATCH 6/8] arm64: dts: meson: g12b: odroid-n2: add fan as cooling
+ device
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add the GPIO fan as a cooling device for the CPU thermal zone. Since we
+have only full fan speed available with this, set the tripping point to
+65°C which is the highest tripping point which Hardkernel used in their
+downstream kernel.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ .../dts/amlogic/meson-g12b-odroid-n2.dtsi     | 38 +++++++++++++++++++
+ 1 file changed, 38 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 e8a3ede698b5..dd345c6aa4b5 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+@@ -388,6 +388,44 @@ &clkc_audio {
+ 	status = "okay";
+ };
+ 
++&cpu_thermal {
++	trips {
++		cpu_warm: cpu_warm {
++			hysteresis = <5000>;
++			temperature = <65000>;
++			type = "active";
++		};
++	};
++
++	cooling-maps {
++		map0 {
++			cooling-device =
++				<&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
++			trip = <&cpu_warm>;
++		};
++		map1 {
++			trip = <&cpu_passive>;
++			cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++					 <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++					 <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++					 <&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++					 <&cpu102 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++					 <&cpu103 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++					 <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
++		};
++		map2 {
++			trip = <&cpu_hot>;
++			cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++					 <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++					 <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++					 <&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++					 <&cpu102 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++					 <&cpu103 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++					 <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
++		};
++	};
++};
++
+ &cpu0 {
+ 	cpu-supply = <&vddcpu_b>;
+ 	operating-points-v2 = <&cpu_opp_table_0>;
+-- 
+2.31.1
+

buildroot-external/board/hardkernel/patches/linux/0006-arm64-dts-meson-g12b-odroid-n2-fix-PHY-deassert-timi.patch

@@ -1,41 +0,0 @@
-From 35d2de7b27bc3f4bc2d977fb6b7671d9ba889496 Mon Sep 17 00:00:00 2001
-Message-Id: <35d2de7b27bc3f4bc2d977fb6b7671d9ba889496.1606829302.git.stefan@agner.ch>
-In-Reply-To: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-References: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Tue, 1 Dec 2020 00:32:23 +0100
-Subject: [PATCH 6/7] arm64: dts: meson: g12b: odroid-n2: fix PHY deassert
- timing requirements
-
-According to the datasheet (Rev. 1.9) the RTL8211F requires at least
-72ms "for internal circuits settling time" before accessing the PHY
-egisters. This fixes an issue where the Ethernet link doesn't come up
-when using ip link set down/up:
-  [   29.360965] meson8b-dwmac ff3f0000.ethernet eth0: Link is Down
-  [   34.569012] meson8b-dwmac ff3f0000.ethernet eth0: PHY [0.0:00] driver [RTL8211F Gigabit Ethernet] (irq=31)
-  [   34.676732] meson8b-dwmac ff3f0000.ethernet: Failed to reset the dma
-  [   34.678874] meson8b-dwmac ff3f0000.ethernet eth0: stmmac_hw_setup: DMA engine initialization failed
-  [   34.687850] meson8b-dwmac ff3f0000.ethernet eth0: stmmac_open: Hw setup failed
-
-Fixes: 658e4129bb81 ("arm64: dts: meson: g12b: odroid-n2: add the Ethernet PHY reset line")
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-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 40390feba053..445d90d25aa3 100644
---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-@@ -415,7 +415,7 @@ external_phy: ethernet-phy@0 {
- 		max-speed = <1000>;
- 
- 		reset-assert-us = <10000>;
--		reset-deassert-us = <30000>;
-+		reset-deassert-us = <80000>;
- 		reset-gpios = <&gpio GPIOZ_15 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;
- 
- 		interrupt-parent = <&gpio_intc>;
--- 
-2.29.2
-

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

@@ -0,0 +1,44 @@
+From b10ae8fd3bef195eda4a30bc5f3995ca13b6cffd Mon Sep 17 00:00:00 2001
+Message-Id: <b10ae8fd3bef195eda4a30bc5f3995ca13b6cffd.1619725559.git.stefan@agner.ch>
+In-Reply-To: <cdfb8eea4103e537898073dc3f7bf8f75cec5efb.1619725559.git.stefan@agner.ch>
+References: <cdfb8eea4103e537898073dc3f7bf8f75cec5efb.1619725559.git.stefan@agner.ch>
+From: Hyeonki Hong <hhk7734@gmail.com>
+Date: Fri, 27 Mar 2020 17:05:22 +0900
+Subject: [PATCH 7/8] arm64: dts: meson: add uart_A node
+
+The UART_A is available through J3 pin 8/10 and documented to be
+available as UART by default.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 7 +++++++
+ 1 file changed, 7 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 dd345c6aa4b5..cec346178e3d 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+@@ -12,6 +12,7 @@
+ / {
+ 	aliases {
+ 		serial0 = &uart_AO;
++		serial1 = &uart_A;
+ 		ethernet0 = &ethmac;
+ 		rtc0 = &rtc;
+ 		rtc1 = &vrtc;
+@@ -728,6 +729,12 @@ &toddr_c {
+ 	status = "okay";
+ };
+ 
++&uart_A {
++	status = "okay";
++	pinctrl-0 = <&uart_a_pins>;
++	pinctrl-names = "default";
++};
++
+ &uart_AO {
+ 	status = "okay";
+ 	pinctrl-0 = <&uart_ao_a_pins>;
+-- 
+2.31.1
+

buildroot-external/board/hardkernel/patches/linux/0007-arm64-dts-meson-fix-PHY-deassert-timing-requirements.patch

@@ -1,152 +0,0 @@
-From 40e8e7e28c44993e352195b359c4d4540bfb2105 Mon Sep 17 00:00:00 2001
-Message-Id: <40e8e7e28c44993e352195b359c4d4540bfb2105.1606829302.git.stefan@agner.ch>
-In-Reply-To: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-References: <9d2a2b44e67b0ef49e534c097e8b5e3e1173b033.1606829302.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Tue, 1 Dec 2020 00:32:23 +0100
-Subject: [PATCH 7/7] arm64: dts: meson: fix PHY deassert timing requirements
-
-According to the datasheet (Rev. 1.9) the RTL8211F requires at least
-72ms "for internal circuits settling time" before accessing the PHY
-egisters. This fixes an issue seen on ODROID-C2 where the Ethernet
-link doesn't come up when using ip link set down/up:
-  [ 6630.714855] meson8b-dwmac c9410000.ethernet eth0: Link is Down
-  [ 6630.785775] meson8b-dwmac c9410000.ethernet eth0: PHY [stmmac-0:00] driver [RTL8211F Gigabit Ethernet] (irq=36)
-  [ 6630.893071] meson8b-dwmac c9410000.ethernet: Failed to reset the dma
-  [ 6630.893800] meson8b-dwmac c9410000.ethernet eth0: stmmac_hw_setup: DMA engine initialization failed
-  [ 6630.902835] meson8b-dwmac c9410000.ethernet eth0: stmmac_open: Hw setup failed
-
-Fixes: f29cabf240ed ("arm64: dts: meson: use the generic Ethernet PHY reset GPIO bindings")
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts  | 2 +-
- arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts   | 2 +-
- arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi  | 2 +-
- arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi     | 2 +-
- arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts  | 2 +-
- arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 2 +-
- arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts   | 2 +-
- arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts        | 2 +-
- arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts    | 2 +-
- 9 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
-index 7be3e354093b..de27beafe9db 100644
---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
-@@ -165,7 +165,7 @@ eth_phy0: ethernet-phy@0 {
- 			reg = <0>;
- 
- 			reset-assert-us = <10000>;
--			reset-deassert-us = <30000>;
-+			reset-deassert-us = <80000>;
- 			reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
- 
- 			interrupt-parent = <&gpio_intc>;
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
-index 70fcfb7b0683..50de1d01e565 100644
---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
-@@ -200,7 +200,7 @@ eth_phy0: ethernet-phy@0 {
- 			reg = <0>;
- 
- 			reset-assert-us = <10000>;
--			reset-deassert-us = <30000>;
-+			reset-deassert-us = <80000>;
- 			reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
- 
- 			interrupt-parent = <&gpio_intc>;
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
-index 222ee8069cfa..9b0b81f191f1 100644
---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
-@@ -126,7 +126,7 @@ eth_phy0: ethernet-phy@0 {
- 			reg = <0>;
- 
- 			reset-assert-us = <10000>;
--			reset-deassert-us = <30000>;
-+			reset-deassert-us = <80000>;
- 			reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
- 
- 			interrupt-parent = <&gpio_intc>;
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
-index ad812854a107..a350fee1264d 100644
---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
-@@ -147,7 +147,7 @@ eth_phy0: ethernet-phy@0 {
- 			reg = <0>;
- 
- 			reset-assert-us = <10000>;
--			reset-deassert-us = <30000>;
-+			reset-deassert-us = <80000>;
- 			reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
- 
- 			interrupt-parent = <&gpio_intc>;
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
-index b08c4537f260..b2ab05c22090 100644
---- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
-@@ -82,7 +82,7 @@ external_phy: ethernet-phy@0 {
- 
- 		/* External PHY reset is shared with internal PHY Led signal */
- 		reset-assert-us = <10000>;
--		reset-deassert-us = <30000>;
-+		reset-deassert-us = <80000>;
- 		reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
- 
- 		interrupt-parent = <&gpio_intc>;
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
-index bff8ec2c1c70..e38d9e50caa7 100644
---- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
-@@ -194,7 +194,7 @@ external_phy: ethernet-phy@0 {
- 		reg = <0>;
- 
- 		reset-assert-us = <10000>;
--		reset-deassert-us = <30000>;
-+		reset-deassert-us = <80000>;
- 		reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
- 
- 		interrupt-parent = <&gpio_intc>;
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
-index 83eca3af44ce..dfa7a37a1281 100644
---- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
-@@ -112,7 +112,7 @@ external_phy: ethernet-phy@0 {
- 		max-speed = <1000>;
- 
- 		reset-assert-us = <10000>;
--		reset-deassert-us = <30000>;
-+		reset-deassert-us = <80000>;
- 		reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
- 	};
- };
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
-index ea45ae0c71b7..8edbfe040805 100644
---- a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
-@@ -64,7 +64,7 @@ external_phy: ethernet-phy@0 {
- 
- 		/* External PHY reset is shared with internal PHY Led signal */
- 		reset-assert-us = <10000>;
--		reset-deassert-us = <30000>;
-+		reset-deassert-us = <80000>;
- 		reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
- 
- 		interrupt-parent = <&gpio_intc>;
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
-index c89c9f846fb1..dde7cfe12cff 100644
---- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
-@@ -114,7 +114,7 @@ external_phy: ethernet-phy@0 {
- 		max-speed = <1000>;
- 
- 		reset-assert-us = <10000>;
--		reset-deassert-us = <30000>;
-+		reset-deassert-us = <80000>;
- 		reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
- 	};
- };
--- 
-2.29.2
-

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

@@ -0,0 +1,37 @@
+From aea42d4a9a307438bf7099aee38daedac2bd5044 Mon Sep 17 00:00:00 2001
+Message-Id: <aea42d4a9a307438bf7099aee38daedac2bd5044.1619725559.git.stefan@agner.ch>
+In-Reply-To: <cdfb8eea4103e537898073dc3f7bf8f75cec5efb.1619725559.git.stefan@agner.ch>
+References: <cdfb8eea4103e537898073dc3f7bf8f75cec5efb.1619725559.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Thu, 29 Apr 2021 21:32:43 +0200
+Subject: [PATCH 8/8] arm64: dts: meson: add i2c2 node to ODROID N2/N2+
+
+The J2 connectors pinout documents "I2C.SDA0/SCL0" on pin 3 and 5, which
+are connected to GPIOX_17/18. This GPIO allow to mux I2C to the second
+I2C instance. Enable i2c2 and use the appropriate pinmux.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 6 ++++++
+ 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 cec346178e3d..f1c3356c78a0 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+@@ -586,6 +586,12 @@ &ir {
+ 	linux,rc-map-name = "rc-odroid";
+ };
+ 
++&i2c2 {
++	status = "okay";
++	pinctrl-0 = <&i2c2_sda_x_pins>, <&i2c2_sck_x_pins>;
++	pinctrl-names = "default";
++};
++
+ &i2c3 {
+ 	status = "okay";
+ 	pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
+-- 
+2.31.1
+

buildroot-external/board/hardkernel/patches/linux/board-odroidc2-add-uartA-uartC.patch

@@ -0,0 +1,32 @@
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+index 1cc9dc6..9f48dff 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+@@ -16,6 +16,8 @@
+ 
+ 	aliases {
+ 		serial0 = &uart_AO;
++		serial1 = &uart_A;
++		serial2 = &uart_C;
+ 		ethernet0 = &ethmac;
+ 	};
+ 
+@@ -290,6 +355,18 @@
+ 	pinctrl-names = "default";
+ };
+ 
++&uart_A {
++	status = "disabled";
++	pinctrl-0 = <&uart_a_pins>;
++	pinctrl-names = "default";
++};
++
++&uart_C {
++	status = "disabled";
++	pinctrl-0 = <&uart_c_pins>;
++	pinctrl-names = "default";
++};
++
+ &usb0_phy {
+ 	status = "okay";
+ 	phy-supply = <&usb_otg_pwr>;

buildroot-external/board/hardkernel/patches/linux/general-meson64-i2cX-missing-pins.patch

@@ -0,0 +1,22 @@
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+index 98cbba6..48ca119 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+@@ -321,6 +322,8 @@
+ 
+ &i2c_A {
+ 	clocks = <&clkc CLKID_I2C>;
++	pinctrl-names = "default";
++	pinctrl-0 = <&i2c_a_pins>;
+ };
+ 
+ &i2c_AO {
+@@ -329,6 +332,8 @@
+ 
+ &i2c_B {
+ 	clocks = <&clkc CLKID_I2C>;
++	pinctrl-names = "default";
++	pinctrl-0 = <&i2c_b_pins>;
+ };
+ 
+ &i2c_C {

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

@@ -0,0 +1,41 @@
+From ca89096189299862a7b2b3123d96fc8bfbe74ce3 Mon Sep 17 00:00:00 2001
+From: Hyeonki Hong <hhk7734@gmail.com>
+Date: Tue, 14 Apr 2020 14:15:25 +0900
+Subject: [PATCH 13/74] ODROID-C4: arm64/dts: add uart_A node
+
+Change-Id: Ib66a03da2fcf39fc459c20c9f98b1baca34dcf5b
+---
+ arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
+index 1b749bd340ce..e5d73598c131 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
+@@ -14,8 +14,9 @@ / {
+ 	model = "Hardkernel ODROID-C4";
+ 
+ 	aliases {
+-		serial0 = &uart_AO;
+ 		ethernet0 = &ethmac;
++		serial0 = &uart_AO;
++		serial1 = &uart_A;
+ 	};
+ 
+ 	chosen {
+@@ -385,6 +386,12 @@ &sd_emmc_c {
+ 	vqmmc-supply = <&flash_1v8>;
+ };
+ 
++&uart_A {
++	status = "okay";
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart_a_pins>;
++};
++
+ &uart_AO {
+ 	status = "okay";
+ 	pinctrl-0 = <&uart_ao_a_pins>;
+-- 
+2.25.1
+

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

@@ -0,0 +1,85 @@
+From 400645dd70ae5a0efbbce35067c8674d380ed2a7 Mon Sep 17 00:00:00 2001
+From: Hyeonki Hong <hhk7734@gmail.com>
+Date: Wed, 13 May 2020 10:37:28 +0900
+Subject: [PATCH 21/74] ODROID-C4: arm64/dts: add i2c2, i2c3 node
+
+Change-Id: Id75f935111744ff6945791deefef20f897dc98ac
+(cherry picked from commit 3f4b2ffd0905946175c478baa65361695e78e0de)
+---
+ .../boot/dts/amlogic/meson-sm1-odroid-c4.dts  | 53 +++++++++++++++++++
+ 1 file changed, 53 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
+index 831053aa6dff..5988dc5f34d0 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
+@@ -16,6 +16,8 @@ / {
+ 
+ 	aliases {
+ 		ethernet0 = &ethmac;
++		i2c0 = &i2c2;
++		i2c1 = &i2c3;
+ 		serial0 = &uart_AO;
+ 		serial1 = &uart_A;
+ 		spi0 = &spicc0;
+@@ -434,6 +436,57 @@ &ir {
+ 	linux,rc-map-name = "rc-odroid";
+ };
+ 
++&i2c2 {
++	status = "okay";
++
++	/*
++	 * 40 Pin Header : SDA(GPIOX.17->3 Pin)
++	 *		   SCL(GPIOX.18->5 Pin)
++	 */
++	pinctrl-names = "default";
++	pinctrl-0 = <&i2c2_master_pins1>;
++
++	/* default 400k */
++	clock-frequency = <400000>;
++};
++
++&i2c3 {
++	/* default i2c clock-frequency is 100Khz */
++	status = "okay";
++
++	/*
++	 * 40 Pin Header : SDA(GPIOA.14->27 Pin)
++	 *		   SCL(GPIOA.15->28 Pin)
++	 */
++	pinctrl-names = "default";
++	pinctrl-0 = <&i2c3_master_pins2>;
++
++	/* default 100k */
++	clock-frequency = <100000>;
++};
++
++&periphs_pinctrl {
++	i2c2_master_pins1: i2c2-master-pins1 {
++		mux {
++			groups = "i2c2_sda_x",
++				"i2c2_sck_x";
++			function = "i2c2";
++			bias-pull-up;
++			drive-strength-microamp = <3000>;
++		};
++	};
++
++	i2c3_master_pins2: i2c3-master-pins2 {
++		mux {
++			groups = "i2c3_sda_a",
++				"i2c3_sck_a";
++			function = "i2c3";
++			bias-pull-up;
++			drive-strength-microamp = <3000>;
++		};
++	};
++};
++
+ &pwm_AO_cd {
+ 	pinctrl-0 = <&pwm_ao_d_e_pins>;
+ 	pinctrl-names = "default";
+-- 
+2.25.1
+

buildroot-external/board/hardkernel/patches/uboot/0001-ARM-meson-isolate-loading-of-socinfo.patch

@@ -1,51 +0,0 @@
-From 526ccae8321b9b48925c44999611c3c5a374328e Mon Sep 17 00:00:00 2001
-Message-Id: <526ccae8321b9b48925c44999611c3c5a374328e.1607542946.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Mon, 31 Aug 2020 13:40:18 +0200
-Subject: [PATCH 1/3] ARM: meson: isolate loading of socinfo
-
-Move loading of socinfo into a separate function so the value can be
-reused later.
-
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- arch/arm/mach-meson/board-info.c | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
-index 3abb27e03b..c585b12ca5 100644
---- a/arch/arm/mach-meson/board-info.c
-+++ b/arch/arm/mach-meson/board-info.c
-@@ -126,7 +126,7 @@ static void print_board_model(void)
- 	printf("Model: %s\n", model ? model : "Unknown");
- }
- 
--int show_board_info(void)
-+static unsigned int get_socinfo(void)
- {
- 	struct regmap *regmap;
- 	int nodeoffset, ret;
-@@ -158,8 +158,20 @@ int show_board_info(void)
- 		return 0;
- 	}
- 
-+	return socinfo;
-+}
-+
-+int show_board_info(void)
-+{
-+	unsigned int socinfo;
-+
- 	/* print board information */
- 	print_board_model();
-+
-+	socinfo = get_socinfo();
-+	if (!socinfo)
-+		return 0;
-+
- 	printf("SoC:   Amlogic Meson %s (%s) Revision %x:%x (%x:%x)\n",
- 	       socinfo_to_soc_id(socinfo),
- 	       socinfo_to_package_id(socinfo),
--- 
-2.29.2
-

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

@@ -1,10 +1,8 @@
-From 0077176ac369a1125c3fb22f7ba8e5d53576a1b3 Mon Sep 17 00:00:00 2001
-Message-Id: <0077176ac369a1125c3fb22f7ba8e5d53576a1b3.1607542946.git.stefan@agner.ch>
-In-Reply-To: <526ccae8321b9b48925c44999611c3c5a374328e.1607542946.git.stefan@agner.ch>
-References: <526ccae8321b9b48925c44999611c3c5a374328e.1607542946.git.stefan@agner.ch>
+From 8511fa06c13a9761e53ed72fe7111f5c3e3514a0 Mon Sep 17 00:00:00 2001
+Message-Id: <8511fa06c13a9761e53ed72fe7111f5c3e3514a0.1617731946.git.stefan@agner.ch>
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Mon, 2 Sep 2019 15:42:04 +0200
-Subject: [PATCH 3/3] HACK: mmc: meson-gx: limit to 24MHz
+Subject: [PATCH] HACK: mmc: meson-gx: limit to 24MHz
 
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
 ---
@@ -12,10 +10,10 @@ Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
-index 719dd1e5e5..dd3dd7c08c 100644
+index fcf4f03d1e..6ded4b619b 100644
 --- a/drivers/mmc/meson_gx_mmc.c
 +++ b/drivers/mmc/meson_gx_mmc.c
-@@ -265,7 +265,7 @@ static int meson_mmc_probe(struct udevice *dev)
+@@ -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);
@@ -25,5 +23,5 @@ index 719dd1e5e5..dd3dd7c08c 100644
  	cfg->name = dev->name;
  
 -- 
-2.29.2
+2.31.1
 

buildroot-external/board/hardkernel/patches/uboot/0002-arm64-dts-meson-odroidc2-readd-PHY-reset-properties.patch

@@ -0,0 +1,38 @@
+From e194459c7459a1c6f9d1183e05186d164f0c6715 Mon Sep 17 00:00:00 2001
+Message-Id: <e194459c7459a1c6f9d1183e05186d164f0c6715.1617807077.git.stefan@agner.ch>
+In-Reply-To: <8511fa06c13a9761e53ed72fe7111f5c3e3514a0.1617807077.git.stefan@agner.ch>
+References: <8511fa06c13a9761e53ed72fe7111f5c3e3514a0.1617807077.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Thu, 1 Apr 2021 14:33:57 +0200
+Subject: [PATCH 2/2] arm64: dts: meson: odroidc2: readd PHY reset properties
+
+The sync of the device tree and dt-bindings from Linux v5.6-rc2
+11a48a5a18c6 ("Linux 5.6-rc2") causes Ethernet to break on some
+ODROID-C2. The PHY seems to need proper reset timing to be functional
+in U-Boot and Linux afterwards. Readd the old PHY reset bindings for
+dwmac until we support the new bindings in the PHY node.
+
+Fixes: dd5f2351e99a ("arm64: dts: meson: sync dt and bindings from v5.6-rc2")
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ arch/arm/dts/meson-gxbb-odroidc2.dts | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/arch/arm/dts/meson-gxbb-odroidc2.dts b/arch/arm/dts/meson-gxbb-odroidc2.dts
+index 70fcfb7b06..8b80bbc90b 100644
+--- a/arch/arm/dts/meson-gxbb-odroidc2.dts
++++ b/arch/arm/dts/meson-gxbb-odroidc2.dts
+@@ -188,6 +188,10 @@
+ 	phy-handle = <&eth_phy0>;
+ 	phy-mode = "rgmii";
+ 
++	snps,reset-gpio = <&gpio GPIOZ_14 0>;
++	snps,reset-delays-us = <0 10000 1000000>;
++	snps,reset-active-low;
++
+ 	amlogic,tx-delay-ns = <2>;
+ 
+ 	mdio {
+-- 
+2.31.1
+

buildroot-external/board/hardkernel/patches/uboot/0002-meson-Add-board_rev-to-env.patch

@@ -1,82 +0,0 @@
-From 2b2ad8c105cbb5fb48c3c5f0512c031f6533d522 Mon Sep 17 00:00:00 2001
-Message-Id: <2b2ad8c105cbb5fb48c3c5f0512c031f6533d522.1607542946.git.stefan@agner.ch>
-In-Reply-To: <526ccae8321b9b48925c44999611c3c5a374328e.1607542946.git.stefan@agner.ch>
-References: <526ccae8321b9b48925c44999611c3c5a374328e.1607542946.git.stefan@agner.ch>
-From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Tue, 4 Aug 2020 13:50:57 +0000
-Subject: [PATCH 2/3] meson: Add board_rev to env
-
-Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- arch/arm/include/asm/arch-meson/boot.h |  4 ++++
- arch/arm/mach-meson/board-info.c       | 12 ++++++++++++
- board/amlogic/odroid-n2/odroid-n2.c    |  5 +++++
- 3 files changed, 21 insertions(+)
-
-diff --git a/arch/arm/include/asm/arch-meson/boot.h b/arch/arm/include/asm/arch-meson/boot.h
-index a90fe55081..c67d12d06c 100644
---- a/arch/arm/include/asm/arch-meson/boot.h
-+++ b/arch/arm/include/asm/arch-meson/boot.h
-@@ -7,6 +7,8 @@
- #ifndef __MESON_BOOT_H__
- #define __MESON_BOOT_H__
- 
-+#include <linux/types.h>
-+
- /* Boot device */
- #define BOOT_DEVICE_RESERVED    0
- #define BOOT_DEVICE_EMMC        1
-@@ -17,4 +19,6 @@
- 
- int meson_get_boot_device(void);
- 
-+int meson_get_soc_rev(char *buff, size_t buff_len);
-+
- #endif /* __MESON_BOOT_H__ */
-diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
-index c585b12ca5..9dbb997281 100644
---- a/arch/arm/mach-meson/board-info.c
-+++ b/arch/arm/mach-meson/board-info.c
-@@ -182,3 +182,15 @@ int show_board_info(void)
- 
- 	return 0;
- }
-+
-+int meson_get_soc_rev(char *buff, size_t buff_len)
-+{
-+	unsigned int socinfo;
-+
-+	socinfo = get_socinfo();
-+	if (!socinfo)
-+		return -1;
-+
-+	/* Write SoC info */
-+	return snprintf(buff, buff_len, "%x", socinfo_to_minor(socinfo));
-+}
-diff --git a/board/amlogic/odroid-n2/odroid-n2.c b/board/amlogic/odroid-n2/odroid-n2.c
-index caf7fd6810..c2a191ba6a 100644
---- a/board/amlogic/odroid-n2/odroid-n2.c
-+++ b/board/amlogic/odroid-n2/odroid-n2.c
-@@ -12,6 +12,7 @@
- #include <asm/io.h>
- #include <asm/arch/sm.h>
- #include <asm/arch/eth.h>
-+#include <asm/arch/boot.h>
- 
- #define EFUSE_MAC_OFFSET	20
- #define EFUSE_MAC_SIZE		12
-@@ -23,6 +24,10 @@ int misc_init_r(void)
- 	char efuse_mac_addr[EFUSE_MAC_SIZE], tmp[3];
- 	ssize_t len;
- 
-+	if (meson_get_soc_rev(tmp, sizeof(tmp)) > 0) {
-+		env_set("board_rev", tmp);
-+	}
-+
- 	meson_eth_init(PHY_INTERFACE_MODE_RGMII, 0);
- 
- 	if (!eth_env_get_enetaddr("ethaddr", mac_addr)) {
--- 
-2.29.2
-

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

@@ -7,6 +7,7 @@ CONFIG_BLK_DEV_NVME=y
 # CONFIG_E1000E is not set
 
 CONFIG_IGB=y
+CONFIG_IGC=m
 
 CONFIG_IWLWIFI=m
 CONFIG_IWLMVM=m
@@ -15,3 +16,10 @@ CONFIG_DRM_I915=m
 CONFIG_DRM_I915_CAPTURE_ERROR=y
 CONFIG_DRM_I915_COMPRESS_ERROR=y
 CONFIG_DRM_I915_USERPTR=y
+
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_ACPI=y
+CONFIG_MMC_SDHCI_PCI=y
+CONFIG_X86_INTEL_LPSS=y

buildroot-external/board/pc/generic-x86-64/meta

@@ -1,10 +1,10 @@
-BOARD_ID=intel-nuc
-BOARD_NAME="Intel NUC"
+BOARD_ID=generic-x86-64
+BOARD_NAME="Generic x86-64"
 CHASSIS=embedded
 BOOTLOADER=barebox
 KERNEL_FILE=bzImage
 BOOT_SYS=efi
 BOOT_SPL=false
 DISK_SIZE=6
-SUPERVISOR_MACHINE=intel-nuc
+SUPERVISOR_MACHINE=generic-x86-64
 SUPERVISOR_ARCH=amd64

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

@@ -22,9 +22,9 @@ function hassos_post_image() {
     # Virtual Disk images
     convert_disk_image_virtual
 
-    convert_disk_image_xz vmdk
-    convert_disk_image_xz vhdx
-    convert_disk_image_xz vdi
+    convert_disk_image_zip vmdk
+    convert_disk_image_zip vhdx
+    convert_disk_image_zip vdi
     convert_disk_image_xz qcow2
 
     # OVA

buildroot-external/board/pc/ova/home-assistant.ovf

@@ -5,7 +5,7 @@
   </References>
   <DiskSection>
     <Info>List of the virtual disks used in the package</Info>
-    <Disk ovf:capacity="6442450944" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:boot="True" vbox:uuid="5f042839-c478-43d9-9eb0-fd8a902146ec"/>
+    <Disk ovf:capacity="34359738368" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:boot="True" vbox:uuid="5f042839-c478-43d9-9eb0-fd8a902146ec"/>
   </DiskSection>
   <NetworkSection>
     <Info>Logical networks used in the package</Info>
@@ -21,7 +21,7 @@
       <Product>Home Assistant Operating System</Product>
       <ProductUrl>https://www.home-assistant.io</ProductUrl>
     </ProductSection>
-    <OperatingSystemSection ovf:id="100" vmw:osType="other4xLinux64Guest">
+    <OperatingSystemSection ovf:id="102" vmw:osType="otherGuest64">
       <Info>The kind of installed guest operating system</Info>
       <Description>Linux</Description>
     </OperatingSystemSection>

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

@@ -1,5 +1,10 @@
 CONFIG_EFI_STUB=y
 
+CONFIG_HOTPLUG_CPU=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+CONFIG_MEMORY_HOTREMOVE=y
+
 CONFIG_VMXNET3=y
 CONFIG_VMWARE_PVSCSI=y
 CONFIG_VMWARE_VMCI_VSOCKETS=y

buildroot-external/board/raspberrypi/boot-env.txt

@@ -2,7 +2,7 @@
 # http://rpf.io/configtxt
 # Some settings may impact device functionality. See link above for details
 
-# HassOS - don't change it!
+# HAOS - don't change it!
 disable_splash=1
 kernel=u-boot.bin
 
@@ -60,6 +60,12 @@ kernel=u-boot.bin
 # Uncomment this to enable the lirc-rpi module
 #dtoverlay=lirc-rpi
 
+# Uncomment this to enable GPIO support for RPI-RF-MOD/HM-MOD-RPI-PCB
+#enable_uart=1
+#dtparam=i2c_arm=on
+#dtoverlay=miniuart-bt
+#dtoverlay=rpi-rf-mod
+
 # Additional overlays and parameters are documented /boot/overlays/README
 
 # Enable audio (loads snd_bcm2835)

buildroot-external/board/raspberrypi/hassos-hook.sh

@@ -8,20 +8,14 @@ function hassos_pre_image() {
         "${BINARIES_DIR}/u-boot.bin" \
         "${BINARIES_DIR}/boot.scr"
     cp "${BINARIES_DIR}"/*.dtb "${BOOT_DATA}/"
-    cp -r "${BINARIES_DIR}/rpi-firmware/overlays" "${BOOT_DATA}/"
+    cp -r "${BINARIES_DIR}/rpi-firmware/"* "${BOOT_DATA}/"
     cp "${BOARD_DIR}/../boot-env.txt" "${BOOT_DATA}/config.txt"
+    cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/"
 
-    # Firmware
-    if [[ "${BOARD_ID}" =~ "rpi4" ]]; then
-        cp "${BINARIES_DIR}/rpi-firmware/fixup.dat" "${BOOT_DATA}/fixup4.dat" 
-        cp "${BINARIES_DIR}/rpi-firmware/start.elf" "${BOOT_DATA}/start4.elf" 
+    # EEPROM update for Raspberry Pi 4/Compute Module 4
+    if grep -Eq "^BR2_PACKAGE_RPI_EEPROM=y$" "${BR2_CONFIG}"; then
         cp "${BINARIES_DIR}/rpi-eeprom/pieeprom.sig" "${BOOT_DATA}/pieeprom.sig"
         cp "${BINARIES_DIR}/rpi-eeprom/pieeprom.upd" "${BOOT_DATA}/pieeprom.upd"
-    else
-        cp -t "${BOOT_DATA}" \
-            "${BINARIES_DIR}/rpi-firmware/fixup.dat" \
-            "${BINARIES_DIR}/rpi-firmware/start.elf" \
-            "${BINARIES_DIR}/rpi-firmware/bootcode.bin"
     fi
 
     # Set cmd options

buildroot-external/board/raspberrypi/kernel.config

@@ -1,2 +1,3 @@
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_AUTOFS_FS is not set
+# CONFIG_PGTABLE_MAPPING is not set

buildroot-external/board/raspberrypi/patches/linux/0001-ARM-dts-bcm283x-add-compatible-picked-up-by-U-Boot.patch

@@ -1,10 +1,8 @@
-From c18ca341da823bd2ec5aa04ea5970d3867eaae73 Mon Sep 17 00:00:00 2001
-Message-Id: <c18ca341da823bd2ec5aa04ea5970d3867eaae73.1605346684.git.stefan@agner.ch>
-In-Reply-To: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
-References: <3651b4af52d63d4e37f40c7a6d0809b0a6c9dd73.1605346684.git.stefan@agner.ch>
+From 2230740c7f74678ca80da55f74ccc24f5aa6bd35 Mon Sep 17 00:00:00 2001
+Message-Id: <2230740c7f74678ca80da55f74ccc24f5aa6bd35.1614676528.git.stefan@agner.ch>
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Tue, 2 Jun 2020 21:20:08 +0000
-Subject: [PATCH 8/8] ARM: dts: bcm283x: add compatible picked up by U-Boot
+Subject: [PATCH] ARM: dts: bcm283x: add compatible picked up by U-Boot
 
 Without brcm,bcm2835-pl011 in compatible U-Boot uses the regular PL011
 driver which seems to crash when enable_uart=1 is not used. Using
@@ -19,10 +17,10 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
-index 4f87bb4fd3d1..12f0d90e8957 100644
+index b4bca5af95e1..c31b87b5bb3a 100644
 --- a/arch/arm/boot/dts/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
-@@ -110,7 +110,7 @@
+@@ -127,7 +127,7 @@ rng@7e104000 {
  		};
  
  		uart2: serial@7e201400 {
@@ -31,7 +29,7 @@ index 4f87bb4fd3d1..12f0d90e8957 100644
  			reg = <0x7e201400 0x200>;
  			interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
  			clocks = <&clocks BCM2835_CLOCK_UART>,
-@@ -121,7 +121,7 @@
+@@ -138,7 +138,7 @@ uart2: serial@7e201400 {
  		};
  
  		uart3: serial@7e201600 {
@@ -40,7 +38,7 @@ index 4f87bb4fd3d1..12f0d90e8957 100644
  			reg = <0x7e201600 0x200>;
  			interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
  			clocks = <&clocks BCM2835_CLOCK_UART>,
-@@ -132,7 +132,7 @@
+@@ -149,7 +149,7 @@ uart3: serial@7e201600 {
  		};
  
  		uart4: serial@7e201800 {
@@ -49,7 +47,7 @@ index 4f87bb4fd3d1..12f0d90e8957 100644
  			reg = <0x7e201800 0x200>;
  			interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
  			clocks = <&clocks BCM2835_CLOCK_UART>,
-@@ -143,7 +143,7 @@
+@@ -160,7 +160,7 @@ uart4: serial@7e201800 {
  		};
  
  		uart5: serial@7e201a00 {
@@ -59,10 +57,10 @@ index 4f87bb4fd3d1..12f0d90e8957 100644
  			interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
  			clocks = <&clocks BCM2835_CLOCK_UART>,
 diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
-index 4426f9e6ba92..abcf677fe416 100644
+index 346838ee9d21..7f289fbca28c 100644
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
-@@ -306,7 +306,7 @@
+@@ -300,7 +300,7 @@ uart1_ctsrts_gpio42: uart1_ctsrts_gpio42 {
  		};
  
  		uart0: serial@7e201000 {
@@ -72,5 +70,5 @@ index 4426f9e6ba92..abcf677fe416 100644
  			interrupts = <2 25>;
  			clocks = <&clocks BCM2835_CLOCK_UART>,
 -- 
-2.29.2
+2.30.1