Merge pull request #157 from home-assistant/dev

Beta 2.1
2018-08-11 21:46:24 +02:00
3499 changed files with 1026294 additions and 67610 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,7 +1,3 @@
-# We don't need this folder because we map the hole folder
-buildroot/
-buildroot-external/
-buildroot-patches/
-
-# Ignore too
-release/
+buildroot
+buildroot-external
+buildroot-patches
--- a/.github/move.yml
+++ b/.github/move.yml
@@ -0,0 +1,13 @@
+# Configuration for move-issues - https://github.com/dessant/move-issues
+
+# Delete the command comment. Ignored when the comment also contains other content
+deleteCommand: true
+# Close the source issue after moving
+closeSourceIssue: true
+# Lock the source issue after moving
+lockSourceIssue: false
+# Set custom aliases for targets
+# aliases:
+#   r: repo
+#   or: owner/repo
+
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -1,15 +0,0 @@
-categories:
-  - title: 'HassOS Core'
-    label: 'os'
-  - title: 'Build'
-    label: 'build'
-  - title: 'Raspberry Pi'
-    label: 'board/raspberry'
-  - title: 'Open Virtual Appliance'
-    label: 'board/ova'
-  - title: 'Intel-Nuc'
-    label: 'board/intel-nuc'
-template: |
-  ## Changes
-
-  $CHANGES
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,17 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-# Label to use when marking an issue as stale
-staleLabel: wontfix
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
--- a/.hadolint.yaml
+++ b/.hadolint.yaml
@@ -1,2 +0,0 @@
-ignored:
-  - DL3008
--- a/10
+++ b/10
@@ -1,10 +1,7 @@
 FROM ubuntu:18.04

-# Set shell
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
 # Docker
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN apt-get update && apt-get install -y \
        apt-transport-https \
        ca-certificates \
        curl \
@@ -12,12 +9,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
    && rm -rf /var/lib/apt/lists/* \
    && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
    && add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
-    && apt-get update && apt-get install -y --no-install-recommends \
-        docker-ce \
+    && apt-get update && apt-get install -y docker-ce \
    && rm -rf /var/lib/apt/lists/*

 # Build Tools
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN apt-get update && apt-get install -y \
        wget patch vim cpio python unzip rsync bc bzip2 ncurses-dev \
        git make g++ file perl bash binutils locales qemu-utils bison flex \
    && rm -rf /var/lib/apt/lists/*
--- a/Documentation/bluetooth.md
+++ b/Documentation/bluetooth.md
@@ -1,9 +1,9 @@
 # Bluetooth

-We support `bluetoothctl` on host. Later we want also support Bluetooth trought UI.
+We support `bluetoothctl` on host. Later we want also support bluetooth trought UI.
 All pairs and settings are persistent over reboots and updates.

-If you want setup Bluetooth on host, use the `bluetoothctl` utility.
+If you want setup bluetooth on host, use the *bluetoothctl* utility.

 ## Scan devices

--- a/Documentation/boards/nuc.md
+++ b/Documentation/boards/nuc.md
@@ -1,50 +0,0 @@
-# Intel NUC
-
-This board configuration supports the Intel NUC mini PCs and compatibles. 
-Probably most recent computers will work.
-
-Requirements:
- x86-64 support
- UEFI boot
- SATA/AHCI storage
- Supported NIC:
-  - Intel Gigabit NIC (e1000, e1000e, igb)
-  - Realtek Gigabit NIC (r8169)
-  - Intel Wireless Wifi 802.11ac (iwlwifi, see below)
-
-## Tested Hardware
-
-| Device | Quirks | 
-|--------|-----------|
-| Intel NUC5CPYH |  |
-| Gigabyte GB-BPCE-3455 | needs 'nomodeset' in cmdline.txt if you want a console |
-
-
-## 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
-
--- a/Documentation/boards/odroid-c2.md
+++ b/Documentation/boards/odroid-c2.md
@@ -1,22 +0,0 @@
-# Odroid-C2
-
-## eMMC
-
-eMMC support is provided transparently. Just flash the image to the eMMC board as you would an SD card.
-
-## Console
-
-By default, console access is granted over the serial header and over HDMI. Certain startup messages will only appear on the serial console by default. To show the messages on the HDMI console instead, swap the order of the two consoles in the `cmdline.txt` file on the boot partition. You can also delete the AML0 console if you don't plan on using the serial adapter.
-eg. `console=ttyAML0,115200n8 console=tty0`
-
-## USB
-
-A long-standing kernel bug currently results in some odd behavior. To use the USB, a device must be plugged into one of the USB ports at hard boot. If all devices are removed from the USB ports, the USB will cease to function until a reboot.
-
-### OTG
-
-The OTG USB is untested.
-
-## GPIO
-
-Refer to [the odroid wiki](https://wiki.odroid.com/odroid-c2/hardware/expansion_connectors).
--- a/Documentation/boards/odroid-xu4.md
+++ b/Documentation/boards/odroid-xu4.md
@@ -1,27 +0,0 @@
-# Odroid-XU4
-
-## eMMC
-
-The Odroid XU4 has a hidden boot sector that is only visible on the Odroid itself (can't be written by a card reader). There are a couple possibilities:
-1) If the eMMC already had a working image before flashing HassOS:
-* It will be booting to uBoot (but no further). 
-    * If you have the serial adapter, you should be able to enter `distro_bootcmd` at the uboot prompt to continue booting.
-    * If not, flash the HassOS image to an SD card and boot off that temporarily (while the eMMC is also plugged in).
-* Once booted, login at the prompts and then enter `dd if=/dev/mmcblk0 of=/dev/mmcblk0boot0 bs=512 skip=63 seek=62 count=1440` at the linux prompt.
-* Reboot with eMMC (don't forget to flip the boot switch to eMMC)
-2) Clean/wiped/corruped boot sector:
-* You'll need to follow [Hardkernel's instructions](https://forum.odroid.com/viewtopic.php?f=53&t=6173) to get a working boot sector. Then flash HassOS and follow instructions above.
-* Alternatively, you can try flash HassOS to both an SD and eMMC, then boot off the SD with the eMMC also plugged in, then run `dd if=/dev/mmcblk1 of=/dev/mmcblk0boot0 bs=512 skip=1 seek=0 count=16381` at the Linux prompt. Note that this is untested, but in theory should work..
-
-If you are getting permissions issues when using the dd command, try disabling RO:
-`echo 0 > /sys/block/mmcblk0boot0/force_ro`
-to re-enable after running dd:
-`echo 1 > /sys/block/mmcblk0boot0/force_ro`
-## Console
-
-By default, console access is granted over the serial header and over HDMI. Certain startup messages will only appear on the serial console by default. To show the messages on the HDMI console instead, swap the order of the two consoles in the `cmdline.txt` file on the boot partition. You can also delete the SAC2 console if you don't plan on using the serial adapter.
-eg. `console=tty1 console=ttySAC2,115200`
-
-## GPIO
-
-Refer to [the odroid wiki](https://wiki.odroid.com/odroid-xu4/hardware/expansion_connectors).
--- a/Documentation/boards/orangepi.md
+++ b/Documentation/boards/orangepi.md
@@ -1,20 +0,0 @@
-# Raspberry PI
-
-Supported Hardware:
-
-| Device | Board | 
-|--------|-----------|
-| Orange Pi Prime | opi-prime |
-
-## Serial console
-
-The serial port on the Orange Pi Prime is a 3 pin header located between the
-power and reset buttons. The pins are labelled away from the board edge. Flow
-control must be disabled in order to send data. The serial specs are 3.3V TTL,
-115200,8,n,1
-
-## I2C
-
-Add `dtparam=i2c0=on` to `cmdline.txt`
-
-[config]: ../configuration.md#automatic
--- a/Documentation/boards/ova.md
+++ b/Documentation/boards/ova.md
@@ -1,7 +1,7 @@
 # OVA

-OVA stands for Open Virtual Appliance. Currently we had remove the ova files and publish a vmdk virtual disk,
-until we have better OVF template to generate our OVA. This VMDK work with (maybe you need convert the disk):
+The OVA stay for open virtual appliance. Currently we had remove the ova files and publish a vmdk virtual disk,
+until we have better OVF template to generate our OVA. This vmdk work with (maybe you need convert the disk):
 - HyperV
 - VirtualBox
 - VMware
--- a/Documentation/boards/raspberrypi.md
+++ b/Documentation/boards/raspberrypi.md
@@ -16,7 +16,7 @@ The 64bit version is under development by RPi-Team. It work very nice but it cou

 ## Serial console

-For access to terminal over serial console, add `console=ttyAMA0,115200` to `cmdline.txt` and `enable_uart=1`, `dtoverlay=pi3-disable-bt` into `config.txt`. GPIO pins are: 6 = GND / 8 = UART TXD / 10 = UART RXD.
+For access to terminal over serial console, add `console=ttyAMA0,115200` to `cmdline.txt` and `enable_uart=1` into `config.txt`. GPIO pins are: 6 = GND / 8 = UART TXD / 10 = UART RXD.

 ## I2C

--- a/Documentation/boards/tinker.md
+++ b/Documentation/boards/tinker.md
@@ -7,11 +7,11 @@ Supported Hardware:
 | Tinker RK3288 | tinker |
 | Tinker S RK3288 | tinker |

-## eMMC
+## EMMC

-eMMC support is provided transparently. Just flash the image to the eMMC by connecting your Tinker Board S to your PC via Micro-USB.
+Actual we support only SD cards. The support for EMMC will follow.

 ## Serial console

-To access the terminal over serial console, add `console=ttyS2,115200` to `cmdline.txt`. GPIO pins are: 34 = GND / 32 = UART TXD / 33 = UART RXD.
+For access to terminal over serial console, add `console=ttyS2,115200` to `cmdline.txt`. GPIO pins are: 34 = GND / 32 = UART TXD / 33 = UART RXD.

--- a/Documentation/configuration.md
+++ b/Documentation/configuration.md
@@ -2,26 +2,20 @@

 ## Automatic

-You can use an USB drive with HassOS to configure network options, SSH access to the host and to install updates.
-Format a USB stick with FAT32/EXT4/NTFS and name it `CONFIG`. Alternative you can create a `CONFIG` folder inside boot partition. Use the following directory structure within the USB drive:
+You can use a USB drive with HassOS to configure network options, ssh access to the host, and to install updates.
+Format a USB stick with FAT32/EXT4/NTFS and name it `CONFIG`. Use the following directory structure within the USB drive:

-```text
+```
 network/
 modules/
-modprobe/
-udev/
 authorized_keys
-timesyncd.conf
 hassos-xy.raucb
 ```

- The `network` folder can contain any kind of NetworkManager connection files. For more information see [Network][network.md].
+- The `network` folder can contain any kind of NetworkManager connection files. For more information see [Network][network.md]. 
 - The `modules` folder is for modules-load configuration files.
- The `modprobe` folder is for modules configuration files (/etc/modprobe.d)
- The `udev` folder is for udev rules files.
 - The `authorized_keys` file activates debug SSH access on port `22222`. See [Debugging Hassio][debug-hassio].
- The `timesyncd.conf` file allow you to set different NTP servers. HassOS won't boot without correct working time servers!
- The `hassos-*.raucb` file is a firmware OTA update which will be installed. These can be found on on the [release][hassos-release] page.
+- The `hassos-*.raucb` file is a firmware OTA update which will be installed. These can be found on on the [release][hassos-release] page. 

 You can put this USB stick into the device and it will be read on startup. You can also trigger this process later over the
 API/UI or by calling `systemctl restart hassos-config` on the host.
@@ -30,29 +24,15 @@ API/UI or by calling `systemctl restart hassos-config` on the host.

 ### Bootargs

-You can edit or create a `cmdline.txt` in your boot partition. That will be read from the bootloader.
+You can edit or create a `cmdline.txt` into your boot partition. That will be read from our bootloader.

 ### Kernel-Module

-The kernel module folder `/etc/modules-load.d` is persistent and you can add your configuration files there. See [Systemd modules load][systemd-modules]. You can add the modules configuration files in `/etc/modprobe.d` that is also persistent.
-
-### Udev rules
-
-The udev rules folder `/etc/udev/rules.d` is persistent and you can add your configuration files there.
+The kernel module folder `/etc/modules-load.d` is persistent and you can add your config files there. See [Systemd modules load][systemd-modules].

 ### Network

-You can manual add, edit or remove connections configurations from `/etc/NetworkManager/system-connections`.
-
-### NTP
-
-You can manual edit the systemd timesync file on `/etc/systemd/timesyncd.conf`.
-Our default ntp configuration look like:
-```
-[Time]
-NTP=time1.google.com time2.google.com time3.google.com
-FallbackNTP=0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org
-```
+You can manual add, edit or remove connections configs from `/etc/NetworkManager/system-connections`.

 [systemd-modules]: https://www.freedesktop.org/software/systemd/man/modules-load.d.html
 [network.md]: network.md
--- a/Documentation/deployment.md
+++ b/Documentation/deployment.md
@@ -1,21 +1,26 @@
 # Deployment

-We provide 3 different types of release builds:
-
+We know 3 types of release builds:
 - development (beta/dev)
 - staging (rc)
 - production (stable)

 ## Versioning
-
 The format of version is *MAJOR.BUILD*. Everytime we create a new release with same userland, we bump the build number.
-The development number they will be bump for the stable release version and the development version go to next major number.
+The development use here own major number they will be bump for the stable version and the development version go to next major number.

-## Git branch/Tag
+```
+0.x = development
+1.x = stable
+2.x = development
+3.x = stable
+```

-The branch `dev` ist the actual development branch and from there we never make a release. The `master` branch contains the development version and from there we build a beta release.
+## GIT Branch/Tag
+The branch `dev` ist the actual development branch and from there we never make a release. The `master` branch hould the development
+version from they we build a beta release.

-If we create a new staging/productive release, we create a new branch `rel-{MAJOR}`. They will be used for the whole cycle of this release.
+If we create a new staging/productive release, we create a new branch `rel-{MAJOR}`. They will be used for the hole cycle of this release.

 ## Upload release files

--- a/Documentation/development.md
+++ b/Documentation/development.md
@@ -1,24 +0,0 @@
-# Development
-
-## Boot system
-
-`BOOT_SYS`:
- efi
- hyprid
- spl
- mbr
-
-HassOS is basicly used GPT. But for use GPT we need own the first 1024 of
-boot drive. Is that not possible, you can use MBR for your device, they work also with SPLs.
-
-Hyprid and SPL use both a hyprid MBR/GPT table but SPL move the GPT header 8MB for give space to write SPL and boot images before.
-
-`BOOTLOADER`:
- uboot
- barebox
-
-We support mainly uboot but for uefi system we can also use barebox. In future we hope to remove barebox with uboot also on uefi.
-
-`DISK_SIZE`:
-Default 2. That is the size of end image in GB.
-
--- a/Documentation/getting_started_development.md
+++ b/Documentation/getting_started_development.md
@@ -1,106 +0,0 @@
-Getting started with Hassos development using Docker on GNU/Linux
-=================================================================
-
-First, install **docker** for your distribution - I'd advise to use your distro's provided packages, since that will make sure permissions et al. are sanely set up for what you are about to run. You're also expected to have your current user properly set up in in your sudoers policy, so that this account may elevate to root and execute arbitrary commands as UID 0 (this is required, since at some point during the build process, a new loopback device-backed filesystem image will be mounted inside a docker container - which requires a "privileged" container to run, which can only be done as root).
-
-Next, make sure the docker daemon is running:
-
-```
-$ sudo systemctl status docker
-● docker.service - Docker Application Container Engine
-   Loaded: loaded (/usr/lib/systemd/system/docker.service; disabled; vendor preset: disabled)
-   Active: inactive (dead)
-     Docs: https://docs.docker.com
-```
-
-My desktop distro doesn't start newly installed services by default, which means I'll have to manually fire up the `docker` service:
-
-```
-$ sudo systemctl start docker
-$ sudo systemctl --no-pager status docker -n0
-● docker.service - Docker Application Container Engine
-   Loaded: loaded (/usr/lib/systemd/system/docker.service; disabled; vendor preset: disabled)
-   Active: active (running) since Wed 2018-10-10 21:08:23 CEST; 25s ago
-     Docs: https://docs.docker.com
- Main PID: 1531 (dockerd)
-    Tasks: 27 (limit: 4915)
-   Memory: 163.4M
-   CGroup: /system.slice/docker.service
-           ├─1531 /usr/bin/dockerd -H fd://
-           └─1539 docker-containerd --config /var/run/docker/containerd/containerd.toml
-```
-
-Now, change your working directory to your hassos repo checkout (please adapt pathnames as needed), make sure your intended changes to the source tree are applied (and committed, ideally :)), and execute the `enter.sh` helper script:
-
-```
-$ cd ~/codebase/hassos/
-$ sudo scripts/enter.sh
-Sending build context to Docker daemon  30.48MB
-Step 1/6 : FROM ubuntu:18.04
-[...]
- ---> 4dc25a21556b
-Successfully built 4dc25a21556b
-Successfully tagged hassbuildroot:latest
-```
-
-Note that the current iteration of `enter.sh` will try to load the **overlayfs** kernel module, which is not strictly required for docker's operation, as far as I can tell. It's OK if loading that module fails; the shell script will continue executing. If everything works out, you will find yourself in an interactive login shell inside your docker container/build environment, where you can peek around:
-
-```
-root@somehashinhex:/build#
-root@somehashinhex:/build# make help
-[...]
-```
-
-The _hassos_ developers provide a Makefile that will build hassos images for a (rather long!) list of targets. For example run the command below to start building the _ova_ variant, and go make a cup of tea. Or fifteen.
-
-```
-root@0db6f7079872:/build# make ova
-[...]
-```
-
-That will result in a single VMDK image file at the very end of the build process. This image file is a compressed block device dump with a proper GPT partition table, prepared to ship into any OVA-compatible hypervisor's innards. For me, the end of the **ova** build steps looks like this:
-
-```
-[...]
-2097152+0 records out
-1073741824 bytes (1.1 GB, 1.0 GiB) copied, 12.2145 s, 87.9 MB/s
-make: Leaving directory '/build/buildroot'
-make: Entering directory '/build/buildroot'
-rm -rf /build/buildroot/output/target /build/buildroot/output/images /build/buildroot/output/host  \
-	/build/buildroot/output/build /build/buildroot/output/staging \
-	/build/buildroot/output/legal-info /build/buildroot/output/graphs
-make: Leaving directory '/build/buildroot'
-```
-
-The artifacts you just built are placed in the `target/` subdirectory:
-
-```
-root@fd292c061896:/build# ls -lh release/
-total 141M
-rw-r--r-- 1 root root 141M Oct 10 20:22 hassos_ova-2.2.vmdk.gz
-```
-
-In order to be able to use this image file with the **qemu** hypervisor, you'll need to unpack it, and convert it to an image format that qemu can work with. Conveniently, the _hassos_ buildenv already provides all the tools we need for this conversion:
-
-```
-root@fd292c061896:/build# gunzip release/hassos_ova-2.2.vmdk.gz
-root@fd292c061896:/build# qemu-img convert -O qcow2 release/hassos_ova-2.2.vmdk release/hassos_ova-2.2.qcow2
-root@fd292c061896:/build# ls -lh release/
-total 673M
-rw-r--r-- 1 root root 337M Oct 10 20:25 hassos_ova-2.2.qcow2
-rw-r--r-- 1 root root 337M Oct 10 20:22 hassos_ova-2.2.vmdk
-```
-
-Now, exit the docker container's environment, and find the build artifacts in the `releases/` directory beneath your repository checkout dir. (The generated files will be owned by _root_; make sure to `chown` them to your user account, if needed.)
-
-From there, qemu can try to boot it. Since the generated image assumes UEFI support in the host/hypervisor, this is slightly more tricky than with "classic"(/legacy) MBR-based images. On the *Debian* host I use to run my qemu virtual machine on, you'll need to install the **ovmf** package, which is described as providing "UEFI firmware for 64-bit x86 virtual machines". That package will install a _TianoCore_-derived qemu UEFI image build at `/usr/share/OVMF/OVMF_CODE.fd`, which we'll use with qemu to boot the generated qcow2 image. (Please adapt pathnames as necessary, for example if you have installed the ovmf firmware image at another location.)
-
-```
-$ /usr/bin/qemu-system-x86_64 -enable-kvm -name hassos_ova -smp 2 -m 1024 -drive file=release/hassos_ova-2.2.qcow2,index=0,media=disk,if=ide,cache=none,format=qcow2 -drive file=/usr/share/ovmf/x64/OVMF_CODE.fd,if=pflash,format=raw,readonly=on
-```
-
-This should pop up qemu's SDL frontend, displaying _hassos_' VT/CLI environment. Specifying addtional options and flags to qemu for network access, keyboard layout et al. are left as an exercise for the reader.
-
-After the boot process has finished, you can log in to _hassos_ without a password, providing *root* as the username. From there, executing `login` on the *hassio>* shell prompt will yield a root shell in the host OS.
-
-Happy hacking! :)
--- a/Documentation/kernel.md
+++ b/Documentation/kernel.md
@@ -3,10 +3,5 @@

 | Board | Version |
 |-------|---------|
-| Open Virtual Applicance | 4.19.20 |
-| Raspberry Pi | 4.14.98 |
-| Tinker Board | 4.19.20 |
-| Odroid-C2 | 4.19.15 |
-| Odroid-XU4 | 4.19.15 |
-| Orangepi-Prime | 4.19.13 |
-| Intel NUC | 4.14.82 |
+| Open Virtual Applicance | 4.14.59 |
+| Raspberry Pi | 4.14.58 |
--- a/Documentation/network.md
+++ b/Documentation/network.md
@@ -1,16 +1,15 @@
 # Network

-HassOS uses NetworkManager to control the host network. In future releases, you will be able to set up the configuration using the API/UI. Currently 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].
+HassOS uses NetworkManager to control the host network. In future releases, you will be able to set up the configuration using the API/UI. Currently only 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 as described in [Configuration][configuration-usb].

 ## Configuration Examples

-You can read the [Official Manual][keyfile] or find many configuration examples across the internet. The system is read-only, if you don't want the IP address to change on every boot, you should set the UUID property with a generic [UUID4][uuid]. Inside `\CONFIG\network\` on the USB or SD, create a file called `my-network` and add the appropriate contents below:
+You can also read the [Official Manual][keyfile] or there are a lot of examples accross internet. The system is read only, if you don't want the IP address to change every boot, you should set the uuid property with a generic [UUID4][uuid]. Inside the `network` folder create the file `my-network` and add the appropriate contents below:

 ### Default

 We have a preinstalled connection profile:
-
-```ini
+```
 [connection]
 id=HassOS default
 uuid=f62bf7c2-e565-49ff-bbfc-a4cf791e6add
@@ -25,7 +24,6 @@ method=auto
 ```

 ### LAN
-
 ```ini
 [connection]
 id=hassos-network
@@ -41,7 +39,6 @@ method=auto
 ```

 ### Wireless WPA/PSK
-
 ```ini
 [connection]
 id=hassos-network
@@ -51,13 +48,11 @@ type=802-11-wireless
 [802-11-wireless]
 mode=infrastructure
 ssid=MY_SSID
-# Uncomment below if your SSID is not broadcasted
-#hidden=true

 [802-11-wireless-security]
 auth-alg=open
 key-mgmt=wpa-psk
-psk=MY_WLAN_SECRET_KEY
+psk=MY_WLAN_SECRED_KEY

 [ipv4]
 method=auto
@@ -69,22 +64,19 @@ method=auto

 ### Static IP

-Replace the following configuration:
-
+Replace follow configs:
 ```ini
 [ipv4]
 method=manual
-address=192.168.1.111/24,192.168.1.1
+address1=192.168.1.111/24,192.168.1.1
 dns=8.8.8.8;8.8.4.4;
 ```
-For address, the value before the comma is the IP address and subnet prefix bitlength; the second value is the IP address of the gateway.

 ## Tips

 ### 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 reset the network configuration to default, use follow commands on host:
 ```bash
 $ rm /etc/NetworkManager/system-connections/*
 $ cp /usr/share/system-connections/* /etc/NetworkManager/system-connections/
@@ -94,50 +86,11 @@ $ nmcli con reload
 ### Powersave

 If you have trouble with powersave you can do following:
-
 ```ini
 [wifi]
 # Values are 0 (use default), 1 (ignore/don't touch), 2 (disable) or 3 (enable).
 powersave=0
 ```
-## Using nmcli to set a static IPV4 address
-
-Log into the HASSOS base system via a console:
-
-```
-Welcome to HassOS
-Hassio login:
-```
-Login as `root` (no password needed)
-
-At the `hassio >` prompt, type `login` (as instructed).
-
-From here you will use the `nmcli` configuration tool.
-
-`# nmcli connection show` will list the “HassOS default” connection in use.
-
-`# nmcli con show "HassOS default"` will list all the properties of the connection.
-
-`# nmcli con edit "HassOS default"` will put you in a position to edit the connection.
-
-`nmcli> print ipv4` will show you the ipv4 properties of this connection.
-
-To add your static IP address (select 'yes' for manual method);
-```
-nmcli> set ipv4.addresses 192.168.100.10/24
-Do you also want to set 'ipv4.method' to 'manual'? [yes]:
-```
-In addition I have found it is wise to set the dns server and the local gateway.  For most home routers these will be the same address.  If you are using Pi-Hole you can set the dns to that.
-```
-nmcli> set ipv4.dns 192.168.100.1
-nmcli> set ipv4.gateway 192.168.100.1
-nmcli> save
-nmcli> quit
-```
-
-If you now view the default connection `cat /etc/NetworkManager/system-connections/default` you should see the method is manual and the address is set.
-
-Doing a `nmcli con reload` does not always work so restart the VM.

 [keyfile]: https://developer.gnome.org/NetworkManager/stable/nm-settings.html
 [configuration-usb]: configuration.md
--- a/43
+++ b/43
@@ -1,43 +0,0 @@
-RELEASE_DIR = /build/release
-
-BUILDROOT=/build/buildroot
-BUILDROOT_EXTERNAL=/build/buildroot-external
-DEFCONFIG_DIR = $(BUILDROOT_EXTERNAL)/configs
-
-TARGETS := $(notdir $(patsubst %_defconfig,%,$(wildcard $(DEFCONFIG_DIR)/*_defconfig)))
-TARGETS_CONFIG := $(notdir $(patsubst %_defconfig,%-config,$(wildcard $(DEFCONFIG_DIR)/*_defconfig)))
-
-.NOTPARALLEL: $(TARGETS) $(TARGETS_CONFIG) all
-
-.PHONY: $(TARGETS) $(TARGETS_CONFIG) all clean help
-
-all: $(TARGETS)
-
-$(RELEASE_DIR):
-	mkdir -p $(RELEASE_DIR)
-
-$(TARGETS_CONFIG): %-config:
-	@echo "config $*"
-	$(MAKE) -C $(BUILDROOT) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) "$*_defconfig"
-
-$(TARGETS): %: $(RELEASE_DIR) %-config
-	@echo "build $@"
-	$(MAKE) -C $(BUILDROOT) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL)
-	cp -f $(BUILDROOT)/output/images/hassos_* $(RELEASE_DIR)/
-
-	# Do not clean when building for one target
-ifneq ($(words $(filter $(TARGETS),$(MAKECMDGOALS))), 1)
-	@echo "clean $@"
-	$(MAKE) -C $(BUILDROOT) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) clean
-endif
-	@echo "finished $@"
-
-clean:
-	$(MAKE) -C $(BUILDROOT) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) clean
-
-help:
-	@echo "Supported targets: $(TARGETS)"
-	@echo "Run 'make <target>' to build a target image."
-	@echo "Run 'make all' to build all target images."
-	@echo "Run 'make clean' to clean the build output."
-	@echo "Run 'make <target>-config' to configure buildroot for a target."
--- a/README.md
+++ b/README.md
@@ -3,11 +3,12 @@ Hass.io OS based on [buildroot](https://buildroot.org/). It's a hypervisor for D

 ## Focus

+- Linux kernel 4.14 (LT)
 - Barebox as bootloader on EFI
 - U-Boot as bootloader on IoT
 - RAUC for OTA updates
 - SquashFS LZ4 as filesystem
- Docker 18.09.0
+- Docker 18.03.1
 - AppArmor protected
 - ZRAM LZ4 for /tmp, /var, swap
 - Run every supervisor
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,52 +0,0 @@
-# https://dev.azure.com/home-assistant
-
-trigger:
-  batch: true
-  branches:
-    include:
-    - dev
-  tags:
-    include:
-    - '*'
-    exclude:
-    - untagged*
-pr:
- dev
-
-variables:
-  - name: versionHadolint
-    value: 'v1.16.3'
-  - name: versionShellCheck
-    value: 'v0.6.0'
-
-jobs:
-
- job: 'Hadolint'
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - script: sudo docker pull hadolint/hadolint:$(versionHadolint)
-    displayName: 'Install Hadolint'
-  - script: |
-      sudo docker run --rm -i \
-        -v $(pwd)/.hadolint.yaml:/.hadolint.yaml:ro \
-        hadolint/hadolint:$(versionHadolint) < Dockerfile
-    displayName: 'Run Hadolint'
-
-
- job: 'ShellCheck'
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - script: sudo docker pull koalaman/shellcheck:$(versionShellCheck)
-    displayName: 'Install ShellCheck'
-  - script: |
-      sudo docker run --rm -i \
-        -v $(pwd):/mnt:ro koalaman/shellcheck:$(versionShellCheck) \
-          scripts/*.sh \
-          buildroot-external/scripts/*.sh \
-          buildroot-external/board/**/*.sh \
-          buildroot-external/rootfs-overlay/usr/sbin/* \
-          buildroot-external/rootfs-overlay/usr/libexec/* \
-          buildroot-external/rootfs-overlay/usr/lib/rauc/*
-    displayName: 'Run ShellCheck'
--- a/buildroot-external/Config.in
+++ b/buildroot-external/Config.in
@@ -3,4 +3,3 @@ source "$BR2_EXTERNAL_HASSOS_PATH/package/libapparmor/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/apparmor/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-bcm43xx/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-rtl8723/Config.in"
-source "$BR2_EXTERNAL_HASSOS_PATH/package/hardkernel-boot/Config.in"
--- a/buildroot-external/board/asus/hassos-hook.sh
+++ b/buildroot-external/board/asus/hassos-hook.sh
@@ -1,28 +0,0 @@
-#!/bin/bash
-# shellcheck disable=SC2155
-
-function hassos_pre_image() {
-    local BOOT_DATA="$(path_boot_dir)"
-    local SPL_IMG="$(path_spl_img)"
-
-    cp -t "${BOOT_DATA}" \
-        "${BINARIES_DIR}/boot.scr" \
-        "${BINARIES_DIR}/rk3288-tinker.dtb"
-
-    echo "console=tty1" > "${BOOT_DATA}/cmdline.txt"
-
-    # Create boot binary
-    rm -f "${BINARIES_DIR}/u-boot-spl-dtb.img"
-    mkimage -n rk3288 -T rksd -d "${BINARIES_DIR}/u-boot-spl-dtb.bin" "${BINARIES_DIR}/u-boot-spl-dtb.img"
-    cat "${BINARIES_DIR}/u-boot-dtb.bin" >> "${BINARIES_DIR}/u-boot-spl-dtb.img"
-
-    # SPL
-    create_spl_image
-
-    dd if="${BINARIES_DIR}/u-boot-spl-dtb.img" of="${SPL_IMG}" conv=notrunc bs=512 seek=64
-}
-
-
-function hassos_post_image() {
-    convert_disk_image_gz
-}
--- a/buildroot-external/board/asus/tinker/kernel.config
+++ b/buildroot-external/board/asus/tinker/kernel.config
--- a/buildroot-external/board/asus/tinker/patches/README.md
+++ b/buildroot-external/board/asus/tinker/patches/README.md
@@ -1,5 +0,0 @@
-## Kernel
-https://github.com/armbian/build/tree/master/patch/kernel/rockchip-next
-
-## u-boot
-https://github.com/armbian/build/tree/master/patch/u-boot/u-boot-rockchip/board_tinkerboard
--- a/buildroot-external/board/asus/tinker/patches/linux/0006-gpu-arm-Midgard-setup_timer-timer_setup.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0006-gpu-arm-Midgard-setup_timer-timer_setup.patch
@@ -1,98 +0,0 @@
-From ee7f0a678fff8316ec0be973f1b3780a63f50942 Mon Sep 17 00:00:00 2001
-From: Myy Miouyouyou <myy@miouyouyou.fr>
-Date: Mon, 11 Dec 2017 21:04:56 +0100
-Subject: [PATCH] gpu: arm: Midgard: setup_timer() -> timer_setup()
-
-This patch is due the changes provoked by series of commit ending
-at 513ae785c63c30741e46f43960213d4ae5382ec0, and removing the
-setup_timer macros.
-The previous patches replaced made sure that timers were all set
-up with setup_timer and replaced setup_timer calls by timer_setup
-calls.
-
-This changed was introduced in the 4.15-rc1.
-
-Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
---
- drivers/gpu/arm/midgard/mali_kbase.h          | 2 +-
- drivers/gpu/arm/midgard/mali_kbase_context.c  | 4 ++--
- drivers/gpu/arm/midgard/mali_kbase_softjobs.c | 4 ++--
- drivers/gpu/arm/midgard/mali_kbase_tlstream.c | 6 ++----
- 4 files changed, 7 insertions(+), 9 deletions(-)
-
-diff --git a/drivers/gpu/arm/midgard/mali_kbase.h b/drivers/gpu/arm/midgard/mali_kbase.h
-index a4ceab9e0..27bde3b71 100644
--- a/drivers/gpu/arm/midgard/mali_kbase.h
-+++ b/drivers/gpu/arm/midgard/mali_kbase.h
-@@ -213,7 +213,7 @@ int kbase_soft_event_update(struct kbase_context *kctx,
- 
- bool kbase_replay_process(struct kbase_jd_atom *katom);
- 
-void kbasep_soft_job_timeout_worker(unsigned long data);
-+void kbasep_soft_job_timeout_worker(struct timer_list *t);
- void kbasep_complete_triggered_soft_events(struct kbase_context *kctx, u64 evt);
- 
- /* api used internally for register access. Contains validation and tracing */
-diff --git a/drivers/gpu/arm/midgard/mali_kbase_context.c b/drivers/gpu/arm/midgard/mali_kbase_context.c
-index f43db48fd..589df768c 100644
--- a/drivers/gpu/arm/midgard/mali_kbase_context.c
-+++ b/drivers/gpu/arm/midgard/mali_kbase_context.c
-@@ -165,9 +165,9 @@ kbase_create_context(struct kbase_device *kbdev, bool is_compat)
- 
- 	mutex_init(&kctx->vinstr_cli_lock);
- 
-	setup_timer(&kctx->soft_job_timeout,
-+	timer_setup(&kctx->soft_job_timeout,
- 		    kbasep_soft_job_timeout_worker,
-		    (uintptr_t)kctx);
-+		    0);
- 
- 	return kctx;
- 
-diff --git a/drivers/gpu/arm/midgard/mali_kbase_softjobs.c b/drivers/gpu/arm/midgard/mali_kbase_softjobs.c
-index 127ada07f..019edf562 100644
--- a/drivers/gpu/arm/midgard/mali_kbase_softjobs.c
-+++ b/drivers/gpu/arm/midgard/mali_kbase_softjobs.c
-@@ -370,9 +370,9 @@ static void kbase_fence_debug_timeout(struct kbase_jd_atom *katom)
- }
- #endif /* CONFIG_MALI_FENCE_DEBUG */
- 
-void kbasep_soft_job_timeout_worker(unsigned long data)
-+void kbasep_soft_job_timeout_worker(struct timer_list *t)
- {
-	struct kbase_context *kctx = (struct kbase_context *)data;
-+	struct kbase_context *kctx = from_timer(kctx, t, soft_job_timeout);
- 	u32 timeout_ms = (u32)atomic_read(
- 			&kctx->kbdev->js_data.soft_job_timeout_ms);
- 	struct timer_list *timer = &kctx->soft_job_timeout;
-diff --git a/drivers/gpu/arm/midgard/mali_kbase_tlstream.c b/drivers/gpu/arm/midgard/mali_kbase_tlstream.c
-index d01aa23b2..11d8b59c7 100644
--- a/drivers/gpu/arm/midgard/mali_kbase_tlstream.c
-+++ b/drivers/gpu/arm/midgard/mali_kbase_tlstream.c
-@@ -1042,13 +1042,11 @@ static void kbasep_tlstream_flush_stream(enum tl_stream_type stype)
-  * Timer is executed periodically to check if any of the stream contains
-  * buffer ready to be submitted to user space.
-  */
-static void kbasep_tlstream_autoflush_timer_callback(unsigned long data)
-+static void kbasep_tlstream_autoflush_timer_callback(struct timer_list *unused)
- {
- 	enum tl_stream_type stype;
- 	int                 rcode;
- 
-	CSTD_UNUSED(data);
-
- 	for (stype = 0; stype < TL_STREAM_TYPE_COUNT; stype++) {
- 		struct tl_stream *stream = tl_stream[stype];
- 		unsigned long    flags;
-@@ -1371,7 +1369,7 @@ int kbase_tlstream_init(void)
- 
- 	/* Initialize autoflush timer. */
- 	atomic_set(&autoflush_timer_active, 0);
-	setup_timer(&autoflush_timer,
-+	timer_setup(&autoflush_timer,
- 			kbasep_tlstream_autoflush_timer_callback,
- 			0);
- 
-- 
-2.14.1
-
--- a/buildroot-external/board/asus/tinker/patches/linux/0007-drivers-gpu-Arm-Midgard-Replace-ACCESS_ONCE-by-READ_.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0007-drivers-gpu-Arm-Midgard-Replace-ACCESS_ONCE-by-READ_.patch
@@ -1,35 +0,0 @@
-From 44a5ba2e969adfb64c84f294c16490194988dcc7 Mon Sep 17 00:00:00 2001
-From: Myy Miouyouyou <myy@miouyouyou.fr>
-Date: Sun, 24 Dec 2017 19:30:12 +0100
-Subject: [PATCH] drivers: gpu: Arm: Midgard: Replace ACCESS_ONCE by READ_ONCE
-
-The ACCESS_ONCE macro has now been removed in the 4.15.0-rc4,
-and every ACCESS_ONCE call has been replaced by either READ_ONCE or
-WRITE_ONCE calls.
-Since the Midgard GPU drivers are not mainlined, the change
-needs to be applied manually.
-
-See commit b899a850431e2dd0943205a63a68573f3e312d0d and its parents,
-for more informations.
-
-Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
---
- drivers/gpu/arm/midgard/mali_kbase_mem.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem.h b/drivers/gpu/arm/midgard/mali_kbase_mem.h
-index e9a8d5dd6..eac685699 100644
--- a/drivers/gpu/arm/midgard/mali_kbase_mem.h
-+++ b/drivers/gpu/arm/midgard/mali_kbase_mem.h
-@@ -591,7 +591,7 @@ void kbase_mem_pool_free_pages(struct kbase_mem_pool *pool, size_t nr_pages,
-  */
- static inline size_t kbase_mem_pool_size(struct kbase_mem_pool *pool)
- {
-	return ACCESS_ONCE(pool->cur_size);
-+	return READ_ONCE(pool->cur_size);
- }
- 
- /**
-- 
-2.14.1
-
--- a/buildroot-external/board/asus/tinker/patches/linux/0008-gpu-arm-midgard-Remove-sys_close-references.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0008-gpu-arm-midgard-Remove-sys_close-references.patch
@@ -1,32 +0,0 @@
-From 47e8aad9419ff8843a373c3e5aa2c9d261d8cd07 Mon Sep 17 00:00:00 2001
-From: Myy Miouyouyou <myy@miouyouyou.fr>
-Date: Mon, 23 Apr 2018 20:54:13 +0200
-Subject: [PATCH] gpu: arm: midgard: Remove sys_close references
-
-sys_close is now replaced by ksys_close in an effort to remove
-in-kernel system calls references.
-
-See 2ca2a09d6215fd9621aa3e2db7cc9428a61f2911 and
-https://lkml.org/lkml/2018/3/25/93 for more details.
-
-Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
---
- drivers/gpu/arm/midgard/mali_kbase_sync.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync.h b/drivers/gpu/arm/midgard/mali_kbase_sync.h
-index de72147d..33b58059 100644
--- a/drivers/gpu/arm/midgard/mali_kbase_sync.h
-+++ b/drivers/gpu/arm/midgard/mali_kbase_sync.h
-@@ -156,7 +156,7 @@ void kbase_sync_fence_out_remove(struct kbase_jd_atom *katom);
-  */
- static inline void kbase_sync_fence_close_fd(int fd)
- {
-	sys_close(fd);
-+	ksys_close(fd);
- }
- 
- /**
-- 
-2.14.1
-
--- a/buildroot-external/board/asus/tinker/patches/linux/0010-GPU-Mali-Midgard-remove-rcu_read_lock-references.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/0010-GPU-Mali-Midgard-remove-rcu_read_lock-references.patch
@@ -1,76 +0,0 @@
-From 9bf91a052d8ceddfd5808547a51e167fb7463754 Mon Sep 17 00:00:00 2001
-From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
-Date: Wed, 18 Jul 2018 19:59:21 +0200
-Subject: [PATCH] GPU: Mali: Midgard: remove rcu_read_lock references
-
-This patch is actually based on @mihailescu2m patch.
-This removes references to rcu_read_lock when acquiring the OPP table,
-as it is useless since.
-See :
-https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/base/power/opp/core.c?id=5b650b388844f26c61c70564865598836d05dcb3
-
-The current rcu_read_lock actually generates some issues with recent
-kernels.
-See here :
-https://community.arm.com/graphics/f/discussions/9207/midgard-r20p0-kernel-drivers-errors
-
-The patch has been recreated since it does not apply directly on r19p0
-sources (I guess the affected line numbers slightly differ...).
-
-@mihailescu2m patch for the Mali Midgard r20p0 kernel driver can be
-acquired here :
-https://github.com/mihailescu2m/linux/commit/bbe73c3c1143e5991bdcaee3afaecf5c31af0647
-
-Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
---
- drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c
-index e280322e..bf69d897 100644
--- a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c
-+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c
-@@ -87,10 +87,9 @@ kbase_devfreq_target(struct device *dev, unsigned long *target_freq, u32 flags)
- 
- 	freq = *target_freq;
- 
-	rcu_read_lock();
- 	opp = devfreq_recommended_opp(dev, &freq, flags);
- 	voltage = dev_pm_opp_get_voltage(opp);
-	rcu_read_unlock();
-+
- 	if (IS_ERR_OR_NULL(opp)) {
- 		dev_err(dev, "Failed to get opp (%ld)\n", PTR_ERR(opp));
- 		return PTR_ERR(opp);
-@@ -186,20 +185,17 @@ static int kbase_devfreq_init_freq_table(struct kbase_device *kbdev,
- 	unsigned long freq;
- 	struct dev_pm_opp *opp;
- 
-	rcu_read_lock();
- 	count = dev_pm_opp_get_opp_count(kbdev->dev);
- 	if (count < 0) {
- 		rcu_read_unlock();
- 		return count;
- 	}
-	rcu_read_unlock();
- 
- 	dp->freq_table = kmalloc_array(count, sizeof(dp->freq_table[0]),
- 				GFP_KERNEL);
- 	if (!dp->freq_table)
- 		return -ENOMEM;
- 
-	rcu_read_lock();
- 	for (i = 0, freq = ULONG_MAX; i < count; i++, freq--) {
- 		opp = dev_pm_opp_find_freq_floor(kbdev->dev, &freq);
- 		if (IS_ERR(opp))
-@@ -207,7 +203,6 @@ static int kbase_devfreq_init_freq_table(struct kbase_device *kbdev,
- 
- 		dp->freq_table[i] = freq;
- 	}
-	rcu_read_unlock();
- 
- 	if (count != i)
- 		dev_warn(kbdev->dev, "Unable to enumerate all OPPs (%d!=%d\n",
-- 
-2.16.4
-
--- a/buildroot-external/board/asus/tinker/patches/linux/1-2-regulator-act8865-add-restart-handler-for-act8846.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/1-2-regulator-act8865-add-restart-handler-for-act8846.patch
@@ -1,74 +0,0 @@
-Patches act8846 regulator providing the proper reset handle and exploit
-the SIPC bit in GLB_POWER_OFF register. Mainly used to reset some rockchip
-boards.
-
-Origin: <https://patchwork.kernel.org/patch/6409521/>
-
-diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c
-index 2ff73d7..836d10b 100644
--- a/drivers/regulator/act8865-regulator.c
-+++ b/drivers/regulator/act8865-regulator.c
-@@ -27,6 +27,7 @@
- #include <linux/of_device.h>
- #include <linux/regulator/of_regulator.h>
- #include <linux/regmap.h>
-+#include <linux/reboot.h>
- 
- /*
-  * ACT8600 Global Register Map.
-@@ -133,6 +134,8 @@
- #define	ACT8865_VOLTAGE_NUM	64
- #define ACT8600_SUDCDC_VOLTAGE_NUM	255
- 
-+#define ACT8846_SIPC_MASK 0x01
-+
- struct act8865 {
- 	struct regmap *regmap;
- 	int off_reg;
-@@ -402,6 +405,22 @@ static void act8865_power_off(void)
- 	while (1);
- }
- 
-+static int act8846_power_cycle(struct notifier_block *this,
-+	unsigned long code, void *unused)
-+{
-+	struct act8865 *act8846;
-+
-+	act8846 = i2c_get_clientdata(act8865_i2c_client);
-+	regmap_write(act8846->regmap, ACT8846_GLB_OFF_CTRL, ACT8846_SIPC_MASK);
-+
-+	return NOTIFY_DONE;
-+}
-+
-+static struct notifier_block act8846_restart_handler = {
-+	.notifier_call = act8846_power_cycle,
-+	.priority = 129,
-+};
-+
- static int act8865_pmic_probe(struct i2c_client *client,
- 			      const struct i2c_device_id *i2c_id)
- {
-@@ -484,6 +503,8 @@ static int act8865_pmic_probe(struct i2c_client *client,
- 	}
- 
- 	if (of_device_is_system_power_controller(dev->of_node)) {
-+		int ret;
-+
- 		if (!pm_power_off && (off_reg > 0)) {
- 			act8865_i2c_client = client;
- 			act8865->off_reg = off_reg;
-@@ -492,6 +513,14 @@ static int act8865_pmic_probe(struct i2c_client *client,
- 		} else {
- 			dev_err(dev, "Failed to set poweroff capability, already defined\n");
- 		}
-+
-+		if (type == ACT8846) {
-+			act8865_i2c_client = client;
-+			ret = register_restart_handler(&act8846_restart_handler);
-+			if (ret)
-+				pr_err("%s: cannot register restart handler, %d\n",
-+					__func__, ret);
-+		}
- 	}
- 
- 	/* Finally register devices */
--- a/buildroot-external/board/asus/tinker/patches/linux/1001-drivers-Integrating-Mali-Midgard-video-and-gpu-drive.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/1001-drivers-Integrating-Mali-Midgard-video-and-gpu-drive.patch
@@ -1,39 +0,0 @@
-From fe85565d9ed8212cbda2148d4731418a36a8d088 Mon Sep 17 00:00:00 2001
-From: Myy Miouyouyou <myy@miouyouyou.fr>
-Date: Mon, 11 Dec 2017 21:53:28 +0100
-Subject: [PATCH 1/3] drivers: Integrating Mali Midgard video and gpu drivers.
-
-I'm dropping the UMP drivers. They are not maintained.
-
-Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
---
- drivers/gpu/Makefile  | 2 +-
- drivers/video/Kconfig | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
-index e9ed439a5..66386b42a 100644
--- a/drivers/gpu/Makefile
-+++ b/drivers/gpu/Makefile
-@@ -2,5 +2,5 @@
- # taken to initialize them in the correct order. Link order is the only way
- # to ensure this currently.
- obj-$(CONFIG_TEGRA_HOST1X)	+= host1x/
-obj-y			+= drm/ vga/
-+obj-y			+= drm/ vga/ arm/
- obj-$(CONFIG_IMX_IPUV3_CORE)	+= ipu-v3/
-diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
-index 3c20af999..041e15f2c 100644
--- a/drivers/video/Kconfig
-+++ b/drivers/video/Kconfig
-@@ -17,6 +17,7 @@ source "drivers/gpu/vga/Kconfig"
- 
- source "drivers/gpu/host1x/Kconfig"
- source "drivers/gpu/ipu-v3/Kconfig"
-+source "drivers/gpu/arm/midgard/Kconfig"
- 
- source "drivers/gpu/drm/Kconfig"
- 
-- 
-2.14.1
-
--- a/buildroot-external/board/asus/tinker/patches/linux/1005-drivers-mmc-dw-mci-rockchip-Handle-ASUS-Tinkerboard.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/1005-drivers-mmc-dw-mci-rockchip-Handle-ASUS-Tinkerboard.patch
@@ -1,116 +0,0 @@
-From 302cd9b8a9f1f8a7735fabea3b9a7645dc40f9cc Mon Sep 17 00:00:00 2001
-From: Myy Miouyouyou <myy@miouyouyou.fr>
-Date: Sun, 7 Jan 2018 01:52:44 +0100
-Subject: [PATCH] drivers: mmc: dw-mci-rockchip: Handle ASUS Tinkerboard reboot
-
-On ASUS Tinkerboard systems, if the SDMMC hardware is shutdown before
-rebooting, the system will be dead, as the SDMMC is the only way to
-boot anything, and the hardware doesn't power up the SDMMC hardware
-automatically when rebooting.
-
-So, when using an ASUS Tinkerboard system, a new reboot handler is
-installed. This reboot handler takes care of powering the SDMMC
-hardware again before restarting the system, resolving the issue.
-
-The code was inspired by the pwrseq_emmc.c, which seems to overcome
-similar effects with eMMC hardware.
-
-Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
---
- drivers/mmc/host/dw_mmc-rockchip.c | 66 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 66 insertions(+)
-
-diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
-index a3f1c2b30..7eac1f221 100644
--- a/drivers/mmc/host/dw_mmc-rockchip.c
-+++ b/drivers/mmc/host/dw_mmc-rockchip.c
-@@ -16,6 +16,11 @@
- #include <linux/pm_runtime.h>
- #include <linux/slab.h>
- 
-+#include <linux/regulator/consumer.h>
-+#include <linux/reboot.h>
-+#include <linux/delay.h>
-+#include "../core/core.h"
-+
- #include "dw_mmc.h"
- #include "dw_mmc-pltfm.h"
- 
-@@ -334,6 +339,66 @@ static const struct of_device_id dw_mci_rockchip_match[] = {
- };
- MODULE_DEVICE_TABLE(of, dw_mci_rockchip_match);
- 
-+struct dw_mci_rockchip_broken_boards_data {
-+	struct notifier_block reset_nb;
-+	struct platform_device *pdev;
-+};
-+
-+/* This reboot handler handles cases where disabling the SDMMC on
-+ * reboot will cause the hardware to be unable to start correctly
-+ * after rebooting.
-+ * 
-+ * This happens with Tinkerboard systems...
-+ */
-+static int dw_mci_rockchip_broken_boards_reset_nb(
-+	struct notifier_block *this,
-+	unsigned long mode, void *cmd)
-+{
-+	struct dw_mci_rockchip_broken_boards_data const *data =
-+		container_of(this,
-+			struct dw_mci_rockchip_broken_boards_data,
-+			reset_nb);
-+	struct dw_mci *host = platform_get_drvdata(data->pdev);
-+	struct mmc_host *mmc = host->slot->mmc;
-+
-+	printk(KERN_ERR "Meow.\n");
-+
-+	mmc_power_off(mmc);
-+
-+	mdelay(20);
-+
-+	if (!IS_ERR(mmc->supply.vmmc))
-+		regulator_enable(mmc->supply.vmmc);
-+
-+	if (!IS_ERR(mmc->supply.vqmmc))
-+		regulator_set_voltage(mmc->supply.vqmmc, 3000000, 3300000);
-+
-+	printk(KERN_ERR "woeM.\n");
-+
-+	return NOTIFY_DONE;
-+}
-+
-+static void dw_mci_rockchip_register_broken_boards_reboot_handler(
-+	struct platform_device *pdev)
-+{
-+	struct dw_mci_rockchip_broken_boards_data *data;
-+
-+	if (!of_machine_is_compatible("asus,rk3288-tinker"))
-+		return;
-+
-+	data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
-+
-+	if (!data)
-+		return;
-+
-+	data->reset_nb.notifier_call =
-+		dw_mci_rockchip_broken_boards_reset_nb;
-+	data->reset_nb.priority = 255;
-+	register_restart_handler(&data->reset_nb);
-+
-+	data->pdev = pdev;
-+}
-+
- static int dw_mci_rockchip_probe(struct platform_device *pdev)
- {
- 	const struct dw_mci_drv_data *drv_data;
-@@ -361,6 +426,7 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev)
- 	}
- 
- 	pm_runtime_put_autosuspend(&pdev->dev);
-+	dw_mci_rockchip_register_broken_boards_reboot_handler(pdev);
- 
- 	return 0;
- }
-- 
-2.14.1
-
--- a/buildroot-external/board/asus/tinker/patches/linux/1006-soc-rockchip-power-domain-export-idle-request.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/1006-soc-rockchip-power-domain-export-idle-request.patch
@@ -1,82 +0,0 @@
-From 4ffe79de7272234408a9179aa4c403ee1b67a362 Mon Sep 17 00:00:00 2001
-From: Myy Miouyouyou <myy@miouyouyou.fr>
-Date: Thu, 7 Dec 2017 21:27:52 +0100
-Subject: [PATCH] soc: rockchip: power-domain: export idle request
-
-We need to put the power status of HEVC/RKVDEC IP into IDLE
-unless we can't reset that IP or the SoC would crash down.
-rockchip_pmu_idle_request(dev, true)---> enter idle
-rockchip_pmu_idle_request(dev, false)---> exit idle
-
-Only the video codec drivers of rockchip platform would
-request this patch currently.
-
-I am not sure whether it is necessary to add a new function
-at generic power domain. I want someone give me some advises
-here.
-
-Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
---
- drivers/soc/rockchip/pm_domains.c | 23 +++++++++++++++++++++++
- include/linux/rockchip_pmu.h      | 15 +++++++++++++++
- 2 files changed, 38 insertions(+)
- create mode 100644 include/linux/rockchip_pmu.h
-
-diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c
-index 40b75748..0006ed53 100644
--- a/drivers/soc/rockchip/pm_domains.c
-+++ b/drivers/soc/rockchip/pm_domains.c
-@@ -180,6 +180,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/linux/rockchip_pmu.h b/include/linux/rockchip_pmu.h
-new file mode 100644
-index 00000000..720b3314
--- /dev/null
-+++ b/include/linux/rockchip_pmu.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.14.1
-
--- a/buildroot-external/board/asus/tinker/patches/linux/1008-rockchip-dwc2-usb-partial-power-down.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/1008-rockchip-dwc2-usb-partial-power-down.patch
@@ -1,44 +0,0 @@
-From 04fbf78e4e569bf872f1ffcb0a6f9b89569dc913 Mon Sep 17 00:00:00 2001
-From: Hal Emmerich <hal@halemmerich.com>
-Date: Thu, 19 Jul 2018 21:48:08 -0500
-Subject: [PATCH] usb: dwc2: disable power_down on rockchip devices
-
- The bug would let the usb controller enter partial power down,
- which was formally known as hibernate, upon boot if nothing was plugged
- in to the port. Partial power down couldn't be exited properly, so any
- usb devices plugged in after boot would not be usable.
-
- Before the name change, params.hibernation was false by default, so
- _dwc2_hcd_suspend() would skip entering hibernation. With the
- rename, _dwc2_hcd_suspend() was changed to use  params.power_down
- to decide whether or not to enter partial power down.
-
- Since params.power_down is non-zero by default, it needs to be set
- to 0 for rockchip devices to restore functionality.
-
- This bug was reported in the linux-usb thread:
- REGRESSION: usb: dwc2: USB device not seen after boot
-
- The commit that caused this regression is:
- 6d23ee9caa6790aea047f9aca7f3c03cb8d96eb6
-
-Signed-off-by: Hal Emmerich <hal@halemmerich.com>
---
- drivers/usb/dwc2/params.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
-index f03e418..492607a 100644
--- a/drivers/usb/dwc2/params.c
-+++ b/drivers/usb/dwc2/params.c
-@@ -82,6 +82,7 @@ static void dwc2_set_rk_params(struct dwc2_hsotg *hsotg)
- 	p->host_perio_tx_fifo_size = 256;
- 	p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 <<
- 		GAHBCFG_HBSTLEN_SHIFT;
-+	p->power_down = 0;
- }
- 
- static void dwc2_set_ltq_params(struct dwc2_hsotg *hsotg)
-- 
-2.11.0
-
--- a/buildroot-external/board/asus/tinker/patches/linux/1009-drivers-clk-rk3288-support-for-dedicating-NPLL-to-a-.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/1009-drivers-clk-rk3288-support-for-dedicating-NPLL-to-a-.patch
@@ -1,228 +0,0 @@
-From bc16cd0aa3cdaaff27b9bf2d3282ccfff81d8784 Mon Sep 17 00:00:00 2001
-From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
-Date: Sat, 29 Sep 2018 02:56:32 +0200
-Subject: [PATCH 5/6] drivers: clk-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.
-
-The only thing I know from this patchset is that it works and have
-resolved some purple line issue at the left of my HDMI screen, when
-connected to MiQi or Tinkerboard devices.
-
-Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
---
- drivers/clk/rockchip/clk-rk3288.c | 98 ++++++++++++++++++++++++++++++++-------
- drivers/clk/rockchip/clk.h        |  3 ++
- 2 files changed, 85 insertions(+), 16 deletions(-)
-
-diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
-index fd2058f7d..b5b56169d 100644
--- a/drivers/clk/rockchip/clk-rk3288.c
-+++ b/drivers/clk/rockchip/clk-rk3288.c
-@@ -83,22 +83,43 @@ static struct rockchip_pll_rate_table rk3288_pll_rates[] = {
- 	RK3066_PLL_RATE( 768000000, 1, 64, 2),
- 	RK3066_PLL_RATE( 742500000, 8, 495, 2),
- 	RK3066_PLL_RATE( 696000000, 1, 58, 2),
-+	RK3066_PLL_RATE_NB(621000000, 1, 207, 8, 1),
- 	RK3066_PLL_RATE( 600000000, 1, 50, 2),
- 	RK3066_PLL_RATE_NB(594000000, 1, 198, 8, 1),
- 	RK3066_PLL_RATE( 552000000, 1, 46, 2),
- 	RK3066_PLL_RATE( 504000000, 1, 84, 4),
- 	RK3066_PLL_RATE( 500000000, 3, 125, 2),
- 	RK3066_PLL_RATE( 456000000, 1, 76, 4),
-+	RK3066_PLL_RATE( 428000000, 1, 107, 6),
- 	RK3066_PLL_RATE( 408000000, 1, 68, 4),
- 	RK3066_PLL_RATE( 400000000, 3, 100, 2),
-+	RK3066_PLL_RATE_NB( 394000000, 1, 197, 12, 1),
- 	RK3066_PLL_RATE( 384000000, 2, 128, 4),
- 	RK3066_PLL_RATE( 360000000, 1, 60, 4),
-+	RK3066_PLL_RATE_NB( 356000000, 1, 178, 12, 1),
-+	RK3066_PLL_RATE_NB( 324000000, 1, 189, 14, 1),
- 	RK3066_PLL_RATE( 312000000, 1, 52, 4),
-	RK3066_PLL_RATE( 300000000, 1, 50, 4),
-	RK3066_PLL_RATE( 297000000, 2, 198, 8),
-+	RK3066_PLL_RATE_NB( 308000000, 1, 154, 12, 1),
-+	RK3066_PLL_RATE_NB( 303000000, 1, 202, 16, 1),
-+	RK3066_PLL_RATE( 300000000, 1, 75, 6),
-+	RK3066_PLL_RATE_NB( 297750000, 2, 397, 16, 1),
-+	RK3066_PLL_RATE_NB( 293250000, 2, 391, 16, 1),
-+	RK3066_PLL_RATE_NB( 292500000, 1, 195, 16, 1),
-+	RK3066_PLL_RATE( 273600000, 1, 114, 10),
-+	RK3066_PLL_RATE_NB( 273000000, 1, 182, 16, 1),
-+	RK3066_PLL_RATE_NB( 270000000, 1, 180, 16, 1),
-+	RK3066_PLL_RATE_NB( 266250000, 2, 355, 16, 1),
-+	RK3066_PLL_RATE_NB( 256500000, 1, 171, 16, 1),
- 	RK3066_PLL_RATE( 252000000, 1, 84, 8),
-	RK3066_PLL_RATE( 216000000, 1, 72, 8),
-	RK3066_PLL_RATE( 148500000, 2, 99, 8),
-+	RK3066_PLL_RATE_NB( 250500000, 1, 167, 16, 1),
-+	RK3066_PLL_RATE_NB( 243428571, 1, 142, 14, 1),
-+	RK3066_PLL_RATE( 238000000, 1, 119, 12),
-+	RK3066_PLL_RATE_NB( 219750000, 2, 293, 16, 1),
-+	RK3066_PLL_RATE_NB( 216000000, 1, 144, 16, 1),
-+	RK3066_PLL_RATE_NB( 213000000, 1, 142, 16, 1),
-+	RK3066_PLL_RATE( 195428571, 1, 114, 14),
-+	RK3066_PLL_RATE( 160000000, 1, 80, 12),
-+	RK3066_PLL_RATE( 157500000, 1, 105, 16),
- 	RK3066_PLL_RATE( 126000000, 1, 84, 16),
- 	RK3066_PLL_RATE(  48000000, 1, 64, 32),
- 	{ /* sentinel */ },
-@@ -194,10 +215,14 @@ 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", "usbphy480m_src" };
-PNAME(mux_pll_src_cpll_gll_usb_npll_p)	= { "cpll", "gpll", "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" };
-@@ -443,24 +468,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),
- 
-@@ -469,16 +494,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),
- 
-@@ -552,7 +577,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),
- 
-@@ -912,6 +937,7 @@ static void __init rk3288_clk_init(struct device_node *np)
- {
- 	struct rockchip_clk_provider *ctx;
- 	struct clk *clk;
-+	s32 npll_vop = -1;
- 
- 	rk3288_cru_base = of_iomap(np, 0);
- 	if (!rk3288_cru_base) {
-@@ -919,6 +945,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
-
--- a/buildroot-external/board/asus/tinker/patches/linux/1010-drm-dw_hdmi-rockchip-better-clock-selection-logic-an.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/1010-drm-dw_hdmi-rockchip-better-clock-selection-logic-an.patch
@@ -1,424 +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>
---
- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 269 ++++++++++++++++++----------
- 1 file changed, 175 insertions(+), 94 deletions(-)
-
-diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
-index 11309a2a4..740b0aeea 100644
--- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
-+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
-@@ -49,122 +49,141 @@ struct rockchip_hdmi {
- 	struct clk *vpll_clk;
- 	struct clk *grf_clk;
- 	struct dw_hdmi *hdmi;
-+	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)) {
-@@ -192,26 +211,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 = {
-@@ -227,7 +275,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,
-@@ -280,6 +360,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,
-@@ -294,7 +375,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,
-@@ -308,7 +388,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,
-@@ -387,6 +466,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);
- 	}
-@@ -399,6 +479,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);
- }
-- 
-2.16.4
-
--- a/buildroot-external/board/asus/tinker/patches/linux/1100-media-Add-JPEG_RAW-format.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/1100-media-Add-JPEG_RAW-format.patch
@@ -1,63 +0,0 @@
-From 1680a655127a62e74cbcfb84782e04a9c55dcf81 Mon Sep 17 00:00:00 2001
-From: Shunqian Zheng <zhengsq@rock-chips.com>
-Date: Wed, 5 Sep 2018 19:00:09 -0300
-Subject: [PATCH 3/6] media: Add JPEG_RAW format
-
-Add V4L2_PIX_FMT_JPEG_RAW format that does not contain
-JPEG header in the output frame.
-
-Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
-Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
---
- Documentation/media/uapi/v4l/pixfmt-compressed.rst | 9 +++++++++
- drivers/media/v4l2-core/v4l2-ioctl.c               | 1 +
- include/uapi/linux/videodev2.h                     | 1 +
- 3 files changed, 11 insertions(+)
-
-diff --git a/Documentation/media/uapi/v4l/pixfmt-compressed.rst b/Documentation/media/uapi/v4l/pixfmt-compressed.rst
-index d382e7a5..4dffe400 100644
--- a/Documentation/media/uapi/v4l/pixfmt-compressed.rst
-+++ b/Documentation/media/uapi/v4l/pixfmt-compressed.rst
-@@ -23,6 +23,15 @@ Compressed Formats
-       - 'JPEG'
-       - TBD. See also :ref:`VIDIOC_G_JPEGCOMP <VIDIOC_G_JPEGCOMP>`,
- 	:ref:`VIDIOC_S_JPEGCOMP <VIDIOC_G_JPEGCOMP>`.
-+    * .. _V4L2-PIX-FMT-JPEG-RAW:
-+
-+      - ``V4L2_PIX_FMT_JPEG_RAW``
-+      - 'Raw JPEG'
-+      - Raw JPEG bitstream, containing a compressed payload. This format
-+        contains an image scan, i.e. without any metadata or headers.
-+        The user is expected to set the needed metadata such as
-+        quantization and entropy encoding tables, via ``V4L2_CID_JPEG``
-+        controls, see :ref:`jpeg-control-id`.
-     * .. _V4L2-PIX-FMT-MPEG:
- 
-       - ``V4L2_PIX_FMT_MPEG``
-diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
-index 54afc9c7..0dcd95f4 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
-+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1301,6 +1301,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
- 		/* Max description length mask:	descr = "0123456789012345678901234567890" */
- 		case V4L2_PIX_FMT_MJPEG:	descr = "Motion-JPEG"; break;
- 		case V4L2_PIX_FMT_JPEG:		descr = "JFIF JPEG"; break;
-+		case V4L2_PIX_FMT_JPEG_RAW:	descr = "Raw JPEG"; break;
- 		case V4L2_PIX_FMT_DV:		descr = "1394"; break;
- 		case V4L2_PIX_FMT_MPEG:		descr = "MPEG-1/2/4"; break;
- 		case V4L2_PIX_FMT_H264:		descr = "H.264"; break;
-diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index 5d1a3685..f271048c 100644
--- a/include/uapi/linux/videodev2.h
-+++ b/include/uapi/linux/videodev2.h
-@@ -627,6 +627,7 @@ struct v4l2_pix_format {
- /* compressed formats */
- #define V4L2_PIX_FMT_MJPEG    v4l2_fourcc('M', 'J', 'P', 'G') /* Motion-JPEG   */
- #define V4L2_PIX_FMT_JPEG     v4l2_fourcc('J', 'P', 'E', 'G') /* JFIF JPEG     */
-+#define V4L2_PIX_FMT_JPEG_RAW v4l2_fourcc('J', 'P', 'G', 'R') /* JFIF JPEG RAW without headers */
- #define V4L2_PIX_FMT_DV       v4l2_fourcc('d', 'v', 's', 'd') /* 1394          */
- #define V4L2_PIX_FMT_MPEG     v4l2_fourcc('M', 'P', 'E', 'G') /* MPEG-1/2/4 Multiplexed */
- #define V4L2_PIX_FMT_H264     v4l2_fourcc('H', '2', '6', '4') /* H264 with start codes */
-- 
-2.16.4
-
--- a/buildroot-external/board/asus/tinker/patches/linux/1101-media-Add-controls-for-JPEG-quantization-tables.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/1101-media-Add-controls-for-JPEG-quantization-tables.patch
@@ -1,153 +0,0 @@
-From 82da876c36ccc7791d5b20e7ee8b50379f7b19aa Mon Sep 17 00:00:00 2001
-From: Shunqian Zheng <zhengsq@rock-chips.com>
-Date: Wed, 5 Sep 2018 19:00:10 -0300
-Subject: [PATCH 4/6] media: Add controls for JPEG quantization tables
-
-Add V4L2_CID_JPEG_QUANTIZATION compound control to allow userspace
-configure the JPEG quantization tables.
-
-Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
-Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
---
- Documentation/media/uapi/v4l/extended-controls.rst | 31 ++++++++++++++++++++++
- Documentation/media/videodev2.h.rst.exceptions     |  1 +
- drivers/media/v4l2-core/v4l2-ctrls.c               | 10 +++++++
- include/uapi/linux/v4l2-controls.h                 | 12 +++++++++
- include/uapi/linux/videodev2.h                     |  1 +
- 5 files changed, 55 insertions(+)
-
-diff --git a/Documentation/media/uapi/v4l/extended-controls.rst b/Documentation/media/uapi/v4l/extended-controls.rst
-index 9f7312bf..1335d27d 100644
--- a/Documentation/media/uapi/v4l/extended-controls.rst
-+++ b/Documentation/media/uapi/v4l/extended-controls.rst
-@@ -3354,7 +3354,38 @@ JPEG Control IDs
-     Specify which JPEG markers are included in compressed stream. This
-     control is valid only for encoders.
- 
-+.. _jpeg-quant-tables-control:
- 
-+``V4L2_CID_JPEG_QUANTIZATION (struct)``
-+    Specifies the luma and chroma quantization matrices for encoding
-+    or decoding a V4L2_PIX_FMT_JPEG_RAW format buffer. The :ref:`itu-t81`
-+    specification allows 8-bit quantization coefficients for
-+    baseline profile images, and 8-bit or 16-bit for extended profile
-+    images. Supporting or not 16-bit precision coefficients is driver-specific.
-+    Coefficients must be set in JPEG zigzag scan order.
-+
-+
-+.. c:type:: struct v4l2_ctrl_jpeg_quantization
-+
-+.. cssclass:: longtable
-+
-+.. flat-table:: struct v4l2_ctrl_jpeg_quantization
-+    :header-rows:  0
-+    :stub-columns: 0
-+    :widths:       1 1 2
-+
-+    * - __u8
-+      - ``precision``
-+      - Specifies the coefficient precision. User shall set 0
-+        for 8-bit, and 1 for 16-bit.
-+
-+    * - __u16
-+      - ``luma_quantization_matrix[64]``
-+      - Sets the luma quantization table.
-+
-+    * - __u16
-+      - ``chroma_quantization_matrix[64]``
-+      - Sets the chroma quantization table.
- 
- .. flat-table::
-     :header-rows:  0
-diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions
-index ca9f0edc..a0a38e92 100644
--- a/Documentation/media/videodev2.h.rst.exceptions
-+++ b/Documentation/media/videodev2.h.rst.exceptions
-@@ -129,6 +129,7 @@ replace symbol V4L2_CTRL_TYPE_STRING :c:type:`v4l2_ctrl_type`
- replace symbol V4L2_CTRL_TYPE_U16 :c:type:`v4l2_ctrl_type`
- replace symbol V4L2_CTRL_TYPE_U32 :c:type:`v4l2_ctrl_type`
- replace symbol V4L2_CTRL_TYPE_U8 :c:type:`v4l2_ctrl_type`
-+replace symbol V4L2_CTRL_TYPE_JPEG_QUANTIZATION :c:type:`v4l2_ctrl_type`
- 
- # V4L2 capability defines
- replace define V4L2_CAP_VIDEO_CAPTURE device-capabilities
-diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
-index 599c1cbf..305bd7a9 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
-+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
-@@ -999,6 +999,7 @@ const char *v4l2_ctrl_get_name(u32 id)
- 	case V4L2_CID_JPEG_RESTART_INTERVAL:	return "Restart Interval";
- 	case V4L2_CID_JPEG_COMPRESSION_QUALITY:	return "Compression Quality";
- 	case V4L2_CID_JPEG_ACTIVE_MARKER:	return "Active Markers";
-+	case V4L2_CID_JPEG_QUANTIZATION:	return "JPEG Quantization Tables";
- 
- 	/* Image source controls */
- 	/* Keep the order of the 'case's the same as in v4l2-controls.h! */
-@@ -1286,6 +1287,9 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
- 	case V4L2_CID_DETECT_MD_REGION_GRID:
- 		*type = V4L2_CTRL_TYPE_U8;
- 		break;
-+	case V4L2_CID_JPEG_QUANTIZATION:
-+		*type = V4L2_CTRL_TYPE_JPEG_QUANTIZATION;
-+		break;
- 	case V4L2_CID_DETECT_MD_THRESHOLD_GRID:
- 		*type = V4L2_CTRL_TYPE_U16;
- 		break;
-@@ -1612,6 +1616,9 @@ static int std_validate(const struct v4l2_ctrl *ctrl, u32 idx,
- 			return -ERANGE;
- 		return 0;
- 
-+	case V4L2_CTRL_TYPE_JPEG_QUANTIZATION:
-+		return 0;
-+
- 	default:
- 		return -EINVAL;
- 	}
-@@ -2133,6 +2140,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,
- 	case V4L2_CTRL_TYPE_U32:
- 		elem_size = sizeof(u32);
- 		break;
-+	case V4L2_CTRL_TYPE_JPEG_QUANTIZATION:
-+		elem_size = sizeof(struct v4l2_ctrl_jpeg_quantization);
-+		break;
- 	default:
- 		if (type < V4L2_CTRL_COMPOUND_TYPES)
- 			elem_size = sizeof(s32);
-diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
-index e4ee10ee..856b3325 100644
--- a/include/uapi/linux/v4l2-controls.h
-+++ b/include/uapi/linux/v4l2-controls.h
-@@ -987,6 +987,18 @@ enum v4l2_jpeg_chroma_subsampling {
- #define	V4L2_JPEG_ACTIVE_MARKER_DQT		(1 << 17)
- #define	V4L2_JPEG_ACTIVE_MARKER_DHT		(1 << 18)
- 
-+#define V4L2_CID_JPEG_QUANTIZATION		(V4L2_CID_JPEG_CLASS_BASE + 5)
-+struct v4l2_ctrl_jpeg_quantization {
-+	/* ITU-T.81 specifies two quantization coefficient precisions:
-+	 * 8-bit for baseline profile,
-+	 * 8-bit or 16-bit for extended profile.
-+	 *
-+	 * User shall set "precision" to 0 for 8-bit and 1 for 16-bit.
-+	 */
-+	__u8	precision;
-+	__u16	luma_quantization_matrix[64];
-+	__u16	chroma_quantization_matrix[64];
-+};
- 
- /* Image source controls */
- #define V4L2_CID_IMAGE_SOURCE_CLASS_BASE	(V4L2_CTRL_CLASS_IMAGE_SOURCE | 0x900)
-diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index f271048c..e998d074 100644
--- a/include/uapi/linux/videodev2.h
-+++ b/include/uapi/linux/videodev2.h
-@@ -1630,6 +1630,7 @@ enum v4l2_ctrl_type {
- 	V4L2_CTRL_TYPE_U8	     = 0x0100,
- 	V4L2_CTRL_TYPE_U16	     = 0x0101,
- 	V4L2_CTRL_TYPE_U32	     = 0x0102,
-+	V4L2_CTRL_TYPE_JPEG_QUANTIZATION = 0x0103,
- };
- 
- /*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
-- 
-2.16.4
-
--- a/buildroot-external/board/asus/tinker/patches/linux/2015-ARM-DTS-rk3288-tinker-Improving-the-CPU-max-volt.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/2015-ARM-DTS-rk3288-tinker-Improving-the-CPU-max-volt.patch
@@ -1,29 +0,0 @@
-From d4775f623b25009039a8ef3f28332033c7766ecc Mon Sep 17 00:00:00 2001
-From: Myy Miouyouyou <myy@miouyouyou.fr>
-Date: Thu, 19 Oct 2017 22:20:33 +0200
-Subject: [PATCH 19/28] ARM: DTS: rk3288-tinker.dts: Improving the CPU max
- voltage
-
-Taken from the various patches provided by @TonyMac32 .
-
-Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
---
- arch/arm/boot/dts/rk3288-tinker.dts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
-index c552fd95..4ce94698 100644
--- a/arch/arm/boot/dts/rk3288-tinker.dts
-+++ b/arch/arm/boot/dts/rk3288-tinker.dts
-@@ -243,7 +243,7 @@
- 				regulator-always-on;
- 				regulator-boot-on;
- 				regulator-min-microvolt = <750000>;
-				regulator-max-microvolt = <1350000>;
-+				regulator-max-microvolt = <1450000>;
- 				regulator-name = "vdd_arm";
- 				regulator-ramp-delay = <6000>;
- 				regulator-state-mem {
-- 
-2.11.0
-
--- a/buildroot-external/board/asus/tinker/patches/linux/2025-ARM-DTSI-rk3288-Renamed-the-VPU-services-clocks.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/2025-ARM-DTSI-rk3288-Renamed-the-VPU-services-clocks.patch
@@ -1,39 +0,0 @@
-From 29ef524e8890bbfd24602a61e14234259df92349 Mon Sep 17 00:00:00 2001
-From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
-Date: Mon, 25 Jun 2018 17:05:37 +0200
-Subject: [PATCH 25/26] ARM: DTSI: rk3288: Renamed the VPU services clocks
-
-In order to conform to the naming scheme used in the whole DTSI.
-
-Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
---
- arch/arm/boot/dts/rk3288.dtsi | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
-index 796609e3..45ec4e89 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
-+++ b/arch/arm/boot/dts/rk3288.dtsi
-@@ -1242,7 +1242,7 @@
- 			<GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
- 		interrupt-names = "irq_enc", "irq_dec";
- 		clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
-		clock-names = "aclk_vcodec", "hclk_vcodec";
-+		clock-names = "aclk", "iface";
- 		power-domains = <&power RK3288_PD_VIDEO>;
- 		rockchip,grf = <&grf>;
- 		resets = <&cru SRST_VCODEC_AXI>, <&cru SRST_VCODEC_AHB>;
-@@ -1277,8 +1277,8 @@
- 			<&cru SCLK_HEVC_CORE>,
- 			<&cru SCLK_HEVC_CABAC>;
- 		clock-names =
-			"aclk_vcodec",
-			"hclk_vcodec",
-+			"aclk",
-+			"iface",
- 			"clk_core",
- 			"clk_cabac";
- 		/*
-- 
-2.16.4
-
--- a/buildroot-external/board/asus/tinker/patches/linux/2026-ARM-DTSI-rk3288-Set-the-VPU-MMU-power-domains.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/2026-ARM-DTSI-rk3288-Set-the-VPU-MMU-power-domains.patch
@@ -1,56 +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
-@@ -1230,6 +1230,7 @@
- 		interrupt-names = "vpu_mmu";
- 		clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
- 		clock-names = "aclk", "iface";
-+		power-domains = <&power RK3288_PD_VIDEO>;
- 		#iommu-cells = <0>;
- 		status = "disabled";
- 	};
-@@ -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
-
--- a/buildroot-external/board/asus/tinker/patches/linux/2027-ARM-dtsi-The-VPU-service-as-defined-in-the-V4L2-driv.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/2027-ARM-dtsi-The-VPU-service-as-defined-in-the-V4L2-driv.patch
@@ -1,43 +0,0 @@
-From 7f8607ba9a20f8ddb5c24559d9b875af762d4717 Mon Sep 17 00:00:00 2001
-From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
-Date: Tue, 11 Sep 2018 02:55:55 +0200
-Subject: [PATCH] ARM: dtsi: The VPU service as defined in the V4L2 driver
-
-Let's try the V4L2 road.
-They've got a lot of things ready, like an entire H264
-movie with the V4L2 data of *every frame*.
-
-That might help in this endless endeavour.
-
-Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
---
- arch/arm/boot/dts/rk3288.dtsi | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
-index 72c36af6..d23c7fa5 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
-+++ b/arch/arm/boot/dts/rk3288.dtsi
-@@ -1246,7 +1246,18 @@
- 		clock-names = "aclk", "iface";
- 		power-domains = <&power RK3288_PD_VIDEO>;
- 		#iommu-cells = <0>;
-		status = "disabled";
-+	};
-+
-+	vpu: video-codec@ff9a0000 {
-+		clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
-+		clock-names = "aclk", "hclk";
-+		compatible = "rockchip,rk3288-vpu";
-+		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
-+			<GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
-+		interrupt-names = "vepu", "vdpu";
-+		iommus = <&vpu_mmu>;
-+		power-domains = <&power RK3288_PD_VIDEO>;
-+		reg = <0x0 0xff9a0000 0x0 0x800>;
- 	};
- 
- 	hevc_mmu: iommu@ff9c0440 {
-- 
-2.16.4
-
--- a/buildroot-external/board/asus/tinker/patches/linux/3000_RK3288-Tinkerboard-add-1.7_1.8Ghz_OPP.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/3000_RK3288-Tinkerboard-add-1.7_1.8Ghz_OPP.patch
@@ -1,45 +0,0 @@
-diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
-index 2601316da..08ec7aa4b 100644
--- a/arch/arm/boot/dts/rk3288-tinker.dts
-+++ b/arch/arm/boot/dts/rk3288-tinker.dts
-@@ -210,8 +210,8 @@
- 			vdd_cpu: DCDC_REG1 {
- 				regulator-always-on;
- 				regulator-boot-on;
-				regulator-min-microvolt = <750000>;
-				regulator-max-microvolt = <1450000>;
-+				regulator-min-microvolt = <712500>;
-+				regulator-max-microvolt = <1500000>;
- 				regulator-name = "vdd_arm";
- 				regulator-ramp-delay = <6000>;
- 				regulator-state-mem {
-@@ -222,8 +222,8 @@
- 			vdd_gpu: DCDC_REG2 {
- 				regulator-always-on;
- 				regulator-boot-on;
-				regulator-min-microvolt = <850000>;
-				regulator-max-microvolt = <1250000>;
-+				regulator-min-microvolt = <712500>;
-+				regulator-max-microvolt = <1500000>;
- 				regulator-name = "vdd_gpu";
- 				regulator-ramp-delay = <6000>;
- 				regulator-state-mem {
-diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
-index 22bcaaa29..2fcd46098 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
-+++ b/arch/arm/boot/dts/rk3288.dtsi
-@@ -149,6 +149,14 @@
- 			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>;
-+		};
- 	};
- 
- 	amba {
--- a/buildroot-external/board/asus/tinker/patches/linux/3002_RK3288-add-missing-interleaved-pcm-attribute.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/3002_RK3288-add-missing-interleaved-pcm-attribute.patch
@@ -1,37 +0,0 @@
-From 24d6638302b48328a58c13439276d4531af4ca7d Mon Sep 17 00:00:00 2001
-From: Katsuhiro Suzuki <katsuhiro@katsuster.net>
-Date: Tue, 11 Sep 2018 01:39:32 +0900
-Subject: ASoC: rockchip: add missing INTERLEAVED PCM attribute
-
-This patch adds SNDRV_PCM_INFO_INTERLEAVED into PCM hardware info.
-
-Signed-off-by: Katsuhiro Suzuki <katsuhiro@katsuster.net>
-Signed-off-by: Mark Brown <broonie@kernel.org>
---
- sound/soc/rockchip/rockchip_pcm.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-(limited to 'sound/soc/rockchip')
-
-Armbian Note: this patch has been backported from 4.20 to 4.19 due to break in rockchip HDMI/I2S audio. This
-can be safely removed once there is a new kernel bump.
-Origin: <https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/sound/soc/rockchip?h=linux-4.20.y&id=24d6638302b48328a58c13439276d4531af4ca7d>
-
-diff --git a/sound/soc/rockchip/rockchip_pcm.c b/sound/soc/rockchip/rockchip_pcm.c
-index f77538319221..9e7b5fa4cf59 100644
--- a/sound/soc/rockchip/rockchip_pcm.c
-+++ b/sound/soc/rockchip/rockchip_pcm.c
-@@ -21,7 +21,8 @@ static const struct snd_pcm_hardware snd_rockchip_hardware = {
- 	.info			= SNDRV_PCM_INFO_MMAP |
- 				  SNDRV_PCM_INFO_MMAP_VALID |
- 				  SNDRV_PCM_INFO_PAUSE |
-				  SNDRV_PCM_INFO_RESUME,
-+				  SNDRV_PCM_INFO_RESUME |
-+				  SNDRV_PCM_INFO_INTERLEAVED,
- 	.period_bytes_min	= 32,
- 	.period_bytes_max	= 8192,
- 	.periods_min		= 1,
-- 
-cgit 1.2-0.3.lf.el7
-
-
--- a/buildroot-external/board/asus/tinker/patches/linux/ARM-DTSI-rk3288-add-usbphy-reset.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/ARM-DTSI-rk3288-add-usbphy-reset.patch
@@ -1,31 +0,0 @@
-diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
-index 0840ffb3..5393f2cd 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
-+++ b/arch/arm/boot/dts/rk3288.dtsi
-@@ -894,6 +894,8 @@
- 				reg = <0x320>;
- 				clocks = <&cru SCLK_OTGPHY0>;
- 				clock-names = "phyclk";
-+				resets = <&cru SRST_USBOTG_PHY>;
-+				reset-names = "phy-reset";
- 				#clock-cells = <0>;
- 			};
- 
-@@ -902,6 +904,8 @@
- 				reg = <0x334>;
- 				clocks = <&cru SCLK_OTGPHY1>;
- 				clock-names = "phyclk";
-+				resets = <&cru SRST_USBHOST0_PHY>;
-+				reset-names = "phy-reset";
- 				#clock-cells = <0>;
- 			};
- 
-@@ -910,6 +914,8 @@
- 				reg = <0x348>;
- 				clocks = <&cru SCLK_OTGPHY2>;
- 				clock-names = "phyclk";
-+				resets = <&cru SRST_USBHOST1_PHY>;
-+				reset-names = "phy-reset";
- 				#clock-cells = <0>;
- 			};
- 		};
--- a/buildroot-external/board/asus/tinker/patches/linux/assert-phy-reset-when-waking-up-in-rk3288-platform.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/assert-phy-reset-when-waking-up-in-rk3288-platform.patch
@@ -1,68 +0,0 @@
-diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
-index cc9c93af..3ff41d87 100644
--- a/drivers/usb/dwc2/core.h
-+++ b/drivers/usb/dwc2/core.h
-@@ -1021,6 +1021,7 @@ struct dwc2_hsotg {
- 	u16 frame_number;
- 
- 	struct phy *phy;
-+	struct work_struct phy_rst_work;
- 	struct usb_phy *uphy;
- 	struct dwc2_hsotg_plat *plat;
- 	struct regulator_bulk_data supplies[DWC2_NUM_SUPPLIES];
-diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c
-index 19ae2595..f1270bf1 100644
--- a/drivers/usb/dwc2/core_intr.c
-+++ b/drivers/usb/dwc2/core_intr.c
-@@ -396,6 +396,7 @@ static void dwc2_wakeup_from_lpm_l1(struct dwc2_hsotg *hsotg)
- static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg)
- {
- 	int ret;
-+	struct device_node *np = hsotg->dev->of_node;
- 
- 	/* Clear interrupt */
- 	dwc2_writel(hsotg, GINTSTS_WKUPINT, GINTSTS);
-@@ -435,6 +436,16 @@ static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg)
- 			/* Restart the Phy Clock */
- 			pcgcctl &= ~PCGCTL_STOPPCLK;
- 			dwc2_writel(hsotg, pcgcctl, PCGCTL);
-+
-+			/*
-+			 * It is a quirk in Rockchip RK3288, causing by
-+			 * a hardware bug. This will propagate out and
-+			 * eventually we'll re-enumerate the device.
-+			 * Not great but the best we can do.
-+			*/
-+			if (of_device_is_compatible(np, "rockchip,rk3288-usb"))
-+				schedule_work(&hsotg->phy_rst_work);
-+
- 			mod_timer(&hsotg->wkp_timer,
- 				  jiffies + msecs_to_jiffies(71));
- 		} else {
-diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
-index 57764289..748763bd 100644
--- a/drivers/usb/dwc2/platform.c
-+++ b/drivers/usb/dwc2/platform.c
-@@ -208,6 +208,14 @@ int dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg)
- 	return ret;
- }
- 
-+/* Only used to reset usb phy at interrupter runtime */
-+static void dwc2_reset_phy_work(struct work_struct *data)
-+{
-+	struct dwc2_hsotg *hsotg = container_of(data, struct dwc2_hsotg,
-+			phy_rst_work);
-+	phy_reset(hsotg->phy);
-+}
-+
- static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg)
- {
- 	int i, ret;
-@@ -252,6 +260,7 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg)
- 			return ret;
- 		}
- 	}
-+	INIT_WORK(&hsotg->phy_rst_work, dwc2_reset_phy_work);
- 
- 	if (!hsotg->phy) {
- 		hsotg->uphy = devm_usb_get_phy(hsotg->dev, USB_PHY_TYPE_USB2);
--- a/buildroot-external/board/asus/tinker/patches/linux/board-tinkerboard-support-older-eMMC-installs.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/board-tinkerboard-support-older-eMMC-installs.patch
@@ -1,665 +0,0 @@
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 2d0b2f4c4..d5c9022e7 100644
--- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -859,6 +859,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
- 	rk3288-firefly-beta.dtb \
- 	rk3288-firefly.dtb \
- 	rk3288-firefly-reload.dtb \
-+	rk3288-miniarm.dtb \
- 	rk3288-miqi.dtb \
- 	rk3288-phycore-rdk.dtb \
- 	rk3288-popmetal.dtb \
-diff --git a/arch/arm/boot/dts/rk3288-miniarm.dts b/arch/arm/boot/dts/rk3288-miniarm.dts
-new file mode 100644
-index 000000000..d0961c35d
--- /dev/null
-+++ b/arch/arm/boot/dts/rk3288-miniarm.dts
-@@ -0,0 +1,647 @@
-+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-+/*
-+ * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd.
-+ */
-+
-+/dts-v1/;
-+
-+#include "rk3288.dtsi"
-+#include <dt-bindings/input/input.h>
-+#include <dt-bindings/clock/rockchip,rk808.h>
-+
-+/ {
-+	model = "Rockchip RK3288 Tinker Board";
-+	compatible = "asus,rk3288-tinker", "rockchip,rk3288";
-+
-+	chosen {
-+		stdout-path = "serial2:115200n8";
-+	};
-+
-+	memory {
-+		reg = <0x0 0x0 0x0 0x80000000>;
-+		device_type = "memory";
-+	};
-+
-+	ext_gmac: external-gmac-clock {
-+		compatible = "fixed-clock";
-+		#clock-cells = <0>;
-+		clock-frequency = <125000000>;
-+		clock-output-names = "ext_gmac";
-+	};
-+
-+	gpio-keys {
-+		compatible = "gpio-keys";
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		autorepeat;
-+
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pwrbtn>;
-+
-+		button@0 {
-+			gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
-+			linux,code = <KEY_POWER>;
-+			label = "GPIO Key Power";
-+			linux,input-type = <1>;
-+			wakeup-source;
-+			debounce-interval = <100>;
-+		};
-+	};
-+
-+	gpio-leds {
-+		compatible = "gpio-leds";
-+
-+		act-led {
-+			gpios=<&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
-+			linux,default-trigger="mmc0";
-+		};
-+
-+		heartbeat-led {
-+			gpios=<&gpio1 RK_PD1 GPIO_ACTIVE_HIGH>;
-+			linux,default-trigger="heartbeat";
-+		};
-+
-+		pwr-led {
-+			gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>;
-+			linux,default-trigger = "default-on";
-+		};
-+	};
-+
-+	sound {
-+		compatible = "simple-audio-card";
-+		simple-audio-card,format = "i2s";
-+		simple-audio-card,name = "rockchip,tinker-codec";
-+		simple-audio-card,mclk-fs = <512>;
-+
-+		simple-audio-card,codec {
-+			sound-dai = <&hdmi>;
-+		};
-+
-+		simple-audio-card,cpu {
-+			sound-dai = <&i2s>;
-+		};
-+	};
-+
-+	/* 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 RK_PD4 GPIO_ACTIVE_LOW>, <&gpio4 RK_PD3 GPIO_ACTIVE_LOW>;
-+	};
-+
-+	vcc_sys: vsys-regulator {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc_sys";
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		regulator-always-on;
-+		regulator-boot-on;
-+	};
-+
-+	vcc_sd: sdmmc-regulator {
-+		compatible = "regulator-fixed";
-+		gpio = <&gpio7 11 GPIO_ACTIVE_LOW>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&sdmmc_pwr>;
-+		regulator-name = "vcc_sd";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		startup-delay-us = <100000>;
-+		vin-supply = <&vcc_io>;
-+	};
-+
-+	wireless-wlan {
-+		compatible = "wlan-platdata";
-+		rockchip,grf = <&grf>;
-+		wifi_chip_type = "8723bs";
-+		sdio_vref = <1800>;
-+		WIFI,host_wake_irq = <&gpio4 30 GPIO_ACTIVE_HIGH>;
-+		status = "okay";
-+	};
-+/*
-+	wireless-bluetooth {
-+		compatible = "bluetooth-platdata";
-+		uart_rts_gpios = <&gpio4 19 GPIO_ACTIVE_LOW>;
-+		pinctrl-names = "default","rts_gpio";
-+		pinctrl-0 = <&uart0_rts>;
-+		pinctrl-1 = <&uart0_gpios>;
-+		BT,reset_gpio    = <&gpio4 29 GPIO_ACTIVE_HIGH>;
-+		BT,wake_gpio     = <&gpio4 26 GPIO_ACTIVE_HIGH>;
-+		BT,wake_host_irq = <&gpio4 31 GPIO_ACTIVE_HIGH>;
-+		status = "okay";
-+	};
-+*/
-+
-+};
-+
-+&cpu0 {
-+	cpu0-supply = <&vdd_cpu>;
-+};
-+
-+&gmac {
-+	assigned-clocks = <&cru SCLK_MAC>;
-+	assigned-clock-parents = <&ext_gmac>;
-+	clock_in_out = "input";
-+	phy-mode = "rgmii";
-+	phy-supply = <&vcc33_lan>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&rgmii_pins>;
-+	snps,reset-gpio = <&gpio4 7 0>;
-+	snps,reset-active-low;
-+	snps,reset-delays-us = <0 10000 1000000>;
-+	tx_delay = <0x30>;
-+	rx_delay = <0x10>;
-+	status = "ok";
-+};
-+
-+&gpu {
-+	mali-supply = <&vdd_gpu>;
-+	status = "okay";
-+};
-+
-+&hdmi {
-+	ddc-i2c-bus = <&i2c5>;
-+	status = "okay";
-+};
-+
-+&i2c0 {
-+	clock-frequency = <400000>;
-+	status = "okay";
-+
-+	rk808: pmic@1b {
-+		compatible = "rockchip,rk808";
-+		reg = <0x1b>;
-+		interrupt-parent = <&gpio0>;
-+		interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
-+		#clock-cells = <1>;
-+		clock-output-names = "xin32k", "rk808-clkout2";
-+		dvs-gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>,
-+				<&gpio0 12 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pmic_int &global_pwroff &dvs_1 &dvs_2>;
-+		rockchip,system-power-controller;
-+		wakeup-source;
-+
-+		vcc1-supply = <&vcc_sys>;
-+		vcc2-supply = <&vcc_sys>;
-+		vcc3-supply = <&vcc_sys>;
-+		vcc4-supply = <&vcc_sys>;
-+		vcc6-supply = <&vcc_sys>;
-+		vcc7-supply = <&vcc_sys>;
-+		vcc8-supply = <&vcc_io>;
-+		vcc9-supply = <&vcc_io>;
-+		vcc10-supply = <&vcc_io>;
-+		vcc11-supply = <&vcc_sys>;
-+		vcc12-supply = <&vcc_io>;
-+		vddio-supply = <&vcc_io>;
-+
-+		regulators {
-+			vdd_cpu: DCDC_REG1 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <712500>;
-+				regulator-max-microvolt = <1500000>;
-+				regulator-name = "vdd_arm";
-+				regulator-ramp-delay = <6000>;
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vdd_gpu: DCDC_REG2 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <712500>;
-+				regulator-max-microvolt = <1500000>;
-+				regulator-name = "vdd_gpu";
-+				regulator-ramp-delay = <6000>;
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <1000000>;
-+				};
-+			};
-+
-+			vcc_ddr: DCDC_REG3 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-name = "vcc_ddr";
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+				};
-+			};
-+
-+			vcc_io: DCDC_REG4 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <3300000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-name = "vcc_io";
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <3300000>;
-+				};
-+			};
-+
-+			vcc18_ldo1: LDO_REG1 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcc18_ldo1";
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <1800000>;
-+				};
-+			};
-+
-+			vcc33_mipi: LDO_REG2 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <3300000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-name = "vcc33_mipi";
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vdd_10: LDO_REG3 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1000000>;
-+				regulator-max-microvolt = <1000000>;
-+				regulator-name = "vdd_10";
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <1000000>;
-+				};
-+			};
-+
-+			vcc18_codec: LDO_REG4 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcc18_codec";
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <1800000>;
-+				};
-+			};
-+
-+			vccio_sd: LDO_REG5 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-name = "vccio_sd";
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <3300000>;
-+				};
-+			};
-+
-+			vdd10_lcd: LDO_REG6 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1000000>;
-+				regulator-max-microvolt = <1000000>;
-+				regulator-name = "vdd10_lcd";
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <1000000>;
-+				};
-+			};
-+
-+			vcc_18: LDO_REG7 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcc_18";
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <1800000>;
-+				};
-+			};
-+
-+			vcc18_lcd: LDO_REG8 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcc18_lcd";
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <1800000>;
-+				};
-+			};
-+
-+			vcc33_sd: SWITCH_REG1 {
-+				regulator-boot-on;
-+				regulator-name = "vcc33_sd";
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+				};
-+			};
-+
-+			vcc33_lan: SWITCH_REG2 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-name = "vcc33_lan";
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+				};
-+			};
-+		};
-+	};
-+};
-+
-+&i2c1 {
-+	status = "okay";
-+};
-+
-+&i2c2 {
-+	status = "okay";
-+
-+	afc0:af-controller@0 {
-+		status = "okay";
-+		compatible = "silicon touch,vm149C-v4l2-i2c-subdev";
-+		reg = <0x0c>;
-+	};
-+
-+	eeprom:m24c08@50 {
-+		compatible = "at,24c08";
-+		reg = <0x50>;
-+	};
-+};
-+
-+&i2c3 {
-+	status = "okay";
-+};
-+
-+&i2c4 {
-+	status = "okay";
-+};
-+
-+&i2c5 {
-+	status = "okay";
-+};
-+
-+&i2s {
-+	#sound-dai-cells = <0>;
-+	status = "okay";
-+};
-+
-+&io_domains {
-+	status = "okay";
-+	rockchip,grf = <&grf>;
-+	wifi-supply = <&vcc_18>;
-+	sdcard-supply = <&vccio_sd>;
-+};
-+
-+&sdio0 {
-+	status = "okay";
-+	clock-frequency = <50000000>;
-+	clock-freq-min-max = <200000 50000000>;
-+	bus-width = <4>;
-+	cap-sd-highspeed;
-+	cap-sdio-irq;
-+	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;
-+	supports-sdio;
-+
-+};
-+
-+&pinctrl {
-+	pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma {
-+		drive-strength = <8>;
-+	};
-+
-+	pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma {
-+		bias-pull-up;
-+		drive-strength = <8>;
-+	};
-+
-+	backlight {
-+		bl_en: bl-en {
-+			rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	buttons {
-+		pwrbtn: pwrbtn {
-+			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
-+		};
-+	};
-+
-+	eth_phy {
-+		eth_phy_pwr: eth-phy-pwr {
-+			rockchip,pins = <0 6 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	pmic {
-+		pmic_int: pmic-int {
-+			rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO \
-+					&pcfg_pull_up>;
-+		};
-+
-+		dvs_1: dvs-1 {
-+			rockchip,pins = <RK_GPIO0 11 RK_FUNC_GPIO \
-+					&pcfg_pull_down>;
-+		};
-+
-+		dvs_2: dvs-2 {
-+			rockchip,pins = <RK_GPIO0 12 RK_FUNC_GPIO \
-+					&pcfg_pull_down>;
-+		};
-+	};
-+
-+	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>;
-+		};
-+	};
-+
-+	sdmmc {
-+		sdmmc_bus4: sdmmc-bus4 {
-+			rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
-+					<6 17 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
-+					<6 18 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
-+					<6 19 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
-+		};
-+
-+		sdmmc_clk: sdmmc-clk {
-+			rockchip,pins = <6 20 RK_FUNC_1 \
-+					&pcfg_pull_none_drv_8ma>;
-+		};
-+
-+		sdmmc_cmd: sdmmc-cmd {
-+			rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
-+		};
-+
-+		sdmmc_pwr: sdmmc-pwr {
-+			rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	usb {
-+		host_vbus_drv: host-vbus-drv {
-+			rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+
-+		pwr_3g: pwr-3g {
-+			rockchip,pins = <7 8 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	wireless-bluetooth {
-+		uart0_gpios: uart0-gpios {
-+			rockchip,pins = <4 19 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+};
-+
-+&pwm0 {
-+	status = "okay";
-+};
-+
-+&saradc {
-+	vref-supply = <&vcc18_ldo1>;
-+	status ="okay";
-+};
-+
-+&sdmmc {
-+	bus-width = <4>;
-+	cap-mmc-highspeed;
-+	cap-sd-highspeed;
-+	card-detect-delay = <200>;
-+	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>;
-+};
-+
-+&emmc {
-+	bus-width = <8>;
-+	cap-mmc-highspeed;
-+	disable-wp;
-+	non-removable;
-+	num-slots = <1>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
-+	max-frequency = <150000000>;
-+	mmc-hs200-1_8v;
-+	mmc-ddr-1_8v;
-+	status = "okay";
-+};
-+
-+&tsadc {
-+	rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
-+	rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
-+	status = "okay";
-+};
-+
-+&uart0 {
-+	status = "okay";
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart0_xfer>, <&uart0_cts>,  <&uart0_rts>;
-+};
-+
-+&uart1 {
-+	status = "okay";
-+};
-+
-+&uart2 {
-+	status = "okay";
-+};
-+
-+&uart3 {
-+	status = "okay";
-+};
-+
-+&uart4 {
-+	status = "okay";
-+};
-+
-+&usbphy {
-+	status = "okay";
-+};
-+
-+&usb_host0_ehci {
-+	status = "okay";
-+};
-+
-+&usb_host1 {
-+	status = "okay";
-+};
-+
-+&usb_otg {
-+	status= "okay";
-+};
-+
-+&vopb {
-+	status = "okay";
-+};
-+
-+&vopb_mmu {
-+	status = "okay";
-+};
-+
-+&vopl {
-+	status = "okay";
-+};
-+
-+&vopl_mmu {
-+	status = "okay";
-+};
-+
-+&vpu_mmu {
-+	status = "okay";
-+};
-+
-+&vpu_service {
-+	status = "okay";
-+};
-+
-+&hevc_mmu {
-+	status = "okay";
-+};
-+
-+&hevc_service {
-+	status = "okay";
-+};
-+
-+&wdt {
-+	status = "okay";
-+};
--- a/buildroot-external/board/asus/tinker/patches/linux/brcmfmac-add-ap6330-firmware.patch
+++ b/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),
--- a/buildroot-external/board/asus/tinker/patches/linux/general-increasing_DMA_block_memory_allocation_to_2048.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/general-increasing_DMA_block_memory_allocation_to_2048.patch
@@ -1,27 +0,0 @@
-diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
-index 3216e09..21bce28
--- a/arch/arm64/mm/dma-mapping.c
-+++ b/arch/arm64/mm/dma-mapping.c
-@@ -44,7 +44,7 @@ static pgprot_t __get_dma_pgprot(unsigned long attrs, pgprot_t prot,
-
- static struct gen_pool *atomic_pool;
-
-#define DEFAULT_DMA_COHERENT_POOL_SIZE  SZ_256K
-+#define DEFAULT_DMA_COHERENT_POOL_SIZE  SZ_2M
- static size_t atomic_pool_size __initdata = DEFAULT_DMA_COHERENT_POOL_SIZE;
-
- static int __init early_coherent_pool(char *p)
-
-diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
-index ada8eb2..8df220f
--- a/arch/arm/mm/dma-mapping.c
-+++ b/arch/arm/mm/dma-mapping.c
-@@ -381,7 +381,7 @@ static void __dma_free_remap(void *cpu_addr, size_t size)
- 			VM_ARM_DMA_CONSISTENT | VM_USERMAP);
- }
-
-#define DEFAULT_DMA_COHERENT_POOL_SIZE	SZ_256K
-+#define DEFAULT_DMA_COHERENT_POOL_SIZE	SZ_2M
- static struct gen_pool *atomic_pool __ro_after_init;
-
- static size_t atomic_pool_size __initdata = DEFAULT_DMA_COHERENT_POOL_SIZE;
--- a/buildroot-external/board/asus/tinker/patches/linux/xt-q8l-v10-add-device-tree.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/xt-q8l-v10-add-device-tree.patch
@@ -1,972 +0,0 @@
--- /dev/null
-+++ b/arch/arm/boot/dts/rk3288-xt-q8l-v10.dts	2018-12-06 21:46:51.493688015 +0000
-@@ -0,0 +1,969 @@
-+/*
-+ * Copyright (c) 2014, 2015 FUKAUMI Naoki <naobsd@gmail.com>
-+ * 					   2018 Paolo Sabatino <paolo.sabatino@gm**l.com>
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ *  a) This file is free software; you can redistribute it and/or
-+ *     modify it under the terms of the GNU General Public License as
-+ *     published by the Free Software Foundation; either version 2 of the
-+ *     License, or (at your option) any later version.
-+ *
-+ *     This file is distributed in the hope that it will be useful,
-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *     GNU General Public License for more details.
-+ *
-+ * Or, alternatively,
-+ *
-+ *  b) Permission is hereby granted, free of charge, to any person
-+ *     obtaining a copy of this software and associated documentation
-+ *     files (the "Software"), to deal in the Software without
-+ *     restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or
-+ *     sell copies of the Software, and to permit persons to whom the
-+ *     Software is furnished to do so, subject to the following
-+ *     conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be
-+ *     included in all copies or substantial portions of the Software.
-+ *
-+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ *     OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/dts-v1/;
-+
-+#include "rk3288.dtsi"
-+#include <dt-bindings/input/input.h>
-+
-+/ {
-+	model = "XT-Q8L-V10-RK3288";
-+	compatible = "generic,xt-q8l-v10-rk3288", "rockchip,rk3288";
-+
-+	memory {
-+		reg = <0x0 0x0 0x0 0x80000000>;
-+		device_type = "memory";
-+	};
-+	
-+	cpu0_opp_table: opp_table {
-+		compatible = "operating-points-v2";
-+		opp-shared;
-+
-+		opp@600000000 {
-+			opp-hz = /bits/ 64 <600000000>;
-+			opp-microvolt = <900000>;
-+		};
-+		opp@816000000 {
-+			opp-hz = /bits/ 64 <816000000>;
-+			opp-microvolt = <1000000>;
-+		};
-+		opp@1008000000 {
-+			opp-hz = /bits/ 64 <1008000000>;
-+			opp-microvolt = <1050000>;
-+		};
-+		opp@1200000000 {
-+			opp-hz = /bits/ 64 <1200000000>;
-+			opp-microvolt = <1100000>;
-+		};
-+		opp@1416000000 {
-+			opp-hz = /bits/ 64 <1416000000>;
-+			opp-microvolt = <1200000>;
-+		};
-+		opp@1512000000 {
-+			opp-hz = /bits/ 64 <1512000000>;
-+			opp-microvolt = <1250000>;
-+		};
-+		opp@1608000000 {
-+			opp-hz = /bits/ 64 <1608000000>;
-+			opp-microvolt = <1300000>;
-+		};
-+		/*
-+		opp@1704000000 {
-+			opp-hz = /bits/ 64 <1704000000>;
-+			opp-microvolt = <1350000>;
-+		};
-+		opp@1800000000 {
-+			opp-hz = /bits/ 64 <1800000000>;
-+			opp-microvolt = <1400000>;
-+		};
-+		*/
-+	};
-+	
-+	/*
-+	 * Peripheral from original q8 device tree, currently no references
-+	 * for drivers in linux kernel.
-+	rockchip-hsadc@ff080000 {
-+		compatible = "rockchip-hsadc";
-+		reg = <0xff080000 0x4000>;
-+		interrupts = <0x0 0x1f 0x4>;
-+		#address-cells = <0x1>;
-+		#size-cells = <0x0>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <0x9a>;
-+		clocks = <0x79 0x7 0x8 0x39>;
-+		clock-names = "hclk_hsadc", "clk_hsadc_out", "clk_hsadc_ext";
-+		dmas = <0x9b 0x0>;
-+		dma-names = "data";
-+		status = "disabled";
-+	};
-+	*/
-+
-+	ext_gmac: external-gmac-clock {
-+		compatible = "fixed-clock";
-+		#clock-cells = <0>;
-+		clock-frequency = <125000000>;
-+		clock-output-names = "ext_gmac";
-+	};
-+	
-+	/*
-+	 * Handle the IR receiver using the gpio-ir-receiver kernel module.
-+	 * This works flawlessy, the original xt-q8l-v10 remote uses a NEC
-+	 * protocol and the keymap rc-xt-q8l-v10 has to be compiled in the
-+	 * kernel for the remote to work as an input device
-+	 */
-+	ir: ir-receiver {
-+		compatible = "gpio-ir-receiver";
-+		gpios = <&gpio7 RK_PA0 GPIO_ACTIVE_LOW>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&ir_int>;
-+		linux,rc-map-name = "rc-xt-q8l-v10";
-+		wakeup-source;
-+	};	
-+
-+	keys: gpio-keys {
-+		compatible = "gpio-keys";
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pwr_key>;
-+
-+		button@0 {
-+			gpio-key,wakeup = <1>;
-+			gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;
-+			label = "GPIO Power";
-+			linux,code = <KEY_POWER>;
-+			wakeup-source;
-+			debounce-interval = <100>;
-+		};
-+		
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		power {
-+			/*
-+				Power led is active high, but we set it here active low
-+				so while there is mass storage access it turns red and
-+				when it is idle is blue
-+			*/
-+			gpios = <&gpio7 2 GPIO_ACTIVE_LOW>; 
-+			label = "power";
-+			linux,default-trigger = "mmc0";
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&power_led>;
-+		};
-+
-+	};
-+
-+	vcc_sys: vsys-regulator {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc_sys";
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		regulator-always-on;
-+		regulator-boot-on;
-+	};
-+
-+	vcc_sd: sdmmc-regulator {
-+		compatible = "regulator-fixed";
-+		gpio = <&gpio7 11 GPIO_ACTIVE_LOW>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&sdmmc_pwr>;
-+		regulator-name = "vcc_sd";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		startup-delay-us = <100000>;
-+		vin-supply = <&vcc_io>;
-+	};
-+
-+	vcc_flash: flash-regulator {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc_flash";
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <1800000>;
-+		vin-supply = <&vcc_io>;
-+	};
-+
-+	vcc_host_5v: usb-host-regulator {
-+		compatible = "regulator-fixed";
-+		gpio = <&gpio0 14 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&host_vbus_drv>;
-+		regulator-name = "vcc_host_5v";
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+        regulator-always-on;
-+        enable-active-high;
-+//        startup-delay-us = <1000>;
-+		vin-supply = <&vcc_sys>;
-+	};
-+
-+
-+	vcc_otg_5v: usb-otg-regulator {
-+		compatible = "regulator-fixed";
-+		enable-active-high;
-+		gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&otg_vbus_drv>;
-+		regulator-name = "vcc_otg_5v";
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+//        startup-delay-us = <1000>;
-+		regulator-always-on;
-+		vin-supply = <&vcc_sys>;
-+	};
-+
-+	/*
-+	 * Required power sequence to properly enable the wireless/bluetooth
-+	 * module connected to sdio0
-+	 */
-+	sdio0_pwrseq: sdio0_pwrseq {
-+		compatible = "mmc-pwrseq-simple";
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&wifi_enable_h>, <&bt_enable_h>;
-+		reset-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>, <&gpio4 29 GPIO_ACTIVE_LOW>;
-+		post-power-on-delay-ms = <100>;
-+	};
-+	
-+	/*
-+	 * Sound taken from tinkerboard device tree, adapted to q8.
-+	 */
-+	soundcard-hdmi {
-+		compatible = "simple-audio-card";
-+		simple-audio-card,format = "i2s";
-+		simple-audio-card,name = "DW-I2S-HDMI";
-+		simple-audio-card,mclk-fs = <512>;
-+
-+		simple-audio-card,codec {
-+			sound-dai = <&hdmi>;
-+		};
-+
-+		simple-audio-card,cpu {
-+			sound-dai = <&i2s>;
-+		};
-+	};
-+	
-+	soundcard-spdif {
-+        compatible = "simple-audio-card";
-+        simple-audio-card,name = "SPDIF";
-+        simple-audio-card,dai-link@1 {
-+			
-+            cpu { 
-+				sound-dai = <&spdif>; 
-+			};
-+			
-+            codec { 
-+				sound-dai = <&spdif_out>; 
-+			};
-+			
-+        };
-+    };
-+
-+    spdif_out: spdif-out {
-+        compatible = "linux,spdif-dit";
-+        #sound-dai-cells = <0>;
-+    };
-+
-+};
-+
-+
-+&io_domains {
-+	status = "okay";
-+
-+	audio-supply = <&vcca_33>;
-+	bb-supply = <&vcc_io>;
-+	dvp-supply = <&vcc_18>;
-+	flash0-supply = <&vcc_flash>;
-+	flash1-supply = <&vcc_lan>;
-+	gpio30-supply = <&vcc_io>;
-+	gpio1830-supply = <&vcc_io>;
-+	lcdc-supply = <&vcc_io>;
-+	sdcard-supply = <&vccio_sd>;
-+	wifi-supply = <&vcc_18>;
-+};
-+
-+&cpu0 {
-+	cpu0-supply = <&vdd_cpu>;
-+	operating-points-v2 = <&cpu0_opp_table>;
-+	/delete-node/operating-points;
-+};
-+
-+&cpu1 {
-+	operating-points-v2 = <&cpu0_opp_table>;
-+	/delete-node/operating-points;
-+};
-+
-+&cpu2 {
-+	operating-points-v2 = <&cpu0_opp_table>;
-+	/delete-node/operating-points;
-+};
-+
-+&cpu3 {
-+	operating-points-v2 = <&cpu0_opp_table>;
-+	/delete-node/operating-points;
-+};
-+
-+&gmac {
-+	assigned-clocks = <&cru SCLK_MAC>;
-+	assigned-clock-parents = <&ext_gmac>;
-+	clock_in_out = "input";
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&rgmii_pins>, <&phy_rst>, <&phy_pmeb>, <&phy_int>;
-+	phy-supply = <&vcc_lan>;
-+	phy-mode = "rgmii";
-+	snps,reset-active-low;
-+	snps,reset-delays-us = <0 10000 1000000>;
-+	snps,reset-gpio = <&gpio4 8 GPIO_ACTIVE_LOW>;
-+	tx_delay = <0x30>;
-+	rx_delay = <0x10>;
-+	status = "ok";
-+};
-+
-+&hdmi {
-+	ddc-i2c-bus = <&i2c5>;
-+	status = "okay";
-+};
-+
-+&gpu {
-+	mali-supply = <&vdd_gpu>;
-+	status = "okay";
-+};
-+
-+&i2c0 {
-+	clock-frequency = <400000>;
-+	status = "okay";
-+
-+	vdd_cpu: syr827@40 {
-+		compatible = "silergy,syr827";
-+		fcs,suspend-voltage-selector = <1>;
-+		reg = <0x40>;
-+		regulator-name = "vdd_cpu";
-+		regulator-min-microvolt = <850000>;
-+		regulator-max-microvolt = <1350000>;
-+		regulator-ramp-delay = <8000>;
-+		regulator-always-on;
-+		regulator-boot-on;
-+		vin-supply = <&vcc_sys>;
-+	};
-+
-+	vdd_gpu: syr828@41 {
-+		compatible = "silergy,syr828";
-+		fcs,suspend-voltage-selector = <1>;
-+		reg = <0x41>;
-+		regulator-name = "vdd_gpu";
-+		regulator-min-microvolt = <850000>;
-+		regulator-max-microvolt = <1350000>;
-+		regulator-ramp-delay = <8000>;
-+		regulator-always-on;
-+		vin-supply = <&vcc_sys>;
-+	};
-+
-+	hym8563: hym8563@51 {
-+		compatible = "haoyu,hym8563";
-+		reg = <0x51>;
-+		#clock-cells = <0>;
-+		clock-frequency = <32768>;
-+		clock-output-names = "xin32k";
-+		interrupt-parent = <&gpio0>;
-+		interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&rtc_int>;
-+	};
-+
-+	act8846: act8846@5a {
-+		compatible = "active-semi,act8846";
-+		reg = <0x5a>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pmic_vsel>;
-+		system-power-controller;
-+
-+		vp1-supply = <&vcc_sys>;
-+		vp2-supply = <&vcc_sys>;
-+		vp3-supply = <&vcc_sys>;
-+		vp4-supply = <&vcc_sys>;
-+		inl1-supply = <&vcc_sys>;
-+		inl2-supply = <&vcc_sys>;
-+		inl3-supply = <&vcc_20>;
-+		wakeup-source;
-+
-+		regulators {
-+			
-+			/*
-+			 * Regulator controlling DDR memory - always on
-+			 */
-+			vcc_ddr: REG1 {
-+				regulator-name = "vcc_ddr";
-+				regulator-min-microvolt = <1200000>;
-+				regulator-max-microvolt = <1200000>;
-+				regulator-always-on;
-+			};
-+
-+			/*
-+			 * Regulator controlling various IO functions of the rk3288.
-+			 * Always on
-+			 */
-+			vcc_io: REG2 {
-+				regulator-name = "vcc_io";
-+				regulator-min-microvolt = <3300000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-always-on;
-+			};
-+
-+			/*
-+			 * Regulator controlling various board logic.
-+			 * Always on.
-+			 * rk3288 electrical datasheet says it should have variable
-+			 * voltage depending upon dvfs
-+			 */
-+			vdd_log: REG3 {
-+				regulator-name = "vdd_log";
-+				regulator-min-microvolt = <1100000>;
-+				regulator-max-microvolt = <1100000>;
-+				regulator-always-on;
-+			};
-+
-+			/*
-+			 * No reference for this on electrical datasheet. Maybe this
-+			 * is vcc_18? Maybe this is vcc18_flash on electrical datasheet.
-+			 * So far we disable it.
-+			 */
-+			vcc_20: REG4 {
-+				regulator-name = "vcc_20";
-+				regulator-min-microvolt = <2000000>;
-+				regulator-max-microvolt = <2000000>;
-+				regulator-always-on;
-+			};
-+
-+			/*
-+			 * This regulator controls SDIO. Electrical datasheet says
-+			 * this regulator can be operated between 1.8 and 3.3 volts
-+			 */
-+			vccio_sd: REG5 {
-+				regulator-name = "vccio_sd";
-+				regulator-min-microvolt = <1800000>; 
-+				regulator-max-microvolt = <3300000>;
-+				regulator-always-on;
-+			};
-+
-+			/*
-+			 * Controlling HDMI and LCD controller on rk3288. 1.0 volts
-+			 * by reference
-+			 */
-+			vdd10_lcd: REG6 {
-+				regulator-name = "vdd10_lcd";
-+				regulator-min-microvolt = <1000000>;
-+				regulator-max-microvolt = <1000000>;
-+				regulator-always-on;
-+			};
-+
-+			/*
-+			 * From the rk3288 electrical datasheet, this regulator powers
-+			 * the rk1000 chip, which is absent in our device, but it
-+			 * is also supplying bluetooth, so we enable it.
-+			 */
-+			vcca_18: REG7 {
-+				regulator-name = "vcca_18";
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-always-on;
-+			};
-+
-+			/*
-+			 * This regulator controls, among other things, the SPDIF
-+			 * interface, so we enable it
-+			 */
-+			vcca_33: REG8 {
-+				regulator-name = "vcca_33";
-+				regulator-min-microvolt = <3300000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-always-on; // Turn this on to get SPDIF!
-+			};
-+
-+			/*
-+			 * LAN regulator
-+			 */
-+			vcc_lan: REG9 {
-+				regulator-name = "vcc_lan";
-+				regulator-min-microvolt = <3300000>;
-+				regulator-max-microvolt = <3300000>;
-+			};
-+
-+			/*
-+			 * Regulator controlling PMU, USB PHY and rk3288 PLLs.
-+			 * 1.0 volts by reference
-+			 */
-+			vdd_10: REG10 {
-+				regulator-name = "vdd_10";
-+				regulator-min-microvolt = <1000000>;
-+				regulator-max-microvolt = <1000000>;
-+				regulator-always-on;
-+			};
-+
-+			/*
-+			 * Regulator controlling Wifi over SDIO, SARADC and USB PHY.
-+			 * Better turn this on
-+			 */
-+			vccio_wl: vcc_18: REG11 {
-+				regulator-name = "vcc_18";
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-always-on;
-+			};
-+
-+			/*
-+			 * Not clear: apparently this controls HDMI and LCD controller
-+			 * on rk3368 devices.
-+			 * 1.8 volts by reference
-+			 */
-+			vcc18_lcd: REG12 {
-+				regulator-name = "vcc18_lcd";
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-always-on;
-+			};
-+		};
-+	};
-+};
-+
-+&i2c1 {
-+	status = "okay";
-+};
-+
-+&i2c2 {
-+	status = "okay";
-+};
-+
-+&i2c4 {
-+	
-+	/*
-+	 * Here should go the RK1000 audio codec parts, but seems that
-+	 * there is no driver in linux kernel at the moment, so we can't
-+	 * describe it.
-+	 * Also, most important, there is no RK1000 on our board :)
-+	 * Datasheet is available here:
-+	 * http://dl.radxa.com/rock/docs/hw/ds/RK1000-S%20DATASHEET%20V14.pdf
-+	 */
-+	status = "okay";
-+	
-+};
-+
-+&i2c5 {
-+	status = "okay";
-+};
-+
-+&pinctrl {
-+
-+	/*
-+		These two lines here, these must be commented out! Otherwise for some reason the kernel
-+		does not see the boot device anymore and will stay stuck in initramfs!
-+		On the contrary, these are required by u-boot to keep the power holding so the device does not
-+		automatically turns off after a small timeout
-+	*/
-+	/*pinctrl-names = "default";*/
-+	/*pinctrl-0 = <&pwr_hold>;*/
-+
-+	pcfg_output_high: pcfg-output-high {
-+		output-high;
-+	};
-+
-+	pcfg_output_low: pcfg-output-low {
-+		output-low;
-+	};
-+
-+	pcfg_wl: pcfg-wl {
-+		bias-pull-up;
-+		drive-strength = <8>;
-+	};
-+	
-+	pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma {
-+		bias-pull-up;
-+		drive-strength = <8>;
-+	};
-+	
-+	pcfg_pull_none_8ma: pcfg-pull-none-8ma {
-+		bias-disable;
-+		drive-strength = <8>;
-+	};
-+
-+	pcfg_wl_clk: pcfg-wl-clk {
-+		bias-disable;
-+		drive-strength = <12>;
-+	};
-+
-+	pcfg_wl_int: pcfg-wl-int {
-+		bias-pull-up;
-+	};
-+	
-+	act8846 {
-+		
-+		/*
-+		 * Original q8 device tree says:
-+		 *  - gpio0 11 HIGH -> power hold
-+		 *  - gpio7 1 LOW -> possibly pmic-vsel, we don't care 
-+		 */ 
-+		pmic_vsel: pmic-vsel {
-+			rockchip,pins = <7 1 RK_FUNC_GPIO &pcfg_output_low>;
-+		};
-+		
-+		pwr_hold: pwr-hold {
-+			rockchip,pins = <0 11 RK_FUNC_GPIO &pcfg_pull_up>;
-+		};
-+	};
-+
-+	gmac {
-+		phy_int: phy-int {
-+			rockchip,pins = <0 9 RK_FUNC_GPIO &pcfg_pull_up>;
-+		};
-+
-+		phy_pmeb: phy-pmeb {
-+			rockchip,pins = <0 8 RK_FUNC_GPIO &pcfg_pull_up>;
-+		};
-+
-+		phy_rst: phy-rst {
-+			rockchip,pins = <4 8 RK_FUNC_GPIO &pcfg_output_high>;
-+		};
-+	};
-+
-+	hym8563 {
-+		rtc_int: rtc-int {
-+			rockchip,pins = <0 4 RK_FUNC_GPIO &pcfg_pull_up>;
-+		};
-+	};
-+
-+	keys {
-+		pwr_key: pwr-key {
-+			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	leds {
-+		power_led: power-led {
-+			rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	ir {
-+		ir_int: ir-int {
-+			rockchip,pins = <7 0 RK_FUNC_GPIO &pcfg_pull_up>;
-+		};
-+	};
-+
-+	sdmmc {
-+		
-+		/*
-+		 * Copied from firefly board definition to give more drive to
-+		 * the sdmmc pins. The Q8 seems to be quite able to drive
-+		 * ultra high speed uSD cards, so we give a bit more energy
-+		 * to the gpio pins
-+		 */
-+		sdmmc_bus4: sdmmc-bus4 {
-+			rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
-+					<6 17 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
-+					<6 18 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
-+					<6 19 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
-+		};
-+
-+		sdmmc_clk: sdmmc-clk {
-+			rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none_8ma>;
-+		};
-+
-+		sdmmc_cmd: sdmmc-cmd {
-+			rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
-+		};
-+
-+		sdmmc_pwr: sdmmc-pwr {
-+			rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+
-+	};
-+
-+	usb_host1 {
-+		host_vbus_drv: host-vbus-drv {
-+			rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+
-+	};
-+
-+	usb_otg {
-+		otg_vbus_drv: otg-vbus-drv {
-+			rockchip,pins = <0 12 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	sdio0 {
-+		wifi_enable_h: wifienable-h {
-+			rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_output_high>;
-+		};
-+
-+		bt_enable_h: bt-enable-h {
-+			rockchip,pins = <4 27 RK_FUNC_GPIO &pcfg_output_high>;
-+		};
-+
-+	};
-+	
-+	
-+	wireless-bluetooth {
-+		uart0_gpios: uart0-gpios {
-+			rockchip,pins = <4 19 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+};
-+
-+&saradc {
-+	vref-supply = <&vcc_18>;
-+	status = "okay";
-+};
-+
-+&emmc {
-+	
-+	/*
-+	 * eMMC seems to be 52Mhz device on q8 devices, so set it here
-+	 * vmmc-supply and vqmmc-supply are removed because they hang
-+	 * u-boot >= v2018.03
-+	 * From the original q8l firmware and eMMC datasheet it also should
-+	 * support DDR highspeed mode, but using mmc-ddr-3_3v or mmc-ddr-1_8v
-+	 * properties are not working
-+	 */
-+	clock-frequency = <50000000>;
-+	 
-+	broken-cd;
-+	bus-width = <8>;
-+	cap-mmc-highspeed;
-+	disable-wp;
-+	non-removable;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&emmc_clk>, <&emmc_cmd>, <&emmc_pwr>, <&emmc_bus8>;
-+
-+	status = "okay";
-+};
-+
-+&sdmmc {
-+	supports-sd;
-+
-+	bus-width = <4>;
-+	cap-mmc-highspeed;
-+	cap-sd-highspeed;
-+	card-detect-delay = <200>;
-+	disable-wp;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>;
-+	vmmc-supply = <&vcc_sd>;
-+	vqmmc-supply = <&vccio_sd>;
-+	sd-uhs-sdr12;
-+	sd-uhs-sdr25;
-+	sd-uhs-sdr50;
-+	sd-uhs-sdr104;
-+	sd-uhs-ddr50;
-+	status = "okay";
-+};
-+
-+&sdio0 {
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	
-+	bus-width = <4>;
-+	mmc-pwrseq = <&sdio0_pwrseq>;
-+	
-+	vmmc-supply = <&vcc_io>;
-+    vqmmc-supply = <&vcc_18>; // This must be the same as in io_domains, 
-+		// otherwise the mmc1 device won't be detected properly
-+		
-+//	clock-frequency = <50000000>;
-+//	max-frequency = <50000000>;
-+
-+	pinctrl-names = "default";
-+    pinctrl-0 = <&sdio0_bus4>, <&sdio0_cmd>, <&sdio0_clk>, <&sdio0_int>;
-+	
-+	cap-sdio-irq;
-+	no-mmc;
-+	no-sd;
-+	cap-sd-highspeed; // required, otherwise does not work!
-+	supports-sdio; 
-+	non-removable;
-+	
-+	keep-power-in-suspend;
-+	disable-wp;
-+ 
-+	
-+	status = "okay";
-+	
-+	brcmf: bcrmf@1 {
-+		reg = <1>;
-+		compatible = "brcm,bcm4329-fmac";
-+		interrupt-parent = <&gpio4>;
-+		interrupts = <30 IRQ_TYPE_LEVEL_LOW>;
-+		interrupt-names = "host-wake";
-+		status = "okay";
-+	}; 
-+	
-+	//sd-uhs-sdr104; // required to be disabled, otherwise the device get
-+		// detected, but there is no communication
-+
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_clk>, <&spi0_cs0>, <&spi0_tx>, <&spi0_rx>, <&spi0_cs1>;
-+	status = "okay";
-+};
-+
-+&tsadc {
-+	rockchip,hw-tshut-mode = <0>;
-+	rockchip,hw-tshut-polarity = <0>;
-+	status = "okay";
-+};
-+
-+/*
-+ * These dmas described here for uarts are present in original q8 board
-+ * dts, so I replicate them here because documentation says that serial
-+ * ports can have dmas.
-+ * note: 
-+ *  - uart0 is the serial port connected to the bluetooth module
-+ *  - uart2 is the onboard serial port 
-+ * 
-+ * As ok kernel 4.19 DMA for serial ports is disabled because it makes
-+ * the ports unusable
-+ * 
-+ */
-+&uart0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart0_xfer>, <&uart0_cts>, <&uart0_rts>;
-+	//dmas = <&dmac_peri 1 &dmac_peri 2>;
-+	//dma-names = "tx", "rx";
-+	status = "okay";
-+};
-+
-+&uart1 {
-+	//dmas = <&dmac_peri 3 &dmac_peri 4>;
-+	//dma-names = "tx", "rx";
-+	status = "okay";
-+};
-+
-+&uart2 {
-+	//dmas = <&dmac_bus_s 4 &dmac_bus_s 5>;
-+	//dma-names = "tx", "rx";
-+	status = "okay";
-+};
-+
-+&uart3 {
-+	//dmas = <&dmac_peri 7 &dmac_peri 8>;
-+	//dma-names = "tx", "rx";
-+	status = "okay";
-+};
-+
-+&uart4 {
-+	//dmas = <&dmac_peri 9 &dmac_peri 10>;
-+	//dma-names = "tx", "rx";
-+	status = "disabled";
-+};
-+
-+/*
-+ * Here usbphy* should have their proper reset lines described in rk3288.dtsi
-+ * Describing resets for usb phy is important because otherwise the USB
-+ * port gets stuck in case it goes into autosuspend: plugging any device
-+ * when the port is autosuspended will actually kill the port itself and
-+ * require a power cycle.
-+ * This is required for the usbphy1 phy, nonetheless it is a good idea to
-+ * specify the proper resources for all the phys though.
-+ * The reference patch which works in conjuction with the reset lines:
-+ * https://patchwork.kernel.org/patch/9469811/
-+ * 
-+ */
-+&usbphy {
-+	status = "okay";
-+};
-+ 
-+&usbphy0 {
-+    vbus-supply = <&vcc_otg_5v>;
-+};
-+
-+&usbphy2 {
-+    vbus-supply = <&vcc_host_5v>;
-+};
-+
-+&usb_host0_ehci {
-+    dr_mode = "host";
-+    reg = <0x0 0xff500000 0x0 0x20000>;
-+    status = "disable";
-+};
-+
-+&usb_host1 {
-+	status = "okay";
-+};
-+
-+&usb_otg {
-+	status = "okay";
-+};
-+
-+/*
-+ * Enable VPU services and complete the relative IOMMU configurations
-+ */
-+&vopb {
-+	status = "okay";
-+};
-+
-+&vopb_mmu {
-+	status = "okay";
-+};
-+
-+&vopl {
-+	status = "okay";
-+};
-+
-+&vopl_mmu {
-+	status = "okay";
-+};
-+
-+&vpu_mmu {
-+	status = "okay";
-+};
-+
-+&vpu_service {
-+	status = "okay";
-+};
-+
-+&hevc_mmu {
-+	status = "okay";
-+};
-+
-+&hevc_service {
-+	status = "okay";
-+};
-+
-+&wdt {
-+	status = "okay";
-+};
-+
-+// i2s bus is present on q8 device, enable it
-+&i2s {
-+	#sound-dai-cells = <0>;
-+	status = "okay";
-+};
-+
-+// spdif is present on q8 device, enable it
-+&spdif {
-+	status = "okay";
-+};
--- a/buildroot-external/board/asus/tinker/patches/linux/xt-q8l-v10-add-dts-makefile.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/xt-q8l-v10-add-dts-makefile.patch
@@ -1,12 +0,0 @@
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 37a3de760..6bcfceede 100644
--- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -832,6 +832,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
- 	rk3188-radxarock.dtb \
- 	rk3228-evb.dtb \
- 	rk3229-evb.dtb \
-+	rk3288-xt-q8l-v10.dtb \
- 	rk3288-evb-act8846.dtb \
- 	rk3288-evb-rk808.dtb \
- 	rk3288-fennec.dtb \
--- a/buildroot-external/board/asus/tinker/patches/linux/xt-q8l-v10-remote-keymap.patch
+++ b/buildroot-external/board/asus/tinker/patches/linux/xt-q8l-v10-remote-keymap.patch
@@ -1,103 +0,0 @@
-diff --git a/include/media/rc-map.h b/include/media/rc-map.h
-index bfa3017..c2a21bb 100644
--- a/include/media/rc-map.h
-+++ b/include/media/rc-map.h
-@@ -277,6 +277,7 @@ struct rc_map *rc_map_get(const char *name);
- #define RC_MAP_WINFAST                   "rc-winfast"
- #define RC_MAP_WINFAST_USBII_DELUXE      "rc-winfast-usbii-deluxe"
- #define RC_MAP_SU3000                    "rc-su3000"
-+#define RC_MAP_XT_Q8L_V10                "rc-xt-q8l-v10"
- #define RC_MAP_ZX_IRDEC                  "rc-zx-irdec"
- 
- /*
-diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
-index d6b913a..ee00ce5 100644
--- a/drivers/media/rc/keymaps/Makefile
-+++ b/drivers/media/rc/keymaps/Makefile
-@@ -116,4 +116,5 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
- 			rc-winfast.o \
- 			rc-winfast-usbii-deluxe.o \
- 			rc-su3000.o \
-+           rc-xt-q8l-v10.o \
- 			rc-zx-irdec.o
-diff --git a/drivers/media/rc/keymaps/rc-xt-q8l-v10.c b/drivers/media/rc/keymaps/rc-xt-q8l-v10.c
-index e69de29..19c7d9e 100644
--- /dev/null
-+++ b/drivers/media/rc/keymaps/rc-xt-q8l-v10.c
-@@ -0,0 +1,76 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+// rc-xt-q8l-v10.c - Keytable for xt-q8l-v10 tv box remote controller
-+//
-+// keymap imported from ir-keymaps.c
-+//
-+// Copyright (c) 2018 Paolo Sabatino
-+
-+#include <media/rc-map.h>
-+#include <linux/module.h>
-+
-+/*
-+
-+*/
-+
-+static struct rc_map_table xt_q8l_v10[] = {
-+	
-+	{ 0xcc1d11, KEY_ENTER },
-+	{ 0xcc1d00, KEY_POWER },
-+	{ 0xcc1d15, KEY_PLAYPAUSE },
-+	{ 0xcc1d16, KEY_STOP },
-+	{ 0xcc1d06, KEY_PREVIOUSSONG },
-+	{ 0xcc1d0a, KEY_NEXTSONG },
-+	{ 0xcc1d41, KEY_1 },
-+	{ 0xcc1d45, KEY_2 },
-+	{ 0xcc1d4d, KEY_3 },
-+	{ 0xcc1d42, KEY_4 },
-+	{ 0xcc1d46, KEY_5 },
-+	{ 0xcc1d4e, KEY_6 },
-+	{ 0xcc1d43, KEY_7 },
-+	{ 0xcc1d47, KEY_8 },
-+	{ 0xcc1d4f, KEY_9 },
-+	{ 0xcc1d49, KEY_0 },
-+	{ 0xcc1d4a, KEY_BACKSPACE },
-+	{ 0xcc1d48, KEY_F6 },
-+	{ 0xcc1d03, KEY_HOME },
-+	{ 0xcc1d0f, KEY_BACK },
-+	{ 0xcc1d40, KEY_MENU },
-+	{ 0xcc1d4c, KEY_TEXT },
-+	{ 0xcc1d10, KEY_LEFT },
-+	{ 0xcc1d12, KEY_RIGHT },
-+	{ 0xcc1d44, KEY_DOWN },
-+	{ 0xcc1d07, KEY_UP },
-+	{ 0xcc1d02, KEY_VOLUMEDOWN },
-+	{ 0xcc1d0c, KEY_MUTE },
-+	{ 0xcc1d0e, KEY_VOLUMEUP },
-+	{ 0xcc1d01, KEY_F1 },
-+	{ 0xcc1d05, KEY_F2 },
-+	{ 0xcc1d09, KEY_F3 },
-+	{ 0xcc1d0d, KEY_F4 },
-+	
-+};
-+
-+static struct rc_map_list xt_q8l_v10_map = {
-+	.map = {
-+		.scan     = xt_q8l_v10,
-+		.size     = ARRAY_SIZE(xt_q8l_v10),
-+		.rc_proto = RC_PROTO_NEC,	/* Legacy IR type */
-+		.name     = RC_MAP_XT_Q8L_V10,
-+	}
-+};
-+
-+static int __init init_rc_map_xt_q8l_v10(void)
-+{
-+	return rc_map_register(&xt_q8l_v10_map);
-+}
-+
-+static void __exit exit_rc_map_xt_q8l_v10(void)
-+{
-+	rc_map_unregister(&xt_q8l_v10_map);
-+}
-+
-+module_init(init_rc_map_xt_q8l_v10)
-+module_exit(exit_rc_map_xt_q8l_v10)
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Paolo Sabatino");
--- a/buildroot-external/board/asus/tinker/patches/uboot/101-u-boot-0002-rockchip-tinker-enable-rockchip-video-driver.patch.disabled
+++ b/buildroot-external/board/asus/tinker/patches/uboot/101-u-boot-0002-rockchip-tinker-enable-rockchip-video-driver.patch.disabled
@@ -1,25 +0,0 @@
-From cd0236ef771fd72e2975ca294ba2f1872d7dbc0b Mon Sep 17 00:00:00 2001
-From: Jonas Karlman <jonas@kwiboo.se>
-Date: Sun, 22 Oct 2017 12:48:24 +0200
-Subject: [PATCH 2/2] rockchip: tinker: enable rockchip video driver
-
---
- configs/tinker-rk3288_defconfig | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
-index 1315be3ee8..3a81328b48 100644
--- a/configs/tinker-rk3288_defconfig
-+++ b/configs/tinker-rk3288_defconfig
-@@ -78,6 +78,11 @@ CONFIG_USB_GADGET_DWC2_OTG=y
- CONFIG_USB_HOST_ETHER=y
- CONFIG_USB_ETHER_ASIX=y
- CONFIG_USB_ETHER_SMSC95XX=y
-+CONFIG_DM_VIDEO=y
-+CONFIG_DISPLAY=y
-+CONFIG_VIDEO_ROCKCHIP=y
-+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
-+CONFIG_CONSOLE_SCROLL_LINES=10
- CONFIG_USE_TINY_PRINTF=y
- CONFIG_CMD_DHRYSTONE=y
- CONFIG_ERRNO_STR=y
--- a/buildroot-external/board/hardkernel/odroid-c2/boot-env.txt
+++ b/buildroot-external/board/hardkernel/odroid-c2/boot-env.txt
@@ -1,131 +0,0 @@
-
-
-# Custom modeline!
-# To use custom modeline you need to disable all the below resolutions
-# and setup your own!
-# For more information check our wiki:
-# http://odroid.com/dokuwiki/doku.php?id=en:c2_hdmi_autosetting
-# Example below:
-#m=custombuilt
-#modeline=1920,1200,154000,74040,60,1920,1968,2000,2080,1200,1202,1208,1235,1,0,1
-
-# 480 Lines (720x480)
-#m=480i60hz
-#m=480i_rpt
-#m=480p60hz
-#m=480p_rpt
-
-# 576 Lines (720x576)
-#m=576i50hz
-#m=576i_rpt
-#m=576p50hz
-#m=576p_rpt
-
-# 720 Lines (1280x720)
-#m=720p50hz
-#m=720p60hz
-
-# 1080 Lines (1920x1080)
-#m=1080i60hz
-m=1080p60hz
-#m=1080i50hz
-#m=1080p50hz
-#m=1080p24hz
-
-# 4K (3840x2160)
-#m=2160p30hz
-#m=2160p25hz
-#m=2160p24hz
-#m=smpte24hz
-#m=2160p50hz
-#m=2160p60hz
-#m=2160p50hz420
-#m=2160p60hz420
-
-### VESA modes ###
-#m=640x480p60hz
-#m=800x480p60hz
-#m=480x800p60hz
-#m=800x600p60hz
-#m=1024x600p60hz
-#m=1024x768p60hz
-#m=1280x800p60hz
-#m=1280x1024p60hz
-#m=1360x768p60hz
-#m=1440x900p60hz
-#m=1600x900p60hz
-#m=1680x1050p60hz
-#m=1600x1200p60hz
-#m=1920x1200p60hz
-#m=2560x1080p60hz
-#m=2560x1440p60hz
-#m=2560x1600p60hz
-#m=3440x1440p60hz
-
-# HDMI BPP Mode
-m_bpp=32
-#m_bpp=24
-#m_bpp=16
-
-# HDMI DVI/VGA modes
-# By default its set to HDMI, if needed change below.
-# Uncomment only a single Line.
-#vout=dvi
-#vout=vga
-
-# HDMI HotPlug Detection control
-# Allows you to force HDMI thinking that the cable is connected.
-# true = HDMI will believe that cable is always connected
-# false = will let board/monitor negotiate the connection status
-hpd=true
-#hpd=false
-
-# Monitor output
-# Controls if HDMI PHY should output anything to the monitor
-monitor_onoff=false
-
-# Server Mode (aka. No Graphics)
-# Setting nographics to 1 will disable all video subsystem
-# This mode is ideal of server type usage. (Saves ~300Mb of RAM)
-nographics=0
-
-# Meson Timer
-# 1 - Meson Timer
-# 0 - Arch Timer
-# Using meson_timer improves the video playback however it breaks KVM (virtualization).
-# Using arch timer allows KVM/Virtualization to work however you'll experience poor video
-mesontimer=1
-
-# UHS (Ultra High Speed) MicroSD mode enable/disable
-disableuhs=false
-
-# MicroSD Card Detection enable/disable
-# Force the MMC controlled to believe that a card is connected.
-mmc_removable=true
-
-# USB Multi WebCam tweak
-# Only enable this if you use it.
-usbmulticam=false
-
-# CPU Frequency / Cores control
-###########################################
-### WARNING!!! WARNING!!! WARNING!!!
-# Before changing anything here please read the wiki entry:
-# http://odroid.com/dokuwiki/doku.php?id=en:c2_set_cpu_freq
-#
-# MAX CPU's
-#maxcpus=1
-#maxcpus=2
-#maxcpus=3
-maxcpus=4
-
-# MAX Frequency
-#max_freq=2016
-#max_freq=1944
-#max_freq=1944
-#max_freq=1920
-#max_freq=1896
-#max_freq=1752
-#max_freq=1680
-#max_freq=1656
-max_freq=1536
--- a/buildroot-external/board/hardkernel/odroid-c2/hassos-hook.sh
+++ b/buildroot-external/board/hardkernel/odroid-c2/hassos-hook.sh
@@ -1,28 +0,0 @@
-#!/bin/bash
-# shellcheck disable=SC2155
-
-function hassos_pre_image() {
-    local BOOT_DATA="$(path_boot_dir)"
-    local BL1="${BINARIES_DIR}/bl1.bin.hardkernel"
-    local UBOOT_GXBB="${BINARIES_DIR}/u-boot.gxbb"
-    local spl_img="$(path_spl_img)"
-
-    cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr"
-    cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/config.txt"
-    cp "${BINARIES_DIR}/meson-gxbb-odroidc2.dtb" "${BOOT_DATA}/meson-gxbb-odroidc2.dtb"
-
-    echo "console=tty0 console=ttyAML0,115200n8" > "${BOOT_DATA}/cmdline.txt"
-
-    # SPL
-    create_spl_image
-
-    dd if="${BL1}" of="${spl_img}" conv=notrunc bs=1 count=440
-    dd if="${BL1}" of="${spl_img}" conv=notrunc bs=512 skip=1 seek=1
-    dd if="${UBOOT_GXBB}" of="${spl_img}" conv=notrunc bs=512 seek=97
-}
-
-
-function hassos_post_image() {
-    convert_disk_image_gz
-}
-
--- a/buildroot-external/board/hardkernel/odroid-c2/kernel.config
+++ b/buildroot-external/board/hardkernel/odroid-c2/kernel.config
--- a/buildroot-external/board/hardkernel/odroid-c2/meta
+++ b/buildroot-external/board/hardkernel/odroid-c2/meta
@@ -1,7 +0,0 @@
-BOARD_ID=odroid-c2
-BOARD_NAME="Hardkernel Odroid-C2"
-CHASSIS=embedded
-BOOTLOADER=uboot
-KERNEL_FILE=Image
-BOOT_SYS=mbr
-BOOT_ENV_SIZE=0x2000
--- a/buildroot-external/board/hardkernel/odroid-c2/patches/linux/000-arm64_dts_meson_Fix_IRQ_trigger_type_for_macirq.patch
+++ b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/000-arm64_dts_meson_Fix_IRQ_trigger_type_for_macirq.patch
@@ -1,50 +0,0 @@
-diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
-index b160bd1084de..fffd55787981 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
-+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
-@@ -461,7 +461,7 @@
- 			compatible = "amlogic,meson-gxbb-dwmac", "snps,dwmac";
- 			reg = <0x0 0xff3f0000 0x0 0x10000
- 				0x0 0xff634540 0x0 0x8>;
-			interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>;
-+			interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
- 			interrupt-names = "macirq";
- 			clocks = <&clkc CLKID_ETH>,
- 				 <&clkc CLKID_FCLK_DIV2>,
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
-index ed336c7a98a7..44c5c51ff1fa 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
-+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
-@@ -467,7 +467,7 @@
- 			compatible = "amlogic,meson-gx-dwmac", "amlogic,meson-gxbb-dwmac", "snps,dwmac";
- 			reg = <0x0 0xc9410000 0x0 0x10000
- 			       0x0 0xc8834540 0x0 0x4>;
-			interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>;
-+			interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
- 			interrupt-names = "macirq";
- 			status = "disabled";
- 		};
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
-index 00f7be6d83f7..2e1cd5e3a246 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
-@@ -143,7 +143,6 @@
- 			interrupt-parent = <&gpio_intc>;
- 			/* MAC_INTR on GPIOZ_15 */
- 			interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
-			eee-broken-1000t;
- 		};
- 	};
- };
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
-index 70325b273bd2..ec09bb5792b7 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
-@@ -142,7 +142,6 @@
- 		eth_phy0: ethernet-phy@0 {
- 			/* Realtek RTL8211F (0x001cc916) */
- 			reg = <0>;
-			eee-broken-1000t;
- 		};
- 	};
- };
--- a/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush
@@ -1,92 +0,0 @@
-
-###########################################
-
-part start mmc ${devnum} 9 mmc_env
-mmc dev ${devnum}
-setenv loadbootstate " \
-    echo 'loading env...'; \
-    mmc read ${ramdisk_addr_r} ${mmc_env} 0x10; \
-    env import -c ${ramdisk_addr_r} 0x2000;"
-
-setenv storebootstate " \
-    echo 'storing env...'; \
-    env export -c -s 0x2000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT; \
-    mmc write ${ramdisk_addr_r} ${mmc_env} 0x10;"
-
-run loadbootstate
-test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
-test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
-test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3
-
-if load mmc ${devnum}:1 ${ramdisk_addr_r} config.txt; then
-  env import -t ${ramdisk_addr_r} ${filesize};
-fi
-
-# Board bootargs
-if test "${m}" = "custombuilt"; then setenv cmode "modeline=${modeline}"; fi
-setenv bootargs_odroidc2 "${condev} no_console_suspend hdmimode=${m} ${cmode} m_bpp=${m_bpp} vout=${vout} fsck.repair=yes net.ifnames=0 elevator=noop disablehpd=${hpd} max_freq=${max_freq} maxcpus=${maxcpus} monitor_onoff=${monitor_onoff} disableuhs=${disableuhs} mmc_removable=${mmc_removable} usbmulticam=${usbmulticam}"
-
-# HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor cgroup_enable=memory"
-
-# HassOS system A/B
-setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
-setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait"
-
-usb start
-
-# Load extraargs
-fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
-fatload mmc ${devnum}:1 ${fdt_addr_r} meson-gxbb-odroidc2.dtb
-#fdt addr ${fdt_addr_r}
-
-# logical volumes get numbered after physical ones.
-# 1. boot
-# 2. Extended partition
-# 3. Overlay
-# 4. Data
-# 5. KernelA
-# 6. SystemA
-# 7. KernelB
-# 8. SystemB
-# 9. BootInfo
-setenv bootargs
-for BOOT_SLOT in "${BOOT_ORDER}"; do
-  if test "x${bootargs}" != "x"; then
-    # skip remaining slots
-  elif test "x${BOOT_SLOT}" = "xA"; then
-    if test ${BOOT_A_LEFT} -gt 0; then
-      setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1
-      echo "Found valid slot A, ${BOOT_A_LEFT} attempts remaining"
-      setenv load_kernel "ext4load mmc ${devnum}:5 ${kernel_addr_r} Image"
-      setenv bootargs "${bootargs_hassos} ${bootargs_odroidc2} ${bootargs_a} rauc.slot=A ${cmdline}"
-    fi
-  elif test "x${BOOT_SLOT}" = "xB"; then
-    if test ${BOOT_B_LEFT} -gt 0; then
-      setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1
-      echo "Found valid slot B, ${BOOT_B_LEFT} attempts remaining"
-      setenv load_kernel "ext4load mmc ${devnum}:7 ${kernel_addr_r} Image"
-      setenv bootargs "${bootargs_hassos} ${bootargs_odroidc2} ${bootargs_b} rauc.slot=B ${cmdline}"
-    fi
-  fi
-done
-
-if test -n "${bootargs}"; then
-  run storebootstate
-else
-  echo "No valid slot found, resetting tries to 3"
-  setenv BOOT_A_LEFT 3
-  setenv BOOT_B_LEFT 3
-  run storebootstate
-  reset
-fi
-
-echo "Loading kernel"
-run load_kernel
-echo " Starting kernel"
-printenv load_kernel
-printenv bootargs
-booti ${kernel_addr_r} - ${fdt_addr_r}
-
-echo "Fails on boot"
-reset
--- a/buildroot-external/board/hardkernel/odroid-c2/uboot.config
+++ b/buildroot-external/board/hardkernel/odroid-c2/uboot.config
@@ -1,8 +0,0 @@
-# CONFIG_USB_STORAGE is not set
-CONFIG_DOS_PARTITION=y
-# CONFIG_EFI_PARTITION is not set
-CONFIG_USB=y
-CONFIG_CMD_USB=y
-CONFIG_DM_USB=y
-CONFIG_CMD_FILEENV=y
-CONFIG_ENV_IS_NOWHERE=Y
--- a/buildroot-external/board/hardkernel/odroid-xu4/boot-env.txt
+++ b/buildroot-external/board/hardkernel/odroid-xu4/boot-env.txt
@@ -1,41 +0,0 @@
-
-macaddr=00:1e:06:61:7a:39
-vout=hdmi
-vout=hdmi
-# - DVI Mode (disables sound over HDMI as per DVI compat)
-# vout=dvi
-
-# --- HDMI CEC Configuration ---
-# ------------------------------------------
-cecenable=false
-# set to true to enable HDMI CEC
-
-# Enable/Disable ODROID-VU7 Touchsreen
-disable_vu7=false
-
-# DRAM Frequency
-# Sets the LPDDR3 memory frequency
-# Supported values: 933 825 728 633 (MHZ)
-ddr_freq 825
-
-# External watchdog board enable
-external_watchdog=false
-# debounce time set to 3 ~ 10 sec, default 3 sec
-external_watchdog_debounce=3
-
-
-#------------------------------------------------------------------------------
-#
-# HDMI Hot Plug detection
-#
-#------------------------------------------------------------------------------
-#
-# Forces the HDMI subsystem to ignore the check if the cable is connected or
-# not.
-# false : disable the detection and force it as connected.
-# true : let cable, board and monitor decide the connection status.
-#
-# default: true
-#
-#------------------------------------------------------------------------------
-HPD=true
--- a/buildroot-external/board/hardkernel/odroid-xu4/hassos-hook.sh
+++ b/buildroot-external/board/hardkernel/odroid-xu4/hassos-hook.sh
@@ -1,31 +0,0 @@
-#!/bin/bash
-# shellcheck disable=SC2155
-
-function hassos_pre_image() {
-    local BOOT_DATA="$(path_boot_dir)"
-    local BL1="${BINARIES_DIR}/bl1.bin.hardkernel"
-    local BL2="${BINARIES_DIR}/bl2.bin.hardkernel.720k_uboot"
-    local BLTZ="${BINARIES_DIR}/tzsw.bin.hardkernel"
-    local UBOOT="${BINARIES_DIR}/u-boot.bin"
-    local spl_img="$(path_spl_img)"
-
-    cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr"
-    cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/config.txt"
-    cp "${BINARIES_DIR}/exynos5422-odroidxu4.dtb" "${BOOT_DATA}/exynos5422-odroidxu4.dtb"
-
-    echo "console=tty1 console=ttySAC2,115200" > "${BOOT_DATA}/cmdline.txt"
-
-    # SPL
-    create_spl_image
-
-    dd if="${BL1}" of="${spl_img}" conv=notrunc bs=512 seek=1
-    dd if="${BL2}" of="${spl_img}" conv=notrunc bs=512 seek=31
-    dd if="${UBOOT}" of="${spl_img}" conv=notrunc bs=512 seek=63
-    dd if="${BLTZ}" of="${spl_img}" conv=notrunc bs=512 seek=1503
-    dd if=/dev/zero of="${spl_img}" conv=notrunc bs=512 count=32 seek=2015
-}
-
-
-function hassos_post_image() {
-    convert_disk_image_gz
-}
--- a/buildroot-external/board/hardkernel/odroid-xu4/kernel.config
+++ b/buildroot-external/board/hardkernel/odroid-xu4/kernel.config
--- a/buildroot-external/board/hardkernel/odroid-xu4/meta
+++ b/buildroot-external/board/hardkernel/odroid-xu4/meta
@@ -1,7 +0,0 @@
-BOARD_ID=odroid-xu4
-BOARD_NAME="Hardkernel Odroid-XU4"
-CHASSIS=embedded
-BOOTLOADER=uboot
-KERNEL_FILE=zImage
-BOOT_SYS=mbr
-BOOT_ENV_SIZE=0x2000
--- a/buildroot-external/board/hardkernel/odroid-xu4/patches/linux/000-arm-exynos_change_the_default_dma_coherent_pool_size.patch
+++ b/buildroot-external/board/hardkernel/odroid-xu4/patches/linux/000-arm-exynos_change_the_default_dma_coherent_pool_size.patch
@@ -1,42 +0,0 @@
-diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
-index bf02dbd9ccda3..8029e21eee149 100644
--- a/arch/arm/include/asm/dma-mapping.h
-+++ b/arch/arm/include/asm/dma-mapping.h
-@@ -5,7 +5,9 @@
- 
- #include <linux/mm_types.h>
- #include <linux/scatterlist.h>
-+#include <linux/device.h>
- #include <linux/dma-debug.h>
-+#include <linux/dma-direction.h>
- 
- #include <asm/memory.h>
- 
-diff --git a/arch/arm/mach-exynos/firmware.c b/arch/arm/mach-exynos/firmware.c
-index fd6da5419b510..5b3abc935e7fc 100644
--- a/arch/arm/mach-exynos/firmware.c
-+++ b/arch/arm/mach-exynos/firmware.c
-@@ -13,12 +13,14 @@
- #include <linux/init.h>
- #include <linux/of.h>
- #include <linux/of_address.h>
-+#include <linux/sizes.h>
- 
- #include <asm/cacheflush.h>
- #include <asm/cputype.h>
- #include <asm/firmware.h>
- #include <asm/hardware/cache-l2x0.h>
- #include <asm/suspend.h>
-+#include <asm/dma-mapping.h>
- 
- #include "common.h"
- #include "smc.h"
-@@ -225,6 +227,8 @@ void __init exynos_firmware_init(void)
- 		outer_cache.write_sec = exynos_l2_write_sec;
- 		outer_cache.configure = exynos_l2_configure;
- 	}
-+
-+	init_dma_coherent_pool_size(SZ_1M);
- }
- 
- #define REG_CPU_STATE_ADDR	(sysram_ns_base_addr + 0x28)
--- a/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush
@@ -1,98 +0,0 @@
-
-###########################################
-
-part start mmc ${devnum} 9 mmc_env
-mmc dev ${devnum}
-setenv loadbootstate " \
-    echo 'loading env...'; \
-    mmc read ${ramdisk_addr_r} ${mmc_env} 0x10; \
-    env import -c ${ramdisk_addr_r} 0x2000;"
-
-setenv storebootstate " \
-    echo 'storing env...'; \
-    env export -c -s 0x2000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT; \
-    mmc write ${ramdisk_addr_r} ${mmc_env} 0x10;"
-
-run loadbootstate
-test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
-test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
-test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3
-
-if load mmc ${devnum}:1 ${ramdisk_addr_r} config.txt; then
-  env import -t ${ramdisk_addr_r} ${filesize};
-fi
-
-# Board bootargs
-setenv hdmi_phy_control "HPD=${HPD} vout=${vout}"
-if test "${cecenable}" = "false"; then fdt rm /cec@101B0000; fi
-if test "${disable_vu7}" = "false"; then setenv hid_quirks "usbhid.quirks=0x0eef:0x0005:0x0004"; fi
-if test "${external_watchdog}" = "true"; then setenv external_watchdog "external_watchdog=${external_watchdog} external_watchdog_debounce=${external_watchdog_debounce}"; fi
-
-setenv bootargs_odroidxu4 "${videoconfig} ${hdmi_phy_control} ${hid_quirks} smsc95xx.macaddr=${macaddr} ${external_watchdog}"
-
-# HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor cgroup_enable=memory"
-
-# HassOS system A/B
-setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
-setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait"
-
-#usb start
-
-# Load extraargs
-fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
-fatload mmc ${devnum}:1 ${fdt_addr_r} exynos5422-odroidxu4.dtb
-fdt addr ${fdt_addr_r}
-
-
-# logical volumes get numbered after physical ones.
-# 1. boot
-# 2. Extended partition
-# 3. Overlay
-# 4. Data
-# 5. KernelA
-# 6. SystemA
-# 7. KernelB
-# 8. SystemB
-# 9. BootInfo
-setenv bootargs
-for BOOT_SLOT in "${BOOT_ORDER}"; do
-  if test "x${bootargs}" != "x"; then
-    # skip remaining slots
-  elif test "x${BOOT_SLOT}" = "xA"; then
-    if test ${BOOT_A_LEFT} -gt 0; then
-      setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1
-      echo "Found valid slot A, ${BOOT_A_LEFT} attempts remaining"
-      setenv load_kernel "ext4load mmc ${devnum}:5 ${kernel_addr_r} zImage"
-      setenv bootargs "${bootargs_hassos} ${bootargs_odroidxu4} ${bootargs_a} rauc.slot=A ${cmdline}"
-    fi
-  elif test "x${BOOT_SLOT}" = "xB"; then
-    if test ${BOOT_B_LEFT} -gt 0; then
-      setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1
-      echo "Found valid slot B, ${BOOT_B_LEFT} attempts remaining"
-      setenv load_kernel "ext4load mmc ${devnum}:7 ${kernel_addr_r} zImage"
-      setenv bootargs "${bootargs_hassos} ${bootargs_odroidxu4} ${bootargs_b} rauc.slot=B ${cmdline}"
-    fi
-  fi
-done
-
-if test -n "${bootargs}"; then
-  run storebootstate
-else
-  echo "No valid slot found, resetting tries to 3"
-  setenv BOOT_A_LEFT 3
-  setenv BOOT_B_LEFT 3
-  run storebootstate
-  reset
-fi
-
-echo "Loading kernel"
-run load_kernel
-echo " Starting kernel"
-printenv load_kernel
-printenv bootargs
-dmc ${ddr_freq}
-bootz ${kernel_addr_r} - ${fdt_addr_r}
-
-echo "Fails on boot"
-reset
--- a/buildroot-external/board/hardkernel/odroid-xu4/uboot.config
+++ b/buildroot-external/board/hardkernel/odroid-xu4/uboot.config
@@ -1,6 +0,0 @@
-# CONFIG_USB_STORAGE is not set
-CONFIG_DOS_PARTITION=y
-# CONFIG_EFI_PARTITION is not set
-CONFIG_CMD_FILEENV=y
-CONFIG_ENV_IS_NOWHERE=Y
-CONFIG_DISPLAY_BOARDINFO=y
--- a/buildroot-external/board/intel/nuc/hassos-hook.sh
+++ b/buildroot-external/board/intel/nuc/hassos-hook.sh
@@ -1,20 +0,0 @@
-#!/bin/bash
-# shellcheck disable=SC2155
-
-function hassos_pre_image() {
-    local BOOT_DATA="$(path_boot_dir)"
-
-    mkdir -p "${BOOT_DATA}/EFI/BOOT"
-    mkdir -p "${BOOT_DATA}/EFI/barebox"
-
-    cp "${BINARIES_DIR}/barebox.bin" "${BOOT_DATA}/EFI/BOOT/BOOTx64.EFI"
-    cp "${BR2_EXTERNAL_HASSOS_PATH}/misc/barebox-state-efi.dtb" "${BOOT_DATA}/EFI/barebox/state.dtb"
-
-    echo "console=tty1" > "${BOOT_DATA}/cmdline.txt"
-}
-
-
-function hassos_post_image() {
-    convert_disk_image_gz
-}
-
--- a/buildroot-external/board/intel/nuc/kernel.config
+++ b/buildroot-external/board/intel/nuc/kernel.config
@@ -1,31 +0,0 @@
-CONFIG_EFI_STUB=y
-
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_USB_XHCI_HCD=y
-
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-
-CONFIG_IGB=y
-
-CONFIG_IWLWIFI=m
-CONFIG_IWLMVM=m
-
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-CONFIG_DRM_I915_USERPTR=y
-
-CONFIG_SND_HDA=m
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_I915=y
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
-
-CONFIG_BT=y
-CONFIG_BT_BREDR=y
-CONFIG_BT_LE=y
-CONFIG_BT_INTEL=m
-CONFIG_BT_BCM=m
-CONFIG_BT_RTL=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_RTL=y
--- a/buildroot-external/board/intel/nuc/meta
+++ b/buildroot-external/board/intel/nuc/meta
@@ -1,7 +0,0 @@
-BOARD_ID=intel-nuc
-BOARD_NAME="Intel NUC"
-CHASSIS=embedded
-BOOTLOADER=barebox
-KERNEL_FILE=bzImage
-BOOT_SYS=efi
-DISK_SIZE=6
--- a/buildroot-external/board/intel/ova/hassos-hook.sh
+++ b/buildroot-external/board/intel/ova/hassos-hook.sh
@@ -1,24 +0,0 @@
-#!/bin/bash
-# shellcheck disable=SC2155
-
-function hassos_pre_image() {
-    local BOOT_DATA="$(path_boot_dir)"
-
-    mkdir -p "${BOOT_DATA}/EFI/BOOT"
-    mkdir -p "${BOOT_DATA}/EFI/barebox"
-
-    cp "${BINARIES_DIR}/barebox.bin" "${BOOT_DATA}/EFI/BOOT/BOOTx64.EFI"
-    cp "${BR2_EXTERNAL_HASSOS_PATH}/misc/barebox-state-efi.dtb" "${BOOT_DATA}/EFI/barebox/state.dtb"
-
-    echo "console=tty1" > "${BOOT_DATA}/cmdline.txt"
-}
-
-
-function hassos_post_image() {
-    convert_disk_image_virtual
-
-    convert_disk_image_gz vmdk
-    convert_disk_image_gz vhdx
-    convert_disk_image_gz vdi
-}
-
--- a/buildroot-external/board/intel/ova/kernel.config
+++ b/buildroot-external/board/intel/ova/kernel.config
@@ -1,30 +0,0 @@
-CONFIG_EFI_STUB=y
-
-CONFIG_VMXNET3=y
-CONFIG_VMWARE_PVSCSI=y
-CONFIG_VMWARE_VMCI_VSOCKETS=y
-CONFIG_VMWARE_VMCI=y
-CONFIG_VMWARE_BALLOON=y
-
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_NET=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_BLK=y
-CONFIG_HW_RANDOM_VIRTIO=y
-
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_USB_XHCI_HCD=y
-
-CONFIG_PARAVIRT=y
-CONFIG_XEN=y
-
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_HYPERV=y
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_BALLOON=m
-CONFIG_HYPERV_KEYBOARD=m
-CONFIG_HYPERV_STORAGE=y
-CONFIG_HYPERV_NET=y
-CONFIG_FB_HYPERV=y
--- a/buildroot-external/board/orangepi/hassos-hook.sh
+++ b/buildroot-external/board/orangepi/hassos-hook.sh
@@ -1,25 +0,0 @@
-#!/bin/bash
-# shellcheck disable=SC2155
-
-function hassos_pre_image() {
-    local BOOT_DATA="$(path_boot_dir)"
-    local SPL="${BINARIES_DIR}/sunxi-spl.bin"
-    local UBOOT="${BINARIES_DIR}/u-boot.itb"
-    local spl_img="$(path_spl_img)"
-
-    cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr"
-    cp "${BINARIES_DIR}/sun50i-h5-orangepi-prime.dtb" "${BOOT_DATA}/sun50i-h5-orangepi-prime.dtb"
-    cp "${BOARD_DIR}/config.txt" "${BOOT_DATA}/config.txt"
-    touch "${BOOT_DATA}/cmdline.txt"
-
-    # SPL
-    create_spl_image
-
-    dd if="${SPL}" of="${spl_img}" conv=notrunc bs=512 seek=16
-    dd if="${UBOOT}" of="${spl_img}" conv=notrunc bs=512 seek=80
-}
-
-
-function hassos_post_image() {
-    convert_disk_image_gz
-}
--- a/buildroot-external/board/orangepi/kernel.config
+++ b/buildroot-external/board/orangepi/kernel.config
@@ -1,3 +0,0 @@
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
-
--- a/buildroot-external/board/orangepi/patches/README.md
+++ b/buildroot-external/board/orangepi/patches/README.md
@@ -1,5 +0,0 @@
-## Kernel
-https://github.com/armbian/build/tree/master/patch/kernel/sunxi-next
-
-## u-boot
-https://github.com/armbian/build/tree/master/patch/u-boot/u-boot-sunxi
--- a/buildroot-external/board/orangepi/patches/uboot/0020-sunxi-call-fdt_fixup_ethernet-again-to-set-macaddr-f.patch
+++ b/buildroot-external/board/orangepi/patches/uboot/0020-sunxi-call-fdt_fixup_ethernet-again-to-set-macaddr-f.patch
@@ -1,41 +0,0 @@
-From 55d3cc28b37000d1a3d7224c0ba4a808274e0b33 Mon Sep 17 00:00:00 2001
-From: Icenowy Zheng <icenowy@aosc.io>
-Date: Fri, 27 Oct 2017 17:25:00 +0800
-Subject: [PATCH 20/20] sunxi: call fdt_fixup_ethernet again to set macaddr for
- more aliases
-
-Sometimes some ethernet aliases do not exist in U-Boot FDT but they
-exist in the FDT used to boot the system. In this situation
-setup_environment is called again in ft_board_setup to generate macaddr
-environment variable for them. However now the call to
-fdt_fixup_ethernet is moved before the call of ft_board_setup.
-
-Call fdt_fixup_ethernet again to add MAC addresses for the extra
-ethernet aliases.
-
-Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
---
- board/sunxi/board.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/board/sunxi/board.c b/board/sunxi/board.c
-index 192cf8ca45..0fe70f47cb 100644
--- a/board/sunxi/board.c
-+++ b/board/sunxi/board.c
-@@ -751,10 +751,12 @@ int ft_board_setup(void *blob, bd_t *bd)
-	int __maybe_unused r;
-
-	/*
-	 * Call setup_environment again in case the boot fdt has
-	 * ethernet aliases the u-boot copy does not have.
-+	 * Call setup_environment and fdt_fixup_ethernet again
-+	 * in case the boot fdt has ethernet aliases the u-boot
-+	 * copy does not have.
-	 */
-	setup_environment(blob);
-+	fdt_fixup_ethernet(blob);
-
- #ifdef CONFIG_VIDEO_DT_SIMPLEFB
-	r = sunxi_simplefb_setup(blob);
--
-2.13.6
--- a/buildroot-external/board/orangepi/patches/uboot/4kfix-limit-screen-to-full-hd.patch
+++ b/buildroot-external/board/orangepi/patches/uboot/4kfix-limit-screen-to-full-hd.patch
@@ -1,19 +0,0 @@
-diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c
-index 92c9d06054..cd16d69e30 100644
--- a/drivers/video/sunxi/sunxi_display.c
-+++ b/drivers/video/sunxi/sunxi_display.c
-@@ -1274,8 +1274,12 @@ void *video_hw_init(void)
-		ret = sunxi_hdmi_hpd_detect(hpd_delay);
-		if (ret) {
-			printf("HDMI connected: ");
-			if (edid && sunxi_hdmi_edid_get_mode(&custom) == 0)
-				mode = &custom;
-+			if (edid && sunxi_hdmi_edid_get_mode(&custom) == 0) {
-+				if ((custom.xres <= 1920) && (custom.yres <= 1080))
-+					mode = &custom;
-+				else
-+					mode = &res_mode_init[RES_MODE_1920x1080];
-+			}
-		} else if (hpd) {
-			sunxi_hdmi_shutdown();
-			sunxi_display.monitor = sunxi_get_default_mon(false);
--- a/buildroot-external/board/orangepi/patches/uboot/adjust-default-dram-clockspeeds.patch
+++ b/buildroot-external/board/orangepi/patches/uboot/adjust-default-dram-clockspeeds.patch
@@ -1,13 +0,0 @@
-diff --git a/configs/orangepi_prime_defconfig b/configs/orangepi_prime_defconfig
-index 103936d772..990cf2a8c0 100644
--- a/configs/orangepi_prime_defconfig
-+++ b/configs/orangepi_prime_defconfig
-@@ -1,7 +1,7 @@
- CONFIG_ARM=y
- CONFIG_ARCH_SUNXI=y
- CONFIG_MACH_SUN50I_H5=y
-CONFIG_DRAM_CLK=672
-+CONFIG_DRAM_CLK=624
- CONFIG_DRAM_ZQ=3881977
- CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-orangepi-prime"
- # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
--- a/buildroot-external/board/orangepi/patches/uboot/do-not-relocate-initrd.patch
+++ b/buildroot-external/board/orangepi/patches/uboot/do-not-relocate-initrd.patch
@@ -1,27 +0,0 @@
-diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
-index 64a190059a..bbec551cac 100644
--- a/include/configs/sunxi-common.h
-+++ b/include/configs/sunxi-common.h
-@@ -503,6 +503,12 @@ extern int soft_i2c_gpio_scl;
- #define FDTFILE CONFIG_DEFAULT_DEVICE_TREE ".dtb"
- #endif
-
-+#ifdef CONFIG_MACH_SUN8I_H3
-+#define INITRD_HIGH_ENV "initrd_high=0xFFFFFFFF\0"
-+#else
-+#define INITRD_HIGH_ENV
-+#endif
-+
- #define CONFIG_EXTRA_ENV_SETTINGS \
-	CONSOLE_ENV_SETTINGS \
-	MEM_LAYOUT_ENV_SETTINGS \
-@@ -512,7 +518,8 @@ extern int soft_i2c_gpio_scl;
-	SUNXI_MTDIDS_DEFAULT \
-	SUNXI_MTDPARTS_DEFAULT \
-	BOOTCMD_SUNXI_COMPAT \
-	BOOTENV
-+	BOOTENV \
-+	INITRD_HIGH_ENV
-
- #else /* ifndef CONFIG_SPL_BUILD */
- #define CONFIG_EXTRA_ENV_SETTINGS
--- a/buildroot-external/board/orangepi/patches/uboot/enable-DT-overlays-support.patch
+++ b/buildroot-external/board/orangepi/patches/uboot/enable-DT-overlays-support.patch
@@ -1,13 +0,0 @@
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 0ed36cded..822ebb812 100644
--- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -578,6 +578,8 @@ config ARCH_SUNXI
-	select CMD_GPIO
-	select CMD_MMC if MMC
-	select CMD_USB if DISTRO_DEFAULTS
-+	select OF_LIBFDT
-+	select OF_LIBFDT_OVERLAY
-	select DM
-	select DM_ETH
-	select DM_GPIO
--- a/buildroot-external/board/orangepi/patches/uboot/enable-r_pio-gpio-access-h3-h5.patch
+++ b/buildroot-external/board/orangepi/patches/uboot/enable-r_pio-gpio-access-h3-h5.patch
@@ -1,24 +0,0 @@
-diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c
-index 7ac8360..0484e7a 100644
--- a/arch/arm/mach-sunxi/board.c
-+++ b/arch/arm/mach-sunxi/board.c
-@@ -23,6 +23,7 @@
- #include <asm/arch/timer.h>
- #include <asm/arch/tzpc.h>
- #include <asm/arch/mmc.h>
-+#include <asm/arch/prcm.h>
-
- #include <linux/compiler.h>
-
-@@ -65,6 +66,11 @@ struct mm_region *mem_map = sunxi_mem_map;
-
- static int gpio_init(void)
- {
-+#if defined(CONFIG_MACH_SUNXI_H3_H5)
-+	/* enable R_PIO GPIO access */
-+	prcm_apb0_enable(PRCM_APB0_GATE_PIO);
-+#endif
-+
- #if CONFIG_CONS_INDEX == 1 && defined(CONFIG_UART0_PORT_F)
- #if defined(CONFIG_MACH_SUN4I) || \
-     defined(CONFIG_MACH_SUN7I) || \
--- a/buildroot-external/board/orangepi/patches/uboot/fdt-setprop-fix-unaligned-access.patch
+++ b/buildroot-external/board/orangepi/patches/uboot/fdt-setprop-fix-unaligned-access.patch
@@ -1,23 +0,0 @@
-diff --git a/cmd/fdt.c b/cmd/fdt.c
-index d7654b2c4f..a71b7713a8 100644
--- a/cmd/fdt.c
-+++ b/cmd/fdt.c
-@@ -17,6 +17,7 @@
- #include <fdt_support.h>
- #include <mapmem.h>
- #include <asm/io.h>
-+#include <asm/unaligned.h>
-
- #define MAX_LEVEL	32		/* how deeply nested we will go */
- #define SCRATCHPAD	1024		/* bytes of scratchpad memory */
-@@ -781,7 +782,10 @@ static int fdt_parse_prop(char * const *newval, int count, char *data, int *len)
-			cp = newp;
-			tmp = simple_strtoul(cp, &newp, 0);
-			if (*cp != '?')
-				*(fdt32_t *)data = cpu_to_fdt32(tmp);
-+			{
-+				tmp = cpu_to_fdt32(tmp);
-+				put_unaligned(tmp, (fdt32_t *)data);
-+			}
-			else
-				newp++;
--- a/buildroot-external/board/orangepi/patches/uboot/h3-Fix-PLL1-setup-to-never-use-dividers.patch
+++ b/buildroot-external/board/orangepi/patches/uboot/h3-Fix-PLL1-setup-to-never-use-dividers.patch
@@ -1,32 +0,0 @@
-From 7f5071f906f79bdc99d6b4b0ccf0cb280abe740b Mon Sep 17 00:00:00 2001
-From: Ondrej Jirman <megous@megous.com>
-Date: Tue, 20 Dec 2016 11:25:12 +0100
-Subject: [PATCH] sunxi: h3: Fix PLL1 setup to never use dividers
-
-Kernel would lower the divider on first CLK change and cause the
-lock up.
---
- arch/arm/mach-sunxi/clock_sun6i.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c
-index 50fb302a19..91aa2a0478 100644
--- a/arch/arm/mach-sunxi/clock_sun6i.c
-+++ b/arch/arm/mach-sunxi/clock_sun6i.c
-@@ -94,11 +94,10 @@ void clock_set_pll1(unsigned int clk)
-	int k = 1;
-	int m = 1;
-
-	if (clk > 1152000000) {
-		k = 2;
-	} else if (clk > 768000000) {
-+	if (clk >= 1368000000) {
-		k = 3;
-		m = 2;
-+	} else if (clk >= 768000000) {
-+		k = 2;
-	}
-
-	/* Switch to 24MHz clock while changing PLL1 */
--
-2.11.0
--- a/buildroot-external/board/orangepi/patches/uboot/h3-enable-power-led.patch
+++ b/buildroot-external/board/orangepi/patches/uboot/h3-enable-power-led.patch
@@ -1,16 +0,0 @@
-diff --git a/board/sunxi/board.c b/board/sunxi/board.c
-index 3cf3614..89cf7f5 100644
--- a/board/sunxi/board.c
-+++ b/board/sunxi/board.c
-@@ -478,6 +478,11 @@ void sunxi_board_init(void)
-	int power_failed = 0;
-	unsigned long ramsize;
-
-+#ifdef CONFIG_MACH_SUN8I_H3
-+	/* turn on power LED (PL10) on H3 boards */
-+	gpio_direction_output(SUNXI_GPL(10), 1);
-+#endif
-+
- #ifdef CONFIG_SY8106A_POWER
-	power_failed = sy8106a_set_vout1(CONFIG_SY8106A_VOUT1_VOLT);
- #endif
--- a/buildroot-external/board/orangepi/patches/uboot/h3-set-safe-axi_apb-clock-dividers.patch
+++ b/buildroot-external/board/orangepi/patches/uboot/h3-set-safe-axi_apb-clock-dividers.patch
@@ -1,42 +0,0 @@
-diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c
-index 15272c9..cedddc2 100644
--- a/arch/arm/mach-sunxi/clock_sun6i.c
-+++ b/arch/arm/mach-sunxi/clock_sun6i.c
-@@ -117,8 +117,8 @@ void clock_set_pll1(unsigned int clk)
-	sdelay(200);
-
-	/* Switch CPU to PLL1 */
-	writel(AXI_DIV_3 << AXI_DIV_SHIFT |
-	       ATB_DIV_2 << ATB_DIV_SHIFT |
-+	writel(AXI_DIV_4 << AXI_DIV_SHIFT |
-+	       ATB_DIV_4 << ATB_DIV_SHIFT |
-	       CPU_CLK_SRC_PLL1 << CPU_CLK_SRC_SHIFT,
-	       &ccm->cpu_axi_cfg);
- }
-diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
-index f2990db..b3a8575 100644
--- a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
-+++ b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
-@@ -180,6 +180,7 @@ struct sunxi_ccm_reg {
- #define CCM_PLL1_CTRL_N(n)		((((n) - 1) & 0x1f) << 8)
- #define CCM_PLL1_CTRL_P(n)		(((n) & 0x3) << 16)
- #define CCM_PLL1_CTRL_EN		(0x1 << 31)
-+#define CCM_PLL1_CTRL_LOCK		(0x1 << 28)
-
- #define CCM_PLL3_CTRL_M_SHIFT		0
- #define CCM_PLL3_CTRL_M_MASK		(0xf << CCM_PLL3_CTRL_M_SHIFT)
-diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c
-index cedddc2..3fe9305 100644
--- a/arch/arm/mach-sunxi/clock_sun6i.c
-+++ b/arch/arm/mach-sunxi/clock_sun6i.c
-@@ -114,7 +114,9 @@ void clock_set_pll1(unsigned int clk)
-	writel(CCM_PLL1_CTRL_EN | CCM_PLL1_CTRL_P(p) |
-	       CCM_PLL1_CTRL_N(clk / (24000000 * k / m)) |
-	       CCM_PLL1_CTRL_K(k) | CCM_PLL1_CTRL_M(m), &ccm->pll1_cfg);
-	sdelay(200);
-+
-+	while (!(readl(&ccm->pll1_cfg) & CCM_PLL1_CTRL_LOCK))
-+		;
-
-	/* Switch CPU to PLL1 */
-	writel(AXI_DIV_4 << AXI_DIV_SHIFT |
--- a/buildroot-external/board/orangepi/patches/uboot/lower-default-DRAM-freq-A64-H5.patch.disabled
+++ b/buildroot-external/board/orangepi/patches/uboot/lower-default-DRAM-freq-A64-H5.patch.disabled
@@ -1,13 +0,0 @@
-diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
-index 2309f59999..716e9c5e26 100644
--- a/arch/arm/mach-sunxi/Kconfig
-+++ b/arch/arm/mach-sunxi/Kconfig
-@@ -278,7 +278,7 @@ config DRAM_CLK
-	default 312 if MACH_SUN6I || MACH_SUN8I
-	default 360 if MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || \
-		       MACH_SUN8I_V3S
-	default 672 if MACH_SUN50I
-+	default 648 if MACH_SUN50I || MACH_SUN50I_H5
-	---help---
-	Set the dram clock speed, valid range 240 - 480 (prior to sun9i),
-	must be a multiple of 24. For the sun9i (A80), the tested values
--- a/buildroot-external/board/orangepi/patches/uboot/sun8i-set-machid.patch
+++ b/buildroot-external/board/orangepi/patches/uboot/sun8i-set-machid.patch
@@ -1,11 +0,0 @@
-diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h
-index a4c3fb69e..47ce2e9e6 100644
--- a/include/configs/sun8i.h
-+++ b/include/configs/sun8i.h
-@@ -30,4 +30,6 @@
-  */
- #include <configs/sunxi-common.h>
-
-+#define CONFIG_MACH_TYPE	(0x1029)
-+
- #endif /* __CONFIG_H */
--- a/buildroot-external/board/orangepi/patches/uboot/sunxi-boot-splash.patch
+++ b/buildroot-external/board/orangepi/patches/uboot/sunxi-boot-splash.patch
@@ -1,62 +0,0 @@
-diff --git a/cmd/Kconfig b/cmd/Kconfig
-index d6d130edfa..92795119ea 100644
--- a/cmd/Kconfig
-+++ b/cmd/Kconfig
-@@ -1029,6 +1029,7 @@ menu "Misc commands"
- config CMD_BMP
-	bool "Enable 'bmp' command"
-	depends on LCD || DM_VIDEO || VIDEO
-+	default y
-	help
-	  This provides a way to obtain information about a BMP-format iamge
-	  and to display it. BMP (which presumably stands for BitMaP) is a
-diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
-index 9ed6b9892c..75d5176edf 100644
--- a/include/config_distro_bootcmd.h
-+++ b/include/config_distro_bootcmd.h
-@@ -323,6 +323,15 @@
-	BOOTENV_SHARED_UBIFS \
-	BOOTENV_SHARED_EFI \
-	"boot_prefixes=/ /boot/\0" \
-+	"splashpos=m,m\0" \
-+	"splashimage=66000000\0" \
-+	"loadsplash= " \
-+		"for prefix in ${boot_prefixes}; do " \
-+			"if test -e mmc 0 ${prefix}boot.bmp; then " \
-+				"load mmc 0 ${splashimage} ${prefix}boot.bmp; " \
-+				"bmp d ${splashimage}; " \
-+			"fi; " \
-+		"done\0" \
-	"boot_scripts=boot.scr.uimg boot.scr\0" \
-	"boot_script_dhcp=boot.scr.uimg\0" \
-	BOOTENV_BOOT_TARGETS \
-diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
-index 02d7be0849..cbdea20d08 100644
--- a/include/configs/sunxi-common.h
-+++ b/include/configs/sunxi-common.h
-@@ -284,6 +284,16 @@ extern int soft_i2c_gpio_scl;
-
- #endif /* CONFIG_VIDEO */
-
-+#if defined CONFIG_VIDEO || defined CONFIG_DM_VIDEO
-+#define CONFIG_VIDEO_LOGO
-+#define CONFIG_SPLASH_SCREEN
-+#define CONFIG_SPLASH_SCREEN_ALIGN
-+#define CONFIG_BMP_16BPP
-+#define CONFIG_BMP_24BPP
-+#define CONFIG_BMP_32BPP
-+#define CONFIG_VIDEO_BMP_RLE8
-+#endif
-+
- /* Ethernet support */
- #ifdef CONFIG_SUNXI_EMAC
- #define CONFIG_PHY_ADDR		1
-@@ -444,7 +454,7 @@ extern int soft_i2c_gpio_scl;
-
- #ifdef CONFIG_USB_KEYBOARD
- #define CONSOLE_STDIN_SETTINGS \
-	"preboot=usb start\0" \
-+	"preboot=run loadsplash; usb start\0" \
-	"stdin=serial,usbkbd\0"
- #else
- #define CONSOLE_STDIN_SETTINGS \
--- a/buildroot-external/board/orangepi/prime/config.txt
+++ b/buildroot-external/board/orangepi/prime/config.txt
@@ -1,3 +0,0 @@
-i2c0_enable=true
-i2c1_enable=false
-i2c2_enable=false
--- a/buildroot-external/board/orangepi/prime/meta
+++ b/buildroot-external/board/orangepi/prime/meta
@@ -1,7 +0,0 @@
-BOARD_ID=opi-prime
-BOARD_NAME="Orange Pi Prime"
-CHASSIS=embedded
-BOOTLOADER=uboot
-KERNEL_FILE=Image
-BOOT_SYS=spl
-BOOT_ENV_SIZE=0x8000
--- a/buildroot-external/board/orangepi/prime/uboot-boot.ush
+++ b/buildroot-external/board/orangepi/prime/uboot-boot.ush
@@ -1,88 +0,0 @@
-
-part start mmc ${devnum} 6 mmc_env
-mmc dev ${devnum}
-setenv loadbootstate " \
-    echo 'loading env...'; \
-    mmc read ${ramdisk_addr_r} ${mmc_env} 0x40; \
-    env import -c ${ramdisk_addr_r} 0x8000;"
-
-setenv storebootstate " \
-    echo 'storing env...'; \
-    env export -c -s 0x8000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT; \
-    mmc write ${ramdisk_addr_r} ${mmc_env} 0x40;"
-
-run loadbootstate
-test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
-test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
-test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3
-
-# HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor cgroup_enable=memory rootwait"
-
-# HassOS system A/B
-setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro"
-setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro"
-
-# Load extraargs
-fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
-
-# Load device tree
-fatload mmc ${devnum}:1 ${fdt_addr_r} sun50i-h5-orangepi-prime.dtb
-fdt addr ${fdt_addr_r}
-
-if load mmc ${devnum}:1 ${ramdisk_addr_r} config.txt; then
-  env import -t ${ramdisk_addr_r} ${filesize};
-fi
-
-if test "${i2c0_enable}" != "false"; then
-  fdt set /soc/i2c@1c2ac00 status "okay"
-fi
-
-if test "${i2c1_enable}" != "false"; then
-  fdt set /soc/i2c@1c2b000 status "okay"
-fi
-
-if test "${i2c2_enable}" != "false"; then
-  fdt set /soc/i2c@1c2b400 status "okay"
-fi
-
-setenv bootargs
-for BOOT_SLOT in "${BOOT_ORDER}"; do
-  if test "x${bootargs}" != "x"; then
-    # skip remaining slots
-  elif test "x${BOOT_SLOT}" = "xA"; then
-    if test ${BOOT_A_LEFT} -gt 0; then
-      setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1
-      echo "Found valid slot A, ${BOOT_A_LEFT} attempts remaining"
-      setenv load_kernel "ext4load mmc ${devnum}:2 ${kernel_addr_r} Image"
-      setenv bootargs "${bootargs_hassos} ${bootargs_a} rauc.slot=A ${cmdline}"
-    fi
-  elif test "x${BOOT_SLOT}" = "xB"; then
-    if test ${BOOT_B_LEFT} -gt 0; then
-      setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1
-      echo "Found valid slot B, ${BOOT_B_LEFT} attempts remaining"
-      setenv load_kernel "ext4load mmc ${devnum}:4 ${kernel_addr_r} Image"
-      setenv bootargs "${bootargs_hassos} ${bootargs_b} rauc.slot=B ${cmdline}"
-    fi
-  fi
-done
-
-if test -n "${bootargs}"; then
-  run storebootstate
-else
-  echo "No valid slot found, resetting tries to 3"
-  setenv BOOT_A_LEFT 3
-  setenv BOOT_B_LEFT 3
-  run storebootstate
-  reset
-fi
-
-echo "Loading kernel"
-run load_kernel
-echo " Starting kernel"
-printenv load_kernel
-printenv bootargs
-booti ${kernel_addr_r} - ${fdt_addr_r}
-
-echo "Fails on boot"
-reset
--- a/buildroot-external/board/orangepi/prime/uboot.config
+++ b/buildroot-external/board/orangepi/prime/uboot.config
@@ -1,8 +0,0 @@
-# CONFIG_USB_STORAGE is not set
-# CONFIG_DOS_PARTITIONcs not set
-CONFIG_EFI_PARTITION is not set
-CONFIG_USB=y
-CONFIG_CMD_USB=y
-CONFIG_DM_USB=y
-CONFIG_CMD_FILEENV=y
-CONFIG_ENV_IS_NOWHERE=Y
--- a/buildroot-external/board/intel/barebox.config
+++ b/buildroot-external/board/intel/barebox.config
--- a/buildroot-external/board/intel/ova/meta
+++ b/buildroot-external/board/intel/ova/meta
@@ -3,5 +3,4 @@ BOARD_NAME="Open Virtual Appliance"
 CHASSIS=vm
 BOOTLOADER=barebox
 KERNEL_FILE=bzImage
-BOOT_SYS=efi
-DISK_SIZE=6
+BOOT_SYS=gpt
--- a/buildroot-external/board/ova/kernel.config
+++ b/buildroot-external/board/ova/kernel.config
@@ -0,0 +1,9 @@
+CONFIG_EFI_STUB=y
+
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_NET=y
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_BLK=m
+
--- a/buildroot-external/board/intel/patches/dt-utils/0001-get-devicetree-from-file.patch
+++ b/buildroot-external/board/intel/patches/dt-utils/0001-get-devicetree-from-file.patch
--- a/buildroot-external/board/intel/patches/dt-utils/0002-support-finding-devices-by-partuuid.patch
+++ b/buildroot-external/board/intel/patches/dt-utils/0002-support-finding-devices-by-partuuid.patch
--- a/buildroot-external/board/intel/patches/rauc/0001-add-i-argument-to.patch
+++ b/buildroot-external/board/intel/patches/rauc/0001-add-i-argument-to.patch
--- a/Show More
+++ b/Show More