diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb6b9a68d71cffadf5c6c356ccca2355e5f062d2..776cf1997d25bc09a31774c1a6e229553a1fe23c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,18 +4,17 @@ image: debian:bullseye-slim
 build:
   script:
     - sed -i 's|http://deb.|http://ftp.de.|g' /etc/apt/sources.list
+    - echo "deb http://ftp.de.debian.org/debian bookworm main" > /etc/apt/sources.list.d/bookworm.list
+    - "printf 'Package: *\\nPin: release n=bookworm\\nPin-Priority: 100\\n' > /etc/apt/preferences.d/bookworm.pref"
     - apt update
-    - apt-get -y install sudo gzip libext2fs2 pigz
-    - apt-get -y install bc parted multistrap udisks2 gcc-aarch64-linux-gnu make device-tree-compiler qemu-user-static binfmt-support build-essential bison flex libssl-dev bash git qemu-system-aarch64
+    - apt-get -y install -t bookworm mmdebstrap genext2fs
+    - apt-get -y install e2fsprogs pigz binfmt-support git mount arch-test qemu-user-static parted
     - cd reform2-imx8mq
     - bash mkimage.sh
     - pigz reform-system.img
     - pigz reform-rescue-system.img
   artifacts:
     paths:
-      - "reform2-imx8mq/linux/arch/arm64/boot/Image"
-      - "reform2-imx8mq/linux/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dtb"
-      - "reform2-imx8mq/linux/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2-hdmi.dtb"
       - "reform2-imx8mq/u-boot/flash.bin"
       - "reform2-imx8mq/u-boot/flash-rescue.bin"
       - "reform2-imx8mq/reform-system.img.gz"
diff --git a/reform2-imx8mq/mkimage.sh b/reform2-imx8mq/mkimage.sh
index 9ae1c6f680b816ed54d544401d4af3389b00c559..946ac41c33ebad82135f521253882a66b60fd653 100755
--- a/reform2-imx8mq/mkimage.sh
+++ b/reform2-imx8mq/mkimage.sh
@@ -4,7 +4,22 @@ set -x
 set -e
 
 # make sure build tools are installed
-sudo apt-get -y install parted multistrap udisks2 gcc-aarch64-linux-gnu make device-tree-compiler qemu-user-static binfmt-support build-essential bison flex libssl-dev mmdebstrap
+DEPS="mmdebstrap genext2fs e2fsprogs binfmt-support git mount arch-test qemu-user-static parted"
+if [ "$(dpkg-query --showformat '${db:Status-Status}\n' --show $DEPS | sort -u)" != "installed" ]; then
+	echo "Not all dependencies of this script are installed."
+	echo "Run the following command to install them:"
+	echo
+	echo "    sudo apt install $DEPS"
+	exit 1
+fi
+if dpkg --compare-versions "$(dpkg-query --showformat='${Version}\n' --show mmdebstrap)" lt "0.8.4-1"; then
+	echo "mmdebstrap version must be >= 0.8.4-1"
+	exit 1
+fi
+if dpkg --compare-versions "$(dpkg-query --showformat='${Version}\n' --show genext2fs)" lt "1.5.0-2"; then
+	echo "genext2fs version must be >= 1.5.0-2"
+	exit 1
+fi
 
 # if we are in a git repository and if SOURCE_DATE_EPOCH is not set, use the
 # timestamp of the latest git commit
@@ -15,47 +30,89 @@ else
 fi
 export SOURCE_DATE_EPOCH
 
-# build the linux kernel
-./mkkernel.sh
-# build u-boot
-./mkuboot.sh
+# /tmp might be too small for the full system, so we set a different TMPDIR
+export TMPDIR="$(pwd)"
+
+# We need a separate partition for /boot for two reasons:
+#
+# 1) To boot encrypted NVMe
+# 2) If we boot a system that is not on the SD-Card (even unencrypted) then we
+#    need to mount the partition containing kernel, initrd and dtb. If /boot is
+#    not in its own partition, then mounting that partition to /boot will
+#    result in the files being in /boot/boot. So we need to create a partition
+#    where kernel, initrd and dtb are at the root of the partition. Otherwise
+#    we cannot upgrade the kernel from the booted system.
+
+# debian-installer chooses 999424 sectors (= 488MB) by default
+BOOTSIZE=488
+ROOTSIZE=2048
+
+# download u-boot v3 from CI
+/usr/lib/apt/apt-helper download-file https://source.mnt.re/reform/reform-boundary-uboot/-/jobs/artifacts/v3/raw/flash.bin\?job\=build flash.bin
 
 # build the debian userland and configure it
-sudo ./mkuserland.sh
-# chroot into the userland and build custom packages (mesa, xserver...)
-sudo ./mkuserland2.sh
+./mkuserland.sh
 
 # Rescue System ---------------------------------------------------------
 
-SIZE=4096M
-# create ext4 partition from target root directory directly at 4MiB offset
-sudo /sbin/mke2fs -v -L 'MNTRESCUE' -N 0 -O 64bit -E offset=4194304 -d target-userland -m 5 -r 1 -t ext4 reform-rescue-system.img $SIZE
-
-sudo /sbin/parted -s reform-rescue-system.img "mklabel msdos"
-sudo /sbin/parted -s reform-rescue-system.img "mkpart primary ext4 4MiB -1s"
-sudo /sbin/parted -s reform-rescue-system.img print
+mmtarfilter --path-exclude='*' --path-include=/boot --path-include='/boot/*' --strip-components=2 < target-userland.tar \
+	| genext2fs --block-size 1024 --size-in-blocks $((BOOTSIZE*1024)) --bytes-per-inode 16384 --tarball - boot.img
+dd if=boot.img of=reform-rescue-system.img seek=1 bs=4194304
+rm boot.img
+mmtarfilter --path-exclude='/boot/*' < target-userland.tar \
+	| genext2fs --block-size 1024 --size-in-blocks $((ROOTSIZE*1024)) --bytes-per-inode 16384 --tarball - root.img
+dd if=root.img of=reform-rescue-system.img seek=$((((BOOTSIZE+4)*1024*1024)/4194304)) bs=4194304
+rm root.img
+dd if=/dev/zero bs=512 count=1 >> reform-rescue-system.img
+/sbin/parted -s reform-rescue-system.img "mklabel msdos"
+# reproducible disk signature
+printf mntr | dd of=reform-rescue-system.img seek=440 bs=1 conv=notrunc
+/sbin/parted -s reform-rescue-system.img "mkpart primary ext4 4MiB $((BOOTSIZE+4))MiB"
+/sbin/parted -s reform-rescue-system.img "mkpart primary ext4 $((BOOTSIZE+4))MiB $((BOOTSIZE+ROOTSIZE+4))MiB"
+/sbin/parted -s reform-rescue-system.img print
 
-# mkuboot.sh needs to run before. this creates flash.bin.
 # install u-boot for i.MX8MQ
-sudo dd if=./u-boot/flash.bin of=reform-rescue-system.img conv=notrunc bs=1k seek=33
+dd if=./flash.bin of=reform-rescue-system.img conv=notrunc bs=1k seek=33
 
 echo Reform Rescue System Image created: reform-rescue-system.img
-
 # Full System -----------------------------------------------------------
 
 # chroot into the userland and add extra applications
-sudo ./mkuserland3.sh
-
-SIZE=9000M
-# create ext4 partition from target root directory directly at 4MiB offset
-sudo /sbin/mke2fs -v -L 'MNTREFORM' -N 0 -O 64bit -E offset=4194304 -d target-userland -m 5 -r 1 -t ext4 reform-system.img $SIZE
-
-sudo /sbin/parted -s reform-system.img "mklabel msdos"
-sudo /sbin/parted -s reform-system.img "mkpart primary ext4 4MiB -1s"
-sudo /sbin/parted -s reform-system.img print
+./mkuserland3.sh
+
+ROOTSIZE=9000
+
+if [ $(id -u) -eq 0 ]; then
+	# genext2fs is very slow so if we run this script as root, we give up
+	# on reproducibility in favor of creating the image faster
+	mkdir target-userland
+	tar --directory target-userland --xattrs --xattrs-include='*' --extract --file target-userland-full.tar
+	/sbin/mke2fs -v -L 'MNTREFORMBOOT' -N 0 -E offset=4194304 -d target-userland/boot -t ext2 reform-system.img ${BOOTSIZE}M
+	rm -rf target-userland/boot/*
+	/sbin/mke2fs -v -L 'MNTREFORMROOT' -N 0 -O 64bit -E offset=$(((BOOTSIZE+4)*1024*1024)) -d target-userland -m 5 -r 1 -t ext4 reform-system.img ${ROOTSIZE}M
+	rm -rf target-userland
+else
+	# if we don't run as root, use the slow (but bit-by-bit reproducible)
+	# genext2fs instead
+	mmtarfilter --path-exclude='*' --path-include=/boot --path-include='/boot/*' --strip-components=2 < target-userland-full.tar \
+		| genext2fs --block-size 1024 --size-in-blocks $((BOOTSIZE*1024)) --bytes-per-inode 16384 --tarball - boot.img
+	dd if=boot.img of=reform-system.img seek=1 bs=4194304
+	rm boot.img
+	mmtarfilter --path-exclude='/boot/*' < target-userland-full.tar \
+		| genext2fs --block-size 1024 --size-in-blocks $((ROOTSIZE*1024)) --bytes-per-inode 16384 --tarball - root.img
+	dd if=root.img of=reform-system.img seek=$((((BOOTSIZE+4)*1024*1024)/4194304)) bs=4194304
+	rm root.img
+fi
+dd if=/dev/zero bs=512 count=1 >> reform-system.img
+/sbin/parted -s reform-system.img "mklabel msdos"
+# reproducible disk signature
+printf mntr | dd of=reform-system.img seek=440 bs=1 conv=notrunc
+/sbin/parted -s reform-system.img "mkpart primary ext4 4MiB $((BOOTSIZE+4))MiB"
+/sbin/parted -s reform-system.img "mkpart primary ext4 $((BOOTSIZE+4))MiB $((BOOTSIZE+ROOTSIZE+4))MiB"
+/sbin/parted -s reform-system.img print
 
 # install u-boot for i.MX8MQ
-sudo dd if=./u-boot/flash.bin of=reform-system.img conv=notrunc bs=1k seek=33
+dd if=./flash.bin of=reform-system.img conv=notrunc bs=1k seek=33
+rm flash.bin
 
 echo Reform Full System Image created: reform-system.img
-
diff --git a/reform2-imx8mq/mkkernel.sh b/reform2-imx8mq/mkkernel.sh
deleted file mode 100755
index 9534e69ccf93c0f2c9023df4549e0db9aef94d42..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/mkkernel.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-set -x
-set -e
-
-export ARCH=arm64
-export CROSS_COMPILE=aarch64-linux-gnu-
-export KBUILD_BUILD_TIMESTAMP=$(date --date="@$SOURCE_DATE_EPOCH" --rfc-email)
-export KBUILD_BUILD_VERSION=1
-export KBUILD_BUILD_USER=reformuser
-export KBUILD_BUILD_HOST=reformhost
-
-if [ ! -d linux ]
-then
-  echo "Cloning Linux..."
-  git clone --depth 1 --branch v5.12 https://github.com/torvalds/linux.git
-fi
-
-cp ./template-kernel/*.dts ./linux/arch/arm64/boot/dts/freescale/
-cp ./template-kernel/kernel-config ./linux/.config
-
-cd linux
-
-echo "== kernel config =="
-cat .config
-echo "== end kernel config =="
-
-for PATCHFILE in ../template-kernel/patches/*.patch
-do
-  echo PATCH: $PATCHFILE
-  if git apply --check $PATCHFILE; then
-    git apply $PATCHFILE
-  else
-    echo "\e[1mKernel patch already applied or cannot apply: $PATCHFILE"
-  fi
-done
-
-make -j$(nproc) Image freescale/imx8mq-mnt-reform2.dtb freescale/imx8mq-mnt-reform2-hdmi.dtb
-
-cd ..
diff --git a/reform2-imx8mq/mkuboot.sh b/reform2-imx8mq/mkuboot.sh
deleted file mode 100755
index 3a5a5cc0615e180ab6cbbf038bb8f04fa4e471cc..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/mkuboot.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-set -x
-set -e
-
-if [ ! -d u-boot ]
-then
-  echo "Cloning U-Boot..."
-  git clone --depth 1 https://source.mnt.re/reform/reform-boundary-uboot.git u-boot
-fi
-
-cd u-boot
-cp mntreform-config .config
-
-export CROSS_COMPILE=aarch64-linux-gnu-
-export ARCH=arm
-
-# build rescue u-boot first (loads kernel from eMMC)
-make -j$(nproc) flash.bin KCPPFLAGS='-DMNTREFORM_BOOT_EMMC'
-cp flash.bin flash-rescue.bin
-
-# build normal u-boot second (loads kernel from SD card)
-make -j$(nproc) flash.bin
-
-cd ..
diff --git a/reform2-imx8mq/mkuserland.sh b/reform2-imx8mq/mkuserland.sh
index 72f82874c0bc1701d6dc6c60301744296392897d..929cf498d4d59bbd322cff7baea258df7633bddd 100755
--- a/reform2-imx8mq/mkuserland.sh
+++ b/reform2-imx8mq/mkuserland.sh
@@ -3,98 +3,57 @@
 set -e
 set -x
 
-ETC=./template-etc
-SKEL=./template-skel
-
-mmdebstrap --architectures=arm64 --components=main --variant="minbase" --include="apt apt-utils gnupg ca-certificates cpio bsdmainutils init-system-helpers procps gpgv debian-archive-keyring readline-common cron netbase iproute2 ifupdown isc-dhcp-client iptables iputils-ping locales less net-tools curl wget nano micro vim coreutils parted file git sudo console-setup console-data unicode-data kbd gpm systemd libpam-systemd systemd-sysv bash-completion ncurses-term alsa-utils brightnessctl brightness-udev usbutils pciutils fbset netcat-traditional nfacct traceroute wpasupplicant htop ncdu ntpdate ntp screen tmux telnet lm-sensors rfkill dosfstools e2fsprogs dialog rsync busybox pulseaudio  sway grim slurp xwayland xterm xfce4-terminal rofi arc-theme thunar policykit-1 libblockdev-dm2 libblockdev-crypto2 gnome-disk-utility cryptsetup openjdk-11-jre-headless  gnome-system-monitor eog evince mpv gedit engrampa connman-gtk gnome-icon-theme breeze-icon-theme fonts-noto-color-emoji lxpolkit mesa-utils w3m man-db pavucontrol python3-psutil ircii elinks  zlib1g-dev patch expat bison flex libunwind-dev libwayland-dev wayland-protocols libwayland-egl-backend-dev libx11-dev libx11-xcb-dev libxdamage-dev libxfixes-dev libxcb-dri3-dev libxcb-xfixes0-dev libxcb-sync-dev libxrandr-dev libxext-dev libxcb-glx0-dev libxcb-present-dev libxcb-dri2-0-dev gettext autopoint libpixman-1-dev libbsd-dev libxkbfile-dev libxcb-composite0-dev libxcb-xinput-dev libxcb-icccm4-dev libxfont-dev nettle-dev libdbus-1-dev libsystemd-dev libpciaccess-dev llvm-dev libudev-dev libmtdev-dev libevdev-dev libxshmfence-dev xutils-dev libdrm-dev libxxf86vm-dev meson gcc g++ python3-setuptools python3-mako xfonts-utils libepoxy-dev libjson-c-dev libpcre3-dev libpango1.0-dev libxkbcommon-dev libinput-dev autoconf make libtool intltool libxml2-dev libxfce4ui-2-dev libgarcon-1-dev xfce4-dev-tools libdbusmenu-gtk3-dev libfmt-dev libgirepository1.0-dev libgtkmm-3.0-dev libjsoncpp-dev libmpdclient-dev libnl-3-dev libnl-genl-3-dev libpulse-dev  libsigc++-2.0-dev libspdlog-dev  libsdl2-gfx-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev libsdl2-dev libsdl2-image-dev libflac-dev libmpg123-dev libpng-dev libmpeg2-4-dev" sid target-userland http://ftp.de.debian.org/debian
-
-# install kernel
-cp linux/arch/arm64/boot/Image target-userland/
-# install DTBs
-cp linux/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dtb target-userland/imx8mq-mnt-reform2-single-display.dtb
-cp linux/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2-hdmi.dtb target-userland/imx8mq-mnt-reform2-dual-display.dtb
-# default to single display (less flickery)
-cp linux/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dtb target-userland/imx8mq-mnt-reform2.dtb
-# provide a copy of u-boot for (re)flashing
-mkdir -p target-userland/boot
-cp ./u-boot/flash.bin target-userland/boot/
-cp ./u-boot/flash-rescue.bin target-userland/boot/
-cp ./u-boot/flash-rescue.sh target-userland/boot/
-
-# default audio settings, or PCM will be muted
-mkdir -p target-userland/var/lib/alsa
-cp $ETC/asound.state target-userland/var/lib/alsa/
-
-# populate root user and skel
-cp -RavT $SKEL target-userland/root/
-cp -RavT $SKEL target-userland/etc/skel/
-mkdir -p target-userland/etc/skel/Desktop
-mkdir -p target-userland/etc/skel/Documents
-mkdir -p target-userland/etc/skel/Downloads
-mkdir -p target-userland/etc/skel/Music
-mkdir -p target-userland/etc/skel/Pictures
-mkdir -p target-userland/etc/skel/Videos
-
-# populate /etc
-cp $ETC/ld.so.conf target-userland/etc # or our libraries won't be picked up
-mkdir -p target-userland/etc/dhcp
-cp $ETC/dhclient.conf target-userland/etc/dhcp
-cp $ETC/motd-rescue target-userland/etc/motd # we start with the rescue system
-cp $ETC/hostname target-userland/etc
-cp $ETC/hosts target-userland/etc
-cp $ETC/adduser.conf target-userland/etc # or else EXTRA_GROUPS doesn't work?!
-cp $ETC/reform-* target-userland/etc
-mkdir -p target-userland/etc/profile.d
-cp $ETC/profile.d/* target-userland/etc/profile.d/
-
-# copy pulse config files that will be moved inside the target fs later
-cp $ETC/pulse/* target-userland/
-
-# custom built libraries
-mkdir -p target-userland/root/src
-
-chroot target-userland /bin/bash <<EOF
-export DEBIAN_FRONTEND=noninteractive
-export DEBCONF_NONINTERACTIVE_SEEN=true
-export LC_ALL=C
-export LANGUAGE=C
-export LANG=C
-
-set -x
-set -e
-
-echo "root:root" | chpasswd
-passwd -d root # remove root password
-
-ln --force --symbolic /usr/share/zoneinfo/Europe/Berlin /etc/localtime
-dpkg --configure -a
-
-echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
-locale-gen
-echo "LANG=en_US.UTF-8" > /etc/default/locale
-
-# add MNT Research/Reform apt repository
-apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 376511EB67AD7BAF
-
-echo "deb https://mntre.com/reform-debian sid/" >>/etc/apt/sources.list
-apt update
-
-# install essential MNT Reform system management scripts and docs
-apt install -y reform-tools reform-handbook
-
-# move pulse config in place
-# FIXME: this is brittle and should go into a .deb
-mv /analog-input-reform.conf /usr/share/pulseaudio/alsa-mixer/paths/
-mv /default.conf /usr/share/pulseaudio/alsa-mixer/profile-sets/
-
-# move hardware setup one-shot service in place
-mv /etc/reform-hw-setup.service /etc/systemd/system/
-systemctl enable reform-hw-setup.service
-
-# remove some unnecessary stuff (apparmor slows down boot)
-apt remove -y ofono foot apparmor
-
-# disable built-in sleep targets in favor of reform-standby script
-systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target
-
-EOF
+PKGSGUI="xwayland xterm xfce4-terminal sway waybar mesa-utils lxpolkit wayland-protocols"
+
+PKGSNET="iproute2 iptables iputils-ping ircii elinks isc-dhcp-client netcat-traditional net-tools network-manager nfacct ntp ntpdate rsync telnet traceroute wpasupplicant curl wget w3m rfkill ifupdown netbase"
+
+PKGSADMIN="apt apt-utils cron cryptsetup lvm2 dbus-bin e2fsprogs fbset init-system-helpers ncdu parted pciutils policykit-1 procps sudo systemd systemd-sysv tmux u-boot-tools screen"
+
+PKGSUTILS="busybox console-data console-setup cpio file flash-kernel gnupg gpgv htop kbd lm-sensors readline-common usbutils xdg-utils bsdmainutils less nano micro vim alsa-utils dosfstools python3-psutil"
+
+PKGSMISC="brightnessctl brightness-udev ca-certificates debian-archive-keyring dialog gpm ncurses-term locales bash-completion man-db cryptsetup-initramfs linux-image-arm64 reform-tools reform-handbook"
+
+mmdebstrap \
+	--architectures=arm64 \
+	--components=main \
+	--variant="minbase" \
+	--verbose \
+	--include="$PKGSGUI $PKGSNET $PKGSADMIN $PKGSUTILS $PKGSMISC" \
+	${comment#setup apt preferences} \
+	--setup-hook='{ echo "Package: *"; echo "Pin: release n=reform, l=reform"; echo "Pin-Priority: 990"; } > "$1"/etc/apt/preferences.d/reform.pref' \
+	${comment#setup flash-kernel} \
+	--essential-hook='mkdir -p "$1"/etc/flash-kernel/ubootenv.d' \
+	--essential-hook='mkdir -p "$1"/etc/flash-kernel/preboot.d' \
+	--essential-hook='echo "MNT Reform 2" > "$1"/etc/flash-kernel/machine' \
+	--essential-hook='{ echo /dev/mmcblk1p2 / auto errors=remount-ro 0 1; echo /dev/mmcblk1p1 /boot auto errors=remount-ro 0 1; } > "$1"/etc/fstab' \
+	--essential-hook='{ echo LINUX_KERNEL_CMDLINE=\"console=ttymxc0,115200 console=tty1\"; echo LINUX_KERNEL_CMDLINE_DEFAULTS=\"ro no_console_suspend cma=512M pci=nomsi\"; } > "$1"/etc/default/flash-kernel' \
+	${comment#select timezone} \
+	--essential-hook='echo tzdata tzdata/Areas select Europe | chroot "$1" debconf-set-selections' \
+	--essential-hook='echo tzdata tzdata/Zones/Europe select Berlin | chroot "$1" debconf-set-selections' \
+	${comment#select locales} \
+	--essential-hook='echo locales locales/default_environment_locale select en_US.UTF-8 | chroot "$1" debconf-set-selections' \
+	--essential-hook='echo locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8 | chroot "$1" debconf-set-selections' \
+	${comment#initramfs-tools} \
+	--essential-hook='mkdir -p "$1"/etc/initramfs-tools' \
+	--essential-hook='printf "pwm_imx27\nnwl-dsi\nti-sn65dsi86\nimx-dcss\npanel-edp\nmux-mmio\nmxsfb\nusbhid\nimx8mq-interconnect\n" > "$1"/etc/initramfs-tools/modules' \
+	${comment#set up motd} \
+	--customize-hook='rm -f "$1"/etc/motd' \
+	--customize-hook='ln -s motd-rescue "$1"/etc/motd' \
+	${comment#provide a copy of u-boot for (re)flashing} \
+	--customize-hook='copy-in flash.bin /boot' \
+	--customize-hook='chown -R root:root "$1"/boot/flash.bin' \
+	${comment#populate root user and skel} \
+	--customize-hook='echo '"'"'if [ $(whoami) == "root" ]; then cat /etc/reform-root-help; elif [ -z $WAYLAND_DISPLAY ]; then cat /etc/reform-help; fi'"'"' >> "$1"/etc/skel/.profile' \
+	--customize-hook='chroot "$1" sh -c "rsync -Pha /etc/skel/ /root"' \
+	${comment#populate /etc} \
+	--customize-hook='echo reform > "$1"/etc/hostname' \
+	--customize-hook='{ echo 127.0.0.1 localhost reform; echo ::1 localhost ip6-localhost ip6-loopback reform; echo ff02::1 ip6-allnodes; echo ff02::2 ip6-allrouters; } > "$1"/etc/hosts' \
+	${comment#or else EXTRA_GROUPS doesnt work?} \
+	--customize-hook='sed -i s/^#EXTRA_GROUPS=/EXTRA_GROUPS=/ "$1"/etc/adduser.conf' \
+	--customize-hook='sed -i s/^#ADD_EXTRA_GROUPS=1/ADD_EXTRA_GROUPS=1/ "$1"/etc/adduser.conf' \
+	${comment#remove root password -- using `passwd -d root` produces unreproducible output} \
+	--customize-hook='echo "root:root" | chroot "$1" chpasswd' \
+	--customize-hook='chroot "$1" sed -i "s/^root:[^:]\+:/root::/" /etc/shadow' \
+	--customize-hook='rm "$1"/etc/resolv.conf' \
+	--customize-hook='rm "$1"/var/lib/dbus/machine-id' ${comment#gets regenerated by dbus} \
+	unstable target-userland.tar http://deb.debian.org/debian "deb [trusted=yes] https://mntre.com/reform-debian-repo reform main"
diff --git a/reform2-imx8mq/mkuserland2.sh b/reform2-imx8mq/mkuserland2.sh
deleted file mode 100755
index 6b332f72d981c6a8bbc56e463dbc56054d56bbbd..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/mkuserland2.sh
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/bash
-
-chroot target-userland /bin/bash <<EOF
-export LC_ALL=C
-export LANGUAGE=C
-export LANG=C
-
-set -e
-set -x
-
-cd /root
-mkdir -p src
-cd src
-
-git clone --depth 1 --branch libdrm-2.4.106 https://gitlab.freedesktop.org/mesa/drm.git
-
-# there's no tag yet for 21.1.3 which will probably include all patches we need
-# so fetch the most recent commit at the time of putting this script together.
-mkdir -p mesa
-cd mesa
-git init
-git remote add origin https://gitlab.freedesktop.org/mesa/mesa.git
-git fetch origin 2ebf4e984b51825c37562e0221bde327188e3eaf
-git reset --hard FETCH_HEAD
-cd ..
-
-mkdir -p xserver
-cd xserver
-git init
-git remote add origin https://gitlab.freedesktop.org/xorg/xserver.git
-git fetch origin f3eb1684fa5008ad7c881f798a5efb7441b23035
-git reset --hard FETCH_HEAD
-cd ..
-
-git clone https://github.com/swaywm/wlroots.git
-git clone https://github.com/swaywm/sway.git
-git clone --depth 1 --branch 0.9.7 https://github.com/Alexays/Waybar.git
-git clone --depth 1 --branch v0.4.0 https://github.com/any1/wayvnc.git
-git clone --depth 1 --branch v0.1.3 https://github.com/Hjdskes/cage.git
-
-cd drm
-meson build -Detnaviv=true -Dradeon=false -Damdgpu=false -Dvmwgfx=false -Dfreedreno=false -Dvc4=false -Dnouveau=false
-ninja -C build install
-cd ..
-rm -rf drm
-
-ldconfig
-
-cd mesa
-meson build -Dplatforms=x11,wayland -Ddri3=true -Dgallium-drivers=swrast,etnaviv,kmsro,virgl -Dgbm=enabled -Degl=enabled -Dbuildtype=release -Db_ndebug=true
-ninja -C build install
-cd ..
-rm -rf mesa
-
-ldconfig
-
-cd wlroots
-git checkout 0.13.0
-meson build
-ninja -C build install
-cd ..
-rm -rf wlroots
-
-ldconfig
-
-cd sway
-git checkout 1.6
-meson build
-ninja -C build install
-chmod +s /usr/local/bin/sway
-cd ..
-rm -rf sway
-
-cd xserver
-
-# patch to work around flickery GTK2 and other legacy X11 GUIs on etnaviv
-
-patch -p1 <<ENDPATCH
-diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
-index be0741a..1dd2876 100644
---- a/glamor/glamor_render.c
-+++ b/glamor/glamor_render.c
-@@ -1584,6 +1584,8 @@ glamor_composite_clipped_region(CARD8 op,
-     if (prect != rect)
-         free(prect);
-  out:
-+    glFinish();
-+
-     if (temp_src != source)
-         FreePicture(temp_src, 0);
-     if (temp_mask != mask)
-ENDPATCH
-
-meson build -Dxorg=true -Dxwayland=true -Dglamor=true -Dxwayland_eglstream=false -Dxnest=false -Ddmx=false -Dxvfb=true -Dxwin=false -Dxephyr=false -Ddri3=true
-ninja -C build install
-cd ..
-rm -rf xserver
-
-# overwrite /usr/bin/Xwayland with symlink to our Xwayland (FIXME: brittle)
-
-rm -f /usr/bin/Xwayland
-ln -s /usr/local/bin/Xwayland /usr/bin/Xwayland
-
-cd Waybar
-meson build
-ninja -C build install
-cd ..
-rm -rf Waybar
-
-cd wayvnc
-mkdir subprojects
-cd subprojects
-git clone https://github.com/any1/neatvnc.git
-git clone https://github.com/any1/aml.git
-cd ..
-meson build
-ninja -C build install
-cd ..
-rm -rf wayvnc
-
-cd cage
-meson build
-ninja -C build install
-cd ..
-rm -rf cage
-
-EOF
diff --git a/reform2-imx8mq/mkuserland3.sh b/reform2-imx8mq/mkuserland3.sh
index 33e40889d14e12091ec55a2a87be05731de10ed9..990eaa6b947f53d54411ea8e964d00eeeafb23dd 100755
--- a/reform2-imx8mq/mkuserland3.sh
+++ b/reform2-imx8mq/mkuserland3.sh
@@ -8,33 +8,30 @@ set -e
 ETC=./template-etc
 SKEL=./template-skel
 
-# populate /etc
-cp $ETC/motd target-userland/etc
-
-chroot target-userland /bin/bash <<EOF
-export DEBIAN_FRONTEND=noninteractive
-export DEBCONF_NONINTERACTIVE_SEEN=true
-export LC_ALL=C
-export LANGUAGE=C
-export LANG=C
-
-set -x
-set -e
-
-# install applications
-
-apt install -y libreoffice libreoffice-gtk3 inkscape firefox-esr emacs gimp wmaker x11-utils
-apt install -y chromium evolution freecad ardour sxiv neverball scummvm dosbox wf-recorder wev linphone-desktop
-
-# install patched software from mntre
-
-apt install -y kicad=5.1.9+dfsg1-1.1 minetest libjsoncpp1 blender=2.79b+mntreform-2
-
-# install a minimal gnome3
-
-apt install -y --no-install-recommends gnome-control-center gnome-session
-
-# remove apparmor (slows down boot)
-apt remove -y apparmor
-
-EOF
+mmdebstrap \
+	--architectures=arm64 \
+	--variant=custom \
+	--setup-hook='mmtarfilter "--path-exclude=/dev/*" < target-userland.tar | tar -C "$1" -x' \
+	${comment#set up motd} \
+	--customize-hook='rm -f "$1"/etc/motd' \
+	--customize-hook='ln -s motd-full "$1"/etc/motd' \
+	${comment#FIXME: network-manager fails to create this most of the time} \
+	${comment#which leads to a bad user experience. we\'ll gladly change this once} \
+	${comment#we figure out how to make DNS server discovery always work with nm.} \
+	--customize-hook='echo "nameserver 8.8.8.8" > "$1"/etc/resolv.conf' \
+	${comment#install applications} \
+	--customize-hook='chroot "$1" apt-get install --yes git libreoffice libreoffice-gtk3 inkscape firefox-esr chromium emacs gimp wmaker x11-utils imagemagick-6.q16' \
+	--customize-hook='chroot "$1" apt-get install --yes evolution freecad ardour sxiv minetest neverball scummvm dosbox wf-recorder wev linphone-desktop kicad' \
+	${comment#install patched software from mntre} \
+	--customize-hook='chroot "$1" apt-get install --yes blender=2.79.b+dfsg0-7+reform1 blender-data=2.79.b+dfsg0-7+reform1 cage wayvnc ffmpeg' \
+	${comment#install a minimal gnome desktop} \
+	--customize-hook='chroot "$1" apt-get install --yes --no-install-recommends gnome-control-center gnome-session openjdk-11-jre-headless gnome-disk-utility gnome-icon-theme breeze-icon-theme gnome-system-monitor gnome-settings-daemon mpv eog evince gedit thunar pavucontrol grim fonts-inter fonts-noto-color-emoji pulseaudio unicode-data engrampa rofi slurp arc-theme' \
+	${comment#enable suspend to RAM} \
+	--customize-hook='chroot "$1" systemctl unmask suspend.target' \
+	--customize-hook='chroot "$1" systemctl unmask sleep.target' \
+	${comment#workaround for minetest camera-in-head bug https://github.com/minetest/minetest/issues/11987} \
+	--customize-hook='chroot "$1" mogrify -fill black -colorize 255 -transparent black /usr/share/games/minetest/games/minetest_game/mods/player_api/models/character.png' \
+	${comment#remove broken gnome online accounts panel} \
+	--customize-hook='rm "$1"/usr/share/applications/gnome-online-accounts-panel.desktop' \
+	--customize-hook='rm "$1"/etc/ssl/certs/java/cacerts' ${comment#regenerate with update-ca-certificates -f} \
+	'' target-userland-full.tar
diff --git a/reform2-imx8mq/multistrap.conf b/reform2-imx8mq/multistrap.conf
deleted file mode 100644
index d7f240a861c187f25b5a5db6b04f5f1a35ba991d..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/multistrap.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-[General]
-arch=arm64
-noauth=false
-unpack=true
-debootstrap=Debian
-aptsources=Debian
-allowrecommends=false
-cleanup=true
-
-# TODO deb-src missing!
-
-[Debian]
-packages=adduser apt apt-utils apt-file bsdmainutils procps gpgv debian-archive-keyring readline-common gnupg cpio init-system-helpers cron manpages netbase groff-base iproute2 ifupdown isc-dhcp-common isc-dhcp-client iptables iputils-ping kmod locales less net-tools netcat-traditional nfacct traceroute curl wget whiptail openssh-server openssh-client nano vim wpasupplicant htop ncdu ntpdate ntp usbutils fbset screen tmux brightnessctl coreutils alsa-utils sudo ca-certificates parted file git ed console-setup console-data unicode-data kbd gpm pciutils cryptsetup unzip telnet busybox lm-sensors systemd libpam-systemd systemd-sysv bash-completion ncurses-term sway grim slurp xwayland xterm xfce4-terminal rofi ircii mesa-utils w3m man-db pulseaudio pavucontrol           zlib1g-dev patch expat bison flex libunwind-dev libwayland-dev wayland-protocols libwayland-egl-backend-dev libx11-dev libx11-xcb-dev libxdamage-dev libxfixes-dev libxcb-dri3-dev libxcb-xfixes0-dev libxcb-sync-dev libxrandr-dev libxext-dev libxcb-glx0-dev libxcb-present-dev libxcb-dri2-0-dev gettext autopoint libpixman-1-dev libbsd-dev libxkbfile-dev libxcb-composite0-dev libxcb-xinput-dev libxcb-icccm4-dev libxfont-dev nettle-dev libdbus-1-dev libsystemd-dev libpciaccess-dev llvm-dev libudev-dev libmtdev-dev libevdev-dev libxshmfence-dev xutils-dev libdrm-dev libxxf86vm-dev meson gcc g++ python3-setuptools python3-mako xfonts-utils libepoxy-dev libjson-c-dev libpcre3-dev libpango1.0-dev libxkbcommon-dev libinput-dev autoconf make libtool intltool libxml2-dev libxfce4ui-2-dev libgarcon-1-dev xfce4-dev-tools      arc-theme thunar gnome-disk-utility gnome-system-monitor policykit-1 dconf-editor    eog evince mpv gedit engrampa    connman-gtk gnome-icon-theme breeze-icon-theme fonts-noto-color-emoji   libdbusmenu-gtk3-dev libfmt-dev libgirepository1.0-dev libgtkmm-3.0-dev libjsoncpp-dev libmpdclient-dev libnl-3-dev libnl-genl-3-dev libpulse-dev  libsigc++-2.0-dev libspdlog-dev gobject-introspection python3-psutil lxpolkit 
-# libblockdev-dm2 libblockdev-crypto2
-# libreoffice libreoffice-gtk3 inkscape firefox-esr emacs grafx2 milkytracker
-source=http://ftp.de.debian.org/debian
-keyring=debian-archive-keyring
-suite=bullseye
-omitdebsrc=false
-additional=
-reinstall=
-components=main contrib non-free
diff --git a/reform2-imx8mq/reform-tools_1.0-7/DEBIAN/conffiles b/reform2-imx8mq/reform-tools_1.0-7/DEBIAN/conffiles
deleted file mode 100644
index ea975c163eb5dbe89ae833df0ae68dc45322a6df..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/reform-tools_1.0-7/DEBIAN/conffiles
+++ /dev/null
@@ -1,3 +0,0 @@
-/etc/reform-desktop-help
-/etc/reform-help
-/etc/reform-root-help
diff --git a/reform2-imx8mq/reform-tools_1.0-7/DEBIAN/control b/reform2-imx8mq/reform-tools_1.0-7/DEBIAN/control
deleted file mode 100644
index 5fcc6efdc4df88f4966f1a09394ef6785fd4b9bd..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/reform-tools_1.0-7/DEBIAN/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Package: reform-tools
-Version: 1.0-7
-Section: admin
-Priority: required
-Architecture: arm64
-Recommends: reform-handbook
-Depends: python3, python3-psutil, mount, rsync, alsa-utils, systemd, net-tools, pavucontrol, procps, connman-gtk, busybox
-Maintainer: Lukas F. Hartmann <lukas@mntre.com>
-Description: MNT Reform System Tools
- A number of scripts for managing boot media, displays, standby, plus a few
- help texts and gadgets for the customized sway desktop. Also contains
- /sbin/reform-init, a boot manager script that gets loaded by u-boot and which
- in turn launches the real /sbin/init after mounting an (encrypted) boot
- medium.
diff --git a/reform2-imx8mq/reform-tools_1.0-7/etc/apt/preferences.d/00reform.pref b/reform2-imx8mq/reform-tools_1.0-7/etc/apt/preferences.d/00reform.pref
deleted file mode 100644
index af36b82f6806bb88c78b7d64ad03ad1045323aab..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/reform-tools_1.0-7/etc/apt/preferences.d/00reform.pref
+++ /dev/null
@@ -1,11 +0,0 @@
-Explanation: install versions from mntre.com even if it doesn't come from the
-Explanation: target release
-Package: *
-Pin: origin "mntre.com"
-Pin-Priority: 999
-
-Explanation: never install the Debian versions of the binary packages belonging
-Explanation: to the source packages we patched
-Package: src:fontconfig src:xwayland src:blender
-Pin: release o=Debian
-Pin-Priority: -1
diff --git a/reform2-imx8mq/reform-tools_1.0-7/etc/reform-desktop-help b/reform2-imx8mq/reform-tools_1.0-7/etc/reform-desktop-help
deleted file mode 100644
index 861dd727aa9c54c7107f14536cf0dcbdbcedbc4e..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/reform-tools_1.0-7/etc/reform-desktop-help
+++ /dev/null
@@ -1,27 +0,0 @@
-This is sway, a tiled windowing system and compositor.
-Windows don't normally float around. Instead, a new window occupies
-the full screen or a division of the screen. For example, if you
-open another window now, both windows will take half of the screen.
-
-To open another terminal, press SUPER+ENTER.
-
-To go to a workspace, press SUPER+1 to SUPER+9.
-To move the focused window to another workspace, press the same
-combination, but together with SHIFT.
-
-To close a window, press SUPER+ESC.
-
-To launch the file manager thunar, press SUPER+T.
-
-To find a program by typing its name, press SUPER+D.
-
-To configure the network, click on NET in the title bar.
-
-You can make windows float, split vertically and more. 
-Check out the sway configuration file:
-gedit ~/.config/sway/config.
-
-To learn more about the command line, enter: reform-help.
-This help can be reached by entering: reform-desktop-help.
-Read the MNT Reform handbook in a browser: reform-handbook.
-
diff --git a/reform2-imx8mq/reform-tools_1.0-7/etc/reform-help b/reform2-imx8mq/reform-tools_1.0-7/etc/reform-help
deleted file mode 100644
index 022c6aee9a7ae9c8d3f3c0d756241b0fd172bcdf..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/reform-tools_1.0-7/etc/reform-help
+++ /dev/null
@@ -1,32 +0,0 @@
-Some useful commands to explore the system:
-
-Learn more about a command:        man name-of-command
-Move around:                       ls, cd, cd ..
-
-Start a graphical environment:     sway
-                                   gnome
-                                   reform-windowmaker
-
-See all running processes:         htop
-See system services:               systemctl
-Analyze disk usage:                ncdu /
-List hardware/peripherals:         lsblk
-                                   lsusb
-                                   lspci
-                                   ip a
-View this message again:           reform-help
-Read the Operator Handbook:        reform-handbook (press % to fix contrast, Q to quit)
-Set keyboard layout and timezone:  reform-config
-Chat in Reform community:          reform-chat
-Select boot device:                reform-boot-config
-Select display configuration:      reform-display-config
-Update / install software:         sudo apt update
-                                   apt search keyword
-                                   sudo apt install package
-View a text file:                  less filename
-Edit a text file:                  micro filename
-Log out:                           exit
-
-Most programs can be quit with Ctrl+C, Q, or Ctrl+Q.
-Exit the chat with /quit.
-
diff --git a/reform2-imx8mq/reform-tools_1.0-7/etc/reform-root-help b/reform2-imx8mq/reform-tools_1.0-7/etc/reform-root-help
deleted file mode 100644
index 0835a5542345e12c4c23384f38ceea5094cee44a..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/reform-tools_1.0-7/etc/reform-root-help
+++ /dev/null
@@ -1,18 +0,0 @@
-You are logged in as root. This account
-can change anything in the system.
-To use the graphical environment sway,
-create a normal user account by entering:
-
-  adduser your-name
-
-Afterwards, to be able to become root by using sudo, enter:
-
-  adduser your-name sudo
-
-Then, log out using exit and log in as your-name.
-
-To read the MNT Reform Operator Handbook, enter:
-
-  reform-handbook   # (in the browser, press %
-                    # to fix contrast, Q to quit)
-
diff --git a/reform2-imx8mq/reform-tools_1.0-7/lib/systemd/system-shutdown/reform-poweroff b/reform2-imx8mq/reform-tools_1.0-7/lib/systemd/system-shutdown/reform-poweroff
deleted file mode 100755
index 3e84f5117058742ec3a5bcb01e3fd099a38c7e13..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/reform-tools_1.0-7/lib/systemd/system-shutdown/reform-poweroff
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-# MNT Reform: Send poweroff command to the system controller via the keyboard
-#
-
-sync
-
-if [[ "$1" == "halt" ]] || [[ "$1" == "poweroff" ]]
-then
-	echo 'xPWR0' > /dev/hidraw0
-fi
-
diff --git a/reform2-imx8mq/reform-tools_1.0-7/sbin/reform-init b/reform2-imx8mq/reform-tools_1.0-7/sbin/reform-init
deleted file mode 100755
index ae5b5beb0c39d7053d5157fcdd79030a8e4b5cf6..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/reform-tools_1.0-7/sbin/reform-init
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/busybox sh
-
-sleep 1
-echo "MNT Reform: reform-init checking boot media..."
-
-/bin/mount -t proc /proc /proc
-
-# Read config file generated by reform-boot-config script
-BOOTPREF=$(cat /reform-boot-medium)
-# Default to SD card
-BOOTPART="/dev/mmcblk1p1"
-
-if [ "x$BOOTPREF" == "x" ]
-then
-	echo "Defaulting to SD card."
-	BOOTPREF="sd"
-fi
-
-echo "Your boot preference is: \"$BOOTPREF\""
-
-# Check config
-if [ "$BOOTPREF" == "usb" ]; then
-	echo "Booting from USB storage in 3 seconds."
-	BOOTPART="/dev/sda1"
-elif [ "$BOOTPREF" == "nvme" ]; then
-	echo "Booting from NVMe SSD."
-	BOOTPART="/dev/nvme0n1p1"
-else
-	# Default. Boot from SD card (already mounted by kernel).
-	echo "Booting from SD card (or eMMC)."
-	exec /sbin/init
-fi
-
-# Check if partition exists
-if [ ! -e $BOOTPART ]; then
-	echo "Partition \"$BOOTPART\" not found. Falling back to SD card."
-	read -r -p "Press ENTER to continue."
-	exec /sbin/init
-fi
-
-# Check if partition is encrypted
-if blkid | grep "$BOOTPART" | grep "crypto_LUKS"; then
-	echo "Attempting to mount encrypted partition \"$BOOTPART\"."
-	while :
-	do
-		/sbin/cryptsetup luksOpen "$BOOTPART" cryptroot && break
-	done
-	BOOTPART="/dev/mapper/cryptroot"
-fi
-
-# Mount
-echo "Trying to boot from partition \"$BOOTPART\"."
-if ! /bin/mount "$BOOTPART" "/mnt"; then
-	echo "Could not mount '$BOOTPART'. Falling back to SD card."
-	read -r -p "Press ENTER to continue."
-	exec /sbin/init
-fi
-
-# Fallback
-if [ ! -e /mnt/sbin/init ]; then
-	echo "No /sbin/init found on mounted disk. Falling back to SD card."
-	umount /mnt
-	read -r -p "Press ENTER to continue."
-	exec /sbin/init
-fi
-
-# Move root mount over to encrypted drive
-cd /mnt || exit 9
-mount --move . /
-exec chroot . /sbin/init
diff --git a/reform2-imx8mq/reform-tools_1.0-7/usr/bin/reform-chat b/reform2-imx8mq/reform-tools_1.0-7/usr/bin/reform-chat
deleted file mode 100755
index 16a8991df8bf2d897a89c596d90b1a1c0852527a..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/reform-tools_1.0-7/usr/bin/reform-chat
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-irc -c '#mnt-reform' -p 6697 reform$RANDOM SSLIRC/irc.libera.chat
diff --git a/reform2-imx8mq/reform-tools_1.0-7/usr/bin/reform-compstat.py b/reform2-imx8mq/reform-tools_1.0-7/usr/bin/reform-compstat.py
deleted file mode 100755
index 1f4ab391474f17c730535063c87d1550cbc540a6..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/reform-tools_1.0-7/usr/bin/reform-compstat.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/python3
-import time, psutil, sys, getopt
-
-def draw_bar(val, maxval):
-	bars = ['▁','▁','▂','▂','▃','▄','▅','▆','▆','▇','█']
-	val = max(0, min(val/maxval, 0.99))
-	return bars[int(val*10)]
-
-def draw_chart(lst, maxval):
-	chart = ""
-	l = len(lst)
-	for x in range(l):
-		chart += draw_bar(lst[l-x-1], maxval)
-	return chart
-
-def history_insert(lst, item, depth):
-	lst.insert(0,item)
-	if (len(lst) > depth): lst.pop()
-	return lst
-
-def main(argv):
-	depth = 5
-	interval = 0.3
-
-	try:
-		opts, args = getopt.getopt(argv,"hd:i:")
-	except getopt.GetoptError:
-		print ('compstat -d <number of bars> -i <interval in seconds, float>')
-		sys.exit(2)
-	for opt, arg in opts:
-		if opt == '-d': depth = int(arg)
-		elif opt == "-i": interval = float(arg)
-
-	cpu_history = []
-	read_history = []
-	write_history = []
-	ldisk_activity = psutil.disk_io_counters()
-
-	while True:
-		cpu_usage = psutil.cpu_percent()
-		disk_activity = psutil.disk_io_counters()
-		
-		history_insert(cpu_history, cpu_usage, depth)	
-		history_insert(read_history, disk_activity.read_bytes - ldisk_activity.read_bytes, depth)	
-		history_insert(write_history, disk_activity.write_bytes - ldisk_activity.write_bytes, depth)
-		
-		print("CPU "+draw_chart(cpu_history, 100.0)+" R/W "+draw_chart(read_history, 1.0*1024*1024)+" "+draw_chart(write_history, 1.0*1024*1024), flush=True)
-		
-		ldisk_activity = disk_activity
-		time.sleep(interval)
-
-main(sys.argv[1:])
-
-
diff --git a/reform2-imx8mq/reform-tools_1.0-7/usr/bin/reform-compstat.sh b/reform2-imx8mq/reform-tools_1.0-7/usr/bin/reform-compstat.sh
deleted file mode 100755
index eafcc734bf8c7632bb53c758a31650a4dbc9d13d..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/reform-tools_1.0-7/usr/bin/reform-compstat.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# clean up any existing processes
-pkill -f 'python3.*compstat'
-
-/usr/bin/python3 /usr/bin/reform-compstat.py -d 1 -i 0.3
-
diff --git a/reform2-imx8mq/reform-tools_1.0-7/usr/bin/reform-connman-gtk.sh b/reform2-imx8mq/reform-tools_1.0-7/usr/bin/reform-connman-gtk.sh
deleted file mode 100755
index 65029982af9cc34ddd71aaf8ea958baca55eefcf..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/reform-tools_1.0-7/usr/bin/reform-connman-gtk.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-pkill 'connman-gtk$'
-connman-gtk
-
diff --git a/reform2-imx8mq/reform-tools_1.0-7/usr/bin/reform-desktop-help b/reform2-imx8mq/reform-tools_1.0-7/usr/bin/reform-desktop-help
deleted file mode 100755
index 732be14479ad303f3c524ff14291201813e75eee..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/reform-tools_1.0-7/usr/bin/reform-desktop-help
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cat /etc/motd
-cat /etc/reform-desktop-help
diff --git a/reform2-imx8mq/reform-tools_1.0-7/usr/bin/reform-help b/reform2-imx8mq/reform-tools_1.0-7/usr/bin/reform-help
deleted file mode 100755
index 1ef94bd6822aa8d7a3747006a0d47b707252e533..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/reform-tools_1.0-7/usr/bin/reform-help
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-cat /etc/reform-help
diff --git a/reform2-imx8mq/reform-tools_1.0-7/usr/bin/reform-pavucontrol.sh b/reform2-imx8mq/reform-tools_1.0-7/usr/bin/reform-pavucontrol.sh
deleted file mode 100755
index 18cf5dca3fc52fc85ac68cfa854c4b135535be0f..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/reform-tools_1.0-7/usr/bin/reform-pavucontrol.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-pkill 'pavucontrol$'
-pavucontrol
-
diff --git a/reform2-imx8mq/reform-tools_1.0-7/usr/sbin/reform-boot-config b/reform2-imx8mq/reform-tools_1.0-7/usr/sbin/reform-boot-config
deleted file mode 100755
index 5010d385fd0ac4d76a220a440ffb5eba191f6d07..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/reform-tools_1.0-7/usr/sbin/reform-boot-config
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-if [ "$EUID" -ne 0 ]
-  then echo "reform-boot-config has to be run as root / using sudo."
-  exit
-fi
-
-echo "This script selects your preferred boot medium. It writes your choice to the file /reform-boot-medium on the SD card (or eMMC). This file is interpreted by /sbin/reform-init at boot."
-echo "If the preferred boot medium is not available at boot time, reform-init will fall back to booting from the SD card (or eMMC)."
-echo
-
-BOOTPREF="$1"
-BOOTPART="mmcblk1p1"
-BOOTDISK="SD card"
-
-if [[ "--emmc" == "$1" ]]
-then
-    BOOTPREF="$2"
-    BOOTPART="mmcblk0p1"
-    BOOTDISK="eMMC"
-fi
-
-if [[ "$BOOTPREF" != "sd" && "$BOOTPREF" != "nvme" && "$BOOTPREF" != "usb" ]]
-then
-	echo "Usage: "
-	echo "  reform-boot-config sd              Boot from SD card or eMMC (default)."
-	echo "  reform-boot-config nvme            Boot from NVMe SSD (encrypted or plain)."
-	echo "  reform-boot-config usb             Boot from USB storage device (encrypted or plain)."
-	echo ""
-	echo "  reform-boot-config --emmc nvme|usb Record boot preference on eMMC instead of SD card."
-	echo "                                     This is only useful with SoM dip switch turned off."
-	exit 1
-fi
-
-MOUNTED_AT=$(mount | grep $BOOTPART | grep "on /" | cut -d ' ' -s -f 3)
-if [[ "x$MOUNTED_AT" != "x" ]]
-then
-	echo "Found $BOOTDISK mounted at $MOUNTED_AT."
-	echo "$BOOTPREF" > "${MOUNTED_AT}/reform-boot-medium"
-	echo "Boot medium choice $BOOTPREF recorded in ${MOUNTED_AT}/reform-boot-medium."
-	echo "Restart MNT Reform (type: reboot) after saving your work to activate the changes."
-	exit
-fi
-
-echo "Assuming your system is not running from $BOOTDISK. Mounting /dev/$BOOTPART on /boot."
-
-mount /dev/$BOOTPART /boot
-
-if [ $? -eq 0 ]
-then
-	echo "$BOOTPREF" > "/boot/reform-boot-medium"
-	echo "Boot medium choice $BOOTPREF recorded in /reform-boot-medium on $BOOTPART."
-	echo "Restart MNT Reform (type: reboot) after saving your work to activate the changes."
-	umount /boot
-	exit
-fi
-
-echo "Error: could not mount the SD card."
-
-umount /boot
diff --git a/reform2-imx8mq/reform-tools_1.0-7/usr/sbin/reform-config b/reform2-imx8mq/reform-tools_1.0-7/usr/sbin/reform-config
deleted file mode 100755
index b1beb55a58e3cc0056a37e9153fca9f4e2bf1923..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/reform-tools_1.0-7/usr/sbin/reform-config
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-
-sudo dpkg-reconfigure keyboard-configuration
-sudo systemctl restart keyboard-setup
-
-sudo dpkg-reconfigure tzdata
-
diff --git a/reform2-imx8mq/reform-tools_1.0-7/usr/sbin/reform-display-config b/reform2-imx8mq/reform-tools_1.0-7/usr/sbin/reform-display-config
deleted file mode 100755
index e5d385e6c95b651ecf315181256b8be04e800493..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/reform-tools_1.0-7/usr/sbin/reform-display-config
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ "$EUID" -ne 0 ]
-  then echo "reform-display-config has to be run as root / using sudo."
-  exit
-fi
-
-DTB="x"
-DTB_TARGET="imx8mq-mnt-reform2.dtb"
-CHOICE="$1"
-BOOTPART="mmcblk1p1"
-BOOTDISK="SD card"
-
-if [[ "--emmc" == "$1" ]]
-then
-    CHOICE="$2"
-    BOOTPART="mmcblk0p1"
-    BOOTDISK="eMMC"
-fi
-
-case "$CHOICE" in
-	dual) DTB="imx8mq-mnt-reform2-dual-display.dtb";;
-	single) DTB="imx8mq-mnt-reform2-single-display.dtb";;
-esac
-
-if [[ "$DTB" == "x" ]]
-then
-	echo "Usage: "
-	echo "  reform-display-config dual                Select dual-display support (internal + HDMI)."
-	echo "  reform-display-config single              Select only internal display (turns off HDMI)."
-  echo "  reform-display-config --emmc dual|single  Record choice on eMMC."
-	exit
-fi
-
-MOUNTED_AT=$(mount | grep $BOOTPART | grep "on /" | cut -d ' ' -s -f 3)
-if [[ "x$MOUNTED_AT" != "x" ]]
-then
-	if [[ -e "${MOUNTED_AT}/${DTB_TARGET}" ]] && [[ -e "${MOUNTED_AT}/${DTB}" ]]
-	then
-		echo "Found source and target files in $MOUNTED_AT."
-		cp -v "${MOUNTED_AT}/${DTB}" "${MOUNTED_AT}/${DTB_TARGET}"
-		echo "Restart MNT Reform (type: reboot) after saving your work to activate the changes."
-		exit
-	fi
-
-	echo "Error: the $BOOTDISK is already mounted at $MOUNTED_AT, but the DTB files ($DTB_TARGET and $DTB) are not there."
-	exit
-fi
-
-echo "Assuming boot files are on $BOOTDISK, but your system is not. Mounting /dev/$BOOTPART on /boot."
-
-mount /dev/$BOOTPART /boot
-
-if [[ -e "/boot/$DTB_TARGET" ]] && [[ -e "/boot/$DTB" ]]
-then
-	echo "Found source and target files in the root directory of $BOOTPART."
-	cp -v "/boot/$DTB" "/boot/$DTB_TARGET"
-	echo "Restart MNT Reform (type: reboot) after saving your work to activate the changes."
-	umount /boot
-	exit
-fi
-
-echo "Error: could not find the DTB files ($DTB_TARGET and $DTB) in any of the expected places."
-
-umount /boot
diff --git a/reform2-imx8mq/reform-tools_1.0-7/usr/sbin/reform-hw-setup.sh b/reform2-imx8mq/reform-tools_1.0-7/usr/sbin/reform-hw-setup.sh
deleted file mode 100755
index 7abd2906574e1291d7db64082667bf141d2b878e..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/reform-tools_1.0-7/usr/sbin/reform-hw-setup.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# This switch in WM8960 needs to be on for the headset mic input to work
-amixer -c 0 sset 'Left Input Mixer Boost' on
-
-# Enable wakeup from suspend on all UARTs
-echo enabled > /sys/devices/platform/soc@0/30800000.bus/30860000.serial/tty/ttymxc0/power/wakeup
-echo enabled > /sys/devices/platform/soc@0/30800000.bus/30890000.serial/tty/ttymxc1/power/wakeup
-echo enabled > /sys/devices/platform/soc@0/30800000.bus/30880000.serial/tty/ttymxc2/power/wakeup
diff --git a/reform2-imx8mq/reform-tools_1.0-7/usr/sbin/reform-migrate b/reform2-imx8mq/reform-tools_1.0-7/usr/sbin/reform-migrate
deleted file mode 100755
index 116c6355e68edf8f991e73259f50d4093353f384..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/reform-tools_1.0-7/usr/sbin/reform-migrate
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-set -e
-
-TARGET="$1"
-
-echo ""
-echo "This script can copy your current OS and files to a different disk, such as an SSD installed in MNT Reform."
-echo ""
-echo "Warning: This will overwrite files on the target partition. Make sure you know what you're doing!"
-echo ""
-echo "Before using this script, your target partition has to be formatted. You can use the gnome-disks program for that."
-echo "gnome-disks can also help you set up an encrypted disk."
-echo ""
-
-if [[ "x$TARGET" == "x" ]]
-then
-	echo "Usage:"
-	echo "  reform-migrate /dev/nvme0n1p1     Mounts the first partition of an NVMe disk and mirrors your system to it."
-	echo "  reform-migrate /dev/mapper/crypt  Mounts encrypted disk 'crypt' and mirrors your system to it."
-	echo "                                    The disk has to be unlocked first with:"
-	echo "                                      cryptsetup luksOpen /dev/nvme0n1p1 crypt"
-	echo ""
-	exit
-fi
-
-if [ ! -e "$TARGET" ]
-then
-	echo "Error: The partition $TARGET does not exist."
-	exit
-fi
-
-if [ "$EUID" -ne 0 ]
-  then echo "reform-migrate has to be run as root / using sudo."
-  exit
-fi
-
-command -v "rsync" >/dev/null 2>&1 || { echo >&2 "Please install \"rsync\" using: apt install rsync"; exit 1; }
-
-echo "Trying to mount $TARGET... (if this fails, format the disk/partition as explained above)"
-
-mount "$TARGET" /mnt
-
-echo "Target partition successfully mounted. The next step will copy all your files over to the target, overwriting existing files in the process."
-echo ""
-
-read -r -p "Are you sure you want to proceed? [y/N] " response
-
-if [[ "$response" != "y" ]]
-then
-	echo "Exiting."
-	umount /mnt
-	exit
-fi
-
-echo "Starting the copy. This can take a while."
-
-rsync -axHAWXS --numeric-ids --info=progress2 / /mnt/
-
-echo "Files copied."
-
-umount /mnt
-
-echo "$TARGET unmounted."
diff --git a/reform2-imx8mq/reform-tools_1.0-7/usr/sbin/reform-standby b/reform2-imx8mq/reform-tools_1.0-7/usr/sbin/reform-standby
deleted file mode 100755
index 76b17305607bd1c7b7a2bcf11c12be2e1876fe7e..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/reform-tools_1.0-7/usr/sbin/reform-standby
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-if [ "$EUID" -ne 0 ]
-  then echo "reform-standby has to be run as root / using sudo."
-  exit
-fi
-
-WIFI=wlp1s0
-
-# configure UARTs as wakeup sources
-echo enabled > /sys/devices/platform/soc@0/30800000.bus/30860000.serial/tty/ttymxc0/power/wakeup
-echo enabled > /sys/devices/platform/soc@0/30800000.bus/30890000.serial/tty/ttymxc1/power/wakeup
-echo enabled > /sys/devices/platform/soc@0/30800000.bus/30880000.serial/tty/ttymxc2/power/wakeup
-
-if [ -e /sys/class/net/$WIFI ]
-then
-  echo "Disconnecting Wi-Fi ($WIFI)..."
-  ifconfig $WIFI down
-fi
-
-echo Entering standby in 3...
-sleep 1
-echo 2...
-sleep 1
-echo 1...
-sleep 1
-
-sync
-echo mem >/sys/power/state
-
-# reset wifi
-if [ -e /sys/class/net/$WIFI ]
-then
-  echo "Resetting Wi-Fi ($WIFI)..."
-  sleep 1
-  echo 1 > /sys/devices/platform/soc@0/33800000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/reset
-  sleep 1
-  ifconfig $WIFI up
-  echo Done.
-fi
diff --git a/reform2-imx8mq/template-etc/adduser.conf b/reform2-imx8mq/template-etc/adduser.conf
deleted file mode 100644
index 440930cf173e3a5eebcfa013efb4b5d5174d5018..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-etc/adduser.conf
+++ /dev/null
@@ -1,85 +0,0 @@
-# /etc/adduser.conf: `adduser' configuration.
-# See adduser(8) and adduser.conf(5) for full documentation.
-
-# The DSHELL variable specifies the default login shell on your
-# system.
-DSHELL=/bin/bash
-
-# The DHOME variable specifies the directory containing users' home
-# directories.
-DHOME=/home
-
-# If GROUPHOMES is "yes", then the home directories will be created as
-# /home/groupname/user.
-GROUPHOMES=no
-
-# If LETTERHOMES is "yes", then the created home directories will have
-# an extra directory - the first letter of the user name. For example:
-# /home/u/user.
-LETTERHOMES=no
-
-# The SKEL variable specifies the directory containing "skeletal" user
-# files; in other words, files such as a sample .profile that will be
-# copied to the new user's home directory when it is created.
-SKEL=/etc/skel
-
-# FIRST_SYSTEM_[GU]ID to LAST_SYSTEM_[GU]ID inclusive is the range for UIDs
-# for dynamically allocated administrative and system accounts/groups.
-# Please note that system software, such as the users allocated by the base-passwd
-# package, may assume that UIDs less than 100 are unallocated.
-FIRST_SYSTEM_UID=100
-LAST_SYSTEM_UID=999
-
-FIRST_SYSTEM_GID=100
-LAST_SYSTEM_GID=999
-
-# FIRST_[GU]ID to LAST_[GU]ID inclusive is the range of UIDs of dynamically
-# allocated user accounts/groups.
-FIRST_UID=1000
-LAST_UID=59999
-
-FIRST_GID=1000
-LAST_GID=59999
-
-# The USERGROUPS variable can be either "yes" or "no".  If "yes" each
-# created user will be given their own group to use as a default.  If
-# "no", each created user will be placed in the group whose gid is
-# USERS_GID (see below).
-USERGROUPS=yes
-
-# If USERGROUPS is "no", then USERS_GID should be the GID of the group
-# `users' (or the equivalent group) on your system.
-USERS_GID=100
-
-# If DIR_MODE is set, directories will be created with the specified
-# mode. Otherwise the default mode 0755 will be used.
-DIR_MODE=0755
-
-# If SETGID_HOME is "yes" home directories for users with their own
-# group the setgid bit will be set. This was the default for
-# versions << 3.13 of adduser. Because it has some bad side effects we
-# no longer do this per default. If you want it nevertheless you can
-# still set it here.
-SETGID_HOME=no
-
-# If QUOTAUSER is set, a default quota will be set from that user with
-# `edquota -p QUOTAUSER newuser'
-QUOTAUSER=""
-
-# If SKEL_IGNORE_REGEX is set, adduser will ignore files matching this
-# regular expression when creating a new home directory
-SKEL_IGNORE_REGEX="dpkg-(old|new|dist|save)"
-
-# Set this if you want the --add_extra_groups option to adduser to add
-# new users to other groups.
-# This is the list of groups that new non-system users will be added to
-# Default:
-EXTRA_GROUPS="dialout cdrom floppy audio video plugdev users"
-
-# If ADD_EXTRA_GROUPS is set to something non-zero, the EXTRA_GROUPS
-# option above will be default behavior for adding new, non-system users
-ADD_EXTRA_GROUPS=1
-
-
-# check user and group names also against this regular expression.
-#NAME_REGEX="^[a-z][-a-z0-9_]*\$"
diff --git a/reform2-imx8mq/template-etc/asound.state b/reform2-imx8mq/template-etc/asound.state
deleted file mode 100644
index b8c162a0b06cb7a96bf3b7f43d9f461e627b9630..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-etc/asound.state
+++ /dev/null
@@ -1,701 +0,0 @@
-state.wm8960audio {
-	control.1 {
-		iface MIXER
-		name 'Capture Volume'
-		value.0 39
-		value.1 39
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 63'
-			dbmin -1725
-			dbmax 3000
-			dbvalue.0 1200
-			dbvalue.1 1200
-		}
-	}
-	control.2 {
-		iface MIXER
-		name 'Capture Volume ZC Switch'
-		value.0 0
-		value.1 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 1'
-		}
-	}
-	control.3 {
-		iface MIXER
-		name 'Capture Switch'
-		value.0 true
-		value.1 true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 2
-		}
-	}
-	control.4 {
-		iface MIXER
-		name 'Left Input Boost Mixer LINPUT3 Volume'
-		value 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 7'
-			dbmin -9999999
-			dbmax 600
-			dbvalue.0 -9999999
-		}
-	}
-	control.5 {
-		iface MIXER
-		name 'Left Input Boost Mixer LINPUT2 Volume'
-		value 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 7'
-			dbmin -9999999
-			dbmax 600
-			dbvalue.0 -9999999
-		}
-	}
-	control.6 {
-		iface MIXER
-		name 'Right Input Boost Mixer RINPUT3 Volume'
-		value 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 7'
-			dbmin -9999999
-			dbmax 600
-			dbvalue.0 -9999999
-		}
-	}
-	control.7 {
-		iface MIXER
-		name 'Right Input Boost Mixer RINPUT2 Volume'
-		value 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 7'
-			dbmin -9999999
-			dbmax 600
-			dbvalue.0 -9999999
-		}
-	}
-	control.8 {
-		iface MIXER
-		name 'Right Input Boost Mixer RINPUT1 Volume'
-		value 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 3'
-			dbmin 0
-			dbmax 2900
-			dbvalue.0 0
-		}
-	}
-	control.9 {
-		iface MIXER
-		name 'Left Input Boost Mixer LINPUT1 Volume'
-		value 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 3'
-			dbmin 0
-			dbmax 2900
-			dbvalue.0 0
-		}
-	}
-	control.10 {
-		iface MIXER
-		name 'Playback Volume'
-		value.0 215
-		value.1 215
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 255'
-			dbmin -9999999
-			dbmax 0
-			dbvalue.0 -2000
-			dbvalue.1 -2000
-		}
-	}
-	control.11 {
-		iface MIXER
-		name 'Headphone Playback Volume'
-		value.0 0
-		value.1 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 127'
-			dbmin -9999999
-			dbmax 600
-			dbvalue.0 -9999999
-			dbvalue.1 -9999999
-		}
-	}
-	control.12 {
-		iface MIXER
-		name 'Headphone Playback ZC Switch'
-		value.0 false
-		value.1 false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 2
-		}
-	}
-	control.13 {
-		iface MIXER
-		name 'Speaker Playback Volume'
-		value.0 101
-		value.1 101
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 127'
-			dbmin -9999999
-			dbmax 600
-			dbvalue.0 -2000
-			dbvalue.1 -2000
-		}
-	}
-	control.14 {
-		iface MIXER
-		name 'Speaker Playback ZC Switch'
-		value.0 false
-		value.1 false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 2
-		}
-	}
-	control.15 {
-		iface MIXER
-		name 'Speaker DC Volume'
-		value 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 5'
-		}
-	}
-	control.16 {
-		iface MIXER
-		name 'Speaker AC Volume'
-		value 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 5'
-		}
-	}
-	control.17 {
-		iface MIXER
-		name 'PCM Playback -6dB Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.18 {
-		iface MIXER
-		name 'ADC Polarity'
-		value 'No Inversion'
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 'No Inversion'
-			item.1 'Left Inverted'
-			item.2 'Right Inverted'
-			item.3 'Stereo Inversion'
-		}
-	}
-	control.19 {
-		iface MIXER
-		name 'ADC High Pass Filter Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.20 {
-		iface MIXER
-		name 'DAC Polarity'
-		value 'No Inversion'
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 'No Inversion'
-			item.1 'Left Inverted'
-			item.2 'Right Inverted'
-			item.3 'Stereo Inversion'
-		}
-	}
-	control.21 {
-		iface MIXER
-		name 'DAC Deemphasis Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.22 {
-		iface MIXER
-		name 'DAC Slope'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.23 {
-		iface MIXER
-		name '3D Filter Upper Cut-Off'
-		value High
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 High
-			item.1 Low
-		}
-	}
-	control.24 {
-		iface MIXER
-		name '3D Filter Lower Cut-Off'
-		value Low
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 Low
-			item.1 High
-		}
-	}
-	control.25 {
-		iface MIXER
-		name '3D Volume'
-		value 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 15'
-		}
-	}
-	control.26 {
-		iface MIXER
-		name '3D Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.27 {
-		iface MIXER
-		name 'ALC Function'
-		value Off
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 Off
-			item.1 Right
-			item.2 Left
-			item.3 Stereo
-		}
-	}
-	control.28 {
-		iface MIXER
-		name 'ALC Max Gain'
-		value 7
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 7'
-		}
-	}
-	control.29 {
-		iface MIXER
-		name 'ALC Target'
-		value 4
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 15'
-		}
-	}
-	control.30 {
-		iface MIXER
-		name 'ALC Min Gain'
-		value 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 7'
-		}
-	}
-	control.31 {
-		iface MIXER
-		name 'ALC Hold Time'
-		value 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 15'
-		}
-	}
-	control.32 {
-		iface MIXER
-		name 'ALC Mode'
-		value ALC
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 ALC
-			item.1 Limiter
-		}
-	}
-	control.33 {
-		iface MIXER
-		name 'ALC Decay'
-		value 3
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 15'
-		}
-	}
-	control.34 {
-		iface MIXER
-		name 'ALC Attack'
-		value 2
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 15'
-		}
-	}
-	control.35 {
-		iface MIXER
-		name 'Noise Gate Threshold'
-		value 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 31'
-		}
-	}
-	control.36 {
-		iface MIXER
-		name 'Noise Gate Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.37 {
-		iface MIXER
-		name 'ADC PCM Capture Volume'
-		value.0 195
-		value.1 195
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 255'
-			dbmin -9999999
-			dbmax 3000
-			dbvalue.0 0
-			dbvalue.1 0
-		}
-	}
-	control.38 {
-		iface MIXER
-		name 'Left Output Mixer Boost Bypass Volume'
-		value 2
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 7'
-			dbmin -2100
-			dbmax 0
-			dbvalue.0 -1500
-		}
-	}
-	control.39 {
-		iface MIXER
-		name 'Left Output Mixer LINPUT3 Volume'
-		value 2
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 7'
-			dbmin -2100
-			dbmax 0
-			dbvalue.0 -1500
-		}
-	}
-	control.40 {
-		iface MIXER
-		name 'Right Output Mixer Boost Bypass Volume'
-		value 2
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 7'
-			dbmin -2100
-			dbmax 0
-			dbvalue.0 -1500
-		}
-	}
-	control.41 {
-		iface MIXER
-		name 'Right Output Mixer RINPUT3 Volume'
-		value 2
-		comment {
-			access 'read write'
-			type INTEGER
-			count 1
-			range '0 - 7'
-			dbmin -2100
-			dbmax 0
-			dbvalue.0 -1500
-		}
-	}
-	control.42 {
-		iface MIXER
-		name 'ADC Data Output Select'
-		value 'Left Data = Left ADC;  Right Data = Right ADC'
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 'Left Data = Left ADC;  Right Data = Right ADC'
-			item.1 'Left Data = Left ADC;  Right Data = Left ADC'
-			item.2 'Left Data = Right ADC; Right Data = Right ADC'
-			item.3 'Left Data = Right ADC; Right Data = Left ADC'
-		}
-	}
-	control.43 {
-		iface MIXER
-		name 'DAC Mono Mix'
-		value Stereo
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 Stereo
-			item.1 Mono
-		}
-	}
-	control.44 {
-		iface MIXER
-		name 'Left Boost Mixer LINPUT2 Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.45 {
-		iface MIXER
-		name 'Left Boost Mixer LINPUT3 Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.46 {
-		iface MIXER
-		name 'Left Boost Mixer LINPUT1 Switch'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.47 {
-		iface MIXER
-		name 'Right Boost Mixer RINPUT2 Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.48 {
-		iface MIXER
-		name 'Right Boost Mixer RINPUT3 Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.49 {
-		iface MIXER
-		name 'Right Boost Mixer RINPUT1 Switch'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.50 {
-		iface MIXER
-		name 'Left Input Mixer Boost Switch'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.51 {
-		iface MIXER
-		name 'Right Input Mixer Boost Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.52 {
-		iface MIXER
-		name 'Left Output Mixer PCM Playback Switch'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.53 {
-		iface MIXER
-		name 'Left Output Mixer LINPUT3 Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.54 {
-		iface MIXER
-		name 'Left Output Mixer Boost Bypass Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.55 {
-		iface MIXER
-		name 'Right Output Mixer PCM Playback Switch'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.56 {
-		iface MIXER
-		name 'Right Output Mixer RINPUT3 Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.57 {
-		iface MIXER
-		name 'Right Output Mixer Boost Bypass Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.58 {
-		iface MIXER
-		name 'Mono Output Mixer Left Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.59 {
-		iface MIXER
-		name 'Mono Output Mixer Right Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-}
diff --git a/reform2-imx8mq/template-etc/dhclient.conf b/reform2-imx8mq/template-etc/dhclient.conf
deleted file mode 100644
index 865f16296b0751951972bfd7007411650c993e1f..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-etc/dhclient.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-# Configuration file for /sbin/dhclient.
-#
-# This is a sample configuration file for dhclient. See dhclient.conf's
-#	man page for more information about the syntax of this file
-#	and a more comprehensive list of the parameters understood by
-#	dhclient.
-#
-# Normally, if the DHCP server provides reasonable information and does
-#	not leave anything out (like the domain name, for example), then
-#	few changes must be made to this file, if any.
-#
-
-option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;
-
-send host-name = gethostname();
-request subnet-mask, broadcast-address, time-offset, routers,
-	domain-name, domain-name-servers, domain-search, host-name,
-	dhcp6.name-servers, dhcp6.domain-search, dhcp6.fqdn, dhcp6.sntp-servers,
-	netbios-name-servers, netbios-scope, interface-mtu,
-	rfc3442-classless-static-routes, ntp-servers;
-
-#send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
-#send dhcp-lease-time 3600;
-#supersede domain-name "fugue.com home.vix.com";
-#prepend domain-name-servers 127.0.0.1;
-#require subnet-mask, domain-name-servers;
-timeout 5;
-#retry 60;
-#reboot 10;
-#select-timeout 5;
-#initial-interval 2;
-#script "/sbin/dhclient-script";
-#media "-link0 -link1 -link2", "link0 link1";
-#reject 192.33.137.209;
-
-#alias {
-#  interface "eth0";
-#  fixed-address 192.5.5.213;
-#  option subnet-mask 255.255.255.255;
-#}
-
-#lease {
-#  interface "eth0";
-#  fixed-address 192.33.137.200;
-#  medium "link0 link1";
-#  option host-name "andare.swiftmedia.com";
-#  option subnet-mask 255.255.255.0;
-#  option broadcast-address 192.33.137.255;
-#  option routers 192.33.137.250;
-#  option domain-name-servers 127.0.0.1;
-#  renew 2 2000/1/12 00:00:01;
-#  rebind 2 2000/1/12 00:00:01;
-#  expire 2 2000/1/12 00:00:01;
-#}
diff --git a/reform2-imx8mq/template-etc/eth.network b/reform2-imx8mq/template-etc/eth.network
deleted file mode 100644
index ecfba0d26036cf45736b57b9ee324191c3738d9c..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-etc/eth.network
+++ /dev/null
@@ -1,8 +0,0 @@
-[Match]
-Name=en*
-
-[Network]
-DHCP=ipv4
-
-[DHCPv4]
-UseHostname=false
diff --git a/reform2-imx8mq/template-etc/fw_env.config b/reform2-imx8mq/template-etc/fw_env.config
deleted file mode 100644
index a06efa96ad158a7841c2668aa051f07d99c742c3..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-etc/fw_env.config
+++ /dev/null
@@ -1 +0,0 @@
-/dev/mmcblk0boot0 	-0x2000 	0x2000
diff --git a/reform2-imx8mq/template-etc/hostname b/reform2-imx8mq/template-etc/hostname
deleted file mode 100644
index 4010da7944bd5e1fecf7120b42e52ef09dbc08bd..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-etc/hostname
+++ /dev/null
@@ -1,2 +0,0 @@
-reform
-
diff --git a/reform2-imx8mq/template-etc/hosts b/reform2-imx8mq/template-etc/hosts
deleted file mode 100644
index 6cf6b00ed6c9a1854e101981c29e03f131857cb1..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-etc/hosts
+++ /dev/null
@@ -1,4 +0,0 @@
-127.0.0.1	localhost reform
-::1		localhost ip6-localhost ip6-loopback reform
-ff02::1		ip6-allnodes
-ff02::2		ip6-allrouters
diff --git a/reform2-imx8mq/template-etc/ld.so.conf b/reform2-imx8mq/template-etc/ld.so.conf
deleted file mode 100644
index ddbd34d537f341a41d2b719b3d0b0d5c74bdb7d8..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-etc/ld.so.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-/usr/local/lib
-/usr/local/lib/dri
-
-include /etc/ld.so.conf.d/*.conf
diff --git a/reform2-imx8mq/template-etc/locale b/reform2-imx8mq/template-etc/locale
deleted file mode 100644
index dd6eee3aa7f8eb5b7980ce0a4aca3fcffe208a7d..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-etc/locale
+++ /dev/null
@@ -1 +0,0 @@
-LANG="en_US.UTF-8"
diff --git a/reform2-imx8mq/template-etc/motd b/reform2-imx8mq/template-etc/motd
deleted file mode 100644
index 0469d853d76a70a3b6df76f7ac1bf2acb178ef6d..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-etc/motd
+++ /dev/null
@@ -1,13 +0,0 @@
-%G
-
-    ▒       ▒       ▒
-    ██▒     ██▒     ██▒                 Welcome to Debian GNU/Linux
-    ████▒   ████▒   ████▒   ██████▒     on MNT Reform
-    ██████▒ ██████▒ ██████▒ ██████▒     System Image v2: 2021-06-08
-    ███████████████████████████
-    ███▒███████▒███████▒███████         https://mntre.com/reform
-    ███  ▒█████  ▒█████  ▒█████         https://www.debian.org
-           ▒███    ▒███    ▒███
-             ▒█      ▒█      ▒█         ████████████████████████
-
-
diff --git a/reform2-imx8mq/template-etc/motd-rescue b/reform2-imx8mq/template-etc/motd-rescue
deleted file mode 100644
index 4f9b02149b2578a0c7d755dff3ab8a30144ed825..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-etc/motd-rescue
+++ /dev/null
@@ -1,17 +0,0 @@
-%G
-
-    ▒       ▒       ▒
-    ██▒     ██▒     ██▒                 Welcome to Debian GNU/Linux
-    ████▒   ████▒   ████▒   ██████▒     on MNT Reform
-    ██████▒ ██████▒ ██████▒ ██████▒     System Image v2: 2021-06-08
-    ███████████████████████████
-    ███▒███████▒███████▒███████         https://mntre.com/reform
-    ███  ▒█████  ▒█████  ▒█████         https://www.debian.org
-           ▒███    ▒███    ▒███
-             ▒█      ▒█      ▒█         ████████████████████████
-
-
-    This is the Rescue System on eMMC flash (mmcblk0). It is intended
-    for repairs on your main system on SD card (mmcblk1) or NVMe SSD.
-
-
diff --git a/reform2-imx8mq/template-etc/profile.d/reform.sh b/reform2-imx8mq/template-etc/profile.d/reform.sh
deleted file mode 100644
index 5167c56fd5b17f9905fe6705fa7abf996ab3336c..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-etc/profile.d/reform.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-# Defaults for MNT Reform
-
-# enable NIR shader path in mesa. without this,
-# some Xwayland applications will be blank
-export ETNA_MESA_DEBUG=nir
-
-# set GTK2 theme
-export GTK2_RC_FILES=/usr/share/themes/Arc-Dark/gtk-2.0/gtkrc
-
-unicode_start
diff --git a/reform2-imx8mq/template-etc/pulse/analog-input-reform.conf b/reform2-imx8mq/template-etc/pulse/analog-input-reform.conf
deleted file mode 100644
index e2147f0dd154dbc30bfebfe0f2b5dcfeeeebea79..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-etc/pulse/analog-input-reform.conf
+++ /dev/null
@@ -1,98 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-
-; Analog input path for MNT Reform, which has a headset mic input
-; that is only on the left channel (mono).
-
-[General]
-priority = 100
-
-[Element Capture]
-switch = mute
-volume = ignore
-
-[Element Mic]
-required-absent = any
-
-[Element Mic Boost]
-required-absent = any
-
-[Element Dock Mic]
-required-absent = any
-
-[Element Dock Mic Boost]
-required-absent = any
-
-[Element Front Mic]
-required-absent = any
-
-[Element Front Mic Boost]
-required-absent = any
-
-[Element Int Mic]
-required-absent = any
-
-[Element Int Mic Boost]
-required-absent = any
-
-[Element Internal Mic]
-required-absent = any
-
-[Element Internal Mic Boost]
-required-absent = any
-
-[Element Rear Mic]
-required-absent = any
-
-[Element Rear Mic Boost]
-required-absent = any
-
-[Element Headset]
-required-absent = any
-
-[Element Headset Mic]
-required-absent = any
-
-[Element Headset Mic Boost]
-required-absent = any
-
-[Element Headphone Mic]
-required-absent = any
-
-[Element Headphone Mic Boost]
-required-absent = any
-
-[Element Line]
-required-absent = any
-
-[Element Line Boost]
-required-absent = any
-
-[Element Aux]
-required-absent = any
-
-[Element Video]
-required-absent = any
-
-[Element Mic/Line]
-required-absent = any
-
-[Element TV Tuner]
-required-absent = any
-
-[Element FM]
-required-absent = any
-
-.include analog-input.conf.common
diff --git a/reform2-imx8mq/template-etc/pulse/default.conf b/reform2-imx8mq/template-etc/pulse/default.conf
deleted file mode 100644
index 9e36a155acead41cabb7af04702d9b99add8e02a..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-etc/pulse/default.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-[General]
-auto-profiles = yes
-
-[Mapping stereo-out]
-device-strings = hw:%f
-fallback = yes
-channel-map = left,right
-paths-output = analog-output analog-output-speaker analog-output-headphones
-direction = output
-priority = 1
-
-[Mapping headset-mono-in]
-device-strings = hw:%f
-fallback = yes
-channel-map = mono
-paths-input = analog-input-reform
-direction = input
-priority = 1
-
-[Profile output:stereo-out+input:mono-in]
-description = MNT Reform
-output-mappings = stereo-out
-input-mappings = headset-mono-in
diff --git a/reform2-imx8mq/template-etc/reform-hw-setup.service b/reform2-imx8mq/template-etc/reform-hw-setup.service
deleted file mode 100644
index e355c4f81ff2468122b2183c0cacfae9ef508259..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-etc/reform-hw-setup.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=MNT Reform Hardware Defaults Setup
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/reform-hw-setup.sh
-StandardOutput=journal
-
-[Install]
-WantedBy=sysinit.target
-
diff --git a/reform2-imx8mq/template-etc/u-boot-inital-env b/reform2-imx8mq/template-etc/u-boot-inital-env
deleted file mode 100644
index 8e69daa746b3817a61fe58c743fa8b77fa4dcd5f..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-etc/u-boot-inital-env
+++ /dev/null
@@ -1,6 +0,0 @@
-board=MNT Reform 2.0
-soc=imx8mq
-fdt_addr=0x50000000
-bootargs='noinitrd root=/dev/mmcblk1p1 rootwait rw console=ttymxc0,115200 console=tty1 cma=512M pci=nomsi'
-bootcmd='ext4load mmc 1 ${loadaddr} /Image; ext4load mmc 1 ${fdt_addr} /imx8mq-mnt-reform2.dtb; booti ${loadaddr} - ${fdt_addr}'
-loadaddr=0x40480000
diff --git a/reform2-imx8mq/template-etc/xorg.conf b/reform2-imx8mq/template-etc/xorg.conf
deleted file mode 100644
index 4f7b6df30d9291c70dc3601cb33f6fb2291cadfc..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-etc/xorg.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-Section "Device"
-  Identifier "etnaviv"
-  Driver "modesetting"
-  Option "kmsdev" "/dev/dri/card1"
-  Option "AccelMethod" "glamor"
-  Option "SWcursor" "off"
-  Option "ShadowFB" "off"
-  Option "PageFlip" "off"
-EndSection
-
-Section "ServerFlags"
-  Option "AutoAddGPU" "false"
-EndSection
-
-Section "Files"
-  ModulePath "/usr/local/lib/xorg/modules"
-  ModulePath "/usr/local/lib/arm-linux-gnueabihf/xorg/modules"
-EndSection
-
diff --git a/reform2-imx8mq/template-kernel/imx8mq-mnt-reform2-hdmi.dts b/reform2-imx8mq/template-kernel/imx8mq-mnt-reform2-hdmi.dts
deleted file mode 100644
index 35e71122044722de601c721869f51264bb2ce44f..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-kernel/imx8mq-mnt-reform2-hdmi.dts
+++ /dev/null
@@ -1,830 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
-* Copyright 2018 Boundary Devices
-* Copyright 2019-2021 MNT Research GmbH
-*/
-
-/dts-v1/;
-
-#include "dt-bindings/input/input.h"
-#include "dt-bindings/pwm/pwm.h"
-#include "dt-bindings/usb/pd.h"
-#include "dt-bindings/gpio/gpio.h"
-#include "imx8mq.dtsi"
-
-/ {
-	model = "MNT Reform 2";
-	compatible = "boundary,imx8mq-nitrogen8m_som", "fsl,imx8mq";
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
-	// 4GB of RAM
-	memory@40000000 {
-		device_type = "memory";
-		reg = <0x00000000 0x40000000 0 0xc0000000>; // TODO: confirm what this means
-	};
-
-	reg_vref_0v9: regulator-vref-0v9 {
-		compatible = "regulator-fixed";
-		regulator-name = "vref-0v9";
-		regulator-min-microvolt = <900000>;
-		regulator-max-microvolt = <900000>;
-		regulator-always-on;
-	};
-
-	reg_vref_1v2: regulator-vref-1v2 {
-		compatible = "regulator-fixed";
-		regulator-name = "vref-1v2";
-		regulator-min-microvolt = <1200000>;
-		regulator-max-microvolt = <1200000>;
-		regulator-always-on;
-	};
-
-	reg_vref_1v8: regulator-vref-1v8 {
-		compatible = "regulator-fixed";
-		regulator-name = "vref-1v8";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
-		regulator-always-on;
-	};
-
-	reg_vref_2v5: regulator-vref-2v5 {
-		compatible = "regulator-fixed";
-		regulator-name = "vref-2v5";
-		regulator-min-microvolt = <2500000>;
-		regulator-max-microvolt = <2500000>;
-		regulator-always-on;
-	};
-
-	reg_vref_3v3: regulator-vref-3v3 {
-		compatible = "regulator-fixed";
-		regulator-name = "vref-3v3";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		regulator-always-on;
-	};
-
-	reg_vref_5v: regulator-vref-5v {
-		compatible = "regulator-fixed";
-		regulator-name = "vref-5v";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		regulator-always-on;
-	};
-
-	backlight: backlight {
-		compatible = "pwm-backlight";
-		pwms = <&pwm2 0 10000>;
-		enable-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
-		brightness-levels = <0 32 64 128 160 200 255>;
-		default-brightness-level = <6>;
-	};
-
-	panel {
-		compatible = "innolux,n125hce-gn1", "simple-panel";
-		power = <&reg_vref_3v3>;
-		backlight = <&backlight>;
-		no-hpd;
-
-		port@0 {
-			panel_in: endpoint {
-				remote-endpoint = <&edp_bridge_out>;
-			};
-		};
-	};
-
-	sound {
-		compatible = "simple-audio-card";
-		simple-audio-card,name = "wm8960-audio";
-		simple-audio-card,format = "i2s";
-		simple-audio-card,frame-master = <&dai_cpu_master>;
-		simple-audio-card,bitclock-master = <&dai_cpu_master>;
-		simple-audio-card,convert-rate = <48000>;
-
-		simple-audio-card,widgets =
-		"Microphone", "Mic Jack",
-		"Line", "Line In",
-		"Line", "Line Out",
-		"Speaker", "Speaker",
-		"Headphone", "Headphone Jack";
-
-		simple-audio-card,routing =
-		"Headphone Jack", "HP_L",
-		"Headphone Jack", "HP_R",
-		"Speaker", "SPK_LP",
-		"Speaker", "SPK_LN",
-		"Speaker", "SPK_RP",
-		"Speaker", "SPK_RN",
-		"Mic Jack", "MICB",
-		"LINPUT1", "Mic Jack",
-		"LINPUT2", "Line In",
-		"RINPUT2", "Line In";
-
-		dai_cpu_master: simple-audio-card,cpu {
-			sound-dai = <&sai2>;
-		};
-
-		dailink0: simple-audio-card,codec {
-			sound-dai = <&codec>;
-		};
-	};
-
-	pcie1_refclk: pcie1-refclk {
-		compatible = "fixed-clock";
-		#clock-cells = <0>;
-		clock-frequency = <100000000>;
-	};
-};
-
-&A53_0 {
-	cpu-supply = <&reg_arm_dram>;
-};
-
-&A53_1 {
-	cpu-supply = <&reg_arm_dram>;
-};
-
-&A53_2 {
-	cpu-supply = <&reg_arm_dram>;
-};
-
-&A53_3 {
-	cpu-supply = <&reg_arm_dram>;
-};
-
-/ {
-	soc@0 {
-		bus@32c00000 {
-
-			hdmi: hdmi@32c00000 {
-				status = "okay";
-
-				compatible = "cdn,imx8mq-hdmi";
-				reg = <0x32c00000 0x100000>,
-					<0x32e40000 0x40000>;
-				interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
-							 <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
-				interrupt-names = "plug_in", "plug_out";
-
-				lane-mapping = <0xe4>; // 0=0, 1=1, 2=2, 3=3 (no swapping)
-
-				ports {
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					port@0 {
-						reg = <0>;
-						#address-cells = <1>;
-						#size-cells = <0>;
-						hdmi_in: endpoint@0 {
-							reg = <0>;
-							remote-endpoint = <&dcss_hdmi_out>;
-						};
-					};
-				};
-			};
-
-			dcss: display-controller@32e00000 {
-				status = "okay";
-
-				compatible = "nxp,imx8mq-dcss";
-				reg = <0x32e00000 0x2d000>, <0x32e2f000 0x1000>;
-				interrupts = <6>, <8>, <9>;
-				interrupt-names = "ctxld", "ctxld_kick", "vblank";
-				interrupt-parent = <&irqsteer>;
-				clocks = <&clk IMX8MQ_CLK_DISP_APB_ROOT>,
-					<&clk IMX8MQ_CLK_DISP_AXI_ROOT>,
-					<&clk IMX8MQ_CLK_DISP_RTRM_ROOT>,
-					<&clk IMX8MQ_VIDEO2_PLL_OUT>,
-					<&clk IMX8MQ_CLK_DISP_DTRC>,
-					<&clk IMX8MQ_VIDEO2_PLL1_REF_SEL>,
-					<&clk IMX8MQ_CLK_PHY_27MHZ>;
-				clock-names = "apb", "axi", "rtrm", "pix", "dtrc", "pll_src", "pll_phy_ref";
-				assigned-clocks = <&clk IMX8MQ_CLK_DISP_AXI>,
-					<&clk IMX8MQ_CLK_DISP_RTRM>,
-					<&clk IMX8MQ_VIDEO2_PLL1_REF_SEL>,
-					<&clk IMX8MQ_VIDEO_PLL1_REF_SEL>,
-					<&clk IMX8MQ_CLK_DC_PIXEL>;
-				assigned-clock-parents = <&clk IMX8MQ_SYS1_PLL_800M>,
-					<&clk IMX8MQ_SYS1_PLL_800M>,
-					<&clk IMX8MQ_CLK_27M>,
-					<&clk IMX8MQ_CLK_25M>,
-					<&clk IMX8MQ_VIDEO_PLL1_OUT>;
-				assigned-clock-rates = <800000000>,
-					<400000000>,
-					<27000000>,
-					<25000000>,
-					<594000000>;
-
-				// external display (HDMI)
-				ports {
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					port@0 {
-						reg = <0>;
-						#address-cells = <1>;
-						#size-cells = <0>;
-						dcss_hdmi_out: endpoint@0 {
-							reg = <0>;
-							remote-endpoint = <&hdmi_in>;
-						};
-					};
-				};
-
-			};
-		};
-	};
-};
-
-// internal display
-&lcdif {
-	status = "okay";
-
-	port@0 {
-		lcdif_mipi_dsi: endpoint {
-			remote-endpoint = <&mipi_dsi_in>;
-		};
-	};
-};
-
-&dphy {
-	status = "okay";
-};
-
-&fec1 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_fec1>;
-	phy-mode = "rgmii-id";
-	phy-handle = <&ethphy0>;
-	fsl,magic-packet;
-	status = "okay";
-
-	mdio {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		ethphy0: ethernet-phy@4 {
-			compatible = "ethernet-phy-ieee802.3-c22";
-			reg = <4>;
-			interrupts = <&gpio1 11 IRQ_TYPE_LEVEL_LOW>;
-			reset-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; // TODO: useful?
-		};
-	};
-};
-
-&i2c1 {
-	clock-frequency = <400000>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_i2c1>;
-	status = "okay";
-
-	// I2C Mux on Nitrogen8M_SOM
-	i2cmux@70 {
-		compatible = "nxp,pca9546";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_i2c1_pca9546>;
-		reg = <0x70>;
-		reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		i2c1a: i2c1@0 {
-			reg = <0>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			// Regulator on Nitrogen8M_SOM
-			reg_arm_dram: fan53555@60 {
-				compatible = "fcs,fan53555";
-				pinctrl-names = "default";
-				pinctrl-0 = <&pinctrl_reg_arm_dram>;
-				reg = <0x60>;
-				regulator-min-microvolt =	 <900000>;
-				regulator-max-microvolt = <1000000>;
-				regulator-ramp-delay = <8000>;
-				regulator-always-on;
-				vsel-gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>;
-			};
-		};
-
-		i2c1b: i2c1@1 {
-			reg = <1>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			// Regulator on Nitrogen8M_SOM
-			reg_dram_1p1v: fan53555@60 {
-				compatible = "fcs,fan53555";
-				pinctrl-names = "default";
-				pinctrl-0 = <&pinctrl_reg_dram_1p1v>;
-				reg = <0x60>;
-				regulator-min-microvolt = <1100000>;
-				regulator-max-microvolt = <1100000>;
-				regulator-ramp-delay = <8000>;
-				regulator-always-on;
-				vsel-gpios = <&gpio2 11 GPIO_ACTIVE_HIGH>;
-			};
-		};
-
-		i2c1c: i2c1@2 {
-			reg = <2>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			// Regulator on Nitrogen8M_SOM
-			reg_soc_gpu_vpu: fan53555@60 {
-				compatible = "fcs,fan53555";
-				pinctrl-names = "default";
-				pinctrl-0 = <&pinctrl_reg_soc_gpu_vpu>;
-				reg = <0x60>;
-				regulator-min-microvolt =	 <900000>;
-				regulator-max-microvolt = <1000000>;
-				regulator-ramp-delay = <8000>;
-				regulator-always-on;
-				vsel-gpios = <&gpio2 20 GPIO_ACTIVE_HIGH>;
-			};
-		};
-
-		// No peripheral connected, available on DSI connector
-		i2c1d: i2c1@3 {
-			reg = <3>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-		};
-	};
-};
-
-// No peripheral connected, available on CSI connector
-&i2c2 {
-	status = "disabled";
-};
-
-&i2c3 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_i2c3>;
-	status = "okay";
-
-	// Audio chip on motherboard
-	codec: wm8960@1a {
-		compatible = "wlf,wm8960";
-		reg = <0x1a>;
-		clocks = <&clk IMX8MQ_CLK_SAI2>;
-		clock-names = "mclk";
-		#sound-dai-cells = <0>;
-	};
-
-	// Realtime clock chip on motherboard
-	pcf8523: pcf8523@68 {
-		compatible = "nxp,pcf8523";
-		reg = <0x68>;
-	};
-};
-
-&i2c4 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_i2c4>;
-	status = "okay";
-
-	// DSI to eDP converter on motherboard
-	edp_bridge: sn65dsi86@2c {
-		compatible = "ti,sn65dsi86";
-		reg = <0x2c>;
-		enable-gpios = <&gpio3 20 GPIO_ACTIVE_HIGH>;
-
-		ports {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			port@0 {
-				reg = <0>;
-
-				edp_bridge_in: endpoint {
-					remote-endpoint = <&mipi_dsi_out>;
-				};
-			};
-
-			port@1 {
-				reg = <1>;
-
-				edp_bridge_out: endpoint {
-					remote-endpoint = <&panel_in>;
-				};
-			};
-		};
-	};
-};
-
-// TODO: add external pin numbers
-&iomuxc {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_hog>;
-
-	pinctrl_hog: hoggrp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SAI5_RXC_GPIO3_IO20		0x19 // WL_EN on Nitrogen8M_SOM, pin 38, goes to /EN input of SN65DSI86
-		MX8MQ_IOMUXC_GPIO1_IO14_GPIO1_IO14		0x56 // TODO: check pullup of usb hub reset on the board (0x40)
-		>;
-	};
-
-	pinctrl_fec1: fec1grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_ENET_MDC_ENET1_MDC			0x3
-		MX8MQ_IOMUXC_ENET_MDIO_ENET1_MDIO		0x23
-		MX8MQ_IOMUXC_ENET_TX_CTL_ENET1_RGMII_TX_CTL	0x1f
-		MX8MQ_IOMUXC_ENET_TXC_ENET1_RGMII_TXC		0x1f
-		MX8MQ_IOMUXC_ENET_TD0_ENET1_RGMII_TD0		0x1f
-		MX8MQ_IOMUXC_ENET_TD1_ENET1_RGMII_TD1		0x1f
-		MX8MQ_IOMUXC_ENET_TD2_ENET1_RGMII_TD2		0x1f
-		MX8MQ_IOMUXC_ENET_TD3_ENET1_RGMII_TD3		0x1f
-		MX8MQ_IOMUXC_ENET_RX_CTL_ENET1_RGMII_RX_CTL	0x91
-		MX8MQ_IOMUXC_ENET_RXC_ENET1_RGMII_RXC		0x91
-		MX8MQ_IOMUXC_ENET_RD0_ENET1_RGMII_RD0		0x91
-		MX8MQ_IOMUXC_ENET_RD1_ENET1_RGMII_RD1		0x91
-		MX8MQ_IOMUXC_ENET_RD2_ENET1_RGMII_RD2		0x91
-		MX8MQ_IOMUXC_ENET_RD3_ENET1_RGMII_RD3		0x91
-		MX8MQ_IOMUXC_GPIO1_IO09_GPIO1_IO9		0x19
-		MX8MQ_IOMUXC_GPIO1_IO11_GPIO1_IO11		0x59
-		>;
-	};
-
-	pinctrl_i2c1: i2c1grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_I2C1_SCL_I2C1_SCL			0x4000007f
-		MX8MQ_IOMUXC_I2C1_SDA_I2C1_SDA			0x4000007f
-		>;
-	};
-
-	pinctrl_i2c1_pca9546: i2c1-pca9546grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_GPIO1_IO04_GPIO1_IO4		0x46
-		>;
-	};
-
-	pinctrl_i2c2: i2c2grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_I2C2_SCL_I2C2_SCL			0x4000007f
-		MX8MQ_IOMUXC_I2C2_SDA_I2C2_SDA			0x4000007f
-		>;
-	};
-
-	pinctrl_i2c3: i2c3grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_I2C3_SCL_I2C3_SCL			0x4000007f
-		MX8MQ_IOMUXC_I2C3_SDA_I2C3_SDA			0x4000007f
-		>;
-	};
-
-	pinctrl_i2c4: i2c4grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_I2C4_SCL_I2C4_SCL			0x4000007f
-		MX8MQ_IOMUXC_I2C4_SDA_I2C4_SDA			0x4000007f
-		>;
-	};
-
-	pinctrl_pcie0: pcie0grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_ECSPI1_MOSI_GPIO5_IO7		0x16
-		>;
-	};
-
-	pinctrl_pcie1: pcie1grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SAI5_RXD2_GPIO3_IO23		0x16
-		>;
-	};
-
-	pinctrl_pwm2: pwm2grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SPDIF_RX_PWM2_OUT			0x16
-		>;
-	};
-
-	pinctrl_pwm3: pwm3grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SPDIF_TX_PWM3_OUT			0x16
-		>;
-	};
-
-	// Backlight
-	pinctrl_pwm4: pwm4grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SAI3_MCLK_PWM4_OUT			0x16
-		>;
-	};
-
-	pinctrl_reg_arm_dram: reg-arm-dram {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SAI5_RXD3_GPIO3_IO24		0x16
-		>;
-	};
-
-	pinctrl_reg_dram_1p1v: reg-dram-1p1v {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SD1_STROBE_GPIO2_IO11		0x16
-		>;
-	};
-
-	pinctrl_reg_soc_gpu_vpu: reg-soc-gpu-vpu {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SD2_WP_GPIO2_IO20			0x16
-		>;
-	};
-
-	pinctrl_sai2: sai2grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SAI2_RXD0_SAI2_RX_DATA0		0xd6	/* Pin 166 */
-		MX8MQ_IOMUXC_SAI2_RXFS_SAI2_RX_SYNC		0xd6	/* Pin 168 */
-		MX8MQ_IOMUXC_SAI2_TXC_SAI2_TX_BCLK		0xd6	/* Pin 170 */
-		MX8MQ_IOMUXC_SAI2_TXFS_SAI2_TX_SYNC		0xd6	/* Pin 172 */
-		MX8MQ_IOMUXC_SAI2_RXC_SAI2_RX_BCLK		0xd6	/* Pin 174 */
-		MX8MQ_IOMUXC_SAI2_MCLK_SAI2_MCLK		0xd6	/* Pin 176 */
-		MX8MQ_IOMUXC_SAI2_TXD0_SAI2_TX_DATA0		0xd6	/* Pin 168 */
-		>;
-	};
-
-	pinctrl_uart1: uart1grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_UART1_RXD_UART1_DCE_RX		0x45
-		MX8MQ_IOMUXC_UART1_TXD_UART1_DCE_TX		0x45
-		>;
-	};
-
-	pinctrl_uart2: uart2grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_UART2_RXD_UART2_DCE_RX		0x45
-		MX8MQ_IOMUXC_UART2_TXD_UART2_DCE_TX		0x45
-		>;
-	};
-
-	pinctrl_uart3: uart3grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_UART3_RXD_UART3_DCE_RX		0x45
-		MX8MQ_IOMUXC_UART3_TXD_UART3_DCE_TX		0x45
-		>;
-	};
-
-	pinctrl_usdhc1: usdhc1grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SD1_CLK_USDHC1_CLK			0x83
-		MX8MQ_IOMUXC_SD1_CMD_USDHC1_CMD			0xc3
-		MX8MQ_IOMUXC_SD1_DATA0_USDHC1_DATA0		0xc3
-		MX8MQ_IOMUXC_SD1_DATA1_USDHC1_DATA1		0xc3
-		MX8MQ_IOMUXC_SD1_DATA2_USDHC1_DATA2		0xc3
-		MX8MQ_IOMUXC_SD1_DATA3_USDHC1_DATA3		0xc3
-		MX8MQ_IOMUXC_SD1_DATA4_USDHC1_DATA4		0xc3
-		MX8MQ_IOMUXC_SD1_DATA5_USDHC1_DATA5		0xc3
-		MX8MQ_IOMUXC_SD1_DATA6_USDHC1_DATA6		0xc3
-		MX8MQ_IOMUXC_SD1_DATA7_USDHC1_DATA7		0xc3
-		MX8MQ_IOMUXC_SD1_RESET_B_GPIO2_IO10		0x41
-		>;
-	};
-
-	pinctrl_usdhc1_100mhz: usdhc1-100mhzgrp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SD1_CLK_USDHC1_CLK			0x8d
-		MX8MQ_IOMUXC_SD1_CMD_USDHC1_CMD			0xcd
-		MX8MQ_IOMUXC_SD1_DATA0_USDHC1_DATA0		0xcd
-		MX8MQ_IOMUXC_SD1_DATA1_USDHC1_DATA1		0xcd
-		MX8MQ_IOMUXC_SD1_DATA2_USDHC1_DATA2		0xcd
-		MX8MQ_IOMUXC_SD1_DATA3_USDHC1_DATA3		0xcd
-		MX8MQ_IOMUXC_SD1_DATA4_USDHC1_DATA4		0xcd
-		MX8MQ_IOMUXC_SD1_DATA5_USDHC1_DATA5		0xcd
-		MX8MQ_IOMUXC_SD1_DATA6_USDHC1_DATA6		0xcd
-		MX8MQ_IOMUXC_SD1_DATA7_USDHC1_DATA7		0xcd
-		>;
-	};
-
-	pinctrl_usdhc1_200mhz: usdhc1-200mhzgrp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SD1_CLK_USDHC1_CLK			0x9f
-		MX8MQ_IOMUXC_SD1_CMD_USDHC1_CMD			0xdf
-		MX8MQ_IOMUXC_SD1_DATA0_USDHC1_DATA0		0xdf
-		MX8MQ_IOMUXC_SD1_DATA1_USDHC1_DATA1		0xdf
-		MX8MQ_IOMUXC_SD1_DATA2_USDHC1_DATA2		0xdf
-		MX8MQ_IOMUXC_SD1_DATA3_USDHC1_DATA3		0xdf
-		MX8MQ_IOMUXC_SD1_DATA4_USDHC1_DATA4		0xdf
-		MX8MQ_IOMUXC_SD1_DATA5_USDHC1_DATA5		0xdf
-		MX8MQ_IOMUXC_SD1_DATA6_USDHC1_DATA6		0xdf
-		MX8MQ_IOMUXC_SD1_DATA7_USDHC1_DATA7		0xdf
-		>;
-	};
-
-	pinctrl_usdhc2: usdhc2grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SD2_CLK_USDHC2_CLK			0x03
-		MX8MQ_IOMUXC_SD2_CMD_USDHC2_CMD			0xc3
-		MX8MQ_IOMUXC_SD2_DATA0_USDHC2_DATA0		0xc3
-		MX8MQ_IOMUXC_SD2_DATA1_USDHC2_DATA1		0xc3
-		MX8MQ_IOMUXC_SD2_DATA2_USDHC2_DATA2		0xc3
-		MX8MQ_IOMUXC_SD2_DATA3_USDHC2_DATA3		0xc
-		>;
-	};
-
-	pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SD2_CLK_USDHC2_CLK			0x0d
-		MX8MQ_IOMUXC_SD2_CMD_USDHC2_CMD			0xcd
-		MX8MQ_IOMUXC_SD2_DATA0_USDHC2_DATA0		0xcd
-		MX8MQ_IOMUXC_SD2_DATA1_USDHC2_DATA1		0xcd
-		MX8MQ_IOMUXC_SD2_DATA2_USDHC2_DATA2		0xcd
-		MX8MQ_IOMUXC_SD2_DATA3_USDHC2_DATA3		0xcd
-		>;
-	};
-
-	pinctrl_usdhc2_200mhz: usdhc2-200mhzgrp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SD2_CLK_USDHC2_CLK			0x1e
-		MX8MQ_IOMUXC_SD2_CMD_USDHC2_CMD			0xce
-		MX8MQ_IOMUXC_SD2_DATA0_USDHC2_DATA0		0xce
-		MX8MQ_IOMUXC_SD2_DATA1_USDHC2_DATA1		0xce
-		MX8MQ_IOMUXC_SD2_DATA2_USDHC2_DATA2		0xce
-		MX8MQ_IOMUXC_SD2_DATA3_USDHC2_DATA3		0xce
-		>;
-	};
-
-	pinctrl_wdog: wdoggrp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_GPIO1_IO02_WDOG1_WDOG_B		0xc6
-		>;
-	};
-};
-
-&mipi_dsi {
-	status = "okay";
-
-	ports {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		port@0 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			reg = <0>;
-
-			mipi_dsi_in: endpoint@0 {
-				reg = <0>;
-				remote-endpoint = <&lcdif_mipi_dsi>;
-			};
-		};
-		port@1 {
-			reg = <1>;
-			mipi_dsi_out: endpoint {
-				remote-endpoint = <&edp_bridge_in>;
-			};
-		};
-	};
-};
-
-&pcie0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_pcie0>;
-	reset-gpio = <&gpio5 7 GPIO_ACTIVE_LOW>;
-	internal-refclk;
-
-	clocks = <&clk IMX8MQ_CLK_PCIE1_ROOT>,
-		<&clk IMX8MQ_CLK_PCIE1_AUX>,
-		<&clk IMX8MQ_CLK_PCIE1_PHY>,
-		<&clk IMX8MQ_CLK_MON_CLK2_OUT>;
-
-	clock-names = "pcie", "pcie_aux", "pcie_phy", "pcie_bus";
-
-	assigned-clocks = <&clk IMX8MQ_CLK_PCIE1_CTRL>,
-		<&clk IMX8MQ_CLK_PCIE1_PHY>,
-		<&clk IMX8MQ_CLK_MON_CLK2_OUT>;
-	assigned-clock-rates = <250000000>,
-		<100000000>,
-		<100000000>;
-	assigned-clock-parents = <&clk IMX8MQ_SYS2_PLL_250M>,
-		<&clk IMX8MQ_SYS2_PLL_100M>;
-
-	status = "okay";
-};
-
-&pcie1 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_pcie1>;
-	reset-gpio = <&gpio3 23 GPIO_ACTIVE_LOW>;
-
-	clocks = <&clk IMX8MQ_CLK_PCIE2_ROOT>,
-		<&clk IMX8MQ_CLK_PCIE2_AUX>,
-		<&clk IMX8MQ_CLK_PCIE2_PHY>,
-		<&pcie1_refclk>;
-	clock-names = "pcie", "pcie_aux", "pcie_phy", "pcie_bus";
-	status = "okay";
-};
-
-&pwm2 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_pwm2>;
-	status = "okay";
-};
-
-&pwm3 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_pwm3>;
-	status = "okay";
-};
-
-// Backlight control
-&pwm4 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_pwm4>;
-	status = "okay";
-};
-
-&sai2 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_sai2>;
-	assigned-clocks = <&clk IMX8MQ_CLK_SAI2>;
-	assigned-clock-parents = <&clk IMX8MQ_AUDIO_PLL1_OUT>;
-	assigned-clock-rates = <12288000>;
-	status = "okay";
-	fsl,sai-asynchronous;
-};
-
-// Don't use i.MX8M internal RTC because we have a dedicated one
-&snvs_rtc {
-	status = "disabled";
-};
-
-// Console
-&uart1 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_uart1>;
-	status = "okay";
-};
-
-// Auxiliary serial port on motherboard
-&uart2 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_uart2>;
-	status = "okay";
-};
-
-// connected to LPC11U24 chip on the motherboard
-&uart3 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_uart3>;
-	status = "okay";
-};
-
-&usb_dwc3_0 {
-	status = "okay";
-	dr_mode = "host";
-};
-
-&usb_dwc3_1 {
-	status = "okay";
-	dr_mode = "host";
-};
-
-&usb3_phy0 {
-	vbus-supply = <&reg_vref_5v>;
-	status = "okay";
-};
-
-&usb3_phy1 {
-	vbus-supply = <&reg_vref_5v>;
-	status = "okay";
-};
-
-// eMMC on Nitrogen8M_SOM
-// TODO: HS currently doesn't work
-&usdhc1 {
-	bus-width = <8>;
-	fsl,strobe-dll-delay-target = <5>;
-	fsl,tuning-start-tap = <63>;
-	fsl,tuning-step = <2>;
-	non-removable;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_usdhc1>;
-	vmmc-supply = <&reg_vref_1v8>;
-	vqmmc-1-8-v;
-	status = "okay";
-};
-
-// SD Card on motherboard
-// TODO: check keep-power-in-suspend, cap-sdio-irq
-&usdhc2 {
-	assigned-clocks = <&clk IMX8MQ_CLK_USDHC2>;
-	assigned-clock-rates = <200000000>;
-	bus-width = <4>;
-	no-1-8-v; // We don't support 1.8V signaling
-	pinctrl-names = "default", "state_100mhz", "state_200mhz";
-	pinctrl-0 = <&pinctrl_usdhc2>;
-	pinctrl-1 = <&pinctrl_usdhc2_100mhz>;
-	pinctrl-2 = <&pinctrl_usdhc2_200mhz>;
-	vmmc-supply = <&reg_vref_3v3>;
-	cd-gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
-	status = "okay";
-};
-
-&wdog1 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_wdog>;
-	fsl,ext-reset-output; // TODO check source for what this means
-	status = "okay";
-};
diff --git a/reform2-imx8mq/template-kernel/imx8mq-mnt-reform2.dts b/reform2-imx8mq/template-kernel/imx8mq-mnt-reform2.dts
deleted file mode 100644
index 1d86e1d33dc3cfa4f6fff8f5988d1b5915a565fb..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-kernel/imx8mq-mnt-reform2.dts
+++ /dev/null
@@ -1,798 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
-* Copyright 2018 Boundary Devices
-* Copyright 2019-2021 MNT Research GmbH
-*/
-
-/dts-v1/;
-
-#include "dt-bindings/input/input.h"
-#include "dt-bindings/pwm/pwm.h"
-#include "dt-bindings/usb/pd.h"
-#include "dt-bindings/gpio/gpio.h"
-#include "imx8mq.dtsi"
-
-/ {
-	model = "MNT Reform 2";
-	compatible = "boundary,imx8mq-nitrogen8m_som", "fsl,imx8mq";
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
-	// 4GB of RAM
-	memory@40000000 {
-		device_type = "memory";
-		reg = <0x00000000 0x40000000 0 0xc0000000>; // TODO: confirm what this means
-	};
-
-	reg_vref_0v9: regulator-vref-0v9 {
-		compatible = "regulator-fixed";
-		regulator-name = "vref-0v9";
-		regulator-min-microvolt = <900000>;
-		regulator-max-microvolt = <900000>;
-		regulator-always-on;
-	};
-
-	reg_vref_1v2: regulator-vref-1v2 {
-		compatible = "regulator-fixed";
-		regulator-name = "vref-1v2";
-		regulator-min-microvolt = <1200000>;
-		regulator-max-microvolt = <1200000>;
-		regulator-always-on;
-	};
-
-	reg_vref_1v8: regulator-vref-1v8 {
-		compatible = "regulator-fixed";
-		regulator-name = "vref-1v8";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
-		regulator-always-on;
-	};
-
-	reg_vref_2v5: regulator-vref-2v5 {
-		compatible = "regulator-fixed";
-		regulator-name = "vref-2v5";
-		regulator-min-microvolt = <2500000>;
-		regulator-max-microvolt = <2500000>;
-		regulator-always-on;
-	};
-
-	reg_vref_3v3: regulator-vref-3v3 {
-		compatible = "regulator-fixed";
-		regulator-name = "vref-3v3";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		regulator-always-on;
-	};
-
-	reg_vref_5v: regulator-vref-5v {
-		compatible = "regulator-fixed";
-		regulator-name = "vref-5v";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		regulator-always-on;
-	};
-
-	backlight: backlight {
-		compatible = "pwm-backlight";
-		pwms = <&pwm2 0 10000>;
-		enable-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
-		brightness-levels = <0 32 64 128 160 200 255>;
-		default-brightness-level = <6>;
-	};
-
-	panel {
-		compatible = "innolux,n125hce-gn1", "simple-panel";
-		power = <&reg_vref_3v3>;
-		backlight = <&backlight>;
-		no-hpd;
-
-		port@0 {
-			panel_in: endpoint {
-				remote-endpoint = <&edp_bridge_out>;
-			};
-		};
-	};
-
-	sound {
-		compatible = "simple-audio-card";
-		simple-audio-card,name = "wm8960-audio";
-		simple-audio-card,format = "i2s";
-		simple-audio-card,frame-master = <&dai_cpu_master>;
-		simple-audio-card,bitclock-master = <&dai_cpu_master>;
-		simple-audio-card,convert-rate = <48000>;
-
-		simple-audio-card,widgets =
-		"Microphone", "Mic Jack",
-		"Line", "Line In",
-		"Line", "Line Out",
-		"Speaker", "Speaker",
-		"Headphone", "Headphone Jack";
-
-		simple-audio-card,routing =
-		"Headphone Jack", "HP_L",
-		"Headphone Jack", "HP_R",
-		"Speaker", "SPK_LP",
-		"Speaker", "SPK_LN",
-		"Speaker", "SPK_RP",
-		"Speaker", "SPK_RN",
-		"Mic Jack", "MICB",
-		"LINPUT1", "Mic Jack",
-		"LINPUT2", "Line In",
-		"RINPUT2", "Line In";
-
-		dai_cpu_master: simple-audio-card,cpu {
-			sound-dai = <&sai2>;
-		};
-
-		dailink0: simple-audio-card,codec {
-			sound-dai = <&codec>;
-		};
-	};
-
-	pcie1_refclk: pcie1-refclk {
-		compatible = "fixed-clock";
-		#clock-cells = <0>;
-		clock-frequency = <100000000>;
-	};
-};
-
-&A53_0 {
-	cpu-supply = <&reg_arm_dram>;
-};
-
-&A53_1 {
-	cpu-supply = <&reg_arm_dram>;
-};
-
-&A53_2 {
-	cpu-supply = <&reg_arm_dram>;
-};
-
-&A53_3 {
-	cpu-supply = <&reg_arm_dram>;
-};
-
-/ {
-	soc@0 {
-		bus@32c00000 {
-			dcss: display-controller@32e00000 {
-				status = "okay";
-
-				compatible = "nxp,imx8mq-dcss";
-				reg = <0x32e00000 0x2d000>, <0x32e2f000 0x1000>;
-				interrupts = <6>, <8>, <9>;
-				interrupt-names = "ctxld", "ctxld_kick", "vblank";
-				interrupt-parent = <&irqsteer>;
-				clocks = <&clk IMX8MQ_CLK_DISP_APB_ROOT>,
-					<&clk IMX8MQ_CLK_DISP_AXI_ROOT>,
-					<&clk IMX8MQ_CLK_DISP_RTRM_ROOT>,
-					<&clk IMX8MQ_CLK_DC_PIXEL>,
-					<&clk IMX8MQ_CLK_DISP_DTRC>,
-					<&clk IMX8MQ_VIDEO2_PLL1_REF_SEL>,
-					<&clk IMX8MQ_CLK_PHY_27MHZ>;
-				clock-names = "apb", "axi", "rtrm", "pix", "dtrc", "pll_src", "pll_phy_ref";
-				assigned-clocks = <&clk IMX8MQ_CLK_DISP_AXI>,
-					<&clk IMX8MQ_CLK_DISP_RTRM>,
-					<&clk IMX8MQ_VIDEO2_PLL1_REF_SEL>,
-					<&clk IMX8MQ_VIDEO_PLL1_REF_SEL>,
-					<&clk IMX8MQ_CLK_DC_PIXEL>;
-				assigned-clock-parents = <&clk IMX8MQ_SYS1_PLL_800M>,
-					<&clk IMX8MQ_SYS1_PLL_800M>,
-					<&clk IMX8MQ_CLK_27M>,
-					<&clk IMX8MQ_CLK_25M>,
-					<&clk IMX8MQ_VIDEO_PLL1_OUT>;
-				assigned-clock-rates = <800000000>,
-					<400000000>,
-					<27000000>,
-					<25000000>,
-					<594000000>;
-
-				// internal display (MIPI-DSI/eDP)
-				ports {
-					#address-cells = <1>;
-					#size-cells = <0>;
-
-					port@0 {
-						reg = <0>;
-						#address-cells = <1>;
-						#size-cells = <0>;
-						dcss_dsi_out: endpoint@0 {
-							reg = <0>;
-						  remote-endpoint = <&mipi_dsi_in>;
-						};
-					};
-				};
-			};
-		};
-	};
-};
-
-// LCDIF is not used, but has to be active or DCSS won't work
-&lcdif {
-	status = "okay";
-	/delete-node/ port@0;
-};
-
-&dphy {
-	status = "okay";
-};
-
-&fec1 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_fec1>;
-	phy-mode = "rgmii-id";
-	phy-handle = <&ethphy0>;
-	fsl,magic-packet;
-	status = "okay";
-
-	mdio {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		ethphy0: ethernet-phy@4 {
-			compatible = "ethernet-phy-ieee802.3-c22";
-			reg = <4>;
-			interrupts = <&gpio1 11 IRQ_TYPE_LEVEL_LOW>;
-			reset-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; // TODO: useful?
-		};
-	};
-};
-
-&i2c1 {
-	clock-frequency = <400000>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_i2c1>;
-	status = "okay";
-
-	// I2C Mux on Nitrogen8M_SOM
-	i2cmux@70 {
-		compatible = "nxp,pca9546";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_i2c1_pca9546>;
-		reg = <0x70>;
-		reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		i2c1a: i2c1@0 {
-			reg = <0>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			// Regulator on Nitrogen8M_SOM
-			reg_arm_dram: fan53555@60 {
-				compatible = "fcs,fan53555";
-				pinctrl-names = "default";
-				pinctrl-0 = <&pinctrl_reg_arm_dram>;
-				reg = <0x60>;
-				regulator-min-microvolt =	 <900000>;
-				regulator-max-microvolt = <1000000>;
-				regulator-ramp-delay = <8000>;
-				regulator-always-on;
-				vsel-gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>;
-			};
-		};
-
-		i2c1b: i2c1@1 {
-			reg = <1>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			// Regulator on Nitrogen8M_SOM
-			reg_dram_1p1v: fan53555@60 {
-				compatible = "fcs,fan53555";
-				pinctrl-names = "default";
-				pinctrl-0 = <&pinctrl_reg_dram_1p1v>;
-				reg = <0x60>;
-				regulator-min-microvolt = <1100000>;
-				regulator-max-microvolt = <1100000>;
-				regulator-ramp-delay = <8000>;
-				regulator-always-on;
-				vsel-gpios = <&gpio2 11 GPIO_ACTIVE_HIGH>;
-			};
-		};
-
-		i2c1c: i2c1@2 {
-			reg = <2>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			// Regulator on Nitrogen8M_SOM
-			reg_soc_gpu_vpu: fan53555@60 {
-				compatible = "fcs,fan53555";
-				pinctrl-names = "default";
-				pinctrl-0 = <&pinctrl_reg_soc_gpu_vpu>;
-				reg = <0x60>;
-				regulator-min-microvolt =	 <900000>;
-				regulator-max-microvolt = <1000000>;
-				regulator-ramp-delay = <8000>;
-				regulator-always-on;
-				vsel-gpios = <&gpio2 20 GPIO_ACTIVE_HIGH>;
-			};
-		};
-
-		// No peripheral connected, available on DSI connector
-		i2c1d: i2c1@3 {
-			reg = <3>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-		};
-	};
-};
-
-// No peripheral connected, available on CSI connector
-&i2c2 {
-	status = "disabled";
-};
-
-&i2c3 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_i2c3>;
-	status = "okay";
-
-	// Audio chip on motherboard
-	codec: wm8960@1a {
-		compatible = "wlf,wm8960";
-		reg = <0x1a>;
-		clocks = <&clk IMX8MQ_CLK_SAI2>;
-		clock-names = "mclk";
-		#sound-dai-cells = <0>;
-	};
-
-	// Realtime clock chip on motherboard
-	pcf8523: pcf8523@68 {
-		compatible = "nxp,pcf8523";
-		reg = <0x68>;
-	};
-};
-
-&i2c4 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_i2c4>;
-	status = "okay";
-
-	// DSI to eDP converter on motherboard
-	edp_bridge: sn65dsi86@2c {
-		compatible = "ti,sn65dsi86";
-		reg = <0x2c>;
-		enable-gpios = <&gpio3 20 GPIO_ACTIVE_HIGH>;
-
-		ports {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			port@0 {
-				reg = <0>;
-
-				edp_bridge_in: endpoint {
-					remote-endpoint = <&mipi_dsi_out>;
-				};
-			};
-
-			port@1 {
-				reg = <1>;
-
-				edp_bridge_out: endpoint {
-					remote-endpoint = <&panel_in>;
-				};
-			};
-		};
-	};
-};
-
-// TODO: add external pin numbers
-&iomuxc {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_hog>;
-
-	pinctrl_hog: hoggrp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SAI5_RXC_GPIO3_IO20		0x19 // WL_EN on Nitrogen8M_SOM, pin 38, goes to /EN input of SN65DSI86
-		MX8MQ_IOMUXC_GPIO1_IO14_GPIO1_IO14		0x56 // TODO: check pullup of usb hub reset on the board (0x40)
-		>;
-	};
-
-	pinctrl_fec1: fec1grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_ENET_MDC_ENET1_MDC			0x3
-		MX8MQ_IOMUXC_ENET_MDIO_ENET1_MDIO		0x23
-		MX8MQ_IOMUXC_ENET_TX_CTL_ENET1_RGMII_TX_CTL	0x1f
-		MX8MQ_IOMUXC_ENET_TXC_ENET1_RGMII_TXC		0x1f
-		MX8MQ_IOMUXC_ENET_TD0_ENET1_RGMII_TD0		0x1f
-		MX8MQ_IOMUXC_ENET_TD1_ENET1_RGMII_TD1		0x1f
-		MX8MQ_IOMUXC_ENET_TD2_ENET1_RGMII_TD2		0x1f
-		MX8MQ_IOMUXC_ENET_TD3_ENET1_RGMII_TD3		0x1f
-		MX8MQ_IOMUXC_ENET_RX_CTL_ENET1_RGMII_RX_CTL	0x91
-		MX8MQ_IOMUXC_ENET_RXC_ENET1_RGMII_RXC		0x91
-		MX8MQ_IOMUXC_ENET_RD0_ENET1_RGMII_RD0		0x91
-		MX8MQ_IOMUXC_ENET_RD1_ENET1_RGMII_RD1		0x91
-		MX8MQ_IOMUXC_ENET_RD2_ENET1_RGMII_RD2		0x91
-		MX8MQ_IOMUXC_ENET_RD3_ENET1_RGMII_RD3		0x91
-		MX8MQ_IOMUXC_GPIO1_IO09_GPIO1_IO9		0x19
-		MX8MQ_IOMUXC_GPIO1_IO11_GPIO1_IO11		0x59
-		>;
-	};
-
-	pinctrl_i2c1: i2c1grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_I2C1_SCL_I2C1_SCL			0x4000007f
-		MX8MQ_IOMUXC_I2C1_SDA_I2C1_SDA			0x4000007f
-		>;
-	};
-
-	pinctrl_i2c1_pca9546: i2c1-pca9546grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_GPIO1_IO04_GPIO1_IO4		0x46
-		>;
-	};
-
-	pinctrl_i2c2: i2c2grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_I2C2_SCL_I2C2_SCL			0x4000007f
-		MX8MQ_IOMUXC_I2C2_SDA_I2C2_SDA			0x4000007f
-		>;
-	};
-
-	pinctrl_i2c3: i2c3grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_I2C3_SCL_I2C3_SCL			0x4000007f
-		MX8MQ_IOMUXC_I2C3_SDA_I2C3_SDA			0x4000007f
-		>;
-	};
-
-	pinctrl_i2c4: i2c4grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_I2C4_SCL_I2C4_SCL			0x4000007f
-		MX8MQ_IOMUXC_I2C4_SDA_I2C4_SDA			0x4000007f
-		>;
-	};
-
-	pinctrl_pcie0: pcie0grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_ECSPI1_MOSI_GPIO5_IO7		0x16
-		>;
-	};
-
-	pinctrl_pcie1: pcie1grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SAI5_RXD2_GPIO3_IO23		0x16
-		>;
-	};
-
-	pinctrl_pwm2: pwm2grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SPDIF_RX_PWM2_OUT			0x16
-		>;
-	};
-
-	pinctrl_pwm3: pwm3grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SPDIF_TX_PWM3_OUT			0x16
-		>;
-	};
-
-	// Backlight
-	pinctrl_pwm4: pwm4grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SAI3_MCLK_PWM4_OUT			0x16
-		>;
-	};
-
-	pinctrl_reg_arm_dram: reg-arm-dram {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SAI5_RXD3_GPIO3_IO24		0x16
-		>;
-	};
-
-	pinctrl_reg_dram_1p1v: reg-dram-1p1v {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SD1_STROBE_GPIO2_IO11		0x16
-		>;
-	};
-
-	pinctrl_reg_soc_gpu_vpu: reg-soc-gpu-vpu {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SD2_WP_GPIO2_IO20			0x16
-		>;
-	};
-
-	pinctrl_sai2: sai2grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SAI2_RXD0_SAI2_RX_DATA0		0xd6	/* Pin 166 */
-		MX8MQ_IOMUXC_SAI2_RXFS_SAI2_RX_SYNC		0xd6	/* Pin 168 */
-		MX8MQ_IOMUXC_SAI2_TXC_SAI2_TX_BCLK		0xd6	/* Pin 170 */
-		MX8MQ_IOMUXC_SAI2_TXFS_SAI2_TX_SYNC		0xd6	/* Pin 172 */
-		MX8MQ_IOMUXC_SAI2_RXC_SAI2_RX_BCLK		0xd6	/* Pin 174 */
-		MX8MQ_IOMUXC_SAI2_MCLK_SAI2_MCLK		0xd6	/* Pin 176 */
-		MX8MQ_IOMUXC_SAI2_TXD0_SAI2_TX_DATA0		0xd6	/* Pin 168 */
-		>;
-	};
-
-	pinctrl_uart1: uart1grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_UART1_RXD_UART1_DCE_RX		0x45
-		MX8MQ_IOMUXC_UART1_TXD_UART1_DCE_TX		0x45
-		>;
-	};
-
-	pinctrl_uart2: uart2grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_UART2_RXD_UART2_DCE_RX		0x45
-		MX8MQ_IOMUXC_UART2_TXD_UART2_DCE_TX		0x45
-		>;
-	};
-
-	pinctrl_uart3: uart3grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_UART3_RXD_UART3_DCE_RX		0x45
-		MX8MQ_IOMUXC_UART3_TXD_UART3_DCE_TX		0x45
-		>;
-	};
-
-	pinctrl_usdhc1: usdhc1grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SD1_CLK_USDHC1_CLK			0x83
-		MX8MQ_IOMUXC_SD1_CMD_USDHC1_CMD			0xc3
-		MX8MQ_IOMUXC_SD1_DATA0_USDHC1_DATA0		0xc3
-		MX8MQ_IOMUXC_SD1_DATA1_USDHC1_DATA1		0xc3
-		MX8MQ_IOMUXC_SD1_DATA2_USDHC1_DATA2		0xc3
-		MX8MQ_IOMUXC_SD1_DATA3_USDHC1_DATA3		0xc3
-		MX8MQ_IOMUXC_SD1_DATA4_USDHC1_DATA4		0xc3
-		MX8MQ_IOMUXC_SD1_DATA5_USDHC1_DATA5		0xc3
-		MX8MQ_IOMUXC_SD1_DATA6_USDHC1_DATA6		0xc3
-		MX8MQ_IOMUXC_SD1_DATA7_USDHC1_DATA7		0xc3
-		MX8MQ_IOMUXC_SD1_RESET_B_GPIO2_IO10		0x41
-		>;
-	};
-
-	pinctrl_usdhc1_100mhz: usdhc1-100mhzgrp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SD1_CLK_USDHC1_CLK			0x8d
-		MX8MQ_IOMUXC_SD1_CMD_USDHC1_CMD			0xcd
-		MX8MQ_IOMUXC_SD1_DATA0_USDHC1_DATA0		0xcd
-		MX8MQ_IOMUXC_SD1_DATA1_USDHC1_DATA1		0xcd
-		MX8MQ_IOMUXC_SD1_DATA2_USDHC1_DATA2		0xcd
-		MX8MQ_IOMUXC_SD1_DATA3_USDHC1_DATA3		0xcd
-		MX8MQ_IOMUXC_SD1_DATA4_USDHC1_DATA4		0xcd
-		MX8MQ_IOMUXC_SD1_DATA5_USDHC1_DATA5		0xcd
-		MX8MQ_IOMUXC_SD1_DATA6_USDHC1_DATA6		0xcd
-		MX8MQ_IOMUXC_SD1_DATA7_USDHC1_DATA7		0xcd
-		>;
-	};
-
-	pinctrl_usdhc1_200mhz: usdhc1-200mhzgrp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SD1_CLK_USDHC1_CLK			0x9f
-		MX8MQ_IOMUXC_SD1_CMD_USDHC1_CMD			0xdf
-		MX8MQ_IOMUXC_SD1_DATA0_USDHC1_DATA0		0xdf
-		MX8MQ_IOMUXC_SD1_DATA1_USDHC1_DATA1		0xdf
-		MX8MQ_IOMUXC_SD1_DATA2_USDHC1_DATA2		0xdf
-		MX8MQ_IOMUXC_SD1_DATA3_USDHC1_DATA3		0xdf
-		MX8MQ_IOMUXC_SD1_DATA4_USDHC1_DATA4		0xdf
-		MX8MQ_IOMUXC_SD1_DATA5_USDHC1_DATA5		0xdf
-		MX8MQ_IOMUXC_SD1_DATA6_USDHC1_DATA6		0xdf
-		MX8MQ_IOMUXC_SD1_DATA7_USDHC1_DATA7		0xdf
-		>;
-	};
-
-	pinctrl_usdhc2: usdhc2grp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SD2_CLK_USDHC2_CLK			0x03
-		MX8MQ_IOMUXC_SD2_CMD_USDHC2_CMD			0xc3
-		MX8MQ_IOMUXC_SD2_DATA0_USDHC2_DATA0		0xc3
-		MX8MQ_IOMUXC_SD2_DATA1_USDHC2_DATA1		0xc3
-		MX8MQ_IOMUXC_SD2_DATA2_USDHC2_DATA2		0xc3
-		MX8MQ_IOMUXC_SD2_DATA3_USDHC2_DATA3		0xc
-		>;
-	};
-
-	pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SD2_CLK_USDHC2_CLK			0x0d
-		MX8MQ_IOMUXC_SD2_CMD_USDHC2_CMD			0xcd
-		MX8MQ_IOMUXC_SD2_DATA0_USDHC2_DATA0		0xcd
-		MX8MQ_IOMUXC_SD2_DATA1_USDHC2_DATA1		0xcd
-		MX8MQ_IOMUXC_SD2_DATA2_USDHC2_DATA2		0xcd
-		MX8MQ_IOMUXC_SD2_DATA3_USDHC2_DATA3		0xcd
-		>;
-	};
-
-	pinctrl_usdhc2_200mhz: usdhc2-200mhzgrp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_SD2_CLK_USDHC2_CLK			0x1e
-		MX8MQ_IOMUXC_SD2_CMD_USDHC2_CMD			0xce
-		MX8MQ_IOMUXC_SD2_DATA0_USDHC2_DATA0		0xce
-		MX8MQ_IOMUXC_SD2_DATA1_USDHC2_DATA1		0xce
-		MX8MQ_IOMUXC_SD2_DATA2_USDHC2_DATA2		0xce
-		MX8MQ_IOMUXC_SD2_DATA3_USDHC2_DATA3		0xce
-		>;
-	};
-
-	pinctrl_wdog: wdoggrp {
-		fsl,pins = <
-		MX8MQ_IOMUXC_GPIO1_IO02_WDOG1_WDOG_B		0xc6
-		>;
-	};
-};
-
-&mipi_dsi {
-	status = "okay";
-
-	ports {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		port@0 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			reg = <0>;
-
-			// We don't want input from LCDIF
-			/delete-node/ endpoint@0;
-
-			mipi_dsi_in: endpoint@1 {
-				reg = <1>;
-				remote-endpoint = <&dcss_dsi_out>;
-			};
-		};
-		port@1 {
-			reg = <1>;
-			mipi_dsi_out: endpoint {
-				remote-endpoint = <&edp_bridge_in>;
-			};
-		};
-	};
-};
-
-&pcie0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_pcie0>;
-	reset-gpio = <&gpio5 7 GPIO_ACTIVE_LOW>;
-	internal-refclk;
-
-	clocks = <&clk IMX8MQ_CLK_PCIE1_ROOT>,
-		<&clk IMX8MQ_CLK_PCIE1_AUX>,
-		<&clk IMX8MQ_CLK_PCIE1_PHY>,
-		<&clk IMX8MQ_CLK_MON_CLK2_OUT>;
-
-	clock-names = "pcie", "pcie_aux", "pcie_phy", "pcie_bus";
-
-	assigned-clocks = <&clk IMX8MQ_CLK_PCIE1_CTRL>,
-		<&clk IMX8MQ_CLK_PCIE1_PHY>,
-		<&clk IMX8MQ_CLK_MON_CLK2_OUT>;
-	assigned-clock-rates = <250000000>,
-		<100000000>,
-		<100000000>;
-	assigned-clock-parents = <&clk IMX8MQ_SYS2_PLL_250M>,
-		<&clk IMX8MQ_SYS2_PLL_100M>;
-
-	status = "okay";
-};
-
-&pcie1 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_pcie1>;
-	reset-gpio = <&gpio3 23 GPIO_ACTIVE_LOW>;
-
-	clocks = <&clk IMX8MQ_CLK_PCIE2_ROOT>,
-		<&clk IMX8MQ_CLK_PCIE2_AUX>,
-		<&clk IMX8MQ_CLK_PCIE2_PHY>,
-		<&pcie1_refclk>;
-	clock-names = "pcie", "pcie_aux", "pcie_phy", "pcie_bus";
-	status = "okay";
-};
-
-&pwm2 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_pwm2>;
-	status = "okay";
-};
-
-&pwm3 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_pwm3>;
-	status = "okay";
-};
-
-// Backlight control
-&pwm4 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_pwm4>;
-	status = "okay";
-};
-
-&sai2 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_sai2>;
-	assigned-clocks = <&clk IMX8MQ_CLK_SAI2>;
-	assigned-clock-parents = <&clk IMX8MQ_AUDIO_PLL1_OUT>;
-	assigned-clock-rates = <12288000>;
-	fsl,sai-asynchronous;
-	status = "okay";
-};
-
-// Don't use i.MX8M internal RTC because we have a dedicated one
-&snvs_rtc {
-	status = "disabled";
-};
-
-// Console
-&uart1 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_uart1>;
-	status = "okay";
-};
-
-// Auxiliary serial port on motherboard
-&uart2 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_uart2>;
-	status = "okay";
-};
-
-// connected to LPC11U24 chip on the motherboard
-&uart3 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_uart3>;
-	status = "okay";
-};
-
-&usb_dwc3_0 {
-	status = "okay";
-	dr_mode = "host";
-};
-
-&usb_dwc3_1 {
-	status = "okay";
-	dr_mode = "host";
-};
-
-&usb3_phy0 {
-	vbus-supply = <&reg_vref_5v>;
-	status = "okay";
-};
-
-&usb3_phy1 {
-	vbus-supply = <&reg_vref_5v>;
-	status = "okay";
-};
-
-// eMMC on Nitrogen8M_SOM
-// TODO: HS currently doesn't work
-&usdhc1 {
-	bus-width = <8>;
-	fsl,strobe-dll-delay-target = <5>;
-	fsl,tuning-start-tap = <63>;
-	fsl,tuning-step = <2>;
-	non-removable;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_usdhc1>;
-	vmmc-supply = <&reg_vref_1v8>;
-	vqmmc-1-8-v;
-	status = "okay";
-};
-
-// SD Card on motherboard
-// TODO: check keep-power-in-suspend, cap-sdio-irq
-&usdhc2 {
-	assigned-clocks = <&clk IMX8MQ_CLK_USDHC2>;
-	assigned-clock-rates = <200000000>;
-	bus-width = <4>;
-	no-1-8-v; // We don't support 1.8V signaling
-	pinctrl-names = "default", "state_100mhz", "state_200mhz";
-	pinctrl-0 = <&pinctrl_usdhc2>;
-	pinctrl-1 = <&pinctrl_usdhc2_100mhz>;
-	pinctrl-2 = <&pinctrl_usdhc2_200mhz>;
-	vmmc-supply = <&reg_vref_3v3>;
-	cd-gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
-	status = "okay";
-};
-
-&wdog1 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_wdog>;
-	fsl,ext-reset-output; // TODO check source for what this means
-	status = "okay";
-};
diff --git a/reform2-imx8mq/template-kernel/kernel-config b/reform2-imx8mq/template-kernel/kernel-config
deleted file mode 100644
index 91f8ae9f7a18c26c0534f9cad8b0676128be862c..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-kernel/kernel-config
+++ /dev/null
@@ -1,6169 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.12.0 Kernel Configuration
-#
-CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110"
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100201
-CONFIG_CLANG_VERSION=0
-CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23501
-CONFIG_LLD_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
-CONFIG_CC_HAS_ASM_GOTO=y
-CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_TABLE_SORT=y
-CONFIG_THREAD_INFO_IN_TASK=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_BUILD_SALT="4.20.0-trunk-amd64"
-CONFIG_DEFAULT_INIT=""
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-# CONFIG_WATCH_QUEUE is not set
-CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_USELIB=y
-CONFIG_AUDIT=y
-CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
-CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
-CONFIG_GENERIC_IRQ_MIGRATION=y
-CONFIG_GENERIC_IRQ_INJECTION=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_GENERIC_IRQ_IPI=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-CONFIG_IRQ_MSI_IOMMU=y
-CONFIG_HANDLE_DOMAIN_IRQ=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_GENERIC_IRQ_DEBUGFS=y
-# end of IRQ subsystem
-
-CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_ARCH_HAS_TICK_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ_FULL is not set
-# CONFIG_NO_HZ is not set
-CONFIG_HIGH_RES_TIMERS=y
-# end of Timers subsystem
-
-# CONFIG_PREEMPT_NONE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
-CONFIG_PREEMPT_COUNT=y
-CONFIG_PREEMPTION=y
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_SCHED_THERMAL_PRESSURE=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-# CONFIG_PSI is not set
-# end of CPU/Task time and stats accounting
-
-CONFIG_CPU_ISOLATION=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-CONFIG_PREEMPT_RCU=y
-# CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
-CONFIG_TREE_SRCU=y
-CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RCU=y
-CONFIG_TASKS_RUDE_RCU=y
-CONFIG_TASKS_TRACE_RCU=y
-CONFIG_RCU_STALL_COMMON=y
-CONFIG_RCU_NEED_SEGCBLIST=y
-# end of RCU Subsystem
-
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-# CONFIG_IKHEADERS is not set
-CONFIG_LOG_BUF_SHIFT=17
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
-CONFIG_GENERIC_SCHED_CLOCK=y
-
-#
-# Scheduler features
-#
-# CONFIG_UCLAMP_TASK is not set
-# end of Scheduler features
-
-CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
-CONFIG_CC_HAS_INT128=y
-CONFIG_ARCH_SUPPORTS_INT128=y
-CONFIG_NUMA_BALANCING=y
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
-CONFIG_CGROUPS=y
-CONFIG_PAGE_COUNTER=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG_KMEM=y
-CONFIG_BLK_CGROUP=y
-CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
-CONFIG_CGROUP_FREEZER=y
-# CONFIG_CGROUP_HUGETLB is not set
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_BPF=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_SOCK_CGROUP_DATA=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_TIME_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-CONFIG_RD_ZSTD=y
-# CONFIG_BOOT_CONFIG is not set
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_LD_ORPHAN_WARN=y
-CONFIG_SYSCTL=y
-CONFIG_HAVE_UID16=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_BPF=y
-CONFIG_EXPERT=y
-CONFIG_UID16=y
-CONFIG_MULTIUSER=y
-CONFIG_SGETMASK_SYSCALL=y
-CONFIG_SYSFS_SYSCALL=y
-CONFIG_FHANDLE=y
-CONFIG_POSIX_TIMERS=y
-CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_FUTEX_PI=y
-CONFIG_HAVE_FUTEX_CMPXCHG=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_IO_URING=y
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_MEMBARRIER=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_BASE_RELATIVE=y
-# CONFIG_BPF_LSM is not set
-CONFIG_BPF_SYSCALL=y
-CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
-# CONFIG_BPF_JIT_ALWAYS_ON is not set
-CONFIG_BPF_JIT_DEFAULT_ON=y
-# CONFIG_BPF_PRELOAD is not set
-CONFIG_USERFAULTFD=y
-CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
-CONFIG_KCMP=y
-CONFIG_RSEQ=y
-# CONFIG_DEBUG_RSEQ is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-# CONFIG_PC104 is not set
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# end of Kernel Performance Events And Counters
-
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_SLAB_MERGE_DEFAULT=y
-# CONFIG_SLAB_FREELIST_RANDOM is not set
-# CONFIG_SLAB_FREELIST_HARDENED is not set
-CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_SYSTEM_DATA_VERIFICATION=y
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-# end of General setup
-
-CONFIG_ARM64=y
-CONFIG_64BIT=y
-CONFIG_MMU=y
-CONFIG_ARM64_PAGE_SHIFT=12
-CONFIG_ARM64_CONT_PTE_SHIFT=4
-CONFIG_ARM64_CONT_PMD_SHIFT=4
-CONFIG_ARCH_MMAP_RND_BITS_MIN=18
-CONFIG_ARCH_MMAP_RND_BITS_MAX=24
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CSUM=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ZONE_DMA=y
-CONFIG_ZONE_DMA32=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_SMP=y
-CONFIG_KERNEL_MODE_NEON=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=3
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_ARCH_PROC_KCORE_TEXT=y
-
-#
-# Platform selection
-#
-# CONFIG_ARCH_ACTIONS is not set
-# CONFIG_ARCH_AGILEX is not set
-# CONFIG_ARCH_N5X is not set
-# CONFIG_ARCH_SUNXI is not set
-# CONFIG_ARCH_ALPINE is not set
-# CONFIG_ARCH_BCM2835 is not set
-# CONFIG_ARCH_BCM4908 is not set
-# CONFIG_ARCH_BCM_IPROC is not set
-# CONFIG_ARCH_BERLIN is not set
-# CONFIG_ARCH_BITMAIN is not set
-# CONFIG_ARCH_BRCMSTB is not set
-# CONFIG_ARCH_EXYNOS is not set
-# CONFIG_ARCH_SPARX5 is not set
-# CONFIG_ARCH_K3 is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
-# CONFIG_ARCH_LG1K is not set
-# CONFIG_ARCH_HISI is not set
-# CONFIG_ARCH_KEEMBAY is not set
-# CONFIG_ARCH_MEDIATEK is not set
-# CONFIG_ARCH_MESON is not set
-# CONFIG_ARCH_MVEBU is not set
-CONFIG_ARCH_MXC=y
-# CONFIG_ARCH_QCOM is not set
-# CONFIG_ARCH_REALTEK is not set
-# CONFIG_ARCH_RENESAS is not set
-# CONFIG_ARCH_ROCKCHIP is not set
-# CONFIG_ARCH_S32 is not set
-# CONFIG_ARCH_SEATTLE is not set
-# CONFIG_ARCH_STRATIX10 is not set
-# CONFIG_ARCH_SYNQUACER is not set
-# CONFIG_ARCH_TEGRA is not set
-# CONFIG_ARCH_SPRD is not set
-# CONFIG_ARCH_THUNDER is not set
-# CONFIG_ARCH_THUNDER2 is not set
-# CONFIG_ARCH_UNIPHIER is not set
-# CONFIG_ARCH_VEXPRESS is not set
-# CONFIG_ARCH_VISCONTI is not set
-# CONFIG_ARCH_XGENE is not set
-# CONFIG_ARCH_ZYNQMP is not set
-# end of Platform selection
-
-#
-# Kernel Features
-#
-
-#
-# ARM errata workarounds via the alternatives framework
-#
-CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y
-CONFIG_ARM64_ERRATUM_826319=y
-CONFIG_ARM64_ERRATUM_827319=y
-CONFIG_ARM64_ERRATUM_824069=y
-CONFIG_ARM64_ERRATUM_819472=y
-CONFIG_ARM64_ERRATUM_832075=y
-CONFIG_ARM64_ERRATUM_834220=y
-CONFIG_ARM64_ERRATUM_845719=y
-CONFIG_ARM64_ERRATUM_843419=y
-CONFIG_ARM64_ERRATUM_1024718=y
-CONFIG_ARM64_ERRATUM_1418040=y
-CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y
-CONFIG_ARM64_ERRATUM_1165522=y
-CONFIG_ARM64_ERRATUM_1319367=y
-CONFIG_ARM64_ERRATUM_1530923=y
-CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
-CONFIG_ARM64_ERRATUM_1286807=y
-CONFIG_ARM64_ERRATUM_1463225=y
-CONFIG_ARM64_ERRATUM_1542419=y
-CONFIG_ARM64_ERRATUM_1508412=y
-CONFIG_CAVIUM_ERRATUM_22375=y
-CONFIG_CAVIUM_ERRATUM_23144=y
-CONFIG_CAVIUM_ERRATUM_23154=y
-CONFIG_CAVIUM_ERRATUM_27456=y
-CONFIG_CAVIUM_ERRATUM_30115=y
-CONFIG_CAVIUM_TX2_ERRATUM_219=y
-CONFIG_FUJITSU_ERRATUM_010001=y
-CONFIG_HISILICON_ERRATUM_161600802=y
-CONFIG_QCOM_FALKOR_ERRATUM_1003=y
-CONFIG_QCOM_FALKOR_ERRATUM_1009=y
-CONFIG_QCOM_QDF2400_ERRATUM_0065=y
-CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
-CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
-CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
-# end of ARM errata workarounds via the alternatives framework
-
-CONFIG_ARM64_4K_PAGES=y
-# CONFIG_ARM64_16K_PAGES is not set
-# CONFIG_ARM64_64K_PAGES is not set
-CONFIG_ARM64_VA_BITS_39=y
-# CONFIG_ARM64_VA_BITS_48 is not set
-CONFIG_ARM64_VA_BITS=39
-CONFIG_ARM64_PA_BITS_48=y
-CONFIG_ARM64_PA_BITS=48
-# CONFIG_CPU_BIG_ENDIAN is not set
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_SCHED_MC=y
-CONFIG_SCHED_SMT=y
-CONFIG_NR_CPUS=512
-CONFIG_HOTPLUG_CPU=y
-CONFIG_NUMA=y
-CONFIG_NODES_SHIFT=6
-CONFIG_USE_PERCPU_NUMA_NODE_ID=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_HOLES_IN_ZONE=y
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=250
-CONFIG_SCHED_HRTICK=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_HW_PERF_EVENTS=y
-CONFIG_SYS_SUPPORTS_HUGETLBFS=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_KEXEC=y
-CONFIG_KEXEC_FILE=y
-# CONFIG_KEXEC_SIG is not set
-CONFIG_CRASH_DUMP=y
-CONFIG_TRANS_TABLE=y
-CONFIG_XEN_DOM0=y
-CONFIG_XEN=y
-CONFIG_FORCE_MAX_ZONEORDER=11
-CONFIG_UNMAP_KERNEL_AT_EL0=y
-CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
-CONFIG_ARM64_TAGGED_ADDR_ABI=y
-CONFIG_COMPAT=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_ARMV8_DEPRECATED=y
-CONFIG_SWP_EMULATION=y
-CONFIG_CP15_BARRIER_EMULATION=y
-CONFIG_SETEND_EMULATION=y
-
-#
-# ARMv8.1 architectural features
-#
-CONFIG_ARM64_HW_AFDBM=y
-CONFIG_ARM64_PAN=y
-CONFIG_AS_HAS_LDAPR=y
-CONFIG_AS_HAS_LSE_ATOMICS=y
-CONFIG_ARM64_LSE_ATOMICS=y
-CONFIG_ARM64_USE_LSE_ATOMICS=y
-CONFIG_ARM64_VHE=y
-# end of ARMv8.1 architectural features
-
-#
-# ARMv8.2 architectural features
-#
-# CONFIG_ARM64_PMEM is not set
-CONFIG_ARM64_RAS_EXTN=y
-CONFIG_ARM64_CNP=y
-# end of ARMv8.2 architectural features
-
-#
-# ARMv8.3 architectural features
-#
-CONFIG_ARM64_PTR_AUTH=y
-CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y
-CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y
-CONFIG_AS_HAS_PAC=y
-CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y
-# end of ARMv8.3 architectural features
-
-#
-# ARMv8.4 architectural features
-#
-CONFIG_ARM64_AMU_EXTN=y
-CONFIG_AS_HAS_ARMV8_4=y
-CONFIG_ARM64_TLB_RANGE=y
-# end of ARMv8.4 architectural features
-
-#
-# ARMv8.5 architectural features
-#
-CONFIG_AS_HAS_ARMV8_5=y
-CONFIG_ARM64_BTI=y
-CONFIG_ARM64_BTI_KERNEL=y
-CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
-CONFIG_ARM64_E0PD=y
-CONFIG_ARCH_RANDOM=y
-CONFIG_ARM64_AS_HAS_MTE=y
-CONFIG_ARM64_MTE=y
-# end of ARMv8.5 architectural features
-
-CONFIG_ARM64_SVE=y
-CONFIG_ARM64_MODULE_PLTS=y
-# CONFIG_ARM64_PSEUDO_NMI is not set
-CONFIG_RELOCATABLE=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
-CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
-CONFIG_STACKPROTECTOR_PER_TASK=y
-# end of Kernel Features
-
-#
-# Boot options
-#
-CONFIG_CMDLINE=""
-CONFIG_EFI_STUB=y
-CONFIG_EFI=y
-CONFIG_DMI=y
-# end of Boot options
-
-CONFIG_SYSVIPC_COMPAT=y
-CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
-CONFIG_ARCH_ENABLE_THP_MIGRATION=y
-
-#
-# Power management options
-#
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_SUSPEND_SKIP_SYNC is not set
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_HIBERNATION_SNAPSHOT_DEV=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-CONFIG_PM_WAKELOCKS=y
-CONFIG_PM_WAKELOCKS_LIMIT=100
-CONFIG_PM_WAKELOCKS_GC=y
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_ADVANCED_DEBUG=y
-# CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_PM_SLEEP_DEBUG=y
-# CONFIG_DPM_WATCHDOG is not set
-CONFIG_PM_CLK=y
-CONFIG_PM_GENERIC_DOMAINS=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-CONFIG_PM_GENERIC_DOMAINS_OF=y
-CONFIG_CPU_PM=y
-# CONFIG_ENERGY_MODEL is not set
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_HIBERNATION_HEADER=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# end of Power management options
-
-#
-# CPU Power Management
-#
-
-#
-# CPU Idle
-#
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
-CONFIG_DT_IDLE_STATES=y
-
-#
-# ARM CPU Idle Drivers
-#
-CONFIG_ARM_CPUIDLE=y
-CONFIG_ARM_PSCI_CPUIDLE=y
-CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y
-# end of ARM CPU Idle Drivers
-# end of CPU Idle
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_ATTR_SET=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_STAT=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-
-#
-# CPU frequency scaling drivers
-#
-CONFIG_CPUFREQ_DT=y
-CONFIG_CPUFREQ_DT_PLATDEV=y
-# CONFIG_ARM_IMX6Q_CPUFREQ is not set
-CONFIG_ARM_IMX_CPUFREQ_DT=y
-# end of CPU Frequency scaling
-# end of CPU Power Management
-
-#
-# Firmware Drivers
-#
-# CONFIG_ARM_SCMI_PROTOCOL is not set
-# CONFIG_ARM_SCPI_PROTOCOL is not set
-# CONFIG_ARM_SDE_INTERFACE is not set
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=y
-# CONFIG_FW_CFG_SYSFS is not set
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_ESRT=y
-CONFIG_EFI_VARS_PSTORE=y
-# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
-CONFIG_EFI_PARAMS_FROM_FDT=y
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_EFI_GENERIC_STUB=y
-CONFIG_EFI_ARMSTUB_DTB_LOADER=y
-CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
-CONFIG_EFI_BOOTLOADER_CONTROL=y
-# CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_TEST is not set
-# CONFIG_RESET_ATTACK_MITIGATION is not set
-# CONFIG_EFI_DISABLE_PCI_DMA is not set
-# end of EFI (Extensible Firmware Interface) Support
-
-CONFIG_EFI_EARLYCON=y
-# CONFIG_IMX_DSP is not set
-# CONFIG_IMX_SCU is not set
-CONFIG_ARM_PSCI_FW=y
-# CONFIG_ARM_PSCI_CHECKER is not set
-CONFIG_HAVE_ARM_SMCCC=y
-CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
-CONFIG_ARM_SMCCC_SOC_ID=y
-
-#
-# Tegra firmware driver
-#
-# end of Tegra firmware driver
-# end of Firmware Drivers
-
-CONFIG_ARCH_SUPPORTS_ACPI=y
-# CONFIG_ACPI is not set
-CONFIG_IRQ_BYPASS_MANAGER=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_MMIO=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_KVM_VFIO=y
-CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_SHA256_ARM64=y
-CONFIG_CRYPTO_SHA512_ARM64=y
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_CRYPTO_SHA512_ARM64_CE=y
-CONFIG_CRYPTO_SHA3_ARM64=y
-# CONFIG_CRYPTO_SM3_ARM64_CE is not set
-# CONFIG_CRYPTO_SM4_ARM64_CE is not set
-# CONFIG_CRYPTO_GHASH_ARM64_CE is not set
-# CONFIG_CRYPTO_CRCT10DIF_ARM64_CE is not set
-CONFIG_CRYPTO_AES_ARM64=y
-CONFIG_CRYPTO_AES_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
-CONFIG_CRYPTO_CHACHA20_NEON=y
-CONFIG_CRYPTO_POLY1305_NEON=y
-# CONFIG_CRYPTO_NHPOLY1305_NEON is not set
-# CONFIG_CRYPTO_AES_ARM64_BS is not set
-
-#
-# General architecture-dependent options
-#
-CONFIG_CRASH_CORE=y
-CONFIG_KEXEC_CORE=y
-CONFIG_KPROBES=y
-CONFIG_JUMP_LABEL=y
-# CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_UPROBES=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_KRETPROBES=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
-CONFIG_HAVE_NMI=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_GENERIC_IDLE_POLL_SETUP=y
-CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
-CONFIG_ARCH_HAS_KEEPINITRD=y
-CONFIG_ARCH_HAS_SET_MEMORY=y
-CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
-CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
-CONFIG_HAVE_ASM_MODVERSIONS=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_RSEQ=y
-CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
-CONFIG_MMU_GATHER_TABLE_FREE=y
-CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
-CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
-CONFIG_HAVE_ARCH_SECCOMP=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP=y
-CONFIG_SECCOMP_FILTER=y
-# CONFIG_SECCOMP_CACHE_DEBUG is not set
-CONFIG_HAVE_ARCH_STACKLEAK=y
-CONFIG_HAVE_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
-CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
-CONFIG_LTO_NONE=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_MOVE_PUD=y
-CONFIG_HAVE_MOVE_PMD=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_ARCH_HUGE_VMAP=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_ARCH_MMAP_RND_BITS=18
-CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
-CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_COMPAT_OLD_SIGACTION=y
-CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_HAVE_ARCH_VMAP_STACK=y
-CONFIG_VMAP_STACK=y
-CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
-CONFIG_STRICT_MODULE_RWX=y
-CONFIG_HAVE_ARCH_COMPILER_H=y
-CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
-CONFIG_ARCH_USE_MEMREMAP_PROT=y
-# CONFIG_LOCK_EVENT_COUNTS is not set
-CONFIG_ARCH_HAS_RELR=y
-CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
-CONFIG_HAVE_ARCH_PFN_VALID=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-# end of GCOV-based kernel profiling
-
-CONFIG_HAVE_GCC_PLUGINS=y
-# end of General architecture-dependent options
-
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULE_SIG_FORMAT=y
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_ASM_MODVERSIONS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_MODULE_SIG=y
-# CONFIG_MODULE_SIG_FORCE is not set
-# CONFIG_MODULE_SIG_ALL is not set
-# CONFIG_MODULE_SIG_SHA1 is not set
-# CONFIG_MODULE_SIG_SHA224 is not set
-CONFIG_MODULE_SIG_SHA256=y
-# CONFIG_MODULE_SIG_SHA384 is not set
-# CONFIG_MODULE_SIG_SHA512 is not set
-CONFIG_MODULE_SIG_HASH="sha256"
-# CONFIG_MODULE_COMPRESS is not set
-# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-# CONFIG_TRIM_UNUSED_KSYMS is not set
-CONFIG_MODULES_TREE_LOOKUP=y
-CONFIG_BLOCK=y
-CONFIG_BLK_SCSI_REQUEST=y
-CONFIG_BLK_CGROUP_RWSTAT=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_INTEGRITY_T10=y
-# CONFIG_BLK_DEV_ZONED is not set
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
-# CONFIG_BLK_CMDLINE_PARSER is not set
-CONFIG_BLK_WBT=y
-# CONFIG_BLK_CGROUP_IOLATENCY is not set
-# CONFIG_BLK_CGROUP_IOCOST is not set
-CONFIG_BLK_WBT_MQ=y
-CONFIG_BLK_DEBUG_FS=y
-CONFIG_BLK_SED_OPAL=y
-# CONFIG_BLK_INLINE_ENCRYPTION is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_AIX_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-CONFIG_AMIGA_PARTITION=y
-CONFIG_ATARI_PARTITION=y
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_UNIXWARE_DISKLABEL=y
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_CMDLINE_PARTITION is not set
-# end of Partition Types
-
-CONFIG_BLOCK_COMPAT=y
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_MQ_VIRTIO=y
-CONFIG_BLK_PM=y
-
-#
-# IO Schedulers
-#
-CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=y
-CONFIG_IOSCHED_BFQ=y
-CONFIG_BFQ_GROUP_IOSCHED=y
-# CONFIG_BFQ_CGROUP_DEBUG is not set
-# end of IO Schedulers
-
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=y
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-CONFIG_QUEUED_SPINLOCKS=y
-CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
-CONFIG_QUEUED_RWLOCKS=y
-CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y
-CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
-CONFIG_FREEZER=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-CONFIG_ARCH_BINFMT_ELF_STATE=y
-CONFIG_ARCH_HAVE_ELF_PROT=y
-CONFIG_ARCH_USE_GNU_PROPERTY=y
-CONFIG_ELFCORE=y
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_BINFMT_MISC=y
-CONFIG_COREDUMP=y
-# end of Executable file formats
-
-#
-# Memory Management options
-#
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_FAST_GUP=y
-CONFIG_ARCH_KEEP_MEMBLOCK=y
-CONFIG_MEMORY_ISOLATION=y
-# CONFIG_MEMORY_HOTPLUG is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MEMORY_BALLOON=y
-CONFIG_BALLOON_COMPACTION=y
-CONFIG_COMPACTION=y
-CONFIG_PAGE_REPORTING=y
-CONFIG_MIGRATION=y
-CONFIG_CONTIG_ALLOC=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_BOUNCE=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_MEMORY_FAILURE=y
-# CONFIG_HWPOISON_INJECT is not set
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-# CONFIG_CLEANCACHE is not set
-CONFIG_FRONTSWAP=y
-CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
-CONFIG_CMA_AREAS=7
-CONFIG_ZSWAP=y
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
-CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
-CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
-CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
-# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
-# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
-CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
-# CONFIG_ZSWAP_DEFAULT_ON is not set
-CONFIG_ZPOOL=y
-CONFIG_ZBUD=y
-# CONFIG_Z3FOLD is not set
-# CONFIG_ZSMALLOC is not set
-CONFIG_GENERIC_EARLY_IOREMAP=y
-# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
-CONFIG_ARCH_HAS_PTE_DEVMAP=y
-CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
-# CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_TEST is not set
-# CONFIG_READ_ONLY_THP_FOR_FS is not set
-CONFIG_ARCH_HAS_PTE_SPECIAL=y
-# end of Memory Management options
-
-CONFIG_NET=y
-CONFIG_NET_INGRESS=y
-CONFIG_SKB_EXTENSIONS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_DIAG=y
-CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
-CONFIG_UNIX_DIAG=y
-# CONFIG_TLS is not set
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=y
-CONFIG_XFRM_USER=y
-# CONFIG_XFRM_INTERFACE is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_AH=y
-CONFIG_XFRM_ESP=y
-CONFIG_XFRM_IPCOMP=y
-CONFIG_NET_KEY=y
-# CONFIG_NET_KEY_MIGRATE is not set
-# CONFIG_XDP_SOCKETS is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE_DEMUX is not set
-CONFIG_NET_IP_TUNNEL=y
-CONFIG_IP_MROUTE_COMMON=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-# CONFIG_NET_IPVTI is not set
-CONFIG_NET_UDP_TUNNEL=y
-# CONFIG_NET_FOU is not set
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_INET_AH is not set
-CONFIG_INET_ESP=y
-# CONFIG_INET_ESP_OFFLOAD is not set
-# CONFIG_INET_ESPINTCP is not set
-# CONFIG_INET_IPCOMP is not set
-CONFIG_INET_TUNNEL=y
-# CONFIG_INET_DIAG is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_AH=y
-CONFIG_INET6_ESP=y
-# CONFIG_INET6_ESP_OFFLOAD is not set
-# CONFIG_INET6_ESPINTCP is not set
-CONFIG_INET6_IPCOMP=y
-# CONFIG_IPV6_MIP6 is not set
-# CONFIG_IPV6_ILA is not set
-CONFIG_INET6_XFRM_TUNNEL=y
-CONFIG_INET6_TUNNEL=y
-# CONFIG_IPV6_VTI is not set
-CONFIG_IPV6_SIT=y
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-# CONFIG_IPV6_RPL_LWTUNNEL is not set
-# CONFIG_NETLABEL is not set
-# CONFIG_MPTCP is not set
-CONFIG_NETWORK_SECMARK=y
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=y
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=y
-CONFIG_NETFILTER_FAMILY_BRIDGE=y
-CONFIG_NETFILTER_NETLINK_ACCT=y
-CONFIG_NETFILTER_NETLINK_QUEUE=y
-CONFIG_NETFILTER_NETLINK_LOG=y
-# CONFIG_NETFILTER_NETLINK_OSF is not set
-CONFIG_NF_CONNTRACK=y
-# CONFIG_NF_LOG_NETDEV is not set
-CONFIG_NETFILTER_CONNCOUNT=y
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CONNTRACK_PROCFS=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
-# CONFIG_NF_CONNTRACK_AMANDA is not set
-# CONFIG_NF_CONNTRACK_FTP is not set
-# CONFIG_NF_CONNTRACK_H323 is not set
-# CONFIG_NF_CONNTRACK_IRC is not set
-# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
-# CONFIG_NF_CONNTRACK_SNMP is not set
-# CONFIG_NF_CONNTRACK_PPTP is not set
-# CONFIG_NF_CONNTRACK_SANE is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-# CONFIG_NF_CONNTRACK_TFTP is not set
-# CONFIG_NF_CT_NETLINK is not set
-# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
-CONFIG_NF_NAT=y
-CONFIG_NF_NAT_REDIRECT=y
-CONFIG_NF_NAT_MASQUERADE=y
-CONFIG_NF_TABLES=y
-CONFIG_NF_TABLES_INET=y
-CONFIG_NF_TABLES_NETDEV=y
-# CONFIG_NFT_NUMGEN is not set
-CONFIG_NFT_CT=y
-CONFIG_NFT_COUNTER=y
-CONFIG_NFT_CONNLIMIT=y
-CONFIG_NFT_LOG=y
-CONFIG_NFT_LIMIT=y
-CONFIG_NFT_MASQ=y
-CONFIG_NFT_REDIR=y
-CONFIG_NFT_NAT=y
-CONFIG_NFT_TUNNEL=y
-# CONFIG_NFT_OBJREF is not set
-CONFIG_NFT_QUEUE=y
-CONFIG_NFT_QUOTA=y
-CONFIG_NFT_REJECT=y
-CONFIG_NFT_REJECT_INET=y
-CONFIG_NFT_COMPAT=y
-# CONFIG_NFT_HASH is not set
-# CONFIG_NFT_XFRM is not set
-CONFIG_NFT_SOCKET=y
-# CONFIG_NFT_OSF is not set
-CONFIG_NFT_TPROXY=y
-# CONFIG_NFT_SYNPROXY is not set
-CONFIG_NF_DUP_NETDEV=y
-CONFIG_NFT_DUP_NETDEV=y
-CONFIG_NFT_FWD_NETDEV=y
-# CONFIG_NFT_REJECT_NETDEV is not set
-# CONFIG_NF_FLOW_TABLE is not set
-CONFIG_NETFILTER_XTABLES=y
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=y
-# CONFIG_NETFILTER_XT_CONNMARK is not set
-
-#
-# Xtables targets
-#
-# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=y
-# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_HL is not set
-# CONFIG_NETFILTER_XT_TARGET_HMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
-# CONFIG_NETFILTER_XT_TARGET_LED is not set
-# CONFIG_NETFILTER_XT_TARGET_LOG is not set
-# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-CONFIG_NETFILTER_XT_NAT=y
-# CONFIG_NETFILTER_XT_TARGET_NETMAP is not set
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=y
-CONFIG_NETFILTER_XT_TARGET_MASQUERADE=y
-# CONFIG_NETFILTER_XT_TARGET_TEE is not set
-# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
-# CONFIG_NETFILTER_XT_TARGET_SECMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
-# CONFIG_NETFILTER_XT_MATCH_BPF is not set
-# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set
-# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
-CONFIG_NETFILTER_XT_MATCH_COMMENT=y
-# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
-# CONFIG_NETFILTER_XT_MATCH_CPU is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-# CONFIG_NETFILTER_XT_MATCH_ECN is not set
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
-# CONFIG_NETFILTER_XT_MATCH_HL is not set
-# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set
-# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
-# CONFIG_NETFILTER_XT_MATCH_L2TP is not set
-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
-# CONFIG_NETFILTER_XT_MATCH_OSF is not set
-# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
-# CONFIG_NETFILTER_XT_MATCH_STATE is not set
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-# end of Core Netfilter Configuration
-
-# CONFIG_IP_SET is not set
-# CONFIG_IP_VS is not set
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=y
-CONFIG_NF_SOCKET_IPV4=y
-CONFIG_NF_TPROXY_IPV4=y
-CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_REJECT_IPV4=y
-CONFIG_NFT_DUP_IPV4=y
-# CONFIG_NFT_FIB_IPV4 is not set
-# CONFIG_NF_TABLES_ARP is not set
-CONFIG_NF_DUP_IPV4=y
-# CONFIG_NF_LOG_ARP is not set
-# CONFIG_NF_LOG_IPV4 is not set
-CONFIG_NF_REJECT_IPV4=y
-CONFIG_IP_NF_IPTABLES=y
-# CONFIG_IP_NF_MATCH_AH is not set
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_RPFILTER is not set
-# CONFIG_IP_NF_MATCH_TTL is not set
-CONFIG_IP_NF_FILTER=y
-# CONFIG_IP_NF_TARGET_REJECT is not set
-# CONFIG_IP_NF_TARGET_SYNPROXY is not set
-CONFIG_IP_NF_NAT=y
-CONFIG_IP_NF_TARGET_MASQUERADE=y
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-CONFIG_IP_NF_TARGET_REDIRECT=y
-CONFIG_IP_NF_MANGLE=y
-# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
-# CONFIG_IP_NF_TARGET_ECN is not set
-# CONFIG_IP_NF_TARGET_TTL is not set
-# CONFIG_IP_NF_RAW is not set
-# CONFIG_IP_NF_SECURITY is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# end of IP: Netfilter Configuration
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_SOCKET_IPV6=y
-CONFIG_NF_TPROXY_IPV6=y
-CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_REJECT_IPV6=y
-# CONFIG_NFT_DUP_IPV6 is not set
-# CONFIG_NFT_FIB_IPV6 is not set
-# CONFIG_NF_DUP_IPV6 is not set
-CONFIG_NF_REJECT_IPV6=y
-# CONFIG_NF_LOG_IPV6 is not set
-CONFIG_IP6_NF_IPTABLES=y
-# CONFIG_IP6_NF_MATCH_AH is not set
-# CONFIG_IP6_NF_MATCH_EUI64 is not set
-# CONFIG_IP6_NF_MATCH_FRAG is not set
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-# CONFIG_IP6_NF_MATCH_HL is not set
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
-# CONFIG_IP6_NF_MATCH_MH is not set
-# CONFIG_IP6_NF_MATCH_RPFILTER is not set
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_MATCH_SRH is not set
-# CONFIG_IP6_NF_TARGET_HL is not set
-# CONFIG_IP6_NF_FILTER is not set
-# CONFIG_IP6_NF_TARGET_SYNPROXY is not set
-CONFIG_IP6_NF_MANGLE=y
-# CONFIG_IP6_NF_RAW is not set
-# CONFIG_IP6_NF_SECURITY is not set
-CONFIG_IP6_NF_NAT=y
-CONFIG_IP6_NF_TARGET_MASQUERADE=y
-# CONFIG_IP6_NF_TARGET_NPT is not set
-# end of IPv6: Netfilter Configuration
-
-CONFIG_NF_DEFRAG_IPV6=y
-CONFIG_NF_TABLES_BRIDGE=y
-# CONFIG_NFT_BRIDGE_META is not set
-# CONFIG_NFT_BRIDGE_REJECT is not set
-# CONFIG_NF_LOG_BRIDGE is not set
-# CONFIG_NF_CONNTRACK_BRIDGE is not set
-# CONFIG_BRIDGE_NF_EBTABLES is not set
-# CONFIG_BPFILTER is not set
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_SCTP is not set
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-# CONFIG_L2TP is not set
-CONFIG_STP=y
-CONFIG_BRIDGE=y
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-# CONFIG_BRIDGE_MRP is not set
-# CONFIG_BRIDGE_CFM is not set
-CONFIG_HAVE_NET_DSA=y
-# CONFIG_NET_DSA is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-CONFIG_LLC=y
-# CONFIG_LLC2 is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_PHONET is not set
-# CONFIG_6LOWPAN is not set
-# CONFIG_IEEE802154 is not set
-# CONFIG_NET_SCHED is not set
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
-# CONFIG_BATMAN_ADV is not set
-# CONFIG_OPENVSWITCH is not set
-# CONFIG_VSOCKETS is not set
-CONFIG_NETLINK_DIAG=y
-# CONFIG_MPLS is not set
-# CONFIG_NET_NSH is not set
-# CONFIG_HSR is not set
-# CONFIG_NET_SWITCHDEV is not set
-CONFIG_NET_L3_MASTER_DEV=y
-# CONFIG_QRTR is not set
-# CONFIG_NET_NCSI is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_SOCK_RX_QUEUE_MAPPING=y
-CONFIG_XPS=y
-CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-CONFIG_BPF_JIT=y
-# CONFIG_BPF_STREAM_PARSER is not set
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
-# end of Network testing
-# end of Networking options
-
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-CONFIG_BT=y
-CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=y
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=y
-# CONFIG_BT_BNEP_MC_FILTER is not set
-# CONFIG_BT_BNEP_PROTO_FILTER is not set
-CONFIG_BT_HIDP=y
-CONFIG_BT_HS=y
-CONFIG_BT_LE=y
-# CONFIG_BT_LEDS is not set
-CONFIG_BT_MSFTEXT=y
-CONFIG_BT_DEBUGFS=y
-# CONFIG_BT_SELFTEST is not set
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_INTEL=y
-CONFIG_BT_BCM=y
-CONFIG_BT_RTL=y
-CONFIG_BT_HCIBTUSB=y
-CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_MTK=y
-CONFIG_BT_HCIBTUSB_RTL=y
-# CONFIG_BT_HCIBTSDIO is not set
-# CONFIG_BT_HCIUART is not set
-CONFIG_BT_HCIBCM203X=y
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIVHCI is not set
-CONFIG_BT_MRVL=y
-# CONFIG_BT_MRVL_SDIO is not set
-CONFIG_BT_ATH3K=y
-# CONFIG_BT_MTKSDIO is not set
-# CONFIG_BT_MTKUART is not set
-# end of Bluetooth device drivers
-
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AF_KCM is not set
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_CFG80211=y
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-CONFIG_CFG80211_CERTIFICATION_ONUS=y
-# CONFIG_CFG80211_REQUIRE_SIGNED_REGDB is not set
-# CONFIG_CFG80211_REG_CELLULAR_HINTS is not set
-# CONFIG_CFG80211_REG_RELAX_NO_IR is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-CONFIG_CFG80211_DEBUGFS=y
-CONFIG_CFG80211_CRDA_SUPPORT=y
-# CONFIG_CFG80211_WEXT is not set
-CONFIG_MAC80211=y
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-CONFIG_MAC80211_DEBUGFS=y
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
-CONFIG_RFKILL=y
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_RFKILL_GPIO=y
-# CONFIG_NET_9P is not set
-# CONFIG_CAIF is not set
-# CONFIG_CEPH_LIB is not set
-# CONFIG_NFC is not set
-# CONFIG_PSAMPLE is not set
-# CONFIG_NET_IFE is not set
-CONFIG_LWTUNNEL=y
-CONFIG_LWTUNNEL_BPF=y
-CONFIG_DST_CACHE=y
-CONFIG_GRO_CELLS=y
-CONFIG_FAILOVER=y
-CONFIG_ETHTOOL_NETLINK=y
-CONFIG_HAVE_EBPF_JIT=y
-
-#
-# Device Drivers
-#
-CONFIG_ARM_AMBA=y
-CONFIG_HAVE_PCI=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_DOMAINS_GENERIC=y
-CONFIG_PCI_SYSCALL=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCIEAER=y
-# CONFIG_PCIEAER_INJECT is not set
-# CONFIG_PCIE_ECRC is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEFAULT is not set
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-CONFIG_PCIEASPM_PERFORMANCE=y
-CONFIG_PCIE_PME=y
-CONFIG_PCIE_DPC=y
-CONFIG_PCIE_PTM=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_STUB is not set
-CONFIG_PCI_ATS=y
-CONFIG_PCI_ECAM=y
-# CONFIG_PCI_IOV is not set
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_PCI_LABEL=y
-# CONFIG_PCIE_BUS_TUNE_OFF is not set
-CONFIG_PCIE_BUS_DEFAULT=y
-# CONFIG_PCIE_BUS_SAFE is not set
-# CONFIG_PCIE_BUS_PERFORMANCE is not set
-# CONFIG_PCIE_BUS_PEER2PEER is not set
-# CONFIG_HOTPLUG_PCI is not set
-
-#
-# PCI controller drivers
-#
-# CONFIG_PCI_FTPCI100 is not set
-CONFIG_PCI_HOST_COMMON=y
-CONFIG_PCI_HOST_GENERIC=y
-# CONFIG_PCIE_XILINX is not set
-# CONFIG_PCI_XGENE is not set
-# CONFIG_PCIE_ALTERA is not set
-# CONFIG_PCI_HOST_THUNDER_PEM is not set
-# CONFIG_PCI_HOST_THUNDER_ECAM is not set
-# CONFIG_PCIE_MICROCHIP_HOST is not set
-
-#
-# DesignWare PCI Core Support
-#
-CONFIG_PCIE_DW=y
-CONFIG_PCIE_DW_HOST=y
-# CONFIG_PCIE_DW_PLAT_HOST is not set
-CONFIG_PCI_IMX6=y
-# CONFIG_PCI_HISI is not set
-# CONFIG_PCIE_KIRIN is not set
-# CONFIG_PCI_MESON is not set
-# CONFIG_PCIE_AL is not set
-# end of DesignWare PCI Core Support
-
-#
-# Mobiveil PCIe Core Support
-#
-# CONFIG_PCIE_LAYERSCAPE_GEN4 is not set
-# end of Mobiveil PCIe Core Support
-
-#
-# Cadence PCIe controllers support
-#
-# CONFIG_PCIE_CADENCE_PLAT_HOST is not set
-# CONFIG_PCI_J721E_HOST is not set
-# end of Cadence PCIe controllers support
-# end of PCI controller drivers
-
-#
-# PCI Endpoint
-#
-# CONFIG_PCI_ENDPOINT is not set
-# end of PCI Endpoint
-
-#
-# PCI switch controller drivers
-#
-# CONFIG_PCI_SW_SWITCHTEC is not set
-# end of PCI switch controller drivers
-
-# CONFIG_CXL_BUS is not set
-# CONFIG_PCCARD is not set
-# CONFIG_RAPIDIO is not set
-
-#
-# Generic Driver Options
-#
-# CONFIG_UEVENT_HELPER is not set
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-
-#
-# Firmware loader
-#
-CONFIG_FW_LOADER=y
-CONFIG_FW_LOADER_PAGED_BUF=y
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
-CONFIG_FW_CACHE=y
-# end of Firmware loader
-
-CONFIG_WANT_DEV_COREDUMP=y
-CONFIG_ALLOW_DEV_COREDUMP=y
-CONFIG_DEV_COREDUMP=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
-CONFIG_SOC_BUS=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=y
-CONFIG_REGMAP_SPI=y
-CONFIG_REGMAP_MMIO=y
-CONFIG_REGMAP_IRQ=y
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_DMA_FENCE_TRACE is not set
-CONFIG_GENERIC_ARCH_TOPOLOGY=y
-CONFIG_GENERIC_ARCH_NUMA=y
-# end of Generic Driver Options
-
-#
-# Bus devices
-#
-# CONFIG_BRCMSTB_GISB_ARB is not set
-# CONFIG_MOXTET is not set
-# CONFIG_IMX_WEIM is not set
-# CONFIG_SIMPLE_PM_BUS is not set
-# CONFIG_VEXPRESS_CONFIG is not set
-# CONFIG_FSL_MC_BUS is not set
-# CONFIG_MHI_BUS is not set
-# end of Bus devices
-
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-# CONFIG_GNSS is not set
-# CONFIG_MTD is not set
-CONFIG_DTC=y
-CONFIG_OF=y
-# CONFIG_OF_UNITTEST is not set
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_KOBJ=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
-CONFIG_OF_RESERVED_MEM=y
-# CONFIG_OF_OVERLAY is not set
-CONFIG_OF_NUMA=y
-# CONFIG_PARPORT is not set
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_NULL_BLK is not set
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=y
-# CONFIG_BLK_DEV_UMEM is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_DRBD is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_XEN_BLKDEV_FRONTEND is not set
-CONFIG_VIRTIO_BLK=y
-# CONFIG_BLK_DEV_RBD is not set
-# CONFIG_BLK_DEV_RSXX is not set
-
-#
-# NVME Support
-#
-CONFIG_NVME_CORE=y
-CONFIG_BLK_DEV_NVME=y
-CONFIG_NVME_MULTIPATH=y
-# CONFIG_NVME_HWMON is not set
-# CONFIG_NVME_FC is not set
-# CONFIG_NVME_TCP is not set
-# end of NVME Support
-
-#
-# Misc devices
-#
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_DUMMY_IRQ is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_TIFM_CORE is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_APDS9802ALS is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_ISL29020 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_BH1770 is not set
-# CONFIG_SENSORS_APDS990X is not set
-# CONFIG_HMC6352 is not set
-# CONFIG_DS1682 is not set
-# CONFIG_LATTICE_ECP3_CONFIG is not set
-# CONFIG_SRAM is not set
-# CONFIG_PCI_ENDPOINT_TEST is not set
-# CONFIG_XILINX_SDFEC is not set
-# CONFIG_PVPANIC is not set
-# CONFIG_HISI_HIKEY_USB is not set
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_AT25=y
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-CONFIG_EEPROM_93CX6=y
-# CONFIG_EEPROM_93XX46 is not set
-# CONFIG_EEPROM_IDT_89HPESX is not set
-# CONFIG_EEPROM_EE1004 is not set
-# end of EEPROM support
-
-# CONFIG_CB710_CORE is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-# CONFIG_TI_ST is not set
-# end of Texas Instruments shared transport line discipline
-
-# CONFIG_SENSORS_LIS3_SPI is not set
-# CONFIG_SENSORS_LIS3_I2C is not set
-# CONFIG_ALTERA_STAPL is not set
-# CONFIG_GENWQE is not set
-# CONFIG_ECHO is not set
-# CONFIG_BCM_VK is not set
-# CONFIG_MISC_ALCOR_PCI is not set
-# CONFIG_MISC_RTSX_PCI is not set
-# CONFIG_MISC_RTSX_USB is not set
-# CONFIG_HABANA_AI is not set
-# CONFIG_UACCE is not set
-# end of Misc devices
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=y
-# CONFIG_RAID_ATTRS is not set
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_PROC_FS is not set
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_BLK_DEV_SR is not set
-CONFIG_CHR_DEV_SG=y
-# CONFIG_CHR_DEV_SCH is not set
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-# CONFIG_SCSI_SCAN_ASYNC is not set
-
-#
-# SCSI Transports
-#
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-# end of SCSI Transports
-
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_ISCSI_TCP is not set
-# CONFIG_ISCSI_BOOT_SYSFS is not set
-# CONFIG_SCSI_CXGB3_ISCSI is not set
-# CONFIG_SCSI_CXGB4_ISCSI is not set
-# CONFIG_SCSI_BNX2_ISCSI is not set
-# CONFIG_BE2ISCSI is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_HPSA is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_3W_SAS is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_MVUMI is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_ESAS2R is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_MPT3SAS is not set
-# CONFIG_SCSI_MPT2SAS is not set
-# CONFIG_SCSI_SMARTPQI is not set
-# CONFIG_SCSI_UFSHCD is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_MYRB is not set
-# CONFIG_SCSI_MYRS is not set
-# CONFIG_XEN_SCSI_FRONTEND is not set
-# CONFIG_SCSI_SNIC is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_FDOMAIN_PCI is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_AM53C974 is not set
-# CONFIG_SCSI_WD719X is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_PMCRAID is not set
-# CONFIG_SCSI_PM8001 is not set
-CONFIG_SCSI_VIRTIO=y
-CONFIG_SCSI_DH=y
-# CONFIG_SCSI_DH_RDAC is not set
-# CONFIG_SCSI_DH_HP_SW is not set
-# CONFIG_SCSI_DH_EMC is not set
-# CONFIG_SCSI_DH_ALUA is not set
-# end of SCSI device support
-
-CONFIG_HAVE_PATA_PLATFORM=y
-# CONFIG_ATA is not set
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_MD_AUTODETECT=y
-# CONFIG_MD_LINEAR is not set
-# CONFIG_MD_RAID0 is not set
-# CONFIG_MD_RAID1 is not set
-# CONFIG_MD_RAID10 is not set
-# CONFIG_MD_RAID456 is not set
-# CONFIG_MD_MULTIPATH is not set
-# CONFIG_MD_FAULTY is not set
-# CONFIG_BCACHE is not set
-CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=y
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=y
-# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
-CONFIG_DM_BIO_PRISON=y
-CONFIG_DM_PERSISTENT_DATA=y
-# CONFIG_DM_UNSTRIPED is not set
-CONFIG_DM_CRYPT=y
-# CONFIG_DM_SNAPSHOT is not set
-CONFIG_DM_THIN_PROVISIONING=y
-# CONFIG_DM_CACHE is not set
-# CONFIG_DM_WRITECACHE is not set
-# CONFIG_DM_EBS is not set
-# CONFIG_DM_ERA is not set
-# CONFIG_DM_CLONE is not set
-# CONFIG_DM_MIRROR is not set
-# CONFIG_DM_RAID is not set
-# CONFIG_DM_ZERO is not set
-# CONFIG_DM_MULTIPATH is not set
-# CONFIG_DM_DELAY is not set
-# CONFIG_DM_DUST is not set
-# CONFIG_DM_INIT is not set
-CONFIG_DM_UEVENT=y
-# CONFIG_DM_FLAKEY is not set
-# CONFIG_DM_VERITY is not set
-# CONFIG_DM_SWITCH is not set
-# CONFIG_DM_LOG_WRITES is not set
-# CONFIG_DM_INTEGRITY is not set
-# CONFIG_TARGET_CORE is not set
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_NOSY is not set
-# end of IEEE 1394 (FireWire) support
-
-CONFIG_NETDEVICES=y
-CONFIG_MII=y
-CONFIG_NET_CORE=y
-# CONFIG_BONDING is not set
-# CONFIG_DUMMY is not set
-CONFIG_WIREGUARD=y
-# CONFIG_WIREGUARD_DEBUG is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_NET_FC is not set
-# CONFIG_NET_TEAM is not set
-CONFIG_MACVLAN=y
-CONFIG_MACVTAP=y
-CONFIG_IPVLAN_L3S=y
-CONFIG_IPVLAN=y
-CONFIG_IPVTAP=y
-CONFIG_VXLAN=y
-# CONFIG_GENEVE is not set
-# CONFIG_BAREUDP is not set
-# CONFIG_GTP is not set
-# CONFIG_MACSEC is not set
-# CONFIG_NETCONSOLE is not set
-CONFIG_TUN=y
-CONFIG_TAP=y
-# CONFIG_TUN_VNET_CROSS_LE is not set
-CONFIG_VETH=y
-CONFIG_VIRTIO_NET=y
-# CONFIG_NLMON is not set
-# CONFIG_ARCNET is not set
-
-#
-# Distributed Switch Architecture drivers
-#
-# end of Distributed Switch Architecture drivers
-
-CONFIG_ETHERNET=y
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_ADAPTEC is not set
-# CONFIG_NET_VENDOR_AGERE is not set
-# CONFIG_NET_VENDOR_ALACRITECH is not set
-# CONFIG_NET_VENDOR_ALTEON is not set
-# CONFIG_ALTERA_TSE is not set
-# CONFIG_NET_VENDOR_AMAZON is not set
-# CONFIG_NET_VENDOR_AMD is not set
-# CONFIG_NET_VENDOR_AQUANTIA is not set
-# CONFIG_NET_VENDOR_ARC is not set
-# CONFIG_NET_VENDOR_ATHEROS is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_BROCADE is not set
-# CONFIG_NET_VENDOR_CADENCE is not set
-# CONFIG_NET_VENDOR_CAVIUM is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_CISCO is not set
-# CONFIG_NET_VENDOR_CORTINA is not set
-# CONFIG_DNET is not set
-# CONFIG_NET_VENDOR_DEC is not set
-# CONFIG_NET_VENDOR_DLINK is not set
-# CONFIG_NET_VENDOR_EMULEX is not set
-# CONFIG_NET_VENDOR_EZCHIP is not set
-CONFIG_NET_VENDOR_FREESCALE=y
-CONFIG_FEC=y
-# CONFIG_FSL_PQ_MDIO is not set
-# CONFIG_FSL_XGMAC_MDIO is not set
-# CONFIG_GIANFAR is not set
-# CONFIG_FSL_ENETC is not set
-# CONFIG_FSL_ENETC_VF is not set
-# CONFIG_FSL_ENETC_MDIO is not set
-# CONFIG_NET_VENDOR_GOOGLE is not set
-# CONFIG_NET_VENDOR_HISILICON is not set
-# CONFIG_NET_VENDOR_HUAWEI is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_JME is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MELLANOX is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_MICROCHIP is not set
-# CONFIG_NET_VENDOR_MICROSEMI is not set
-# CONFIG_NET_VENDOR_MYRI is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_NETERION is not set
-# CONFIG_NET_VENDOR_NETRONOME is not set
-# CONFIG_NET_VENDOR_NI is not set
-# CONFIG_NET_VENDOR_NVIDIA is not set
-# CONFIG_NET_VENDOR_OKI is not set
-# CONFIG_ETHOC is not set
-# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
-# CONFIG_NET_VENDOR_PENSANDO is not set
-# CONFIG_NET_VENDOR_QLOGIC is not set
-# CONFIG_NET_VENDOR_QUALCOMM is not set
-# CONFIG_NET_VENDOR_RDC is not set
-# CONFIG_NET_VENDOR_REALTEK is not set
-# CONFIG_NET_VENDOR_RENESAS is not set
-# CONFIG_NET_VENDOR_ROCKER is not set
-# CONFIG_NET_VENDOR_SAMSUNG is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SOLARFLARE is not set
-# CONFIG_NET_VENDOR_SILAN is not set
-# CONFIG_NET_VENDOR_SIS is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_SOCIONEXT is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_SUN is not set
-# CONFIG_NET_VENDOR_SYNOPSYS is not set
-# CONFIG_NET_VENDOR_TEHUTI is not set
-# CONFIG_NET_VENDOR_TI is not set
-# CONFIG_NET_VENDOR_VIA is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-# CONFIG_NET_VENDOR_XILINX is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_PHYLIB=y
-CONFIG_SWPHY=y
-# CONFIG_LED_TRIGGER_PHY is not set
-CONFIG_FIXED_PHY=y
-
-#
-# MII PHY device drivers
-#
-# CONFIG_AMD_PHY is not set
-# CONFIG_ADIN_PHY is not set
-# CONFIG_AQUANTIA_PHY is not set
-# CONFIG_AX88796B_PHY is not set
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_BCM54140_PHY is not set
-# CONFIG_BCM7XXX_PHY is not set
-# CONFIG_BCM84881_PHY is not set
-# CONFIG_BCM87XX_PHY is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_CORTINA_PHY is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_LXT_PHY is not set
-# CONFIG_INTEL_XWAY_PHY is not set
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_MARVELL_10G_PHY is not set
-# CONFIG_MICREL_PHY is not set
-# CONFIG_MICROCHIP_PHY is not set
-# CONFIG_MICROCHIP_T1_PHY is not set
-# CONFIG_MICROSEMI_PHY is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_NXP_TJA11XX_PHY is not set
-CONFIG_AT803X_PHY=y
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_RENESAS_PHY is not set
-# CONFIG_ROCKCHIP_PHY is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_STE10XP is not set
-# CONFIG_TERANETICS_PHY is not set
-# CONFIG_DP83822_PHY is not set
-# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DP83848_PHY is not set
-# CONFIG_DP83867_PHY is not set
-# CONFIG_DP83869_PHY is not set
-# CONFIG_VITESSE_PHY is not set
-# CONFIG_XILINX_GMII2RGMII is not set
-# CONFIG_MICREL_KS8995MA is not set
-CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_BUS=y
-CONFIG_OF_MDIO=y
-CONFIG_MDIO_DEVRES=y
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MDIO_BCM_UNIMAC is not set
-# CONFIG_MDIO_HISI_FEMAC is not set
-# CONFIG_MDIO_MVUSB is not set
-# CONFIG_MDIO_MSCC_MIIM is not set
-# CONFIG_MDIO_OCTEON is not set
-# CONFIG_MDIO_IPQ4019 is not set
-# CONFIG_MDIO_IPQ8064 is not set
-# CONFIG_MDIO_THUNDER is not set
-
-#
-# MDIO Multiplexers
-#
-CONFIG_MDIO_BUS_MUX=y
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-
-#
-# PCS device drivers
-#
-# CONFIG_PCS_XPCS is not set
-# end of PCS device drivers
-
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-CONFIG_USB_NET_DRIVERS=y
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_RTL8152 is not set
-# CONFIG_USB_LAN78XX is not set
-CONFIG_USB_USBNET=y
-# CONFIG_USB_NET_AX8817X is not set
-# CONFIG_USB_NET_AX88179_178A is not set
-CONFIG_USB_NET_CDCETHER=y
-CONFIG_USB_NET_CDC_EEM=y
-# CONFIG_USB_NET_CDC_NCM is not set
-# CONFIG_USB_NET_HUAWEI_CDC_NCM is not set
-# CONFIG_USB_NET_CDC_MBIM is not set
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_SR9700 is not set
-# CONFIG_USB_NET_SR9800 is not set
-# CONFIG_USB_NET_SMSC75XX is not set
-# CONFIG_USB_NET_SMSC95XX is not set
-# CONFIG_USB_NET_GL620A is not set
-# CONFIG_USB_NET_NET1080 is not set
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-# CONFIG_USB_NET_CDC_SUBSET is not set
-# CONFIG_USB_NET_ZAURUS is not set
-# CONFIG_USB_NET_CX82310_ETH is not set
-# CONFIG_USB_NET_KALMIA is not set
-# CONFIG_USB_NET_QMI_WWAN is not set
-# CONFIG_USB_HSO is not set
-# CONFIG_USB_NET_INT51X1 is not set
-CONFIG_USB_IPHETH=y
-# CONFIG_USB_SIERRA_NET is not set
-# CONFIG_USB_VL600 is not set
-# CONFIG_USB_NET_CH9200 is not set
-# CONFIG_USB_NET_AQC111 is not set
-# CONFIG_USB_RTL8153_ECM is not set
-CONFIG_WLAN=y
-# CONFIG_WLAN_VENDOR_ADMTEK is not set
-CONFIG_ATH_COMMON=y
-CONFIG_WLAN_VENDOR_ATH=y
-# CONFIG_ATH_DEBUG is not set
-# CONFIG_ATH_REG_DYNAMIC_USER_REG_HINTS is not set
-CONFIG_ATH5K=y
-CONFIG_ATH5K_DEBUG=y
-# CONFIG_ATH5K_TRACER is not set
-CONFIG_ATH5K_PCI=y
-# CONFIG_ATH5K_TEST_CHANNELS is not set
-CONFIG_ATH9K_HW=y
-CONFIG_ATH9K_COMMON=y
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K=y
-CONFIG_ATH9K_PCI=y
-# CONFIG_ATH9K_AHB is not set
-# CONFIG_ATH9K_DEBUGFS is not set
-# CONFIG_ATH9K_DFS_CERTIFIED is not set
-# CONFIG_ATH9K_DYNACK is not set
-# CONFIG_ATH9K_WOW is not set
-CONFIG_ATH9K_RFKILL=y
-CONFIG_ATH9K_CHANNEL_CONTEXT=y
-CONFIG_ATH9K_PCOEM=y
-# CONFIG_ATH9K_PCI_NO_EEPROM is not set
-CONFIG_ATH9K_HTC=y
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_ATH9K_HWRNG=y
-# CONFIG_CARL9170 is not set
-# CONFIG_ATH6KL is not set
-CONFIG_AR5523=y
-# CONFIG_WIL6210 is not set
-CONFIG_ATH10K=y
-CONFIG_ATH10K_CE=y
-CONFIG_ATH10K_PCI=y
-# CONFIG_ATH10K_AHB is not set
-# CONFIG_ATH10K_SDIO is not set
-# CONFIG_ATH10K_USB is not set
-# CONFIG_ATH10K_DEBUG is not set
-# CONFIG_ATH10K_DEBUGFS is not set
-# CONFIG_ATH10K_TRACING is not set
-# CONFIG_ATH10K_DFS_CERTIFIED is not set
-# CONFIG_WCN36XX is not set
-# CONFIG_WLAN_VENDOR_ATMEL is not set
-CONFIG_WLAN_VENDOR_BROADCOM=y
-# CONFIG_B43 is not set
-# CONFIG_B43LEGACY is not set
-# CONFIG_BRCMSMAC is not set
-# CONFIG_BRCMFMAC is not set
-# CONFIG_WLAN_VENDOR_CISCO is not set
-CONFIG_WLAN_VENDOR_INTEL=y
-# CONFIG_IPW2100 is not set
-# CONFIG_IPW2200 is not set
-# CONFIG_IWL4965 is not set
-# CONFIG_IWL3945 is not set
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_LEDS=y
-# CONFIG_IWLDVM is not set
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-# CONFIG_IWLWIFI_BCAST_FILTERING is not set
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-# CONFIG_IWLWIFI_DEBUGFS is not set
-CONFIG_IWLWIFI_DEVICE_TRACING=y
-# end of Debugging Options
-
-# CONFIG_WLAN_VENDOR_INTERSIL is not set
-# CONFIG_WLAN_VENDOR_MARVELL is not set
-CONFIG_WLAN_VENDOR_MEDIATEK=y
-# CONFIG_MT7601U is not set
-# CONFIG_MT76x0U is not set
-# CONFIG_MT76x0E is not set
-# CONFIG_MT76x2E is not set
-# CONFIG_MT76x2U is not set
-# CONFIG_MT7603E is not set
-# CONFIG_MT7615E is not set
-# CONFIG_MT7663U is not set
-# CONFIG_MT7663S is not set
-# CONFIG_MT7915E is not set
-# CONFIG_MT7921E is not set
-CONFIG_WLAN_VENDOR_MICROCHIP=y
-# CONFIG_WILC1000_SDIO is not set
-# CONFIG_WILC1000_SPI is not set
-# CONFIG_WLAN_VENDOR_RALINK is not set
-CONFIG_WLAN_VENDOR_REALTEK=y
-# CONFIG_RTL8180 is not set
-# CONFIG_RTL8187 is not set
-# CONFIG_RTL_CARDS is not set
-# CONFIG_RTL8XXXU is not set
-# CONFIG_RTW88 is not set
-# CONFIG_WLAN_VENDOR_RSI is not set
-# CONFIG_WLAN_VENDOR_ST is not set
-# CONFIG_WLAN_VENDOR_TI is not set
-# CONFIG_WLAN_VENDOR_ZYDAS is not set
-# CONFIG_WLAN_VENDOR_QUANTENNA is not set
-# CONFIG_MAC80211_HWSIM is not set
-# CONFIG_USB_NET_RNDIS_WLAN is not set
-# CONFIG_VIRT_WIFI is not set
-# CONFIG_WAN is not set
-# CONFIG_XEN_NETDEV_FRONTEND is not set
-# CONFIG_VMXNET3 is not set
-# CONFIG_NETDEVSIM is not set
-CONFIG_NET_FAILOVER=y
-# CONFIG_ISDN is not set
-# CONFIG_NVM is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_LEDS=y
-CONFIG_INPUT_FF_MEMLESS=y
-# CONFIG_INPUT_SPARSEKMAP is not set
-# CONFIG_INPUT_MATRIXKMAP is not set
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=y
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_ADP5589 is not set
-# CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_KEYBOARD_QT1050 is not set
-# CONFIG_KEYBOARD_QT1070 is not set
-# CONFIG_KEYBOARD_QT2160 is not set
-# CONFIG_KEYBOARD_DLINK_DIR685 is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
-# CONFIG_KEYBOARD_GPIO_POLLED is not set
-# CONFIG_KEYBOARD_TCA6416 is not set
-# CONFIG_KEYBOARD_TCA8418 is not set
-# CONFIG_KEYBOARD_MATRIX is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_LM8333 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
-# CONFIG_KEYBOARD_MPR121 is not set
-CONFIG_KEYBOARD_SNVS_PWRKEY=y
-# CONFIG_KEYBOARD_IMX is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_SAMSUNG is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_OMAP4 is not set
-# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_CAP11XX is not set
-# CONFIG_KEYBOARD_BCM is not set
-CONFIG_INPUT_MOUSE=y
-# CONFIG_MOUSE_PS2 is not set
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_BCM5974 is not set
-# CONFIG_MOUSE_CYAPA is not set
-# CONFIG_MOUSE_ELAN_I2C is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_MOUSE_GPIO is not set
-# CONFIG_MOUSE_SYNAPTICS_I2C is not set
-# CONFIG_MOUSE_SYNAPTICS_USB is not set
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-# CONFIG_JOYSTICK_AS5011 is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-CONFIG_JOYSTICK_XPAD=y
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-# CONFIG_JOYSTICK_PXRC is not set
-# CONFIG_JOYSTICK_FSIA6B is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-# CONFIG_RMI4_CORE is not set
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-# CONFIG_SERIO_SERPORT is not set
-# CONFIG_SERIO_AMBAKMI is not set
-# CONFIG_SERIO_PCIPS2 is not set
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW is not set
-# CONFIG_SERIO_ALTERA_PS2 is not set
-# CONFIG_SERIO_PS2MULT is not set
-# CONFIG_SERIO_ARC_PS2 is not set
-# CONFIG_SERIO_APBPS2 is not set
-# CONFIG_SERIO_GPIO_PS2 is not set
-# CONFIG_USERIO is not set
-# CONFIG_GAMEPORT is not set
-# end of Hardware I/O ports
-# end of Input device support
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_LDISC_AUTOLOAD=y
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_EARLYCON=y
-# CONFIG_SERIAL_8250 is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_AMBA_PL010=y
-CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set
-# CONFIG_SERIAL_KGDB_NMI is not set
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_MAX310X is not set
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-CONFIG_SERIAL_IMX_EARLYCON=y
-# CONFIG_SERIAL_UARTLITE is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_CONSOLE_POLL=y
-# CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_SIFIVE is not set
-# CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_SC16IS7XX is not set
-# CONFIG_SERIAL_BCM63XX is not set
-# CONFIG_SERIAL_ALTERA_JTAGUART is not set
-# CONFIG_SERIAL_ALTERA_UART is not set
-# CONFIG_SERIAL_XILINX_PS_UART is not set
-# CONFIG_SERIAL_ARC is not set
-# CONFIG_SERIAL_RP2 is not set
-# CONFIG_SERIAL_FSL_LPUART is not set
-# CONFIG_SERIAL_FSL_LINFLEXUART is not set
-# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
-# CONFIG_SERIAL_SPRD is not set
-# end of Serial drivers
-
-CONFIG_SERIAL_MCTRL_GPIO=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_N_GSM is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_NULL_TTY is not set
-# CONFIG_TRACE_SINK is not set
-CONFIG_HVC_DRIVER=y
-# CONFIG_HVC_XEN is not set
-# CONFIG_HVC_DCC is not set
-CONFIG_SERIAL_DEV_BUS=y
-CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
-# CONFIG_TTY_PRINTK is not set
-CONFIG_VIRTIO_CONSOLE=y
-# CONFIG_IPMI_HANDLER is not set
-# CONFIG_IPMB_DEVICE_INTERFACE is not set
-CONFIG_HW_RANDOM=y
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-# CONFIG_HW_RANDOM_BA431 is not set
-CONFIG_HW_RANDOM_VIRTIO=y
-# CONFIG_HW_RANDOM_CAVIUM is not set
-# CONFIG_HW_RANDOM_CCTRNG is not set
-# CONFIG_HW_RANDOM_XIPHERA is not set
-# CONFIG_APPLICOM is not set
-CONFIG_DEVMEM=y
-# CONFIG_RAW_DRIVER is not set
-CONFIG_DEVPORT=y
-# CONFIG_TCG_TPM is not set
-# CONFIG_XILLYBUS is not set
-# end of Character devices
-
-CONFIG_RANDOM_TRUST_CPU=y
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_MUX=y
-
-#
-# Multiplexer I2C Chip support
-#
-# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
-# CONFIG_I2C_MUX_GPIO is not set
-# CONFIG_I2C_MUX_GPMUX is not set
-# CONFIG_I2C_MUX_LTC4306 is not set
-# CONFIG_I2C_MUX_PCA9541 is not set
-CONFIG_I2C_MUX_PCA954x=y
-CONFIG_I2C_MUX_PINCTRL=y
-CONFIG_I2C_MUX_REG=y
-# CONFIG_I2C_DEMUX_PINCTRL is not set
-# CONFIG_I2C_MUX_MLXCPLD is not set
-# end of Multiplexer I2C Chip support
-
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_ALGOBIT=y
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_NVIDIA_GPU is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_CADENCE is not set
-# CONFIG_I2C_CBUS_GPIO is not set
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-# CONFIG_I2C_DESIGNWARE_PCI is not set
-# CONFIG_I2C_EMEV2 is not set
-# CONFIG_I2C_GPIO is not set
-CONFIG_I2C_IMX=y
-CONFIG_I2C_IMX_LPI2C=y
-# CONFIG_I2C_NOMADIK is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_RK3X is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_THUNDERX is not set
-# CONFIG_I2C_XILINX is not set
-
-#
-# External I2C/SMBus adapter drivers
-#
-# CONFIG_I2C_DIOLAN_U2C is not set
-# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-
-#
-# Other I2C/SMBus bus drivers
-#
-# end of I2C Hardware Bus support
-
-# CONFIG_I2C_STUB is not set
-CONFIG_I2C_SLAVE=y
-# CONFIG_I2C_SLAVE_EEPROM is not set
-# CONFIG_I2C_SLAVE_TESTUNIT is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# end of I2C support
-
-# CONFIG_I3C is not set
-CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_MEM=y
-
-#
-# SPI Master Controller Drivers
-#
-# CONFIG_SPI_ALTERA is not set
-# CONFIG_SPI_AXI_SPI_ENGINE is not set
-CONFIG_SPI_BITBANG=y
-# CONFIG_SPI_CADENCE is not set
-# CONFIG_SPI_CADENCE_QUADSPI is not set
-# CONFIG_SPI_DESIGNWARE is not set
-# CONFIG_SPI_FSL_LPSPI is not set
-# CONFIG_SPI_FSL_QUADSPI is not set
-# CONFIG_SPI_NXP_FLEXSPI is not set
-# CONFIG_SPI_GPIO is not set
-CONFIG_SPI_IMX=y
-# CONFIG_SPI_FSL_SPI is not set
-# CONFIG_SPI_OC_TINY is not set
-# CONFIG_SPI_PL022 is not set
-# CONFIG_SPI_PXA2XX is not set
-# CONFIG_SPI_ROCKCHIP is not set
-# CONFIG_SPI_SC18IS602 is not set
-# CONFIG_SPI_SIFIVE is not set
-# CONFIG_SPI_MXIC is not set
-# CONFIG_SPI_THUNDERX is not set
-# CONFIG_SPI_XCOMM is not set
-# CONFIG_SPI_XILINX is not set
-# CONFIG_SPI_ZYNQMP_GQSPI is not set
-# CONFIG_SPI_AMD is not set
-
-#
-# SPI Multiplexer support
-#
-# CONFIG_SPI_MUX is not set
-
-#
-# SPI Protocol Masters
-#
-CONFIG_SPI_SPIDEV=y
-# CONFIG_SPI_LOOPBACK_TEST is not set
-# CONFIG_SPI_TLE62X0 is not set
-# CONFIG_SPI_SLAVE is not set
-# CONFIG_SPMI is not set
-# CONFIG_HSI is not set
-# CONFIG_PPS is not set
-
-#
-# PTP clock support
-#
-# CONFIG_PTP_1588_CLOCK is not set
-
-#
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
-#
-# end of PTP clock support
-
-CONFIG_PINCTRL=y
-CONFIG_GENERIC_PINCTRL_GROUPS=y
-CONFIG_PINMUX=y
-CONFIG_GENERIC_PINMUX_FUNCTIONS=y
-CONFIG_PINCONF=y
-CONFIG_GENERIC_PINCONF=y
-# CONFIG_DEBUG_PINCTRL is not set
-# CONFIG_PINCTRL_MCP23S08 is not set
-# CONFIG_PINCTRL_SINGLE is not set
-# CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_STMFX is not set
-# CONFIG_PINCTRL_OCELOT is not set
-# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
-CONFIG_PINCTRL_IMX=y
-# CONFIG_PINCTRL_IMX8MM is not set
-# CONFIG_PINCTRL_IMX8MN is not set
-# CONFIG_PINCTRL_IMX8MP is not set
-CONFIG_PINCTRL_IMX8MQ=y
-
-#
-# Renesas pinctrl drivers
-#
-# end of Renesas pinctrl drivers
-
-CONFIG_GPIOLIB=y
-CONFIG_GPIOLIB_FASTPATH_LIMIT=512
-CONFIG_OF_GPIO=y
-CONFIG_GPIOLIB_IRQCHIP=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_CDEV=y
-CONFIG_GPIO_CDEV_V1=y
-CONFIG_GPIO_GENERIC=y
-
-#
-# Memory mapped GPIO drivers
-#
-# CONFIG_GPIO_74XX_MMIO is not set
-# CONFIG_GPIO_ALTERA is not set
-# CONFIG_GPIO_CADENCE is not set
-# CONFIG_GPIO_DWAPB is not set
-# CONFIG_GPIO_FTGPIO010 is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_HLWD is not set
-# CONFIG_GPIO_LOGICVC is not set
-# CONFIG_GPIO_MB86S7X is not set
-CONFIG_GPIO_MXC=y
-# CONFIG_GPIO_PL061 is not set
-# CONFIG_GPIO_SAMA5D2_PIOBU is not set
-# CONFIG_GPIO_SIFIVE is not set
-# CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_XGENE is not set
-# CONFIG_GPIO_XILINX is not set
-# CONFIG_GPIO_AMD_FCH is not set
-# end of Memory mapped GPIO drivers
-
-#
-# I2C GPIO expanders
-#
-# CONFIG_GPIO_ADP5588 is not set
-# CONFIG_GPIO_ADNP is not set
-# CONFIG_GPIO_GW_PLD is not set
-# CONFIG_GPIO_MAX7300 is not set
-# CONFIG_GPIO_MAX732X is not set
-CONFIG_GPIO_PCA953X=y
-CONFIG_GPIO_PCA953X_IRQ=y
-# CONFIG_GPIO_PCA9570 is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_TPIC2810 is not set
-# end of I2C GPIO expanders
-
-#
-# MFD GPIO expanders
-#
-# CONFIG_GPIO_WM8994 is not set
-# end of MFD GPIO expanders
-
-#
-# PCI GPIO expanders
-#
-# CONFIG_GPIO_BT8XX is not set
-# CONFIG_GPIO_PCI_IDIO_16 is not set
-# CONFIG_GPIO_PCIE_IDIO_24 is not set
-# CONFIG_GPIO_RDC321X is not set
-# end of PCI GPIO expanders
-
-#
-# SPI GPIO expanders
-#
-# CONFIG_GPIO_74X164 is not set
-# CONFIG_GPIO_MAX3191X is not set
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_PISOSR is not set
-# CONFIG_GPIO_XRA1403 is not set
-# end of SPI GPIO expanders
-
-#
-# USB GPIO expanders
-#
-# end of USB GPIO expanders
-
-#
-# Virtual GPIO drivers
-#
-# CONFIG_GPIO_AGGREGATOR is not set
-# CONFIG_GPIO_MOCKUP is not set
-# end of Virtual GPIO drivers
-
-# CONFIG_W1 is not set
-CONFIG_POWER_RESET=y
-# CONFIG_POWER_RESET_BRCMSTB is not set
-# CONFIG_POWER_RESET_GPIO is not set
-# CONFIG_POWER_RESET_GPIO_RESTART is not set
-# CONFIG_POWER_RESET_LTC2952 is not set
-# CONFIG_POWER_RESET_REGULATOR is not set
-# CONFIG_POWER_RESET_RESTART is not set
-# CONFIG_POWER_RESET_XGENE is not set
-CONFIG_POWER_RESET_SYSCON=y
-CONFIG_POWER_RESET_SYSCON_POWEROFF=y
-# CONFIG_SYSCON_REBOOT_MODE is not set
-# CONFIG_NVMEM_REBOOT_MODE is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_POWER_SUPPLY_HWMON=y
-# CONFIG_PDA_POWER is not set
-# CONFIG_TEST_POWER is not set
-# CONFIG_CHARGER_ADP5061 is not set
-# CONFIG_BATTERY_CW2015 is not set
-# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_DS2781 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_SBS is not set
-# CONFIG_CHARGER_SBS is not set
-# CONFIG_MANAGER_SBS is not set
-# CONFIG_BATTERY_BQ27XXX is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_CHARGER_LP8727 is not set
-# CONFIG_CHARGER_GPIO is not set
-# CONFIG_CHARGER_MANAGER is not set
-# CONFIG_CHARGER_LT3651 is not set
-# CONFIG_CHARGER_LTC4162L is not set
-# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
-# CONFIG_CHARGER_BQ2415X is not set
-# CONFIG_CHARGER_BQ24257 is not set
-# CONFIG_CHARGER_BQ24735 is not set
-# CONFIG_CHARGER_BQ2515X is not set
-# CONFIG_CHARGER_BQ25890 is not set
-# CONFIG_CHARGER_BQ25980 is not set
-# CONFIG_CHARGER_BQ256XX is not set
-# CONFIG_CHARGER_SMB347 is not set
-# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_CHARGER_RT9455 is not set
-# CONFIG_CHARGER_UCS1002 is not set
-# CONFIG_CHARGER_BD99954 is not set
-CONFIG_HWMON=y
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-# CONFIG_SENSORS_AD7314 is not set
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM1177 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADT7310 is not set
-# CONFIG_SENSORS_ADT7410 is not set
-# CONFIG_SENSORS_ADT7411 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_AHT10 is not set
-# CONFIG_SENSORS_AS370 is not set
-# CONFIG_SENSORS_ASC7621 is not set
-# CONFIG_SENSORS_AXI_FAN_CONTROL is not set
-# CONFIG_SENSORS_ASPEED is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_CORSAIR_CPRO is not set
-# CONFIG_SENSORS_CORSAIR_PSU is not set
-# CONFIG_SENSORS_DS620 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_I5K_AMB is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_FTSTEUTATES is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_G762 is not set
-# CONFIG_SENSORS_GPIO_FAN is not set
-# CONFIG_SENSORS_HIH6130 is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_JC42 is not set
-# CONFIG_SENSORS_POWR1220 is not set
-# CONFIG_SENSORS_LINEAGE is not set
-# CONFIG_SENSORS_LTC2945 is not set
-# CONFIG_SENSORS_LTC2947_I2C is not set
-# CONFIG_SENSORS_LTC2947_SPI is not set
-# CONFIG_SENSORS_LTC2990 is not set
-# CONFIG_SENSORS_LTC2992 is not set
-# CONFIG_SENSORS_LTC4151 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4222 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_LTC4260 is not set
-# CONFIG_SENSORS_LTC4261 is not set
-# CONFIG_SENSORS_MAX1111 is not set
-# CONFIG_SENSORS_MAX127 is not set
-# CONFIG_SENSORS_MAX16065 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX1668 is not set
-# CONFIG_SENSORS_MAX197 is not set
-# CONFIG_SENSORS_MAX31722 is not set
-# CONFIG_SENSORS_MAX31730 is not set
-# CONFIG_SENSORS_MAX6621 is not set
-# CONFIG_SENSORS_MAX6639 is not set
-# CONFIG_SENSORS_MAX6642 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_MAX6697 is not set
-# CONFIG_SENSORS_MAX31790 is not set
-# CONFIG_SENSORS_MCP3021 is not set
-# CONFIG_SENSORS_TC654 is not set
-# CONFIG_SENSORS_TPS23861 is not set
-# CONFIG_SENSORS_MR75203 is not set
-# CONFIG_SENSORS_ADCXX is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM70 is not set
-# CONFIG_SENSORS_LM73 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_LM93 is not set
-# CONFIG_SENSORS_LM95234 is not set
-# CONFIG_SENSORS_LM95241 is not set
-# CONFIG_SENSORS_LM95245 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_NTC_THERMISTOR is not set
-# CONFIG_SENSORS_NCT6683 is not set
-# CONFIG_SENSORS_NCT6775 is not set
-# CONFIG_SENSORS_NCT7802 is not set
-# CONFIG_SENSORS_NCT7904 is not set
-# CONFIG_SENSORS_NPCM7XX is not set
-# CONFIG_SENSORS_OCC_P8_I2C is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_PMBUS is not set
-CONFIG_SENSORS_PWM_FAN=y
-# CONFIG_SENSORS_SBTSI is not set
-# CONFIG_SENSORS_SHT15 is not set
-# CONFIG_SENSORS_SHT21 is not set
-# CONFIG_SENSORS_SHT3x is not set
-# CONFIG_SENSORS_SHTC1 is not set
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_EMC1403 is not set
-# CONFIG_SENSORS_EMC2103 is not set
-# CONFIG_SENSORS_EMC6W201 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_SCH5627 is not set
-# CONFIG_SENSORS_SCH5636 is not set
-# CONFIG_SENSORS_STTS751 is not set
-# CONFIG_SENSORS_SMM665 is not set
-# CONFIG_SENSORS_ADC128D818 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_ADS7871 is not set
-# CONFIG_SENSORS_AMC6821 is not set
-# CONFIG_SENSORS_INA209 is not set
-# CONFIG_SENSORS_INA2XX is not set
-# CONFIG_SENSORS_INA3221 is not set
-# CONFIG_SENSORS_TC74 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP102 is not set
-# CONFIG_SENSORS_TMP103 is not set
-# CONFIG_SENSORS_TMP108 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_TMP513 is not set
-# CONFIG_SENSORS_VIA686A is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_VT8231 is not set
-# CONFIG_SENSORS_W83773G is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83795 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
-CONFIG_THERMAL=y
-# CONFIG_THERMAL_NETLINK is not set
-CONFIG_THERMAL_STATISTICS=y
-CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
-CONFIG_THERMAL_HWMON=y
-CONFIG_THERMAL_OF=y
-CONFIG_THERMAL_WRITABLE_TRIPS=y
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-CONFIG_THERMAL_GOV_FAIR_SHARE=y
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_THERMAL_GOV_BANG_BANG=y
-CONFIG_THERMAL_GOV_USER_SPACE=y
-CONFIG_CPU_THERMAL=y
-CONFIG_CPU_FREQ_THERMAL=y
-CONFIG_CPU_IDLE_THERMAL=y
-CONFIG_DEVFREQ_THERMAL=y
-# CONFIG_THERMAL_EMULATION is not set
-CONFIG_THERMAL_MMIO=y
-CONFIG_IMX_THERMAL=y
-# CONFIG_IMX8MM_THERMAL is not set
-CONFIG_QORIQ_THERMAL=y
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
-CONFIG_WATCHDOG_OPEN_TIMEOUT=0
-CONFIG_WATCHDOG_SYSFS=y
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
-
-#
-# Watchdog Device Drivers
-#
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_GPIO_WATCHDOG is not set
-# CONFIG_XILINX_WATCHDOG is not set
-# CONFIG_ZIIRAVE_WATCHDOG is not set
-# CONFIG_ARM_SP805_WATCHDOG is not set
-# CONFIG_ARM_SBSA_WATCHDOG is not set
-# CONFIG_CADENCE_WATCHDOG is not set
-# CONFIG_DW_WATCHDOG is not set
-# CONFIG_MAX63XX_WATCHDOG is not set
-CONFIG_IMX2_WDT=y
-# CONFIG_IMX7ULP_WDT is not set
-# CONFIG_ARM_SMC_WATCHDOG is not set
-# CONFIG_ALIM7101_WDT is not set
-# CONFIG_I6300ESB_WDT is not set
-# CONFIG_MEN_A21_WDT is not set
-# CONFIG_XEN_WDT is not set
-
-#
-# PCI-based Watchdog Cards
-#
-# CONFIG_PCIPCWATCHDOG is not set
-# CONFIG_WDTPCI is not set
-
-#
-# USB-based Watchdog Cards
-#
-# CONFIG_USBPCWATCHDOG is not set
-CONFIG_SSB_POSSIBLE=y
-CONFIG_SSB=y
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-# CONFIG_SSB_SDIOHOST is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-# CONFIG_SSB_DRIVER_GPIO is not set
-CONFIG_BCMA_POSSIBLE=y
-CONFIG_BCMA=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-# CONFIG_BCMA_HOST_PCI is not set
-# CONFIG_BCMA_HOST_SOC is not set
-# CONFIG_BCMA_DRIVER_PCI is not set
-# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
-# CONFIG_BCMA_DRIVER_GPIO is not set
-# CONFIG_BCMA_DEBUG is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=y
-# CONFIG_MFD_ACT8945A is not set
-# CONFIG_MFD_AS3711 is not set
-# CONFIG_MFD_AS3722 is not set
-# CONFIG_PMIC_ADP5520 is not set
-# CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_ATMEL_FLEXCOM is not set
-# CONFIG_MFD_ATMEL_HLCDC is not set
-# CONFIG_MFD_BCM590XX is not set
-# CONFIG_MFD_BD9571MWV is not set
-# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_MADERA is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_MFD_DA9052_SPI is not set
-# CONFIG_MFD_DA9052_I2C is not set
-# CONFIG_MFD_DA9055 is not set
-# CONFIG_MFD_DA9062 is not set
-# CONFIG_MFD_DA9063 is not set
-# CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
-# CONFIG_MFD_GATEWORKS_GSC is not set
-# CONFIG_MFD_MC13XXX_SPI is not set
-# CONFIG_MFD_MC13XXX_I2C is not set
-# CONFIG_MFD_MP2629 is not set
-# CONFIG_MFD_HI6421_PMIC is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_HTC_I2CPLD is not set
-# CONFIG_LPC_ICH is not set
-# CONFIG_LPC_SCH is not set
-# CONFIG_MFD_INTEL_PMT is not set
-# CONFIG_MFD_IQS62X is not set
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_88PM800 is not set
-# CONFIG_MFD_88PM805 is not set
-# CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_MAX77620 is not set
-# CONFIG_MFD_MAX77650 is not set
-# CONFIG_MFD_MAX77686 is not set
-# CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX77843 is not set
-# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_MAX8925 is not set
-# CONFIG_MFD_MAX8997 is not set
-# CONFIG_MFD_MAX8998 is not set
-# CONFIG_MFD_MT6360 is not set
-# CONFIG_MFD_MT6397 is not set
-# CONFIG_MFD_MENF21BMC is not set
-# CONFIG_EZX_PCAP is not set
-# CONFIG_MFD_CPCAP is not set
-# CONFIG_MFD_VIPERBOARD is not set
-# CONFIG_MFD_RETU is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_UCB1400_CORE is not set
-# CONFIG_MFD_RDC321X is not set
-# CONFIG_MFD_RT5033 is not set
-# CONFIG_MFD_RC5T583 is not set
-# CONFIG_MFD_RK808 is not set
-# CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_SEC_CORE is not set
-# CONFIG_MFD_SI476X_CORE is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_SKY81452 is not set
-# CONFIG_ABX500_CORE is not set
-# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SYSCON=y
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
-# CONFIG_MFD_LP3943 is not set
-# CONFIG_MFD_LP8788 is not set
-# CONFIG_MFD_TI_LMU is not set
-# CONFIG_MFD_PALMAS is not set
-# CONFIG_TPS6105X is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TPS6507X is not set
-# CONFIG_MFD_TPS65086 is not set
-# CONFIG_MFD_TPS65090 is not set
-# CONFIG_MFD_TPS65217 is not set
-# CONFIG_MFD_TI_LP873X is not set
-# CONFIG_MFD_TI_LP87565 is not set
-# CONFIG_MFD_TPS65218 is not set
-# CONFIG_MFD_TPS6586X is not set
-# CONFIG_MFD_TPS65910 is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_TPS65912_SPI is not set
-# CONFIG_MFD_TPS80031 is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_TWL6040_CORE is not set
-# CONFIG_MFD_WL1273_CORE is not set
-# CONFIG_MFD_LM3533 is not set
-# CONFIG_MFD_TC3589X is not set
-# CONFIG_MFD_TQMX86 is not set
-# CONFIG_MFD_VX855 is not set
-# CONFIG_MFD_LOCHNAGAR is not set
-# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_ARIZONA_SPI is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MFD_WM831X_I2C is not set
-# CONFIG_MFD_WM831X_SPI is not set
-# CONFIG_MFD_WM8350_I2C is not set
-CONFIG_MFD_WM8994=y
-# CONFIG_MFD_ROHM_BD718XX is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
-# CONFIG_MFD_ROHM_BD71828 is not set
-# CONFIG_MFD_STPMIC1 is not set
-# CONFIG_MFD_STMFX is not set
-# CONFIG_RAVE_SP_CORE is not set
-# CONFIG_MFD_INTEL_M10_BMC is not set
-# end of Multifunction device drivers
-
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_DEBUG=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
-CONFIG_REGULATOR_USERSPACE_CONSUMER=y
-# CONFIG_REGULATOR_88PG86X is not set
-# CONFIG_REGULATOR_ACT8865 is not set
-# CONFIG_REGULATOR_AD5398 is not set
-CONFIG_REGULATOR_ANATOP=y
-# CONFIG_REGULATOR_DA9121 is not set
-# CONFIG_REGULATOR_DA9210 is not set
-# CONFIG_REGULATOR_DA9211 is not set
-CONFIG_REGULATOR_FAN53555=y
-# CONFIG_REGULATOR_FAN53880 is not set
-CONFIG_REGULATOR_GPIO=y
-# CONFIG_REGULATOR_ISL9305 is not set
-# CONFIG_REGULATOR_ISL6271A is not set
-# CONFIG_REGULATOR_LP3971 is not set
-# CONFIG_REGULATOR_LP3972 is not set
-# CONFIG_REGULATOR_LP872X is not set
-# CONFIG_REGULATOR_LP8755 is not set
-# CONFIG_REGULATOR_LTC3589 is not set
-# CONFIG_REGULATOR_LTC3676 is not set
-# CONFIG_REGULATOR_MAX1586 is not set
-# CONFIG_REGULATOR_MAX8649 is not set
-# CONFIG_REGULATOR_MAX8660 is not set
-# CONFIG_REGULATOR_MAX8952 is not set
-# CONFIG_REGULATOR_MAX8973 is not set
-# CONFIG_REGULATOR_MAX77826 is not set
-# CONFIG_REGULATOR_MCP16502 is not set
-# CONFIG_REGULATOR_MP5416 is not set
-# CONFIG_REGULATOR_MP8859 is not set
-# CONFIG_REGULATOR_MP886X is not set
-# CONFIG_REGULATOR_MPQ7920 is not set
-# CONFIG_REGULATOR_MT6311 is not set
-# CONFIG_REGULATOR_PCA9450 is not set
-# CONFIG_REGULATOR_PF8X00 is not set
-CONFIG_REGULATOR_PFUZE100=y
-# CONFIG_REGULATOR_PV88060 is not set
-# CONFIG_REGULATOR_PV88080 is not set
-# CONFIG_REGULATOR_PV88090 is not set
-CONFIG_REGULATOR_PWM=y
-# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
-# CONFIG_REGULATOR_RT4801 is not set
-# CONFIG_REGULATOR_RTMV20 is not set
-# CONFIG_REGULATOR_SLG51000 is not set
-# CONFIG_REGULATOR_SY8106A is not set
-# CONFIG_REGULATOR_SY8824X is not set
-# CONFIG_REGULATOR_SY8827N is not set
-# CONFIG_REGULATOR_TPS51632 is not set
-# CONFIG_REGULATOR_TPS62360 is not set
-# CONFIG_REGULATOR_TPS65023 is not set
-# CONFIG_REGULATOR_TPS6507X is not set
-# CONFIG_REGULATOR_TPS65132 is not set
-# CONFIG_REGULATOR_TPS6524X is not set
-CONFIG_REGULATOR_VCTRL=y
-# CONFIG_REGULATOR_WM8994 is not set
-# CONFIG_RC_CORE is not set
-CONFIG_CEC_CORE=y
-CONFIG_CEC_NOTIFIER=y
-CONFIG_MEDIA_CEC_SUPPORT=y
-# CONFIG_CEC_CH7322 is not set
-# CONFIG_CEC_GPIO is not set
-# CONFIG_USB_PULSE8_CEC is not set
-# CONFIG_USB_RAINSHADOW_CEC is not set
-CONFIG_MEDIA_SUPPORT=y
-# CONFIG_MEDIA_SUPPORT_FILTER is not set
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-
-#
-# Media device types
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_RADIO_SUPPORT=y
-CONFIG_MEDIA_SDR_SUPPORT=y
-CONFIG_MEDIA_PLATFORM_SUPPORT=y
-CONFIG_MEDIA_TEST_SUPPORT=y
-# end of Media device types
-
-#
-# Media core support
-#
-CONFIG_VIDEO_DEV=y
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_DVB_CORE=y
-# end of Media core support
-
-#
-# Video4Linux options
-#
-CONFIG_VIDEO_V4L2=y
-CONFIG_VIDEO_V4L2_I2C=y
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_V4L2_H264=y
-CONFIG_V4L2_MEM2MEM_DEV=y
-# end of Video4Linux options
-
-#
-# Media controller options
-#
-# CONFIG_MEDIA_CONTROLLER_DVB is not set
-CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
-
-#
-# Please notice that the enabled Media controller Request API is EXPERIMENTAL
-#
-# end of Media controller options
-
-#
-# Digital TV options
-#
-# CONFIG_DVB_MMAP is not set
-CONFIG_DVB_NET=y
-CONFIG_DVB_MAX_ADAPTERS=16
-CONFIG_DVB_DYNAMIC_MINORS=y
-# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
-# CONFIG_DVB_ULE_DEBUG is not set
-# end of Digital TV options
-
-#
-# Media drivers
-#
-CONFIG_MEDIA_USB_SUPPORT=y
-
-#
-# Webcam devices
-#
-CONFIG_USB_VIDEO_CLASS=y
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=y
-# CONFIG_USB_M5602 is not set
-# CONFIG_USB_STV06XX is not set
-# CONFIG_USB_GL860 is not set
-# CONFIG_USB_GSPCA_BENQ is not set
-# CONFIG_USB_GSPCA_CONEX is not set
-# CONFIG_USB_GSPCA_CPIA1 is not set
-# CONFIG_USB_GSPCA_DTCS033 is not set
-# CONFIG_USB_GSPCA_ETOMS is not set
-# CONFIG_USB_GSPCA_FINEPIX is not set
-# CONFIG_USB_GSPCA_JEILINJ is not set
-# CONFIG_USB_GSPCA_JL2005BCD is not set
-# CONFIG_USB_GSPCA_KINECT is not set
-# CONFIG_USB_GSPCA_KONICA is not set
-# CONFIG_USB_GSPCA_MARS is not set
-# CONFIG_USB_GSPCA_MR97310A is not set
-# CONFIG_USB_GSPCA_NW80X is not set
-# CONFIG_USB_GSPCA_OV519 is not set
-# CONFIG_USB_GSPCA_OV534 is not set
-# CONFIG_USB_GSPCA_OV534_9 is not set
-# CONFIG_USB_GSPCA_PAC207 is not set
-# CONFIG_USB_GSPCA_PAC7302 is not set
-# CONFIG_USB_GSPCA_PAC7311 is not set
-# CONFIG_USB_GSPCA_SE401 is not set
-# CONFIG_USB_GSPCA_SN9C2028 is not set
-# CONFIG_USB_GSPCA_SN9C20X is not set
-# CONFIG_USB_GSPCA_SONIXB is not set
-# CONFIG_USB_GSPCA_SONIXJ is not set
-# CONFIG_USB_GSPCA_SPCA500 is not set
-# CONFIG_USB_GSPCA_SPCA501 is not set
-# CONFIG_USB_GSPCA_SPCA505 is not set
-# CONFIG_USB_GSPCA_SPCA506 is not set
-# CONFIG_USB_GSPCA_SPCA508 is not set
-# CONFIG_USB_GSPCA_SPCA561 is not set
-# CONFIG_USB_GSPCA_SPCA1528 is not set
-# CONFIG_USB_GSPCA_SQ905 is not set
-# CONFIG_USB_GSPCA_SQ905C is not set
-# CONFIG_USB_GSPCA_SQ930X is not set
-# CONFIG_USB_GSPCA_STK014 is not set
-CONFIG_USB_GSPCA_STK1135=y
-# CONFIG_USB_GSPCA_STV0680 is not set
-# CONFIG_USB_GSPCA_SUNPLUS is not set
-# CONFIG_USB_GSPCA_T613 is not set
-# CONFIG_USB_GSPCA_TOPRO is not set
-# CONFIG_USB_GSPCA_TOUPTEK is not set
-# CONFIG_USB_GSPCA_TV8532 is not set
-# CONFIG_USB_GSPCA_VC032X is not set
-# CONFIG_USB_GSPCA_VICAM is not set
-# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
-# CONFIG_USB_GSPCA_ZC3XX is not set
-# CONFIG_USB_PWC is not set
-# CONFIG_VIDEO_CPIA2 is not set
-# CONFIG_USB_ZR364XX is not set
-# CONFIG_USB_STKWEBCAM is not set
-# CONFIG_USB_S2255 is not set
-# CONFIG_VIDEO_USBTV is not set
-
-#
-# Analog TV USB devices
-#
-# CONFIG_VIDEO_PVRUSB2 is not set
-# CONFIG_VIDEO_HDPVR is not set
-# CONFIG_VIDEO_STK1160_COMMON is not set
-# CONFIG_VIDEO_GO7007 is not set
-
-#
-# Analog/digital TV USB devices
-#
-# CONFIG_VIDEO_AU0828 is not set
-# CONFIG_VIDEO_CX231XX is not set
-
-#
-# Digital TV USB devices
-#
-# CONFIG_DVB_USB_V2 is not set
-# CONFIG_DVB_TTUSB_BUDGET is not set
-# CONFIG_DVB_TTUSB_DEC is not set
-# CONFIG_SMS_USB_DRV is not set
-# CONFIG_DVB_B2C2_FLEXCOP_USB is not set
-# CONFIG_DVB_AS102 is not set
-
-#
-# Webcam, TV (analog/digital) USB devices
-#
-# CONFIG_VIDEO_EM28XX is not set
-
-#
-# Software defined radio USB devices
-#
-# CONFIG_USB_AIRSPY is not set
-# CONFIG_USB_HACKRF is not set
-# CONFIG_USB_MSI2500 is not set
-# CONFIG_MEDIA_PCI_SUPPORT is not set
-CONFIG_RADIO_ADAPTERS=y
-# CONFIG_RADIO_SI470X is not set
-# CONFIG_RADIO_SI4713 is not set
-# CONFIG_USB_MR800 is not set
-# CONFIG_USB_DSBR is not set
-# CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_RADIO_SHARK is not set
-# CONFIG_RADIO_SHARK2 is not set
-# CONFIG_USB_KEENE is not set
-# CONFIG_USB_RAREMONO is not set
-# CONFIG_USB_MA901 is not set
-# CONFIG_RADIO_TEA5764 is not set
-# CONFIG_RADIO_SAA7706H is not set
-# CONFIG_RADIO_TEF6862 is not set
-# CONFIG_RADIO_WL1273 is not set
-CONFIG_VIDEOBUF2_CORE=y
-CONFIG_VIDEOBUF2_V4L2=y
-CONFIG_VIDEOBUF2_MEMOPS=y
-CONFIG_VIDEOBUF2_DMA_CONTIG=y
-CONFIG_VIDEOBUF2_VMALLOC=y
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-# CONFIG_VIDEO_CODA is not set
-# CONFIG_VIDEO_IMX_PXP is not set
-# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
-# CONFIG_DVB_PLATFORM_DRIVERS is not set
-# CONFIG_SDR_PLATFORM_DRIVERS is not set
-
-#
-# MMC/SDIO DVB adapters
-#
-# CONFIG_SMS_SDIO_DRV is not set
-# CONFIG_V4L_TEST_DRIVERS is not set
-# CONFIG_DVB_TEST_DRIVERS is not set
-# end of Media drivers
-
-#
-# Media ancillary drivers
-#
-CONFIG_MEDIA_ATTACH=y
-
-#
-# Audio decoders, processors and mixers
-#
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TDA1997X is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-# CONFIG_VIDEO_MSP3400 is not set
-# CONFIG_VIDEO_CS3308 is not set
-# CONFIG_VIDEO_CS5345 is not set
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_UDA1342 is not set
-# CONFIG_VIDEO_WM8775 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_VP27SMPX is not set
-# CONFIG_VIDEO_SONY_BTF_MPX is not set
-# end of Audio decoders, processors and mixers
-
-#
-# RDS decoders
-#
-# CONFIG_VIDEO_SAA6588 is not set
-# end of RDS decoders
-
-#
-# Video decoders
-#
-# CONFIG_VIDEO_ADV7180 is not set
-# CONFIG_VIDEO_ADV7183 is not set
-# CONFIG_VIDEO_ADV748X is not set
-# CONFIG_VIDEO_ADV7604 is not set
-# CONFIG_VIDEO_ADV7842 is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_ML86V7667 is not set
-# CONFIG_VIDEO_SAA7110 is not set
-# CONFIG_VIDEO_SAA711X is not set
-# CONFIG_VIDEO_TC358743 is not set
-# CONFIG_VIDEO_TVP514X is not set
-# CONFIG_VIDEO_TVP5150 is not set
-# CONFIG_VIDEO_TVP7002 is not set
-# CONFIG_VIDEO_TW2804 is not set
-# CONFIG_VIDEO_TW9903 is not set
-# CONFIG_VIDEO_TW9906 is not set
-# CONFIG_VIDEO_TW9910 is not set
-# CONFIG_VIDEO_VPX3220 is not set
-# CONFIG_VIDEO_MAX9286 is not set
-
-#
-# Video and audio decoders
-#
-# CONFIG_VIDEO_SAA717X is not set
-# CONFIG_VIDEO_CX25840 is not set
-# end of Video decoders
-
-#
-# Video encoders
-#
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_ADV7393 is not set
-# CONFIG_VIDEO_ADV7511 is not set
-# CONFIG_VIDEO_AD9389B is not set
-# CONFIG_VIDEO_AK881X is not set
-# CONFIG_VIDEO_THS8200 is not set
-# end of Video encoders
-
-#
-# Video improvement chips
-#
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-# end of Video improvement chips
-
-#
-# Audio/Video compression chips
-#
-# CONFIG_VIDEO_SAA6752HS is not set
-# end of Audio/Video compression chips
-
-#
-# SDR tuner chips
-#
-# CONFIG_SDR_MAX2175 is not set
-# end of SDR tuner chips
-
-#
-# Miscellaneous helper chips
-#
-# CONFIG_VIDEO_THS7303 is not set
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_I2C is not set
-# CONFIG_VIDEO_ST_MIPID02 is not set
-# end of Miscellaneous helper chips
-
-#
-# Camera sensor devices
-#
-# CONFIG_VIDEO_HI556 is not set
-# CONFIG_VIDEO_IMX214 is not set
-# CONFIG_VIDEO_IMX219 is not set
-# CONFIG_VIDEO_IMX258 is not set
-# CONFIG_VIDEO_IMX274 is not set
-# CONFIG_VIDEO_IMX290 is not set
-# CONFIG_VIDEO_IMX319 is not set
-# CONFIG_VIDEO_IMX334 is not set
-# CONFIG_VIDEO_IMX355 is not set
-# CONFIG_VIDEO_OV02A10 is not set
-# CONFIG_VIDEO_OV2640 is not set
-# CONFIG_VIDEO_OV2659 is not set
-# CONFIG_VIDEO_OV2680 is not set
-# CONFIG_VIDEO_OV2685 is not set
-# CONFIG_VIDEO_OV5640 is not set
-# CONFIG_VIDEO_OV5645 is not set
-# CONFIG_VIDEO_OV5647 is not set
-# CONFIG_VIDEO_OV5648 is not set
-# CONFIG_VIDEO_OV6650 is not set
-# CONFIG_VIDEO_OV5670 is not set
-# CONFIG_VIDEO_OV5675 is not set
-# CONFIG_VIDEO_OV5695 is not set
-# CONFIG_VIDEO_OV7251 is not set
-# CONFIG_VIDEO_OV772X is not set
-# CONFIG_VIDEO_OV7640 is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OV7740 is not set
-# CONFIG_VIDEO_OV8856 is not set
-# CONFIG_VIDEO_OV8865 is not set
-# CONFIG_VIDEO_OV9640 is not set
-# CONFIG_VIDEO_OV9650 is not set
-# CONFIG_VIDEO_OV13858 is not set
-# CONFIG_VIDEO_VS6624 is not set
-# CONFIG_VIDEO_MT9M001 is not set
-# CONFIG_VIDEO_MT9M032 is not set
-# CONFIG_VIDEO_MT9M111 is not set
-# CONFIG_VIDEO_MT9P031 is not set
-# CONFIG_VIDEO_MT9T001 is not set
-# CONFIG_VIDEO_MT9T112 is not set
-# CONFIG_VIDEO_MT9V011 is not set
-# CONFIG_VIDEO_MT9V032 is not set
-# CONFIG_VIDEO_MT9V111 is not set
-# CONFIG_VIDEO_SR030PC30 is not set
-# CONFIG_VIDEO_NOON010PC30 is not set
-# CONFIG_VIDEO_M5MOLS is not set
-# CONFIG_VIDEO_RDACM20 is not set
-# CONFIG_VIDEO_RDACM21 is not set
-# CONFIG_VIDEO_RJ54N1 is not set
-# CONFIG_VIDEO_S5K6AA is not set
-# CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_S5K4ECGX is not set
-# CONFIG_VIDEO_S5K5BAF is not set
-# CONFIG_VIDEO_CCS is not set
-# CONFIG_VIDEO_ET8EK8 is not set
-# CONFIG_VIDEO_S5C73M3 is not set
-# end of Camera sensor devices
-
-#
-# Lens drivers
-#
-# CONFIG_VIDEO_AD5820 is not set
-# CONFIG_VIDEO_AK7375 is not set
-# CONFIG_VIDEO_DW9714 is not set
-# CONFIG_VIDEO_DW9768 is not set
-# CONFIG_VIDEO_DW9807_VCM is not set
-# end of Lens drivers
-
-#
-# Flash devices
-#
-# CONFIG_VIDEO_ADP1653 is not set
-# CONFIG_VIDEO_LM3560 is not set
-# CONFIG_VIDEO_LM3646 is not set
-# end of Flash devices
-
-#
-# SPI helper chips
-#
-# CONFIG_VIDEO_GS1662 is not set
-# end of SPI helper chips
-
-#
-# Media SPI Adapters
-#
-# CONFIG_CXD2880_SPI_DRV is not set
-# end of Media SPI Adapters
-
-CONFIG_MEDIA_TUNER=y
-
-#
-# Customize TV tuners
-#
-CONFIG_MEDIA_TUNER_SIMPLE=y
-# CONFIG_MEDIA_TUNER_TDA18250 is not set
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-# CONFIG_MEDIA_TUNER_MSI001 is not set
-CONFIG_MEDIA_TUNER_MT20XX=y
-# CONFIG_MEDIA_TUNER_MT2060 is not set
-# CONFIG_MEDIA_TUNER_MT2063 is not set
-# CONFIG_MEDIA_TUNER_MT2266 is not set
-# CONFIG_MEDIA_TUNER_MT2131 is not set
-# CONFIG_MEDIA_TUNER_QT1010 is not set
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
-# CONFIG_MEDIA_TUNER_MXL5005S is not set
-# CONFIG_MEDIA_TUNER_MXL5007T is not set
-CONFIG_MEDIA_TUNER_MC44S803=y
-# CONFIG_MEDIA_TUNER_MAX2165 is not set
-# CONFIG_MEDIA_TUNER_TDA18218 is not set
-# CONFIG_MEDIA_TUNER_FC0011 is not set
-# CONFIG_MEDIA_TUNER_FC0012 is not set
-# CONFIG_MEDIA_TUNER_FC0013 is not set
-# CONFIG_MEDIA_TUNER_TDA18212 is not set
-# CONFIG_MEDIA_TUNER_E4000 is not set
-# CONFIG_MEDIA_TUNER_FC2580 is not set
-# CONFIG_MEDIA_TUNER_M88RS6000T is not set
-# CONFIG_MEDIA_TUNER_TUA9001 is not set
-# CONFIG_MEDIA_TUNER_SI2157 is not set
-# CONFIG_MEDIA_TUNER_IT913X is not set
-# CONFIG_MEDIA_TUNER_R820T is not set
-# CONFIG_MEDIA_TUNER_MXL301RF is not set
-# CONFIG_MEDIA_TUNER_QM1D1C0042 is not set
-# CONFIG_MEDIA_TUNER_QM1D1B0004 is not set
-# end of Customize TV tuners
-
-#
-# Customise DVB Frontends
-#
-
-#
-# Multistandard (satellite) frontends
-#
-# CONFIG_DVB_STB0899 is not set
-# CONFIG_DVB_STB6100 is not set
-# CONFIG_DVB_STV090x is not set
-# CONFIG_DVB_STV0910 is not set
-# CONFIG_DVB_STV6110x is not set
-# CONFIG_DVB_STV6111 is not set
-# CONFIG_DVB_MXL5XX is not set
-# CONFIG_DVB_M88DS3103 is not set
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-# CONFIG_DVB_DRXK is not set
-# CONFIG_DVB_TDA18271C2DD is not set
-# CONFIG_DVB_SI2165 is not set
-# CONFIG_DVB_MN88472 is not set
-# CONFIG_DVB_MN88473 is not set
-
-#
-# DVB-S (satellite) frontends
-#
-# CONFIG_DVB_CX24110 is not set
-# CONFIG_DVB_CX24123 is not set
-# CONFIG_DVB_MT312 is not set
-# CONFIG_DVB_ZL10036 is not set
-# CONFIG_DVB_ZL10039 is not set
-# CONFIG_DVB_S5H1420 is not set
-# CONFIG_DVB_STV0288 is not set
-# CONFIG_DVB_STB6000 is not set
-# CONFIG_DVB_STV0299 is not set
-# CONFIG_DVB_STV6110 is not set
-# CONFIG_DVB_STV0900 is not set
-# CONFIG_DVB_TDA8083 is not set
-# CONFIG_DVB_TDA10086 is not set
-# CONFIG_DVB_TDA8261 is not set
-# CONFIG_DVB_VES1X93 is not set
-# CONFIG_DVB_TUNER_ITD1000 is not set
-# CONFIG_DVB_TUNER_CX24113 is not set
-# CONFIG_DVB_TDA826X is not set
-# CONFIG_DVB_TUA6100 is not set
-# CONFIG_DVB_CX24116 is not set
-# CONFIG_DVB_CX24117 is not set
-# CONFIG_DVB_CX24120 is not set
-# CONFIG_DVB_SI21XX is not set
-# CONFIG_DVB_TS2020 is not set
-# CONFIG_DVB_DS3000 is not set
-# CONFIG_DVB_MB86A16 is not set
-# CONFIG_DVB_TDA10071 is not set
-
-#
-# DVB-T (terrestrial) frontends
-#
-# CONFIG_DVB_SP8870 is not set
-# CONFIG_DVB_SP887X is not set
-# CONFIG_DVB_CX22700 is not set
-# CONFIG_DVB_CX22702 is not set
-# CONFIG_DVB_S5H1432 is not set
-# CONFIG_DVB_DRXD is not set
-# CONFIG_DVB_L64781 is not set
-# CONFIG_DVB_TDA1004X is not set
-# CONFIG_DVB_NXT6000 is not set
-# CONFIG_DVB_MT352 is not set
-# CONFIG_DVB_ZL10353 is not set
-# CONFIG_DVB_DIB3000MB is not set
-# CONFIG_DVB_DIB3000MC is not set
-# CONFIG_DVB_DIB7000M is not set
-# CONFIG_DVB_DIB7000P is not set
-# CONFIG_DVB_DIB9000 is not set
-# CONFIG_DVB_TDA10048 is not set
-# CONFIG_DVB_AF9013 is not set
-# CONFIG_DVB_EC100 is not set
-# CONFIG_DVB_STV0367 is not set
-# CONFIG_DVB_CXD2820R is not set
-# CONFIG_DVB_CXD2841ER is not set
-# CONFIG_DVB_RTL2830 is not set
-# CONFIG_DVB_RTL2832 is not set
-# CONFIG_DVB_RTL2832_SDR is not set
-# CONFIG_DVB_SI2168 is not set
-# CONFIG_DVB_ZD1301_DEMOD is not set
-# CONFIG_DVB_CXD2880 is not set
-
-#
-# DVB-C (cable) frontends
-#
-# CONFIG_DVB_VES1820 is not set
-# CONFIG_DVB_TDA10021 is not set
-# CONFIG_DVB_TDA10023 is not set
-# CONFIG_DVB_STV0297 is not set
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-# CONFIG_DVB_NXT200X is not set
-# CONFIG_DVB_OR51211 is not set
-# CONFIG_DVB_OR51132 is not set
-# CONFIG_DVB_BCM3510 is not set
-# CONFIG_DVB_LGDT330X is not set
-# CONFIG_DVB_LGDT3305 is not set
-# CONFIG_DVB_LGDT3306A is not set
-# CONFIG_DVB_LG2160 is not set
-# CONFIG_DVB_S5H1409 is not set
-# CONFIG_DVB_AU8522_DTV is not set
-# CONFIG_DVB_AU8522_V4L is not set
-# CONFIG_DVB_S5H1411 is not set
-# CONFIG_DVB_MXL692 is not set
-
-#
-# ISDB-T (terrestrial) frontends
-#
-# CONFIG_DVB_S921 is not set
-# CONFIG_DVB_DIB8000 is not set
-# CONFIG_DVB_MB86A20S is not set
-
-#
-# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
-#
-# CONFIG_DVB_TC90522 is not set
-# CONFIG_DVB_MN88443X is not set
-
-#
-# Digital terrestrial only tuners/PLL
-#
-# CONFIG_DVB_PLL is not set
-# CONFIG_DVB_TUNER_DIB0070 is not set
-# CONFIG_DVB_TUNER_DIB0090 is not set
-
-#
-# SEC control devices for DVB-S
-#
-# CONFIG_DVB_DRX39XYJ is not set
-# CONFIG_DVB_LNBH25 is not set
-# CONFIG_DVB_LNBH29 is not set
-# CONFIG_DVB_LNBP21 is not set
-# CONFIG_DVB_LNBP22 is not set
-# CONFIG_DVB_ISL6405 is not set
-# CONFIG_DVB_ISL6421 is not set
-# CONFIG_DVB_ISL6423 is not set
-# CONFIG_DVB_A8293 is not set
-# CONFIG_DVB_LGS8GL5 is not set
-# CONFIG_DVB_LGS8GXX is not set
-# CONFIG_DVB_ATBM8830 is not set
-# CONFIG_DVB_TDA665x is not set
-# CONFIG_DVB_IX2505V is not set
-# CONFIG_DVB_M88RS2000 is not set
-# CONFIG_DVB_AF9033 is not set
-# CONFIG_DVB_HORUS3A is not set
-# CONFIG_DVB_ASCOT2E is not set
-# CONFIG_DVB_HELENE is not set
-
-#
-# Common Interface (EN50221) controller drivers
-#
-# CONFIG_DVB_CXD2099 is not set
-# CONFIG_DVB_SP2 is not set
-# end of Customise DVB Frontends
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
-# end of Media ancillary drivers
-
-#
-# Graphics support
-#
-# CONFIG_VGA_ARB is not set
-CONFIG_DRM=y
-CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_DP_AUX_CHARDEV=y
-# CONFIG_DRM_DEBUG_MM is not set
-# CONFIG_DRM_DEBUG_SELFTEST is not set
-CONFIG_DRM_KMS_HELPER=y
-CONFIG_DRM_KMS_FB_HELPER=y
-# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
-CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-# CONFIG_DRM_DP_CEC is not set
-CONFIG_DRM_GEM_CMA_HELPER=y
-CONFIG_DRM_KMS_CMA_HELPER=y
-CONFIG_DRM_GEM_SHMEM_HELPER=y
-CONFIG_DRM_SCHED=y
-
-#
-# I2C encoder or helper chips
-#
-# CONFIG_DRM_I2C_CH7006 is not set
-# CONFIG_DRM_I2C_SIL164 is not set
-# CONFIG_DRM_I2C_NXP_TDA998X is not set
-# CONFIG_DRM_I2C_NXP_TDA9950 is not set
-# end of I2C encoder or helper chips
-
-#
-# ARM devices
-#
-# CONFIG_DRM_HDLCD is not set
-# CONFIG_DRM_MALI_DISPLAY is not set
-# CONFIG_DRM_KOMEDA is not set
-# end of ARM devices
-
-# CONFIG_DRM_RADEON is not set
-# CONFIG_DRM_AMDGPU is not set
-# CONFIG_DRM_NOUVEAU is not set
-# CONFIG_DRM_VGEM is not set
-# CONFIG_DRM_VKMS is not set
-# CONFIG_DRM_UDL is not set
-# CONFIG_DRM_AST is not set
-# CONFIG_DRM_MGAG200 is not set
-# CONFIG_DRM_RCAR_DW_HDMI is not set
-# CONFIG_DRM_RCAR_LVDS is not set
-# CONFIG_DRM_QXL is not set
-# CONFIG_DRM_BOCHS is not set
-CONFIG_DRM_VIRTIO_GPU=y
-CONFIG_DRM_PANEL=y
-
-#
-# Display Panels
-#
-# CONFIG_DRM_PANEL_ABT_Y030XX067A is not set
-# CONFIG_DRM_PANEL_ARM_VERSATILE is not set
-# CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
-# CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
-# CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set
-# CONFIG_DRM_PANEL_DSI_CM is not set
-CONFIG_DRM_PANEL_LVDS=y
-CONFIG_DRM_PANEL_SIMPLE=y
-# CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set
-# CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set
-# CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
-# CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
-# CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
-# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
-# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
-# CONFIG_DRM_PANEL_KHADAS_TS050 is not set
-# CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
-# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
-# CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
-# CONFIG_DRM_PANEL_LG_LB035Q02 is not set
-# CONFIG_DRM_PANEL_LG_LG4573 is not set
-# CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
-# CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
-# CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
-# CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
-# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
-# CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
-# CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set
-# CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
-# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
-# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
-# CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
-# CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
-# CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_SOFEF00 is not set
-# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
-# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
-# CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set
-# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
-# CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
-# CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
-# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
-# CONFIG_DRM_PANEL_SONY_ACX424AKP is not set
-# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
-# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
-# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
-# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
-# CONFIG_DRM_PANEL_TPO_TPG110 is not set
-# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
-# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
-# CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
-# end of Display Panels
-
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_PANEL_BRIDGE=y
-
-#
-# Display Interface Bridges
-#
-# CONFIG_DRM_CDNS_DSI is not set
-# CONFIG_DRM_CHRONTEL_CH7033 is not set
-CONFIG_DRM_DISPLAY_CONNECTOR=y
-# CONFIG_DRM_LONTIUM_LT9611 is not set
-# CONFIG_DRM_LONTIUM_LT9611UXC is not set
-CONFIG_DRM_LVDS_CODEC=y
-# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
-CONFIG_DRM_NWL_MIPI_DSI=y
-# CONFIG_DRM_NXP_PTN3460 is not set
-# CONFIG_DRM_PARADE_PS8622 is not set
-# CONFIG_DRM_PARADE_PS8640 is not set
-# CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SII902X is not set
-# CONFIG_DRM_SII9234 is not set
-CONFIG_DRM_SIMPLE_BRIDGE=y
-# CONFIG_DRM_THINE_THC63LVD1024 is not set
-# CONFIG_DRM_TOSHIBA_TC358762 is not set
-# CONFIG_DRM_TOSHIBA_TC358764 is not set
-# CONFIG_DRM_TOSHIBA_TC358767 is not set
-# CONFIG_DRM_TOSHIBA_TC358768 is not set
-# CONFIG_DRM_TOSHIBA_TC358775 is not set
-# CONFIG_DRM_TI_TFP410 is not set
-CONFIG_DRM_TI_SN65DSI86=y
-# CONFIG_DRM_TI_TPD12S015 is not set
-# CONFIG_DRM_ANALOGIX_ANX6345 is not set
-# CONFIG_DRM_ANALOGIX_ANX78XX is not set
-# CONFIG_DRM_ANALOGIX_ANX7625 is not set
-# CONFIG_DRM_I2C_ADV7511 is not set
-CONFIG_DRM_CDNS_MHDP8546=y
-CONFIG_DRM_CDNS_MHDP=y
-CONFIG_DRM_CDNS_HDMI=y
-CONFIG_DRM_CDNS_DP=y
-CONFIG_DRM_CDNS_AUDIO=y
-CONFIG_DRM_CDNS_HDMI_CEC=y
-# end of Display Interface Bridges
-
-CONFIG_DRM_IMX_CDNS_MHDP=y
-CONFIG_DRM_IMX_DCSS=y
-CONFIG_DRM_ETNAVIV=y
-CONFIG_DRM_ETNAVIV_THERMAL=y
-# CONFIG_DRM_ARCPGU is not set
-# CONFIG_DRM_HISI_HIBMC is not set
-# CONFIG_DRM_HISI_KIRIN is not set
-CONFIG_DRM_MXS=y
-CONFIG_DRM_MXSFB=y
-# CONFIG_DRM_CIRRUS_QEMU is not set
-# CONFIG_DRM_GM12U320 is not set
-# CONFIG_TINYDRM_HX8357D is not set
-# CONFIG_TINYDRM_ILI9225 is not set
-# CONFIG_TINYDRM_ILI9341 is not set
-# CONFIG_TINYDRM_ILI9486 is not set
-# CONFIG_TINYDRM_MI0283QT is not set
-# CONFIG_TINYDRM_REPAPER is not set
-# CONFIG_TINYDRM_ST7586 is not set
-# CONFIG_TINYDRM_ST7735R is not set
-# CONFIG_DRM_PL111 is not set
-# CONFIG_DRM_XEN is not set
-# CONFIG_DRM_LIMA is not set
-# CONFIG_DRM_PANFROST is not set
-# CONFIG_DRM_TIDSS is not set
-# CONFIG_DRM_LEGACY is not set
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
-
-#
-# Frame buffer Devices
-#
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_NOTIFY=y
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SYS_FILLRECT=y
-CONFIG_FB_SYS_COPYAREA=y
-CONFIG_FB_SYS_IMAGEBLIT=y
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=y
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_ARMCLCD is not set
-# CONFIG_FB_IMX is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_UVESA is not set
-CONFIG_FB_EFI=y
-# CONFIG_FB_OPENCORES is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_SMSCUFX is not set
-CONFIG_FB_UDL=y
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_XEN_FBDEV_FRONTEND is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_MX3 is not set
-CONFIG_FB_SIMPLE=y
-# CONFIG_FB_SSD1307 is not set
-# CONFIG_FB_SM712 is not set
-# end of Frame buffer Devices
-
-#
-# Backlight & LCD device support
-#
-# CONFIG_LCD_CLASS_DEVICE is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_KTD253 is not set
-CONFIG_BACKLIGHT_PWM=y
-# CONFIG_BACKLIGHT_QCOM_WLED is not set
-# CONFIG_BACKLIGHT_ADP8860 is not set
-# CONFIG_BACKLIGHT_ADP8870 is not set
-# CONFIG_BACKLIGHT_LM3630A is not set
-# CONFIG_BACKLIGHT_LM3639 is not set
-# CONFIG_BACKLIGHT_LP855X is not set
-CONFIG_BACKLIGHT_GPIO=y
-# CONFIG_BACKLIGHT_LV5207LP is not set
-# CONFIG_BACKLIGHT_BD6107 is not set
-# CONFIG_BACKLIGHT_ARCXCNN is not set
-CONFIG_BACKLIGHT_LED=y
-# end of Backlight & LCD device support
-
-CONFIG_VIDEOMODE_HELPERS=y
-CONFIG_HDMI=y
-
-#
-# Console display driver support
-#
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_DUMMY_CONSOLE_COLUMNS=80
-CONFIG_DUMMY_CONSOLE_ROWS=25
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
-# end of Console display driver support
-
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-# CONFIG_LOGO_LINUX_VGA16 is not set
-# CONFIG_LOGO_LINUX_CLUT224 is not set
-# end of Graphics support
-
-CONFIG_SOUND=y
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=y
-CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=y
-CONFIG_SND_PCM_ELD=y
-CONFIG_SND_PCM_IEC958=y
-CONFIG_SND_DMAENGINE_PCM=y
-CONFIG_SND_HWDEP=y
-CONFIG_SND_SEQ_DEVICE=y
-CONFIG_SND_RAWMIDI=y
-CONFIG_SND_JACK=y
-CONFIG_SND_JACK_INPUT_DEV=y
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=y
-CONFIG_SND_PCM_OSS=y
-# CONFIG_SND_PCM_OSS_PLUGINS is not set
-CONFIG_SND_PCM_TIMER=y
-CONFIG_SND_HRTIMER=y
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_MAX_CARDS=32
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_PROC_FS=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_SEQUENCER=y
-# CONFIG_SND_SEQ_DUMMY is not set
-# CONFIG_SND_SEQUENCER_OSS is not set
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_SEQ_MIDI_EVENT=y
-CONFIG_SND_SEQ_MIDI=y
-CONFIG_SND_AC97_CODEC=y
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_ALOOP is not set
-# CONFIG_SND_VIRMIDI is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_MPU401 is not set
-# CONFIG_SND_AC97_POWER_SAVE is not set
-# CONFIG_SND_PCI is not set
-
-#
-# HD-Audio
-#
-# end of HD-Audio
-
-CONFIG_SND_HDA_PREALLOC_SIZE=2048
-# CONFIG_SND_SPI is not set
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=y
-CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
-# CONFIG_SND_USB_UA101 is not set
-# CONFIG_SND_USB_CAIAQ is not set
-# CONFIG_SND_USB_6FIRE is not set
-# CONFIG_SND_USB_HIFACE is not set
-# CONFIG_SND_BCD2000 is not set
-# CONFIG_SND_USB_POD is not set
-# CONFIG_SND_USB_PODHD is not set
-# CONFIG_SND_USB_TONEPORT is not set
-# CONFIG_SND_USB_VARIAX is not set
-CONFIG_SND_SOC=y
-CONFIG_SND_SOC_AC97_BUS=y
-CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
-# CONFIG_SND_SOC_ADI is not set
-# CONFIG_SND_SOC_AMD_ACP is not set
-# CONFIG_SND_ATMEL_SOC is not set
-# CONFIG_SND_BCM63XX_I2S_WHISTLER is not set
-# CONFIG_SND_DESIGNWARE_I2S is not set
-
-#
-# SoC Audio for Freescale CPUs
-#
-
-#
-# Common SoC Audio options for Freescale CPUs:
-#
-CONFIG_SND_SOC_FSL_ASRC=y
-CONFIG_SND_SOC_FSL_SAI=y
-# CONFIG_SND_SOC_FSL_MQS is not set
-CONFIG_SND_SOC_FSL_AUDMIX=y
-CONFIG_SND_SOC_FSL_SSI=y
-CONFIG_SND_SOC_FSL_SPDIF=y
-CONFIG_SND_SOC_FSL_ESAI=y
-CONFIG_SND_SOC_FSL_MICFIL=y
-# CONFIG_SND_SOC_FSL_EASRC is not set
-# CONFIG_SND_SOC_FSL_XCVR is not set
-CONFIG_SND_SOC_FSL_AUD2HTX=y
-CONFIG_SND_SOC_IMX_PCM_DMA=y
-CONFIG_SND_SOC_IMX_AUDMUX=y
-CONFIG_SND_IMX_SOC=y
-
-#
-# SoC Audio support for Freescale i.MX boards:
-#
-# CONFIG_SND_SOC_IMX_ES8328 is not set
-# CONFIG_SND_SOC_IMX_SGTL5000 is not set
-CONFIG_SND_SOC_IMX_SPDIF=y
-CONFIG_SND_SOC_FSL_ASOC_CARD=y
-CONFIG_SND_SOC_IMX_AUDMIX=y
-CONFIG_SND_SOC_IMX_HDMI=y
-# end of SoC Audio for Freescale CPUs
-
-# CONFIG_SND_I2S_HI6210_I2S is not set
-# CONFIG_SND_SOC_IMG is not set
-# CONFIG_SND_SOC_MTK_BTCVSD is not set
-# CONFIG_SND_SOC_SOF_TOPLEVEL is not set
-
-#
-# STMicroelectronics STM32 SOC audio support
-#
-# end of STMicroelectronics STM32 SOC audio support
-
-# CONFIG_SND_SOC_XILINX_I2S is not set
-# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
-# CONFIG_SND_SOC_XILINX_SPDIF is not set
-# CONFIG_SND_SOC_XTFPGA_I2S is not set
-CONFIG_SND_SOC_I2C_AND_SPI=y
-
-#
-# CODEC drivers
-#
-CONFIG_SND_SOC_AC97_CODEC=y
-# CONFIG_SND_SOC_ADAU1372_I2C is not set
-# CONFIG_SND_SOC_ADAU1372_SPI is not set
-# CONFIG_SND_SOC_ADAU1701 is not set
-# CONFIG_SND_SOC_ADAU1761_I2C is not set
-# CONFIG_SND_SOC_ADAU1761_SPI is not set
-# CONFIG_SND_SOC_ADAU7002 is not set
-# CONFIG_SND_SOC_ADAU7118_HW is not set
-# CONFIG_SND_SOC_ADAU7118_I2C is not set
-# CONFIG_SND_SOC_AK4104 is not set
-# CONFIG_SND_SOC_AK4118 is not set
-# CONFIG_SND_SOC_AK4458 is not set
-# CONFIG_SND_SOC_AK4554 is not set
-# CONFIG_SND_SOC_AK4613 is not set
-# CONFIG_SND_SOC_AK4642 is not set
-# CONFIG_SND_SOC_AK5386 is not set
-# CONFIG_SND_SOC_AK5558 is not set
-# CONFIG_SND_SOC_ALC5623 is not set
-# CONFIG_SND_SOC_BD28623 is not set
-# CONFIG_SND_SOC_BT_SCO is not set
-# CONFIG_SND_SOC_CS35L32 is not set
-# CONFIG_SND_SOC_CS35L33 is not set
-# CONFIG_SND_SOC_CS35L34 is not set
-# CONFIG_SND_SOC_CS35L35 is not set
-# CONFIG_SND_SOC_CS35L36 is not set
-# CONFIG_SND_SOC_CS42L42 is not set
-# CONFIG_SND_SOC_CS42L51_I2C is not set
-# CONFIG_SND_SOC_CS42L52 is not set
-# CONFIG_SND_SOC_CS42L56 is not set
-# CONFIG_SND_SOC_CS42L73 is not set
-# CONFIG_SND_SOC_CS4234 is not set
-# CONFIG_SND_SOC_CS4265 is not set
-# CONFIG_SND_SOC_CS4270 is not set
-# CONFIG_SND_SOC_CS4271_I2C is not set
-# CONFIG_SND_SOC_CS4271_SPI is not set
-# CONFIG_SND_SOC_CS42XX8_I2C is not set
-# CONFIG_SND_SOC_CS43130 is not set
-# CONFIG_SND_SOC_CS4341 is not set
-# CONFIG_SND_SOC_CS4349 is not set
-# CONFIG_SND_SOC_CS53L30 is not set
-# CONFIG_SND_SOC_CX2072X is not set
-# CONFIG_SND_SOC_DA7213 is not set
-# CONFIG_SND_SOC_DMIC is not set
-CONFIG_SND_SOC_HDMI_CODEC=y
-# CONFIG_SND_SOC_ES7134 is not set
-# CONFIG_SND_SOC_ES7241 is not set
-# CONFIG_SND_SOC_ES8316 is not set
-# CONFIG_SND_SOC_ES8328_I2C is not set
-# CONFIG_SND_SOC_ES8328_SPI is not set
-# CONFIG_SND_SOC_GTM601 is not set
-# CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_MAX98088 is not set
-# CONFIG_SND_SOC_MAX98357A is not set
-# CONFIG_SND_SOC_MAX98504 is not set
-# CONFIG_SND_SOC_MAX9867 is not set
-# CONFIG_SND_SOC_MAX98927 is not set
-# CONFIG_SND_SOC_MAX98373_I2C is not set
-# CONFIG_SND_SOC_MAX98390 is not set
-# CONFIG_SND_SOC_MAX9860 is not set
-# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
-# CONFIG_SND_SOC_PCM1681 is not set
-# CONFIG_SND_SOC_PCM1789_I2C is not set
-# CONFIG_SND_SOC_PCM179X_I2C is not set
-# CONFIG_SND_SOC_PCM179X_SPI is not set
-# CONFIG_SND_SOC_PCM186X_I2C is not set
-# CONFIG_SND_SOC_PCM186X_SPI is not set
-# CONFIG_SND_SOC_PCM3060_I2C is not set
-# CONFIG_SND_SOC_PCM3060_SPI is not set
-# CONFIG_SND_SOC_PCM3168A_I2C is not set
-# CONFIG_SND_SOC_PCM3168A_SPI is not set
-# CONFIG_SND_SOC_PCM5102A is not set
-# CONFIG_SND_SOC_PCM512x_I2C is not set
-# CONFIG_SND_SOC_PCM512x_SPI is not set
-# CONFIG_SND_SOC_RK3328 is not set
-# CONFIG_SND_SOC_RT5616 is not set
-# CONFIG_SND_SOC_RT5631 is not set
-# CONFIG_SND_SOC_RT5659 is not set
-# CONFIG_SND_SOC_SGTL5000 is not set
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
-# CONFIG_SND_SOC_SIMPLE_MUX is not set
-# CONFIG_SND_SOC_SPDIF is not set
-# CONFIG_SND_SOC_SSM2305 is not set
-# CONFIG_SND_SOC_SSM2602_SPI is not set
-# CONFIG_SND_SOC_SSM2602_I2C is not set
-# CONFIG_SND_SOC_SSM4567 is not set
-# CONFIG_SND_SOC_STA32X is not set
-# CONFIG_SND_SOC_STA350 is not set
-# CONFIG_SND_SOC_STI_SAS is not set
-# CONFIG_SND_SOC_TAS2552 is not set
-# CONFIG_SND_SOC_TAS2562 is not set
-# CONFIG_SND_SOC_TAS2764 is not set
-# CONFIG_SND_SOC_TAS2770 is not set
-# CONFIG_SND_SOC_TAS5086 is not set
-# CONFIG_SND_SOC_TAS571X is not set
-# CONFIG_SND_SOC_TAS5720 is not set
-# CONFIG_SND_SOC_TAS6424 is not set
-# CONFIG_SND_SOC_TDA7419 is not set
-# CONFIG_SND_SOC_TFA9879 is not set
-# CONFIG_SND_SOC_TLV320AIC23_I2C is not set
-# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
-# CONFIG_SND_SOC_TLV320AIC31XX is not set
-# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
-# CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set
-# CONFIG_SND_SOC_TLV320AIC3X is not set
-# CONFIG_SND_SOC_TLV320ADCX140 is not set
-# CONFIG_SND_SOC_TS3A227E is not set
-# CONFIG_SND_SOC_TSCS42XX is not set
-# CONFIG_SND_SOC_TSCS454 is not set
-# CONFIG_SND_SOC_UDA1334 is not set
-# CONFIG_SND_SOC_WM8510 is not set
-# CONFIG_SND_SOC_WM8523 is not set
-# CONFIG_SND_SOC_WM8524 is not set
-# CONFIG_SND_SOC_WM8580 is not set
-# CONFIG_SND_SOC_WM8711 is not set
-# CONFIG_SND_SOC_WM8728 is not set
-# CONFIG_SND_SOC_WM8731 is not set
-# CONFIG_SND_SOC_WM8737 is not set
-# CONFIG_SND_SOC_WM8741 is not set
-# CONFIG_SND_SOC_WM8750 is not set
-# CONFIG_SND_SOC_WM8753 is not set
-# CONFIG_SND_SOC_WM8770 is not set
-# CONFIG_SND_SOC_WM8776 is not set
-# CONFIG_SND_SOC_WM8782 is not set
-# CONFIG_SND_SOC_WM8804_I2C is not set
-# CONFIG_SND_SOC_WM8804_SPI is not set
-# CONFIG_SND_SOC_WM8903 is not set
-# CONFIG_SND_SOC_WM8904 is not set
-CONFIG_SND_SOC_WM8960=y
-# CONFIG_SND_SOC_WM8962 is not set
-# CONFIG_SND_SOC_WM8974 is not set
-# CONFIG_SND_SOC_WM8978 is not set
-# CONFIG_SND_SOC_WM8985 is not set
-# CONFIG_SND_SOC_ZL38060 is not set
-# CONFIG_SND_SOC_ZX_AUD96P22 is not set
-# CONFIG_SND_SOC_MAX9759 is not set
-# CONFIG_SND_SOC_MT6351 is not set
-# CONFIG_SND_SOC_MT6358 is not set
-# CONFIG_SND_SOC_MT6660 is not set
-# CONFIG_SND_SOC_NAU8315 is not set
-# CONFIG_SND_SOC_NAU8540 is not set
-# CONFIG_SND_SOC_NAU8810 is not set
-# CONFIG_SND_SOC_NAU8822 is not set
-# CONFIG_SND_SOC_NAU8824 is not set
-# CONFIG_SND_SOC_TPA6130A2 is not set
-# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
-# CONFIG_SND_SOC_LPASS_VA_MACRO is not set
-# CONFIG_SND_SOC_LPASS_RX_MACRO is not set
-# CONFIG_SND_SOC_LPASS_TX_MACRO is not set
-# end of CODEC drivers
-
-CONFIG_SND_SIMPLE_CARD_UTILS=y
-CONFIG_SND_SIMPLE_CARD=y
-CONFIG_SND_AUDIO_GRAPH_CARD=y
-# CONFIG_SND_XEN_FRONTEND is not set
-CONFIG_AC97_BUS=y
-
-#
-# HID support
-#
-CONFIG_HID=y
-CONFIG_HID_BATTERY_STRENGTH=y
-CONFIG_HIDRAW=y
-CONFIG_UHID=y
-CONFIG_HID_GENERIC=y
-
-#
-# Special HID drivers
-#
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_ACCUTOUCH is not set
-# CONFIG_HID_ACRUX is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_APPLEIR is not set
-# CONFIG_HID_ASUS is not set
-# CONFIG_HID_AUREAL is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_BETOP_FF is not set
-# CONFIG_HID_BIGBEN_FF is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_CORSAIR is not set
-# CONFIG_HID_COUGAR is not set
-# CONFIG_HID_MACALLY is not set
-# CONFIG_HID_PRODIKEYS is not set
-# CONFIG_HID_CMEDIA is not set
-# CONFIG_HID_CP2112 is not set
-# CONFIG_HID_CREATIVE_SB0540 is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_ELAN is not set
-# CONFIG_HID_ELECOM is not set
-# CONFIG_HID_ELO is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_GEMBIRD is not set
-# CONFIG_HID_GFRM is not set
-# CONFIG_HID_GLORIOUS is not set
-# CONFIG_HID_HOLTEK is not set
-# CONFIG_HID_VIVALDI is not set
-# CONFIG_HID_GT683R is not set
-# CONFIG_HID_KEYTOUCH is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_UCLOGIC is not set
-# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_VIEWSONIC is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID_ICADE is not set
-# CONFIG_HID_ITE is not set
-# CONFIG_HID_JABRA is not set
-# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_LCPOWER is not set
-# CONFIG_HID_LED is not set
-# CONFIG_HID_LENOVO is not set
-CONFIG_HID_LOGITECH=y
-CONFIG_HID_LOGITECH_DJ=y
-CONFIG_HID_LOGITECH_HIDPP=y
-# CONFIG_LOGITECH_FF is not set
-# CONFIG_LOGIRUMBLEPAD2_FF is not set
-# CONFIG_LOGIG940_FF is not set
-# CONFIG_LOGIWHEELS_FF is not set
-CONFIG_HID_MAGICMOUSE=y
-# CONFIG_HID_MALTRON is not set
-# CONFIG_HID_MAYFLASH is not set
-# CONFIG_HID_REDRAGON is not set
-CONFIG_HID_MICROSOFT=y
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_MULTITOUCH is not set
-# CONFIG_HID_NTI is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PENMOUNT is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PICOLCD is not set
-# CONFIG_HID_PLANTRONICS is not set
-# CONFIG_HID_PLAYSTATION is not set
-# CONFIG_HID_PRIMAX is not set
-# CONFIG_HID_RETRODE is not set
-# CONFIG_HID_ROCCAT is not set
-# CONFIG_HID_SAITEK is not set
-# CONFIG_HID_SAMSUNG is not set
-CONFIG_HID_SONY=y
-CONFIG_SONY_FF=y
-# CONFIG_HID_SPEEDLINK is not set
-# CONFIG_HID_STEAM is not set
-# CONFIG_HID_STEELSERIES is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_RMI is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_TIVO is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_THINGM is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_UDRAW_PS3 is not set
-# CONFIG_HID_U2FZERO is not set
-CONFIG_HID_WACOM=y
-CONFIG_HID_WIIMOTE=y
-# CONFIG_HID_XINMO is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HID_ZYDACRON is not set
-# CONFIG_HID_SENSOR_HUB is not set
-# CONFIG_HID_ALPS is not set
-# CONFIG_HID_MCP2221 is not set
-# end of Special HID drivers
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=y
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-# end of USB HID support
-
-#
-# I2C HID support
-#
-# CONFIG_I2C_HID_OF is not set
-# CONFIG_I2C_HID_OF_GOODIX is not set
-# end of I2C HID support
-# end of HID support
-
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_LED_TRIG=y
-CONFIG_USB_ULPI_BUS=y
-# CONFIG_USB_CONN_GPIO is not set
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=y
-CONFIG_USB_PCI=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-# CONFIG_USB_FEW_INIT_RETRIES is not set
-CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_OTG=y
-# CONFIG_USB_OTG_PRODUCTLIST is not set
-# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
-# CONFIG_USB_OTG_FSM is not set
-# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
-CONFIG_USB_AUTOSUSPEND_DELAY=2
-CONFIG_USB_MON=y
-
-#
-# USB Host Controller Drivers
-#
-# CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
-# CONFIG_USB_XHCI_DBGCAP is not set
-CONFIG_USB_XHCI_PCI=y
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
-CONFIG_USB_XHCI_PLATFORM=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=y
-CONFIG_USB_EHCI_FSL=y
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_FOTG210_HCD is not set
-# CONFIG_USB_MAX3421_HCD is not set
-CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_HCD_PCI is not set
-# CONFIG_USB_OHCI_HCD_SSB is not set
-# CONFIG_USB_OHCI_HCD_PLATFORM is not set
-# CONFIG_USB_UHCI_HCD is not set
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_HCD_BCMA is not set
-# CONFIG_USB_HCD_SSB is not set
-# CONFIG_USB_HCD_TEST_MODE is not set
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=y
-CONFIG_USB_PRINTER=y
-CONFIG_USB_WDM=y
-CONFIG_USB_TMC=y
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=y
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_REALTEK is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_STORAGE_KARMA is not set
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-# CONFIG_USB_STORAGE_ENE_UB6250 is not set
-CONFIG_USB_UAS=y
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USBIP_CORE is not set
-# CONFIG_USB_CDNS_SUPPORT is not set
-# CONFIG_USB_MUSB_HDRC is not set
-CONFIG_USB_DWC3=y
-# CONFIG_USB_DWC3_ULPI is not set
-CONFIG_USB_DWC3_HOST=y
-
-#
-# Platform Glue Driver Support
-#
-# CONFIG_USB_DWC3_HAPS is not set
-# CONFIG_USB_DWC3_OF_SIMPLE is not set
-# CONFIG_USB_DWC3_IMX8MP is not set
-# CONFIG_USB_DWC2 is not set
-# CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_ISP1760 is not set
-
-#
-# USB port drivers
-#
-CONFIG_USB_SERIAL=y
-# CONFIG_USB_SERIAL_CONSOLE is not set
-CONFIG_USB_SERIAL_GENERIC=y
-# CONFIG_USB_SERIAL_SIMPLE is not set
-# CONFIG_USB_SERIAL_AIRCABLE is not set
-# CONFIG_USB_SERIAL_ARK3116 is not set
-# CONFIG_USB_SERIAL_BELKIN is not set
-# CONFIG_USB_SERIAL_CH341 is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
-# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-CONFIG_USB_SERIAL_CP210X=y
-# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
-# CONFIG_USB_SERIAL_EMPEG is not set
-CONFIG_USB_SERIAL_FTDI_SIO=y
-# CONFIG_USB_SERIAL_VISOR is not set
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_IR is not set
-# CONFIG_USB_SERIAL_EDGEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
-# CONFIG_USB_SERIAL_F81232 is not set
-# CONFIG_USB_SERIAL_F8153X is not set
-# CONFIG_USB_SERIAL_GARMIN is not set
-# CONFIG_USB_SERIAL_IPW is not set
-# CONFIG_USB_SERIAL_IUU is not set
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
-# CONFIG_USB_SERIAL_KLSI is not set
-# CONFIG_USB_SERIAL_KOBIL_SCT is not set
-# CONFIG_USB_SERIAL_MCT_U232 is not set
-# CONFIG_USB_SERIAL_METRO is not set
-# CONFIG_USB_SERIAL_MOS7720 is not set
-# CONFIG_USB_SERIAL_MOS7840 is not set
-# CONFIG_USB_SERIAL_MXUPORT is not set
-# CONFIG_USB_SERIAL_NAVMAN is not set
-CONFIG_USB_SERIAL_PL2303=y
-# CONFIG_USB_SERIAL_OTI6858 is not set
-# CONFIG_USB_SERIAL_QCAUX is not set
-# CONFIG_USB_SERIAL_QUALCOMM is not set
-# CONFIG_USB_SERIAL_SPCP8X5 is not set
-# CONFIG_USB_SERIAL_SAFE is not set
-# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
-# CONFIG_USB_SERIAL_SYMBOL is not set
-# CONFIG_USB_SERIAL_TI is not set
-# CONFIG_USB_SERIAL_CYBERJACK is not set
-# CONFIG_USB_SERIAL_OPTION is not set
-# CONFIG_USB_SERIAL_OMNINET is not set
-# CONFIG_USB_SERIAL_OPTICON is not set
-# CONFIG_USB_SERIAL_XSENS_MT is not set
-# CONFIG_USB_SERIAL_WISHBONE is not set
-# CONFIG_USB_SERIAL_SSU100 is not set
-# CONFIG_USB_SERIAL_QT2 is not set
-# CONFIG_USB_SERIAL_UPD78F0730 is not set
-# CONFIG_USB_SERIAL_XR is not set
-# CONFIG_USB_SERIAL_DEBUG is not set
-
-#
-# USB Miscellaneous drivers
-#
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_APPLE_MFI_FASTCHARGE is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_EHSET_TEST_FIXTURE is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB_YUREX is not set
-# CONFIG_USB_EZUSB_FX2 is not set
-# CONFIG_USB_HUB_USB251XB is not set
-# CONFIG_USB_HSIC_USB3503 is not set
-# CONFIG_USB_HSIC_USB4604 is not set
-# CONFIG_USB_LINK_LAYER_TEST is not set
-# CONFIG_USB_CHAOSKEY is not set
-
-#
-# USB Physical Layer drivers
-#
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_ISP1301 is not set
-# CONFIG_USB_MXS_PHY is not set
-CONFIG_USB_ULPI=y
-CONFIG_USB_ULPI_VIEWPORT=y
-# end of USB Physical Layer drivers
-
-# CONFIG_USB_GADGET is not set
-# CONFIG_TYPEC is not set
-CONFIG_USB_ROLE_SWITCH=y
-CONFIG_MMC=y
-CONFIG_PWRSEQ_EMMC=y
-CONFIG_PWRSEQ_SIMPLE=y
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_BLOCK_MINORS=256
-# CONFIG_SDIO_UART is not set
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_ARMMMCI is not set
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_IO_ACCESSORS=y
-# CONFIG_MMC_SDHCI_PCI is not set
-CONFIG_MMC_SDHCI_PLTFM=y
-# CONFIG_MMC_SDHCI_OF_ARASAN is not set
-# CONFIG_MMC_SDHCI_OF_ASPEED is not set
-# CONFIG_MMC_SDHCI_OF_AT91 is not set
-CONFIG_MMC_SDHCI_OF_ESDHC=y
-# CONFIG_MMC_SDHCI_OF_DWCMSHC is not set
-# CONFIG_MMC_SDHCI_CADENCE is not set
-CONFIG_MMC_SDHCI_ESDHC_IMX=y
-# CONFIG_MMC_SDHCI_F_SDH30 is not set
-# CONFIG_MMC_SDHCI_MILBEAUT is not set
-# CONFIG_MMC_MXC is not set
-# CONFIG_MMC_TIFM_SD is not set
-# CONFIG_MMC_SPI is not set
-# CONFIG_MMC_CB710 is not set
-# CONFIG_MMC_VIA_SDMMC is not set
-# CONFIG_MMC_DW is not set
-# CONFIG_MMC_VUB300 is not set
-# CONFIG_MMC_USHC is not set
-# CONFIG_MMC_USDHI6ROL0 is not set
-CONFIG_MMC_CQHCI=y
-# CONFIG_MMC_HSQ is not set
-# CONFIG_MMC_TOSHIBA_PCI is not set
-# CONFIG_MMC_MTK is not set
-# CONFIG_MMC_SDHCI_XENON is not set
-# CONFIG_MMC_SDHCI_OMAP is not set
-# CONFIG_MMC_SDHCI_AM654 is not set
-# CONFIG_MEMSTICK is not set
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-# CONFIG_LEDS_CLASS_FLASH is not set
-# CONFIG_LEDS_CLASS_MULTICOLOR is not set
-# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
-
-#
-# LED drivers
-#
-# CONFIG_LEDS_AN30259A is not set
-# CONFIG_LEDS_AW2013 is not set
-# CONFIG_LEDS_BCM6328 is not set
-# CONFIG_LEDS_BCM6358 is not set
-# CONFIG_LEDS_CR0014114 is not set
-# CONFIG_LEDS_EL15203000 is not set
-# CONFIG_LEDS_LM3530 is not set
-# CONFIG_LEDS_LM3532 is not set
-# CONFIG_LEDS_LM3642 is not set
-# CONFIG_LEDS_LM3692X is not set
-# CONFIG_LEDS_PCA9532 is not set
-CONFIG_LEDS_GPIO=y
-# CONFIG_LEDS_LP3944 is not set
-# CONFIG_LEDS_LP3952 is not set
-# CONFIG_LEDS_LP50XX is not set
-# CONFIG_LEDS_LP55XX_COMMON is not set
-# CONFIG_LEDS_LP8860 is not set
-CONFIG_LEDS_PCA955X=y
-CONFIG_LEDS_PCA955X_GPIO=y
-# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_DAC124S085 is not set
-# CONFIG_LEDS_PWM is not set
-# CONFIG_LEDS_REGULATOR is not set
-# CONFIG_LEDS_BD2802 is not set
-# CONFIG_LEDS_LT3593 is not set
-# CONFIG_LEDS_TCA6507 is not set
-# CONFIG_LEDS_TLC591XX is not set
-# CONFIG_LEDS_LM355x is not set
-# CONFIG_LEDS_IS31FL319X is not set
-# CONFIG_LEDS_IS31FL32XX is not set
-
-#
-# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
-#
-# CONFIG_LEDS_BLINKM is not set
-# CONFIG_LEDS_SYSCON is not set
-# CONFIG_LEDS_MLXREG is not set
-# CONFIG_LEDS_USER is not set
-# CONFIG_LEDS_SPI_BYTE is not set
-# CONFIG_LEDS_TI_LMU_COMMON is not set
-
-#
-# Flash and Torch LED drivers
-#
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-# CONFIG_LEDS_TRIGGER_TIMER is not set
-# CONFIG_LEDS_TRIGGER_ONESHOT is not set
-# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
-# CONFIG_LEDS_TRIGGER_CPU is not set
-# CONFIG_LEDS_TRIGGER_ACTIVITY is not set
-# CONFIG_LEDS_TRIGGER_GPIO is not set
-# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-# CONFIG_LEDS_TRIGGER_TRANSIENT is not set
-# CONFIG_LEDS_TRIGGER_CAMERA is not set
-# CONFIG_LEDS_TRIGGER_PANIC is not set
-# CONFIG_LEDS_TRIGGER_NETDEV is not set
-# CONFIG_LEDS_TRIGGER_PATTERN is not set
-# CONFIG_LEDS_TRIGGER_AUDIO is not set
-# CONFIG_LEDS_TRIGGER_TTY is not set
-
-#
-# LED Blink
-#
-# CONFIG_LEDS_BLINK is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_INFINIBAND is not set
-CONFIG_EDAC_SUPPORT=y
-# CONFIG_EDAC is not set
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_SYSTOHC=y
-CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-# CONFIG_RTC_NVMEM is not set
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-# CONFIG_RTC_DRV_TEST is not set
-
-#
-# I2C RTC drivers
-#
-# CONFIG_RTC_DRV_ABB5ZES3 is not set
-# CONFIG_RTC_DRV_ABEOZ9 is not set
-# CONFIG_RTC_DRV_ABX80X is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_HYM8563 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_ISL12022 is not set
-# CONFIG_RTC_DRV_ISL12026 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-CONFIG_RTC_DRV_PCF8523=y
-# CONFIG_RTC_DRV_PCF85063 is not set
-# CONFIG_RTC_DRV_PCF85363 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_BQ32K is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_RX8010 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-# CONFIG_RTC_DRV_EM3027 is not set
-# CONFIG_RTC_DRV_RV3028 is not set
-# CONFIG_RTC_DRV_RV3032 is not set
-# CONFIG_RTC_DRV_RV8803 is not set
-# CONFIG_RTC_DRV_SD3078 is not set
-
-#
-# SPI RTC drivers
-#
-# CONFIG_RTC_DRV_M41T93 is not set
-# CONFIG_RTC_DRV_M41T94 is not set
-# CONFIG_RTC_DRV_DS1302 is not set
-# CONFIG_RTC_DRV_DS1305 is not set
-# CONFIG_RTC_DRV_DS1343 is not set
-# CONFIG_RTC_DRV_DS1347 is not set
-# CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_MAX6916 is not set
-# CONFIG_RTC_DRV_R9701 is not set
-# CONFIG_RTC_DRV_RX4581 is not set
-# CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_PCF2123 is not set
-# CONFIG_RTC_DRV_MCP795 is not set
-CONFIG_RTC_I2C_AND_SPI=y
-
-#
-# SPI and I2C RTC drivers
-#
-# CONFIG_RTC_DRV_DS3232 is not set
-# CONFIG_RTC_DRV_PCF2127 is not set
-# CONFIG_RTC_DRV_RV3029C2 is not set
-# CONFIG_RTC_DRV_RX6110 is not set
-
-#
-# Platform RTC drivers
-#
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1685_FAMILY is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_DS2404 is not set
-# CONFIG_RTC_DRV_EFI is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_MSM6242 is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-# CONFIG_RTC_DRV_RP5C01 is not set
-# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_ZYNQMP is not set
-
-#
-# on-CPU RTC drivers
-#
-# CONFIG_RTC_DRV_IMXDI is not set
-# CONFIG_RTC_DRV_PL030 is not set
-# CONFIG_RTC_DRV_PL031 is not set
-# CONFIG_RTC_DRV_CADENCE is not set
-# CONFIG_RTC_DRV_FTRTC010 is not set
-# CONFIG_RTC_DRV_MXC is not set
-# CONFIG_RTC_DRV_MXC_V2 is not set
-CONFIG_RTC_DRV_SNVS=y
-# CONFIG_RTC_DRV_R7301 is not set
-
-#
-# HID Sensor RTC drivers
-#
-# CONFIG_RTC_DRV_GOLDFISH is not set
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_VIRTUAL_CHANNELS=y
-CONFIG_DMA_OF=y
-# CONFIG_ALTERA_MSGDMA is not set
-# CONFIG_AMBA_PL08X is not set
-# CONFIG_DW_AXI_DMAC is not set
-# CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_QDMA is not set
-# CONFIG_HISI_DMA is not set
-# CONFIG_IMX_DMA is not set
-CONFIG_IMX_SDMA=y
-# CONFIG_INTEL_IDMA64 is not set
-# CONFIG_MV_XOR_V2 is not set
-# CONFIG_MXS_DMA is not set
-CONFIG_MX3_IPU=y
-CONFIG_MX3_IPU_IRQS=4
-# CONFIG_PL330_DMA is not set
-# CONFIG_PLX_DMA is not set
-# CONFIG_XILINX_DMA is not set
-# CONFIG_XILINX_ZYNQMP_DMA is not set
-# CONFIG_XILINX_ZYNQMP_DPDMA is not set
-# CONFIG_QCOM_HIDMA_MGMT is not set
-# CONFIG_QCOM_HIDMA is not set
-# CONFIG_DW_DMAC is not set
-# CONFIG_DW_DMAC_PCI is not set
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
-# CONFIG_SF_PDMA is not set
-
-#
-# DMA Clients
-#
-# CONFIG_ASYNC_TX_DMA is not set
-# CONFIG_DMATEST is not set
-
-#
-# DMABUF options
-#
-CONFIG_SYNC_FILE=y
-# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
-# CONFIG_DMABUF_MOVE_NOTIFY is not set
-# CONFIG_DMABUF_DEBUG is not set
-# CONFIG_DMABUF_SELFTESTS is not set
-CONFIG_DMABUF_HEAPS=y
-CONFIG_DMABUF_HEAPS_SYSTEM=y
-CONFIG_DMABUF_HEAPS_CMA=y
-# end of DMABUF options
-
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_UIO is not set
-# CONFIG_VFIO is not set
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_PCI_LIB=y
-CONFIG_VIRTIO_MENU=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_BALLOON=y
-CONFIG_VIRTIO_INPUT=y
-CONFIG_VIRTIO_MMIO=y
-CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
-CONFIG_VIRTIO_DMA_SHARED_BUFFER=y
-# CONFIG_VDPA is not set
-# CONFIG_VHOST_MENU is not set
-
-#
-# Microsoft Hyper-V guest support
-#
-# end of Microsoft Hyper-V guest support
-
-#
-# Xen driver support
-#
-# CONFIG_XEN_BALLOON is not set
-# CONFIG_XEN_DEV_EVTCHN is not set
-# CONFIG_XEN_BACKEND is not set
-# CONFIG_XENFS is not set
-# CONFIG_XEN_SYS_HYPERVISOR is not set
-# CONFIG_XEN_GNTDEV is not set
-# CONFIG_XEN_GRANT_DEV_ALLOC is not set
-# CONFIG_XEN_GRANT_DMA_ALLOC is not set
-CONFIG_SWIOTLB_XEN=y
-# CONFIG_XEN_PVCALLS_FRONTEND is not set
-CONFIG_XEN_PRIVCMD=m
-CONFIG_XEN_EFI=y
-CONFIG_XEN_AUTO_XLATE=y
-# end of Xen driver support
-
-# CONFIG_GREYBUS is not set
-CONFIG_STAGING=y
-# CONFIG_PRISM2_USB is not set
-# CONFIG_COMEDI is not set
-# CONFIG_RTL8192U is not set
-# CONFIG_RTLLIB is not set
-# CONFIG_RTL8723BS is not set
-# CONFIG_R8712U is not set
-# CONFIG_R8188EU is not set
-# CONFIG_RTS5208 is not set
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-# CONFIG_FB_SM750 is not set
-CONFIG_STAGING_MEDIA=y
-CONFIG_VIDEO_HANTRO=y
-CONFIG_VIDEO_HANTRO_IMX8M=y
-# CONFIG_VIDEO_IMX_MEDIA is not set
-# CONFIG_VIDEO_ZORAN is not set
-
-#
-# Android
-#
-CONFIG_ASHMEM=y
-# end of Android
-
-# CONFIG_STAGING_BOARD is not set
-# CONFIG_LTE_GDM724X is not set
-# CONFIG_GS_FPGABOOT is not set
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_FB_TFT is not set
-# CONFIG_KS7010 is not set
-# CONFIG_PI433 is not set
-
-#
-# Gasket devices
-#
-# CONFIG_STAGING_GASKET_FRAMEWORK is not set
-# end of Gasket devices
-
-# CONFIG_XIL_AXIS_FIFO is not set
-# CONFIG_FIELDBUS_DEV is not set
-# CONFIG_QLGE is not set
-# CONFIG_WIMAX is not set
-# CONFIG_WFX is not set
-# CONFIG_GOLDFISH is not set
-# CONFIG_CHROME_PLATFORMS is not set
-# CONFIG_MELLANOX_PLATFORM is not set
-CONFIG_HAVE_CLK=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_COMMON_CLK=y
-# CONFIG_COMMON_CLK_MAX9485 is not set
-# CONFIG_COMMON_CLK_SI5341 is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
-# CONFIG_COMMON_CLK_SI514 is not set
-# CONFIG_COMMON_CLK_SI544 is not set
-# CONFIG_COMMON_CLK_SI570 is not set
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_CDCE925 is not set
-# CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_COMMON_CLK_AXI_CLKGEN is not set
-# CONFIG_COMMON_CLK_XGENE is not set
-# CONFIG_COMMON_CLK_PWM is not set
-# CONFIG_COMMON_CLK_VC5 is not set
-# CONFIG_COMMON_CLK_FIXED_MMIO is not set
-CONFIG_MXC_CLK=y
-# CONFIG_CLK_IMX8MM is not set
-# CONFIG_CLK_IMX8MN is not set
-# CONFIG_CLK_IMX8MP is not set
-CONFIG_CLK_IMX8MQ=y
-# CONFIG_XILINX_VCU is not set
-CONFIG_HWSPINLOCK=y
-
-#
-# Clock Source drivers
-#
-CONFIG_TIMER_OF=y
-CONFIG_TIMER_PROBE=y
-CONFIG_ARM_ARCH_TIMER=y
-CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
-CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
-CONFIG_FSL_ERRATUM_A008585=y
-# CONFIG_HISILICON_ERRATUM_161010101 is not set
-CONFIG_ARM64_ERRATUM_858921=y
-CONFIG_TIMER_IMX_SYS_CTR=y
-# CONFIG_MICROCHIP_PIT64B is not set
-# end of Clock Source drivers
-
-CONFIG_MAILBOX=y
-# CONFIG_ARM_MHU is not set
-# CONFIG_ARM_MHU_V2 is not set
-CONFIG_IMX_MBOX=y
-# CONFIG_PLATFORM_MHU is not set
-# CONFIG_PL320_MBOX is not set
-# CONFIG_ALTERA_MBOX is not set
-# CONFIG_MAILBOX_TEST is not set
-CONFIG_IOMMU_IOVA=y
-CONFIG_IOMMU_API=y
-CONFIG_IOMMU_SUPPORT=y
-
-#
-# Generic IOMMU Pagetable Support
-#
-CONFIG_IOMMU_IO_PGTABLE=y
-CONFIG_IOMMU_IO_PGTABLE_LPAE=y
-# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
-CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
-# CONFIG_IOMMU_IO_PGTABLE_ARMV7S_SELFTEST is not set
-# end of Generic IOMMU Pagetable Support
-
-# CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_OF_IOMMU=y
-CONFIG_IOMMU_DMA=y
-# CONFIG_ARM_SMMU is not set
-# CONFIG_ARM_SMMU_V3 is not set
-CONFIG_VIRTIO_IOMMU=y
-
-#
-# Remoteproc drivers
-#
-# CONFIG_REMOTEPROC is not set
-# end of Remoteproc drivers
-
-#
-# Rpmsg drivers
-#
-CONFIG_RPMSG=y
-# CONFIG_RPMSG_CHAR is not set
-CONFIG_RPMSG_NS=y
-# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
-CONFIG_RPMSG_VIRTIO=y
-# end of Rpmsg drivers
-
-# CONFIG_SOUNDWIRE is not set
-
-#
-# SOC (System On Chip) specific Drivers
-#
-
-#
-# Amlogic SoC drivers
-#
-# end of Amlogic SoC drivers
-
-#
-# Broadcom SoC drivers
-#
-# CONFIG_SOC_BRCMSTB is not set
-# end of Broadcom SoC drivers
-
-#
-# NXP/Freescale QorIQ SoC drivers
-#
-# CONFIG_QUICC_ENGINE is not set
-CONFIG_FSL_GUTS=y
-# CONFIG_FSL_RCPM is not set
-# end of NXP/Freescale QorIQ SoC drivers
-
-#
-# i.MX SoC drivers
-#
-CONFIG_IMX_GPCV2_PM_DOMAINS=y
-CONFIG_SOC_IMX8M=y
-# end of i.MX SoC drivers
-
-#
-# Enable LiteX SoC Builder specific drivers
-#
-# CONFIG_LITEX_SOC_CONTROLLER is not set
-# end of Enable LiteX SoC Builder specific drivers
-
-#
-# Qualcomm SoC drivers
-#
-# end of Qualcomm SoC drivers
-
-# CONFIG_SOC_TI is not set
-
-#
-# Xilinx SoC drivers
-#
-# end of Xilinx SoC drivers
-# end of SOC (System On Chip) specific Drivers
-
-CONFIG_PM_DEVFREQ=y
-
-#
-# DEVFREQ Governors
-#
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
-# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
-# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
-CONFIG_DEVFREQ_GOV_USERSPACE=y
-# CONFIG_DEVFREQ_GOV_PASSIVE is not set
-
-#
-# DEVFREQ Drivers
-#
-# CONFIG_ARM_IMX_BUS_DEVFREQ is not set
-# CONFIG_ARM_IMX8M_DDRC_DEVFREQ is not set
-# CONFIG_PM_DEVFREQ_EVENT is not set
-# CONFIG_EXTCON is not set
-# CONFIG_MEMORY is not set
-# CONFIG_IIO is not set
-# CONFIG_NTB is not set
-# CONFIG_VME_BUS is not set
-CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
-# CONFIG_PWM_DEBUG is not set
-# CONFIG_PWM_ATMEL_TCB is not set
-# CONFIG_PWM_DWC is not set
-# CONFIG_PWM_FSL_FTM is not set
-# CONFIG_PWM_IMX1 is not set
-CONFIG_PWM_IMX27=y
-# CONFIG_PWM_IMX_TPM is not set
-# CONFIG_PWM_PCA9685 is not set
-
-#
-# IRQ chip support
-#
-CONFIG_IRQCHIP=y
-CONFIG_ARM_GIC=y
-CONFIG_ARM_GIC_MAX_NR=1
-CONFIG_ARM_GIC_V2M=y
-CONFIG_ARM_GIC_V3=y
-CONFIG_ARM_GIC_V3_ITS=y
-CONFIG_ARM_GIC_V3_ITS_PCI=y
-# CONFIG_AL_FIC is not set
-CONFIG_IMX_GPCV2=y
-CONFIG_PARTITION_PERCPU=y
-CONFIG_IMX_IRQSTEER=y
-CONFIG_IMX_INTMUX=y
-# end of IRQ chip support
-
-# CONFIG_IPACK_BUS is not set
-CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
-CONFIG_RESET_IMX7=y
-# CONFIG_RESET_INTEL_GW is not set
-# CONFIG_RESET_TI_SYSCON is not set
-
-#
-# PHY Subsystem
-#
-CONFIG_GENERIC_PHY=y
-CONFIG_GENERIC_PHY_MIPI_DPHY=y
-# CONFIG_PHY_XGENE is not set
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_PHY_CADENCE_TORRENT is not set
-# CONFIG_PHY_CADENCE_DPHY is not set
-# CONFIG_PHY_CADENCE_SIERRA is not set
-# CONFIG_PHY_CADENCE_SALVO is not set
-CONFIG_PHY_FSL_IMX8MQ_USB=y
-CONFIG_PHY_MIXEL_MIPI_DPHY=y
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_MAPPHONE_MDM6600 is not set
-# CONFIG_PHY_OCELOT_SERDES is not set
-# CONFIG_PHY_QCOM_USB_HS is not set
-# CONFIG_PHY_QCOM_USB_HSIC is not set
-# CONFIG_PHY_TUSB1210 is not set
-# end of PHY Subsystem
-
-CONFIG_POWERCAP=y
-CONFIG_IDLE_INJECT=y
-# CONFIG_DTPM is not set
-# CONFIG_MCB is not set
-
-#
-# Performance monitor support
-#
-# CONFIG_ARM_CCI_PMU is not set
-# CONFIG_ARM_CCN is not set
-# CONFIG_ARM_CMN is not set
-CONFIG_ARM_PMU=y
-# CONFIG_ARM_DSU_PMU is not set
-CONFIG_FSL_IMX8_DDR_PMU=y
-# CONFIG_ARM_SPE_PMU is not set
-# end of Performance monitor support
-
-CONFIG_RAS=y
-# CONFIG_USB4 is not set
-
-#
-# Android
-#
-CONFIG_ANDROID=y
-CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_BINDERFS=y
-CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
-# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
-# end of Android
-
-# CONFIG_LIBNVDIMM is not set
-# CONFIG_DAX is not set
-CONFIG_NVMEM=y
-CONFIG_NVMEM_SYSFS=y
-# CONFIG_NVMEM_IMX_IIM is not set
-CONFIG_NVMEM_IMX_OCOTP=y
-# CONFIG_NVMEM_SNVS_LPGPR is not set
-# CONFIG_NVMEM_RMEM is not set
-
-#
-# HW tracing support
-#
-# CONFIG_STM is not set
-# CONFIG_INTEL_TH is not set
-# end of HW tracing support
-
-# CONFIG_FPGA is not set
-# CONFIG_FSI is not set
-# CONFIG_TEE is not set
-CONFIG_MULTIPLEXER=y
-
-#
-# Multiplexer drivers
-#
-# CONFIG_MUX_ADG792A is not set
-# CONFIG_MUX_ADGS1408 is not set
-CONFIG_MUX_GPIO=y
-CONFIG_MUX_MMIO=y
-# end of Multiplexer drivers
-
-CONFIG_PM_OPP=y
-# CONFIG_SIOX is not set
-# CONFIG_SLIMBUS is not set
-CONFIG_INTERCONNECT=y
-CONFIG_INTERCONNECT_IMX=y
-# CONFIG_INTERCONNECT_IMX8MM is not set
-# CONFIG_INTERCONNECT_IMX8MN is not set
-CONFIG_INTERCONNECT_IMX8MQ=y
-# CONFIG_COUNTER is not set
-# end of Device Drivers
-
-#
-# File systems
-#
-CONFIG_DCACHE_WORD_ACCESS=y
-CONFIG_VALIDATE_FS_PARSER=y
-CONFIG_FS_IOMAP=y
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_USE_FOR_EXT2=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=y
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_BTRFS_FS is not set
-# CONFIG_NILFS2_FS is not set
-# CONFIG_F2FS_FS is not set
-# CONFIG_FS_DAX is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_EXPORTFS_BLOCK_OPS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_MANDATORY_FILE_LOCKING=y
-# CONFIG_FS_ENCRYPTION is not set
-# CONFIG_FS_VERITY is not set
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_FANOTIFY=y
-# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-CONFIG_PRINT_QUOTA_WARNING=y
-# CONFIG_QUOTA_DEBUG is not set
-# CONFIG_QFMT_V1 is not set
-# CONFIG_QFMT_V2 is not set
-CONFIG_QUOTACTL=y
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_AUTOFS_FS is not set
-CONFIG_FUSE_FS=y
-# CONFIG_CUSE is not set
-CONFIG_VIRTIO_FS=y
-CONFIG_OVERLAY_FS=y
-# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
-# CONFIG_OVERLAY_FS_INDEX is not set
-# CONFIG_OVERLAY_FS_XINO_AUTO is not set
-# CONFIG_OVERLAY_FS_METACOPY is not set
-
-#
-# Caches
-#
-CONFIG_FSCACHE=y
-CONFIG_FSCACHE_STATS=y
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=y
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-# end of Caches
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=y
-# end of CD-ROM/DVD Filesystems
-
-#
-# DOS/FAT/EXFAT/NT Filesystems
-#
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
-CONFIG_FAT_DEFAULT_UTF8=y
-CONFIG_EXFAT_FS=y
-CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-CONFIG_NTFS_FS=y
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-# end of DOS/FAT/EXFAT/NT Filesystems
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_VMCORE=y
-# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_PROC_CHILDREN=y
-CONFIG_KERNFS=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-# CONFIG_TMPFS_INODE64 is not set
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_MEMFD_CREATE=y
-CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
-# CONFIG_CONFIGFS_FS is not set
-# CONFIG_EFIVAR_FS is not set
-# end of Pseudo filesystems
-
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ORANGEFS_FS is not set
-# CONFIG_ADFS_FS is not set
-CONFIG_AFFS_FS=y
-# CONFIG_ECRYPT_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
-CONFIG_SQUASHFS=y
-CONFIG_SQUASHFS_FILE_CACHE=y
-# CONFIG_SQUASHFS_FILE_DIRECT is not set
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-CONFIG_SQUASHFS_DECOMP_MULTI=y
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-CONFIG_SQUASHFS_ZSTD=y
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_PSTORE=y
-CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
-CONFIG_PSTORE_DEFLATE_COMPRESS=y
-# CONFIG_PSTORE_LZO_COMPRESS is not set
-# CONFIG_PSTORE_LZ4_COMPRESS is not set
-# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
-# CONFIG_PSTORE_842_COMPRESS is not set
-# CONFIG_PSTORE_ZSTD_COMPRESS is not set
-CONFIG_PSTORE_COMPRESS=y
-CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
-CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_PMSG is not set
-# CONFIG_PSTORE_FTRACE is not set
-# CONFIG_PSTORE_RAM is not set
-# CONFIG_PSTORE_BLK is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-# CONFIG_EROFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-# CONFIG_NFS_FS is not set
-# CONFIG_NFSD is not set
-# CONFIG_CEPH_FS is not set
-# CONFIG_CIFS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_737=y
-CONFIG_NLS_CODEPAGE_775=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_CODEPAGE_852=y
-CONFIG_NLS_CODEPAGE_855=y
-CONFIG_NLS_CODEPAGE_857=y
-CONFIG_NLS_CODEPAGE_860=y
-CONFIG_NLS_CODEPAGE_861=y
-CONFIG_NLS_CODEPAGE_862=y
-CONFIG_NLS_CODEPAGE_863=y
-CONFIG_NLS_CODEPAGE_864=y
-CONFIG_NLS_CODEPAGE_865=y
-CONFIG_NLS_CODEPAGE_866=y
-CONFIG_NLS_CODEPAGE_869=y
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-CONFIG_NLS_CODEPAGE_1250=y
-CONFIG_NLS_CODEPAGE_1251=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_MAC_ROMAN is not set
-# CONFIG_NLS_MAC_CELTIC is not set
-# CONFIG_NLS_MAC_CENTEURO is not set
-# CONFIG_NLS_MAC_CROATIAN is not set
-# CONFIG_NLS_MAC_CYRILLIC is not set
-# CONFIG_NLS_MAC_GAELIC is not set
-# CONFIG_NLS_MAC_GREEK is not set
-# CONFIG_NLS_MAC_ICELAND is not set
-# CONFIG_NLS_MAC_INUIT is not set
-# CONFIG_NLS_MAC_ROMANIAN is not set
-# CONFIG_NLS_MAC_TURKISH is not set
-CONFIG_NLS_UTF8=y
-CONFIG_UNICODE=y
-# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
-CONFIG_IO_WQ=y
-# end of File systems
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-# CONFIG_KEYS_REQUEST_CACHE is not set
-# CONFIG_PERSISTENT_KEYRINGS is not set
-# CONFIG_BIG_KEYS is not set
-# CONFIG_ENCRYPTED_KEYS is not set
-CONFIG_KEY_DH_OPERATIONS=y
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_PATH=y
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HARDENED_USERCOPY=y
-# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
-# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
-CONFIG_FORTIFY_SOURCE=y
-# CONFIG_STATIC_USERMODEHELPER is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
-CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_HASH=y
-CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
-# CONFIG_SECURITY_APPARMOR_DEBUG is not set
-# CONFIG_SECURITY_LOADPIN is not set
-# CONFIG_SECURITY_YAMA is not set
-# CONFIG_SECURITY_SAFESETID is not set
-# CONFIG_SECURITY_LOCKDOWN_LSM is not set
-CONFIG_INTEGRITY=y
-# CONFIG_INTEGRITY_SIGNATURE is not set
-CONFIG_INTEGRITY_AUDIT=y
-# CONFIG_IMA is not set
-# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
-# CONFIG_EVM is not set
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="loadpin,safesetid,smack,apparmor"
-
-#
-# Kernel hardening options
-#
-
-#
-# Memory initialization
-#
-CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
-# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
-# end of Memory initialization
-# end of Kernel hardening options
-# end of Security options
-
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_FIPS=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_SKCIPHER=y
-CONFIG_CRYPTO_SKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=y
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=y
-CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_KPP=y
-CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-# CONFIG_CRYPTO_USER is not set
-# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
-# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_PCRYPT=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_AUTHENC=y
-# CONFIG_CRYPTO_TEST is not set
-CONFIG_CRYPTO_SIMD=y
-CONFIG_CRYPTO_ENGINE=y
-
-#
-# Public-key cryptography
-#
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECC=y
-CONFIG_CRYPTO_ECDH=y
-CONFIG_CRYPTO_ECRDSA=y
-# CONFIG_CRYPTO_SM2 is not set
-CONFIG_CRYPTO_CURVE25519=y
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=y
-CONFIG_CRYPTO_GCM=y
-# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
-# CONFIG_CRYPTO_AEGIS128 is not set
-CONFIG_CRYPTO_SEQIV=y
-CONFIG_CRYPTO_ECHAINIV=y
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-# CONFIG_CRYPTO_CFB is not set
-CONFIG_CRYPTO_CTR=y
-# CONFIG_CRYPTO_CTS is not set
-CONFIG_CRYPTO_ECB=y
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_OFB is not set
-# CONFIG_CRYPTO_PCBC is not set
-CONFIG_CRYPTO_XTS=y
-# CONFIG_CRYPTO_KEYWRAP is not set
-# CONFIG_CRYPTO_ADIANTUM is not set
-CONFIG_CRYPTO_ESSIV=y
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=y
-CONFIG_CRYPTO_HMAC=y
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_VMAC is not set
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=y
-# CONFIG_CRYPTO_CRC32 is not set
-# CONFIG_CRYPTO_XXHASH is not set
-# CONFIG_CRYPTO_BLAKE2B is not set
-# CONFIG_CRYPTO_BLAKE2S is not set
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_GHASH=y
-# CONFIG_CRYPTO_POLY1305 is not set
-# CONFIG_CRYPTO_MD4 is not set
-CONFIG_CRYPTO_MD5=y
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_RMD160 is not set
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-# CONFIG_CRYPTO_SHA512 is not set
-CONFIG_CRYPTO_SHA3=y
-# CONFIG_CRYPTO_SM3 is not set
-CONFIG_CRYPTO_STREEBOG=y
-# CONFIG_CRYPTO_WP512 is not set
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_AES_TI is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_BLOWFISH=y
-CONFIG_CRYPTO_BLOWFISH_COMMON=y
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-CONFIG_CRYPTO_DES=y
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_CHACHA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_SM4 is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=y
-# CONFIG_CRYPTO_842 is not set
-# CONFIG_CRYPTO_LZ4 is not set
-# CONFIG_CRYPTO_LZ4HC is not set
-# CONFIG_CRYPTO_ZSTD is not set
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=y
-CONFIG_CRYPTO_DRBG_MENU=y
-CONFIG_CRYPTO_DRBG_HMAC=y
-# CONFIG_CRYPTO_DRBG_HASH is not set
-# CONFIG_CRYPTO_DRBG_CTR is not set
-CONFIG_CRYPTO_DRBG=y
-CONFIG_CRYPTO_JITTERENTROPY=y
-CONFIG_CRYPTO_USER_API=y
-CONFIG_CRYPTO_USER_API_HASH=y
-CONFIG_CRYPTO_USER_API_SKCIPHER=y
-CONFIG_CRYPTO_USER_API_RNG=y
-# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
-CONFIG_CRYPTO_USER_API_AEAD=y
-CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
-CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=y
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
-CONFIG_CRYPTO_LIB_BLAKE2S=y
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y
-CONFIG_CRYPTO_LIB_CHACHA=y
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=y
-CONFIG_CRYPTO_LIB_CURVE25519=y
-CONFIG_CRYPTO_LIB_DES=y
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=y
-CONFIG_CRYPTO_LIB_POLY1305=y
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_COMMON=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API_DESC=y
-CONFIG_CRYPTO_DEV_FSL_CAAM=y
-# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
-CONFIG_CRYPTO_DEV_FSL_CAAM_JR=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
-# CONFIG_CRYPTO_DEV_FSL_CAAM_INTC is not set
-CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
-# CONFIG_CRYPTO_DEV_SAHARA is not set
-# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
-# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
-# CONFIG_CRYPTO_DEV_CCP is not set
-# CONFIG_CRYPTO_DEV_MXS_DCP is not set
-# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
-CONFIG_CRYPTO_DEV_VIRTIO=y
-# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
-# CONFIG_CRYPTO_DEV_CCREE is not set
-# CONFIG_CRYPTO_DEV_HISI_SEC is not set
-# CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set
-CONFIG_ASYMMETRIC_KEY_TYPE=y
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
-CONFIG_X509_CERTIFICATE_PARSER=y
-# CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set
-CONFIG_PKCS7_MESSAGE_PARSER=y
-# CONFIG_PKCS7_TEST_KEY is not set
-# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
-
-#
-# Certificates for signature checking
-#
-CONFIG_MODULE_SIG_KEY=""
-CONFIG_SYSTEM_TRUSTED_KEYRING=y
-CONFIG_SYSTEM_TRUSTED_KEYS=""
-# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
-# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
-# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
-# end of Certificates for signature checking
-
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_LINEAR_RANGES=y
-# CONFIG_PACKING is not set
-CONFIG_BITREVERSE=y
-CONFIG_HAVE_ARCH_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_CORDIC=y
-# CONFIG_PRIME_NUMBERS is not set
-CONFIG_RATIONAL=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
-CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
-# CONFIG_INDIRECT_PIO is not set
-# CONFIG_CRC_CCITT is not set
-CONFIG_CRC16=y
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=y
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-# CONFIG_CRC64 is not set
-# CONFIG_CRC4 is not set
-# CONFIG_CRC7 is not set
-CONFIG_LIBCRC32C=y
-# CONFIG_CRC8 is not set
-CONFIG_XXHASH=y
-CONFIG_AUDIT_GENERIC=y
-CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
-CONFIG_AUDIT_COMPAT_GENERIC=y
-# CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_ZSTD_DECOMPRESS=y
-CONFIG_XZ_DEC=y
-# CONFIG_XZ_DEC_X86 is not set
-# CONFIG_XZ_DEC_POWERPC is not set
-# CONFIG_XZ_DEC_IA64 is not set
-# CONFIG_XZ_DEC_ARM is not set
-# CONFIG_XZ_DEC_ARMTHUMB is not set
-# CONFIG_XZ_DEC_SPARC is not set
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_DECOMPRESS_ZSTD=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_INTERVAL_TREE=y
-CONFIG_XARRAY_MULTI=y
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAS_DMA=y
-CONFIG_DMA_OPS=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_DMA_DECLARE_COHERENT=y
-CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
-CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
-CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
-CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
-CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
-CONFIG_SWIOTLB=y
-CONFIG_DMA_NONCOHERENT_MMAP=y
-CONFIG_DMA_COHERENT_POOL=y
-CONFIG_DMA_REMAP=y
-CONFIG_DMA_DIRECT_REMAP=y
-CONFIG_DMA_CMA=y
-CONFIG_DMA_PERNUMA_CMA=y
-
-#
-# Default contiguous memory area size:
-#
-CONFIG_CMA_SIZE_MBYTES=512
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_ALIGNMENT=8
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_DMA_MAP_BENCHMARK is not set
-CONFIG_SGL_ALLOC=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
-CONFIG_NLATTR=y
-CONFIG_CLZ_TAB=y
-CONFIG_IRQ_POLL=y
-CONFIG_MPILIB=y
-CONFIG_LIBFDT=y
-CONFIG_OID_REGISTRY=y
-CONFIG_UCS2_STRING=y
-CONFIG_HAVE_GENERIC_VDSO=y
-CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_GENERIC_VDSO_TIME_NS=y
-CONFIG_FONT_SUPPORT=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-CONFIG_SG_POOL=y
-CONFIG_ARCH_STACKWALK=y
-CONFIG_SBITMAP=y
-# CONFIG_STRING_SELFTEST is not set
-# end of Library routines
-
-CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
-
-#
-# Kernel hacking
-#
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-# CONFIG_PRINTK_CALLER is not set
-CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
-CONFIG_CONSOLE_LOGLEVEL_QUIET=4
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-CONFIG_BOOT_PRINTK_DELAY=y
-CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DYNAMIC_DEBUG_CORE=y
-CONFIG_SYMBOLIC_ERRNAME=y
-CONFIG_DEBUG_BUGVERBOSE=y
-# end of printk and dmesg options
-
-#
-# Compile-time checks and compiler options
-#
-CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_INFO_REDUCED is not set
-# CONFIG_DEBUG_INFO_COMPRESSED is not set
-# CONFIG_DEBUG_INFO_SPLIT is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
-# CONFIG_DEBUG_INFO_DWARF4 is not set
-# CONFIG_DEBUG_INFO_DWARF5 is not set
-# CONFIG_DEBUG_INFO_BTF is not set
-# CONFIG_GDB_SCRIPTS is not set
-CONFIG_FRAME_WARN=2048
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_READABLE_ASM is not set
-# CONFIG_HEADERS_INSTALL is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_32B is not set
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# end of Compile-time checks and compiler options
-
-#
-# Generic Kernel Debugging Instruments
-#
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-CONFIG_MAGIC_SYSRQ_SERIAL=y
-CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
-CONFIG_DEBUG_FS=y
-CONFIG_DEBUG_FS_ALLOW_ALL=y
-# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
-# CONFIG_DEBUG_FS_ALLOW_NONE is not set
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_KGDB=y
-CONFIG_KGDB_HONOUR_BLOCKLIST=y
-CONFIG_KGDB_SERIAL_CONSOLE=y
-# CONFIG_KGDB_TESTS is not set
-CONFIG_KGDB_KDB=y
-CONFIG_KDB_DEFAULT_ENABLE=0x1
-# CONFIG_KDB_KEYBOARD is not set
-CONFIG_KDB_CONTINUE_CATASTROPHIC=0
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
-# CONFIG_UBSAN is not set
-# end of Generic Kernel Debugging Instruments
-
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
-
-#
-# Memory Debugging
-#
-CONFIG_PAGE_EXTENSION=y
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_PAGE_OWNER is not set
-CONFIG_PAGE_POISONING=y
-# CONFIG_DEBUG_PAGE_REF is not set
-# CONFIG_DEBUG_RODATA_TEST is not set
-CONFIG_ARCH_HAS_DEBUG_WX=y
-CONFIG_DEBUG_WX=y
-CONFIG_GENERIC_PTDUMP=y
-CONFIG_PTDUMP_CORE=y
-# CONFIG_PTDUMP_DEBUGFS is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-CONFIG_SCHED_STACK_END_CHECK=y
-CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VM_PGTABLE is not set
-CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
-# CONFIG_DEBUG_VIRTUAL is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_HAVE_ARCH_KASAN=y
-CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
-CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y
-CONFIG_CC_HAS_KASAN_GENERIC=y
-CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
-# CONFIG_KASAN is not set
-CONFIG_HAVE_ARCH_KFENCE=y
-# CONFIG_KFENCE is not set
-# end of Memory Debugging
-
-# CONFIG_DEBUG_SHIRQ is not set
-
-#
-# Debug Oops, Lockups and Hangs
-#
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_SOFTLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-# CONFIG_WQ_WATCHDOG is not set
-# CONFIG_TEST_LOCKUP is not set
-# end of Debug Oops, Lockups and Hangs
-
-#
-# Scheduler Debugging
-#
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHED_INFO=y
-CONFIG_SCHEDSTATS=y
-# end of Scheduler Debugging
-
-# CONFIG_DEBUG_TIMEKEEPING is not set
-CONFIG_DEBUG_PREEMPT=y
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-# CONFIG_WW_MUTEX_SELFTEST is not set
-# CONFIG_SCF_TORTURE_TEST is not set
-# CONFIG_CSD_LOCK_WAIT_DEBUG is not set
-# end of Lock Debugging (spinlocks, mutexes, etc...)
-
-# CONFIG_DEBUG_IRQFLAGS is not set
-CONFIG_STACKTRACE=y
-# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_HAVE_DEBUG_BUGVERBOSE=y
-
-#
-# Debug kernel data structures
-#
-CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PLIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-CONFIG_BUG_ON_DATA_CORRUPTION=y
-# end of Debug kernel data structures
-
-# CONFIG_DEBUG_CREDENTIALS is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_RCU_SCALE_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RCU_REF_SCALE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
-# end of RCU Debugging
-
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACER_MAX_TRACE=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-# CONFIG_BOOTTIME_TRACING is not set
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-# CONFIG_FUNCTION_PROFILER is not set
-CONFIG_STACK_TRACER=y
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-CONFIG_FTRACE_SYSCALLS=y
-CONFIG_TRACER_SNAPSHOT=y
-# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_KPROBE_EVENTS=y
-# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-# CONFIG_BPF_KPROBE_OVERRIDE is not set
-CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
-# CONFIG_SYNTH_EVENTS is not set
-# CONFIG_HIST_TRIGGERS is not set
-# CONFIG_TRACE_EVENT_INJECT is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_FTRACE_RECORD_RECURSION is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_KPROBE_EVENT_GEN_TEST is not set
-# CONFIG_SAMPLES is not set
-# CONFIG_STRICT_DEVMEM is not set
-
-#
-# arm64 Debugging
-#
-# CONFIG_PID_IN_CONTEXTIDR is not set
-# CONFIG_DEBUG_EFI is not set
-# CONFIG_ARM64_RELOC_TEST is not set
-# CONFIG_CORESIGHT is not set
-# end of arm64 Debugging
-
-#
-# Kernel Testing and Coverage
-#
-# CONFIG_KUNIT is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-CONFIG_FUNCTION_ERROR_INJECTION=y
-# CONFIG_FAULT_INJECTION is not set
-CONFIG_ARCH_HAS_KCOV=y
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_KCOV is not set
-# CONFIG_RUNTIME_TESTING_MENU is not set
-CONFIG_MEMTEST=y
-# end of Kernel Testing and Coverage
-# end of Kernel hacking
diff --git a/reform2-imx8mq/template-kernel/patches/0001-nwl-dsi-fixup-mode-only-for-LCDIF-input-not-DCSS.patch b/reform2-imx8mq/template-kernel/patches/0001-nwl-dsi-fixup-mode-only-for-LCDIF-input-not-DCSS.patch
deleted file mode 100644
index bb9b5bdabed377e2e4acdb76ee241cdecee6c55e..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-kernel/patches/0001-nwl-dsi-fixup-mode-only-for-LCDIF-input-not-DCSS.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7443b914832c05cfe3707555b7d1ca1f3c6d7783 Mon Sep 17 00:00:00 2001
-From: mntmn <lukas@mntmn.com>
-Date: Tue, 24 Nov 2020 00:49:16 +0100
-Subject: [PATCH 1/8] nwl-dsi: fixup mode only for LCDIF input, not DCSS
-
-The inversion of HSYNC and VSYNC should not be done when the input
-source is DCSS, or internal display does not work on MNT Reform 2.0.
----
- drivers/gpu/drm/bridge/nwl-dsi.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/bridge/nwl-dsi.c b/drivers/gpu/drm/bridge/nwl-dsi.c
-index 66b67402f..6735ab2a2 100644
---- a/drivers/gpu/drm/bridge/nwl-dsi.c
-+++ b/drivers/gpu/drm/bridge/nwl-dsi.c
-@@ -807,9 +807,15 @@ static bool nwl_dsi_bridge_mode_fixup(struct drm_bridge *bridge,
- 				      const struct drm_display_mode *mode,
- 				      struct drm_display_mode *adjusted_mode)
- {
--	/* At least LCDIF + NWL needs active high sync */
--	adjusted_mode->flags |= (DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC);
--	adjusted_mode->flags &= ~(DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC);
-+	struct device_node *remote;
-+	struct nwl_dsi *dsi = bridge_to_dsi(bridge);
-+	remote = of_graph_get_remote_node(dsi->dev->of_node, 0,
-+						NWL_DSI_ENDPOINT_LCDIF);
-+	if (remote) {
-+		/* At least LCDIF + NWL needs active high sync */
-+		adjusted_mode->flags |= (DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC);
-+		adjusted_mode->flags &= ~(DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC);
-+	}
- 
- 	return true;
- }
--- 
-2.28.0
-
diff --git a/reform2-imx8mq/template-kernel/patches/0005-pci-imx6-add-support-for-internal-refclk-imx8mq.patch b/reform2-imx8mq/template-kernel/patches/0005-pci-imx6-add-support-for-internal-refclk-imx8mq.patch
deleted file mode 100644
index 4b1bd67dfc60734f68e2f1c6334c7fc9fd87de8f..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-kernel/patches/0005-pci-imx6-add-support-for-internal-refclk-imx8mq.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 30d25ce7792fd1aa37e839a513b7fcf7447fd813 Mon Sep 17 00:00:00 2001
-From: mntmn <lukas@mntmn.com>
-Date: Tue, 24 Nov 2020 01:01:42 +0100
-Subject: [PATCH 5/8] pci-imx6: add support for internal refclk (imx8mq)
-
-NXP i.MX8MQ supports feeding an internal refclk to the PCIe root
-controller(s). This is required to make use of the first PCIe controller
-on the Boundary Devices Nitrogen8M SoM, which is the standard processor
-module of MNT Reform 2.0.
-
-The patch adds a new boolean property "internal_refclk" for the pcie
-nodes.
-
-The actual generation of the clock requires poking a register of ANATOP.
-The code for this is taken from the (fsl) vendor kernel.
----
- drivers/pci/controller/dwc/pci-imx6.c | 43 ++++++++++++++++++++++++++-
- 1 file changed, 42 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
-index 5cf1ef12f..2f1ed228d 100644
---- a/drivers/pci/controller/dwc/pci-imx6.c
-+++ b/drivers/pci/controller/dwc/pci-imx6.c
-@@ -64,6 +64,7 @@ struct imx6_pcie {
- 	struct dw_pcie		*pci;
- 	int			reset_gpio;
- 	bool			gpio_active_high;
-+	bool			internal_refclk;
- 	struct clk		*pcie_bus;
- 	struct clk		*pcie_phy;
- 	struct clk		*pcie_inbound_axi;
-@@ -609,8 +610,45 @@ static void imx6_pcie_configure_type(struct imx6_pcie *imx6_pcie)
- 	regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, mask, val);
- }
- 
-+#define IMX8MQ_ANA_PLLOUT_REG			0x74
-+#define IMX8MQ_ANA_PLLOUT_CKE			BIT(4)
-+#define IMX8MQ_ANA_PLLOUT_SEL_MASK		0xF
-+#define IMX8MQ_ANA_PLLOUT_SEL_SYSPLL1		0xB
-+#define IMX8MQ_ANA_PLLOUT_DIV_REG		0x7C
-+#define IMX8MQ_ANA_PLLOUT_SYSPLL1_DIV		0x7
-+
-+static void imx6_pcie_enable_internal_refclk(void)
-+{
-+	uint32_t val;
-+	struct device_node* np;
-+	void __iomem *base;
-+
-+	np = of_find_compatible_node(NULL, NULL,
-+				"fsl,imx8mq-anatop");
-+	base = of_iomap(np, 0);
-+	WARN_ON(!base);
-+
-+	val = readl(base + IMX8MQ_ANA_PLLOUT_REG);
-+	val &= ~IMX8MQ_ANA_PLLOUT_SEL_MASK;
-+	val |= IMX8MQ_ANA_PLLOUT_SEL_SYSPLL1;
-+	writel(val, base + IMX8MQ_ANA_PLLOUT_REG);
-+	/* SYS_PLL1 is 800M, PCIE REF CLK is 100M */
-+	val = readl(base + IMX8MQ_ANA_PLLOUT_DIV_REG);
-+	val |= IMX8MQ_ANA_PLLOUT_SYSPLL1_DIV;
-+	writel(val, base + IMX8MQ_ANA_PLLOUT_DIV_REG);
-+
-+	val = readl(base + IMX8MQ_ANA_PLLOUT_REG);
-+	val |= IMX8MQ_ANA_PLLOUT_CKE;
-+	writel(val, base + IMX8MQ_ANA_PLLOUT_REG);
-+
-+	usleep_range(9000,10000);
-+}
-+
- static void imx6_pcie_init_phy(struct imx6_pcie *imx6_pcie)
- {
-+	if (imx6_pcie->internal_refclk)
-+		imx6_pcie_enable_internal_refclk();
-+
- 	switch (imx6_pcie->drvdata->variant) {
- 	case IMX8MQ:
- 		/*
-@@ -620,7 +658,8 @@ static void imx6_pcie_init_phy(struct imx6_pcie *imx6_pcie)
- 		regmap_update_bits(imx6_pcie->iomuxc_gpr,
- 				   imx6_pcie_grp_offset(imx6_pcie),
- 				   IMX8MQ_GPR_PCIE_REF_USE_PAD,
--				   IMX8MQ_GPR_PCIE_REF_USE_PAD);
-+				   (imx6_pcie->internal_refclk ?
-+				    0 : IMX8MQ_GPR_PCIE_REF_USE_PAD));
- 		break;
- 	case IMX7D:
- 		regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12,
-@@ -1087,6 +1126,8 @@ static int imx6_pcie_probe(struct platform_device *pdev)
- 		if (IS_ERR(imx6_pcie->pcie_aux))
- 			return dev_err_probe(dev, PTR_ERR(imx6_pcie->pcie_aux),
- 					     "pcie_aux clock source missing or invalid\n");
-+		imx6_pcie->internal_refclk = of_property_read_bool(node,
-+								   "internal-refclk");
- 		fallthrough;
- 	case IMX7D:
- 		if (dbi_base->start == IMX8MQ_PCIE2_BASE_ADDR)
--- 
-2.28.0
-
diff --git a/reform2-imx8mq/template-kernel/patches/0009-revert-58074b08c04af1817ab34be986a80279e7267d07-edid.patch b/reform2-imx8mq/template-kernel/patches/0009-revert-58074b08c04af1817ab34be986a80279e7267d07-edid.patch
deleted file mode 100644
index 80cdf68f6097b12e8d52a1aeba4bdb06dcddd38e..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-kernel/patches/0009-revert-58074b08c04af1817ab34be986a80279e7267d07-edid.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
-index f27306c51e4d..42ac796ac053 100644
---- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c
-+++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
-@@ -121,7 +121,6 @@
-  * @debugfs:      Used for managing our debugfs.
-  * @host_node:    Remote DSI node.
-  * @dsi:          Our MIPI DSI source.
-- * @edid:         Detected EDID of eDP panel.
-  * @refclk:       Our reference clock.
-  * @panel:        Our panel.
-  * @enable_gpio:  The GPIO we toggle to enable the bridge.
-@@ -147,7 +146,6 @@ struct ti_sn_bridge {
- 	struct drm_bridge		bridge;
- 	struct drm_connector		connector;
- 	struct dentry			*debugfs;
--	struct edid			*edid;
- 	struct device_node		*host_node;
- 	struct mipi_dsi_device		*dsi;
- 	struct clk			*refclk;
-@@ -269,23 +267,6 @@ connector_to_ti_sn_bridge(struct drm_connector *connector)
- static int ti_sn_bridge_connector_get_modes(struct drm_connector *connector)
- {
- 	struct ti_sn_bridge *pdata = connector_to_ti_sn_bridge(connector);
--	struct edid *edid = pdata->edid;
--	int num, ret;
--
--	if (!edid) {
--		pm_runtime_get_sync(pdata->dev);
--		edid = pdata->edid = drm_get_edid(connector, &pdata->aux.ddc);
--		pm_runtime_put(pdata->dev);
--	}
--
--	if (edid && drm_edid_is_valid(edid)) {
--		ret = drm_connector_update_edid_property(connector, edid);
--		if (!ret) {
--			num = drm_add_edid_modes(connector, edid);
--			if (num)
--				return num;
--		}
--	}
- 
- 	return drm_panel_get_modes(pdata->panel, connector);
- }
-@@ -1306,7 +1287,6 @@ static int ti_sn_bridge_remove(struct i2c_client *client)
- 	if (!pdata)
- 		return -EINVAL;
- 
--	kfree(pdata->edid);
- 	ti_sn_debugfs_remove(pdata);
- 
- 	of_node_put(pdata->host_node);
diff --git a/reform2-imx8mq/template-kernel/patches/caam-revert-imx8m-soc-match.patch b/reform2-imx8mq/template-kernel/patches/caam-revert-imx8m-soc-match.patch
deleted file mode 100644
index b54f3812b5e8511e1c46463099434fd8386e99e8..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-kernel/patches/caam-revert-imx8m-soc-match.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-commit 3a379fc9c14b251805fa94e7cfe58cd1635feb5e
-Author: Lukas F. Hartmann <lukas@mntre.com>
-Date:   Mon Jun 7 23:30:28 2021 +0200
-
-    Revert "soc: imx8m: change to use platform driver"
-    
-    This reverts commit 7d981405d0fd3cfc0de052e4791f516235d8b858.
-
-diff --git a/drivers/soc/imx/soc-imx8m.c b/drivers/soc/imx/soc-imx8m.c
-index 071e14496e4..cc57a384d74 100644
---- a/drivers/soc/imx/soc-imx8m.c
-+++ b/drivers/soc/imx/soc-imx8m.c
-@@ -5,8 +5,6 @@
- 
- #include <linux/init.h>
- #include <linux/io.h>
--#include <linux/module.h>
--#include <linux/nvmem-consumer.h>
- #include <linux/of_address.h>
- #include <linux/slab.h>
- #include <linux/sys_soc.h>
-@@ -31,7 +29,7 @@
- 
- struct imx8_soc_data {
- 	char *name;
--	u32 (*soc_revision)(struct device *dev);
-+	u32 (*soc_revision)(void);
- };
- 
- static u64 soc_uid;
-@@ -52,7 +50,7 @@ static u32 imx8mq_soc_revision_from_atf(void)
- static inline u32 imx8mq_soc_revision_from_atf(void) { return 0; };
- #endif
- 
--static u32 __init imx8mq_soc_revision(struct device *dev)
-+static u32 __init imx8mq_soc_revision(void)
- {
- 	struct device_node *np;
- 	void __iomem *ocotp_base;
-@@ -77,20 +75,9 @@ static u32 __init imx8mq_soc_revision(struct device *dev)
- 			rev = REV_B1;
- 	}
- 
--	if (dev) {
--		int ret;
--
--		ret = nvmem_cell_read_u64(dev, "soc_unique_id", &soc_uid);
--		if (ret) {
--			iounmap(ocotp_base);
--			of_node_put(np);
--			return ret;
--		}
--	} else {
--		soc_uid = readl_relaxed(ocotp_base + OCOTP_UID_HIGH);
--		soc_uid <<= 32;
--		soc_uid |= readl_relaxed(ocotp_base + OCOTP_UID_LOW);
--	}
-+	soc_uid = readl_relaxed(ocotp_base + OCOTP_UID_HIGH);
-+	soc_uid <<= 32;
-+	soc_uid |= readl_relaxed(ocotp_base + OCOTP_UID_LOW);
- 
- 	iounmap(ocotp_base);
- 	of_node_put(np);
-@@ -120,7 +107,7 @@ static void __init imx8mm_soc_uid(void)
- 	of_node_put(np);
- }
- 
--static u32 __init imx8mm_soc_revision(struct device *dev)
-+static u32 __init imx8mm_soc_revision(void)
- {
- 	struct device_node *np;
- 	void __iomem *anatop_base;
-@@ -138,15 +125,7 @@ static u32 __init imx8mm_soc_revision(struct device *dev)
- 	iounmap(anatop_base);
- 	of_node_put(np);
- 
--	if (dev) {
--		int ret;
--
--		ret = nvmem_cell_read_u64(dev, "soc_unique_id", &soc_uid);
--		if (ret)
--			return ret;
--	} else {
--		imx8mm_soc_uid();
--	}
-+	imx8mm_soc_uid();
- 
- 	return rev;
- }
-@@ -171,7 +150,7 @@ static const struct imx8_soc_data imx8mp_soc_data = {
- 	.soc_revision = imx8mm_soc_revision,
- };
- 
--static __maybe_unused const struct of_device_id imx8_machine_match[] = {
-+static __maybe_unused const struct of_device_id imx8_soc_match[] = {
- 	{ .compatible = "fsl,imx8mq", .data = &imx8mq_soc_data, },
- 	{ .compatible = "fsl,imx8mm", .data = &imx8mm_soc_data, },
- 	{ .compatible = "fsl,imx8mn", .data = &imx8mn_soc_data, },
-@@ -179,20 +158,12 @@ static __maybe_unused const struct of_device_id imx8_machine_match[] = {
- 	{ }
- };
- 
--static __maybe_unused const struct of_device_id imx8_soc_match[] = {
--	{ .compatible = "fsl,imx8mq-soc", .data = &imx8mq_soc_data, },
--	{ .compatible = "fsl,imx8mm-soc", .data = &imx8mm_soc_data, },
--	{ .compatible = "fsl,imx8mn-soc", .data = &imx8mn_soc_data, },
--	{ .compatible = "fsl,imx8mp-soc", .data = &imx8mp_soc_data, },
--	{ }
--};
--
- #define imx8_revision(soc_rev) \
- 	soc_rev ? \
- 	kasprintf(GFP_KERNEL, "%d.%d", (soc_rev >> 4) & 0xf,  soc_rev & 0xf) : \
- 	"unknown"
- 
--static int imx8_soc_info(struct platform_device *pdev)
-+static int __init imx8_soc_init(void)
- {
- 	struct soc_device_attribute *soc_dev_attr;
- 	struct soc_device *soc_dev;
-@@ -211,10 +182,7 @@ static int imx8_soc_info(struct platform_device *pdev)
- 	if (ret)
- 		goto free_soc;
- 
--	if (pdev)
--		id = of_match_node(imx8_soc_match, pdev->dev.of_node);
--	else
--		id = of_match_node(imx8_machine_match, of_root);
-+	id = of_match_node(imx8_soc_match, of_root);
- 	if (!id) {
- 		ret = -ENODEV;
- 		goto free_soc;
-@@ -223,16 +191,8 @@ static int imx8_soc_info(struct platform_device *pdev)
- 	data = id->data;
- 	if (data) {
- 		soc_dev_attr->soc_id = data->name;
--		if (data->soc_revision) {
--			if (pdev) {
--				soc_rev = data->soc_revision(&pdev->dev);
--				ret = soc_rev;
--				if (ret < 0)
--					goto free_soc;
--			} else {
--				soc_rev = data->soc_revision(NULL);
--			}
--		}
-+		if (data->soc_revision)
-+			soc_rev = data->soc_revision();
- 	}
- 
- 	soc_dev_attr->revision = imx8_revision(soc_rev);
-@@ -270,24 +230,4 @@ static int imx8_soc_info(struct platform_device *pdev)
- 	kfree(soc_dev_attr);
- 	return ret;
- }
--
--/* Retain device_initcall is for backward compatibility with DTS. */
--static int __init imx8_soc_init(void)
--{
--	if (of_find_matching_node_and_match(NULL, imx8_soc_match, NULL))
--		return 0;
--
--	return imx8_soc_info(NULL);
--}
- device_initcall(imx8_soc_init);
--
--static struct platform_driver imx8_soc_info_driver = {
--	.probe = imx8_soc_info,
--	.driver = {
--		.name = "imx8_soc_info",
--		.of_match_table = imx8_soc_match,
--	},
--};
--
--module_platform_driver(imx8_soc_info_driver);
--MODULE_LICENSE("GPL v2");
diff --git a/reform2-imx8mq/template-kernel/patches/caam-revert-swiotlb-origaddr.patch b/reform2-imx8mq/template-kernel/patches/caam-revert-swiotlb-origaddr.patch
deleted file mode 100644
index 772f66472b6b390f207d36f0bad8602a7f15e256..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-kernel/patches/caam-revert-swiotlb-origaddr.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 7c61e7a9318a9d506440d276748d2cdc05e07298
-Author: Lukas F. Hartmann <lukas@mntre.com>
-Date:   Tue Jun 8 03:08:20 2021 +0200
-
-    Revert "swiotlb: don't modify orig_addr in swiotlb_tbl_sync_single"
-    
-    This reverts commit 16fc3cef33a04632ab6b31758abdd77563a20759.
-
-diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
-index c10e855a03b..a817dc5537b 100644
---- a/kernel/dma/swiotlb.c
-+++ b/kernel/dma/swiotlb.c
-@@ -726,6 +726,7 @@ void swiotlb_tbl_sync_single(struct device *hwdev, phys_addr_t tlb_addr,
- 
- 	if (orig_addr == INVALID_PHYS_ADDR)
- 		return;
-+	orig_addr += (unsigned long)tlb_addr & (IO_TLB_SIZE - 1);
- 
- 	validate_sync_size_and_truncate(hwdev, orig_size, &size);
- 
diff --git a/reform2-imx8mq/template-kernel/patches/mnt3004-MNT-Reform-imx8mq-add-PHY_27M-clock.patch b/reform2-imx8mq/template-kernel/patches/mnt3004-MNT-Reform-imx8mq-add-PHY_27M-clock.patch
deleted file mode 100644
index f59f39adf048d04f41b92c209d7f7b1a6eb26a0a..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-kernel/patches/mnt3004-MNT-Reform-imx8mq-add-PHY_27M-clock.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b9b161fcc88ab6fa0642aa3f533be3e0aac6978b Mon Sep 17 00:00:00 2001
-From: mntmn <lukas@mntmn.com>
-Date: Thu, 28 May 2020 22:51:46 +0200
-Subject: [PATCH] MNT Reform: imx8mq: add PHY_27M clock
----
- drivers/clk/imx/clk-imx8mq.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/clk/imx/clk-imx8mq.c b/drivers/clk/imx/clk-imx8mq.c
-index fdc68db68de5..a9e2d2f09864 100644
---- a/drivers/clk/imx/clk-imx8mq.c
-+++ b/drivers/clk/imx/clk-imx8mq.c
-@@ -25,7 +25,7 @@ static u32 share_count_sai6;
- static u32 share_count_dcss;
- static u32 share_count_nand;
- 
--static const char * const pll_ref_sels[] = { "osc_25m", "osc_27m", "dummy", "dummy", };
-+static const char * const pll_ref_sels[] = { "osc_25m", "osc_27m", "phy_27m", "dummy", };
- static const char * const arm_pll_bypass_sels[] = {"arm_pll", "arm_pll_ref_sel", };
- static const char * const gpu_pll_bypass_sels[] = {"gpu_pll", "gpu_pll_ref_sel", };
- static const char * const vpu_pll_bypass_sels[] = {"vpu_pll", "vpu_pll_ref_sel", };
-@@ -304,6 +304,7 @@ static int imx8mq_clocks_probe(struct platform_device *pdev)
- 	hws[IMX8MQ_CLK_EXT2] = imx_obtain_fixed_clk_hw(np, "clk_ext2");
- 	hws[IMX8MQ_CLK_EXT3] = imx_obtain_fixed_clk_hw(np, "clk_ext3");
- 	hws[IMX8MQ_CLK_EXT4] = imx_obtain_fixed_clk_hw(np, "clk_ext4");
-+	hws[IMX8MQ_CLK_PHY_27MHZ] = imx_clk_hw_fixed("phy_27m", 27000000);
- 
- 	np = of_find_compatible_node(NULL, NULL, "fsl,imx8mq-anatop");
- 	base = of_iomap(np, 0);
-
diff --git a/reform2-imx8mq/template-kernel/patches/mnt3006-MNT-Reform-imx8mq-add-PHY_27M-clock-missing-define.patch b/reform2-imx8mq/template-kernel/patches/mnt3006-MNT-Reform-imx8mq-add-PHY_27M-clock-missing-define.patch
deleted file mode 100644
index db640f1ad0c7cd88bb16fb399fc06e85876c9f73..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-kernel/patches/mnt3006-MNT-Reform-imx8mq-add-PHY_27M-clock-missing-define.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 4db354f81d9b02ce3a978ec1238d228e1c4a5ad4
-Author: Lukas F. Hartmann <lukas@mntre.com>
-Date:   Mon Jun 7 15:22:58 2021 +0200
-
-    [PATCH] MNT Reform: imx8mq: add PHY_27M clock: missing define
-
-diff --git a/include/dt-bindings/clock/imx8mq-clock.h b/include/dt-bindings/clock/imx8mq-clock.h
-index 82e907ce7..d7b8ada86 100644
---- a/include/dt-bindings/clock/imx8mq-clock.h
-+++ b/include/dt-bindings/clock/imx8mq-clock.h
-@@ -445,6 +445,8 @@
- #define IMX8MQ_CLK_MON_SEL			301
- #define IMX8MQ_CLK_MON_CLK2_OUT			302
- 
--#define IMX8MQ_CLK_END				303
-+#define IMX8MQ_CLK_PHY_27MHZ  303
-+
-+#define IMX8MQ_CLK_END				304
- 
- #endif /* __DT_BINDINGS_CLOCK_IMX8MQ_H */
diff --git a/reform2-imx8mq/template-kernel/patches/mnt4000-limit-fslsai-to-48khz.patch b/reform2-imx8mq/template-kernel/patches/mnt4000-limit-fslsai-to-48khz.patch
deleted file mode 100644
index 8faec48574f044bd0714c2e62305a2047005eaa3..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-kernel/patches/mnt4000-limit-fslsai-to-48khz.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
-index f3d3d20d35d7..449af79e2640 100644
---- a/sound/soc/fsl/fsl_sai.c
-+++ b/sound/soc/fsl/fsl_sai.c
-@@ -27,9 +27,7 @@
- 		       FSL_SAI_CSR_FEIE)
- 
- static const unsigned int fsl_sai_rates[] = {
--	8000, 11025, 12000, 16000, 22050,
--	24000, 32000, 44100, 48000, 64000,
--	88200, 96000, 176400, 192000
-+	48000, 96000, 192000
- };
- 
- static const struct snd_pcm_hw_constraint_list fsl_sai_rate_constraints = {
diff --git a/reform2-imx8mq/template-kernel/patches/mnt4001-lcdif-fix-pcie-interference.patch b/reform2-imx8mq/template-kernel/patches/mnt4001-lcdif-fix-pcie-interference.patch
deleted file mode 100644
index e08355812c82df3c1728e9829aaaa1bed8f7663c..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-kernel/patches/mnt4001-lcdif-fix-pcie-interference.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/drivers/gpu/drm/mxsfb/mxsfb_kms.c b/drivers/gpu/drm/mxsfb/mxsfb_kms.c
-index 3e1bb0aefb87..13128b6f2770 100644
---- a/drivers/gpu/drm/mxsfb/mxsfb_kms.c
-+++ b/drivers/gpu/drm/mxsfb/mxsfb_kms.c
-@@ -212,7 +212,7 @@ static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb)
- 
- 	mxsfb_set_formats(mxsfb);
- 
--	clk_set_rate(mxsfb->clk, m->crtc_clock * 1000);
-+	clk_set_rate(mxsfb->clk, m->crtc_clock * 660);
- 
- 	if (mxsfb->bridge && mxsfb->bridge->timings)
- 		bus_flags = mxsfb->bridge->timings->input_bus_flags;
-@@ -540,12 +540,44 @@ static const uint64_t mxsfb_modifiers[] = {
-  * Initialization
-  */
- 
-+void imx8mq_pcie_qos_for_lcdif(void)
-+{
-+	void __iomem *qosc = ioremap(0x307f0000, 0x2100);
-+	// clock and unlock QoSC registers
-+	writel(0x0, qosc);
-+	writel(0x1, qosc);
-+	writel(0x0, qosc+0x60);
-+
-+	// limit number of outstanding transactions for PCIe1
-+	writel(0x0, qosc+0x1000);
-+	writel(0x1, qosc+0x1000);
-+	writel(0x01010100, qosc+0x1050);
-+	writel(0x01010100, qosc+0x1060);
-+	writel(0x01010100, qosc+0x1070);
-+	writel(0x1, qosc+0x1000);
-+
-+	// limit number of outstanding transactions for PCIe2
-+	writel(0x0, qosc+0x2000);
-+	writel(0x1, qosc+0x2000);
-+	writel(0x01010100, qosc+0x2050);
-+	writel(0x01010100, qosc+0x2060);
-+	writel(0x01010100, qosc+0x2070);
-+	writel(0x1, qosc+0x2000);
-+
-+	iounmap(qosc);
-+}
-+
- int mxsfb_kms_init(struct mxsfb_drm_private *mxsfb)
- {
- 	struct drm_encoder *encoder = &mxsfb->encoder;
- 	struct drm_crtc *crtc = &mxsfb->crtc;
- 	int ret;
- 
-+	/*
-+		FIXME Workaround to fix PCIe interfering with LCDIF refresh (MNT Reform)
-+	*/
-+	imx8mq_pcie_qos_for_lcdif();
-+
- 	drm_plane_helper_add(&mxsfb->planes.primary,
- 			     &mxsfb_plane_primary_helper_funcs);
- 	ret = drm_universal_plane_init(mxsfb->drm, &mxsfb->planes.primary, 1,
diff --git a/reform2-imx8mq/template-kernel/patches/mnt4002-imx-gpcv2-wake-smccc.patch b/reform2-imx8mq/template-kernel/patches/mnt4002-imx-gpcv2-wake-smccc.patch
deleted file mode 100644
index 5de0ec79d2f2d750bb2ac232e9f2f15f7e8f8db9..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-kernel/patches/mnt4002-imx-gpcv2-wake-smccc.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/drivers/irqchip/irq-imx-gpcv2.c b/drivers/irqchip/irq-imx-gpcv2.c
-index 7031ef44de4f..9cba81b5050d 100644
---- a/drivers/irqchip/irq-imx-gpcv2.c
-+++ b/drivers/irqchip/irq-imx-gpcv2.c
-@@ -3,6 +3,7 @@
-  * Copyright (C) 2015 Freescale Semiconductor, Inc.
-  */
- 
-+#include <linux/arm-smccc.h>
- #include <linux/of_address.h>
- #include <linux/of_irq.h>
- #include <linux/slab.h>
-@@ -17,6 +18,13 @@
- #define GPC_IMR1_CORE2		0x1c0
- #define GPC_IMR1_CORE3		0x1d0
- 
-+#define FSL_SIP_GPC                     0xC2000000
-+#define FSL_SIP_CONFIG_GPC_MASK         0x00
-+#define FSL_SIP_CONFIG_GPC_UNMASK       0x01
-+#define FSL_SIP_CONFIG_GPC_SET_WAKE     0x02
-+#define FSL_SIP_CONFIG_GPC_PM_DOMAIN    0x03
-+#define FSL_SIP_CONFIG_GPC_SET_AFF      0x04
-+#define FSL_SIP_CONFIG_GPC_CORE_WAKE    0x05
- 
- struct gpcv2_irqchip_data {
- 	struct raw_spinlock	rlock;
-@@ -76,12 +84,17 @@ static int imx_gpcv2_irq_set_wake(struct irq_data *d, unsigned int on)
- 	unsigned int idx = d->hwirq / 32;
- 	unsigned long flags;
- 	u32 mask, val;
-+	struct arm_smccc_res res;
- 
- 	raw_spin_lock_irqsave(&cd->rlock, flags);
- 	mask = BIT(d->hwirq % 32);
- 	val = cd->wakeup_sources[idx];
- 
- 	cd->wakeup_sources[idx] = on ? (val & ~mask) : (val | mask);
-+
-+	// save wakeup config in vendor tf-a
-+	arm_smccc_smc(FSL_SIP_GPC, FSL_SIP_CONFIG_GPC_SET_WAKE, d->hwirq, on, 0, 0, 0, 0, &res);
-+
- 	raw_spin_unlock_irqrestore(&cd->rlock, flags);
- 
- 	/*
-@@ -97,6 +110,7 @@ static void imx_gpcv2_irq_unmask(struct irq_data *d)
- 	struct gpcv2_irqchip_data *cd = d->chip_data;
- 	void __iomem *reg;
- 	u32 val;
-+	struct arm_smccc_res res;
- 
- 	raw_spin_lock(&cd->rlock);
- 	reg = gpcv2_idx_to_reg(cd, d->hwirq / 32);
-@@ -105,6 +119,10 @@ static void imx_gpcv2_irq_unmask(struct irq_data *d)
- 	writel_relaxed(val, reg);
- 	raw_spin_unlock(&cd->rlock);
- 
-+	// call into vendor tf-a
-+	//arm_smccc_smc(FSL_SIP_GPC, FSL_SIP_CONFIG_GPC_UNMASK,
-+	//							d->hwirq, 0, 0, 0, 0, 0, &res);
-+
- 	irq_chip_unmask_parent(d);
- }
- 
-@@ -113,12 +131,18 @@ static void imx_gpcv2_irq_mask(struct irq_data *d)
- 	struct gpcv2_irqchip_data *cd = d->chip_data;
- 	void __iomem *reg;
- 	u32 val;
-+	struct arm_smccc_res res;
- 
- 	raw_spin_lock(&cd->rlock);
- 	reg = gpcv2_idx_to_reg(cd, d->hwirq / 32);
- 	val = readl_relaxed(reg);
- 	val |= BIT(d->hwirq % 32);
- 	writel_relaxed(val, reg);
-+
-+	// call into vendor tf-a
-+	//arm_smccc_smc(FSL_SIP_GPC, FSL_SIP_CONFIG_GPC_MASK,
-+	//							d->hwirq, 0, 0, 0, 0, 0, &res);
-+
- 	raw_spin_unlock(&cd->rlock);
- 
- 	irq_chip_mask_parent(d);
diff --git a/reform2-imx8mq/template-kernel/patches/mnt4003-emmc-clockgate.patch b/reform2-imx8mq/template-kernel/patches/mnt4003-emmc-clockgate.patch
deleted file mode 100644
index 01c0e5cad2a7ecbc9e64dd841ee1621475a60c92..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-kernel/patches/mnt4003-emmc-clockgate.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/drivers/clk/imx/clk-imx8mq.c b/drivers/clk/imx/clk-imx8mq.c
-index 779ea69e6..62ba6fb0d 100644
---- a/drivers/clk/imx/clk-imx8mq.c
-+++ b/drivers/clk/imx/clk-imx8mq.c
-@@ -364,7 +365,6 @@ static int imx8mq_clocks_probe(struct platform_device *pdev)
- 	hws[IMX8MQ_SYS1_PLL_133M_CG] = imx_clk_hw_gate("sys1_pll_133m_cg", "sys1_pll_out", base + 0x30, 15);
- 	hws[IMX8MQ_SYS1_PLL_160M_CG] = imx_clk_hw_gate("sys1_pll_160m_cg", "sys1_pll_out", base + 0x30, 17);
- 	hws[IMX8MQ_SYS1_PLL_200M_CG] = imx_clk_hw_gate("sys1_pll_200m_cg", "sys1_pll_out", base + 0x30, 19);
--	hws[IMX8MQ_SYS1_PLL_266M_CG] = imx_clk_hw_gate("sys1_pll_266m_cg", "sys1_pll_out", base + 0x30, 21);
- 	hws[IMX8MQ_SYS1_PLL_400M_CG] = imx_clk_hw_gate("sys1_pll_400m_cg", "sys1_pll_out", base + 0x30, 23);
- 	hws[IMX8MQ_SYS1_PLL_800M_CG] = imx_clk_hw_gate("sys1_pll_800m_cg", "sys1_pll_out", base + 0x30, 25);
- 
-@@ -374,7 +374,7 @@ static int imx8mq_clocks_probe(struct platform_device *pdev)
- 	hws[IMX8MQ_SYS1_PLL_133M] = imx_clk_hw_fixed_factor("sys1_pll_133m", "sys1_pll_133m_cg", 1, 6);
- 	hws[IMX8MQ_SYS1_PLL_160M] = imx_clk_hw_fixed_factor("sys1_pll_160m", "sys1_pll_160m_cg", 1, 5);
- 	hws[IMX8MQ_SYS1_PLL_200M] = imx_clk_hw_fixed_factor("sys1_pll_200m", "sys1_pll_200m_cg", 1, 4);
--	hws[IMX8MQ_SYS1_PLL_266M] = imx_clk_hw_fixed_factor("sys1_pll_266m", "sys1_pll_266m_cg", 1, 3);
-+	hws[IMX8MQ_SYS1_PLL_266M] = imx_clk_hw_fixed_factor("sys1_pll_266m", "sys1_pll_out", 1, 3);
- 	hws[IMX8MQ_SYS1_PLL_400M] = imx_clk_hw_fixed_factor("sys1_pll_400m", "sys1_pll_400m_cg", 1, 2);
- 	hws[IMX8MQ_SYS1_PLL_800M] = imx_clk_hw_fixed_factor("sys1_pll_800m", "sys1_pll_800m_cg", 1, 1);
- 
diff --git a/reform2-imx8mq/template-kernel/patches/mnt5000-imx8mq-import-HDMI-driver-and-make-DCSS-compatible.patch b/reform2-imx8mq/template-kernel/patches/mnt5000-imx8mq-import-HDMI-driver-and-make-DCSS-compatible.patch
deleted file mode 100644
index f6e1272841aa20c6efe270e712ddc00c5ce45b28..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-kernel/patches/mnt5000-imx8mq-import-HDMI-driver-and-make-DCSS-compatible.patch
+++ /dev/null
@@ -1,6877 +0,0 @@
-From ad68506bf8fe69e6da8848c5a592c448d202b389 Mon Sep 17 00:00:00 2001
-From: "Lukas F. Hartmann" <lukas@mntre.com>
-Date: Tue, 23 Feb 2021 19:30:04 +0100
-Subject: [PATCH] MNT Reform: imx8mq: import HDMI driver and make DCSS
- compatible with both HDMI and LCDIF
-
----
- drivers/gpu/drm/bridge/cadence/Kconfig        |   27 +
- drivers/gpu/drm/bridge/cadence/Makefile       |   10 +
- drivers/gpu/drm/bridge/cadence/cdns-dp-core.c |  590 +++++++++
- .../gpu/drm/bridge/cadence/cdns-hdmi-core.c   |  688 +++++++++++
- .../gpu/drm/bridge/cadence/cdns-mhdp-audio.c  |  393 ++++++
- .../gpu/drm/bridge/cadence/cdns-mhdp-cec.c    |  341 ++++++
- .../gpu/drm/bridge/cadence/cdns-mhdp-common.c | 1060 +++++++++++++++++
- .../gpu/drm/bridge/cadence/cdns-mhdp-hdmi.c   |  357 ++++++
- drivers/gpu/drm/bridge/cadence/cdns-mhdp.h    |  209 ++++
- drivers/gpu/drm/imx/Kconfig                   |    9 +
- drivers/gpu/drm/imx/Makefile                  |    4 +
- drivers/gpu/drm/imx/cdn-mhdp-dp-phy.c         |  529 ++++++++
- drivers/gpu/drm/imx/cdn-mhdp-hdmi-phy.c       |  777 ++++++++++++
- drivers/gpu/drm/imx/cdn-mhdp-imxdrv.c         |  211 ++++
- drivers/gpu/drm/imx/cdn-mhdp-phy.h            |  155 +++
- drivers/gpu/drm/imx/cdns-mhdp-imx.h           |   75 ++
- drivers/gpu/drm/imx/dcss/dcss-dev.c           |   20 +-
- drivers/gpu/drm/imx/dcss/dcss-dev.h           |    1 +
- drivers/gpu/drm/imx/dcss/dcss-drv.c           |   95 +-
- drivers/gpu/drm/imx/dcss/dcss-dtg.c           |   25 +-
- drivers/gpu/drm/imx/dcss/dcss-kms.c           |   46 +-
- drivers/gpu/drm/imx/dcss/dcss-kms.h           |    4 +-
- include/drm/bridge/cdns-mhdp-cbs.h            |   29 +
- include/drm/bridge/cdns-mhdp-common.h         |  812 +++++++++++++
- 24 files changed, 6424 insertions(+), 43 deletions(-)
- create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-dp-core.c
- create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-hdmi-core.c
- create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp-audio.c
- create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp-cec.c
- create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp-common.c
- create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp-hdmi.c
- create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp.h
- create mode 100644 drivers/gpu/drm/imx/cdn-mhdp-dp-phy.c
- create mode 100644 drivers/gpu/drm/imx/cdn-mhdp-hdmi-phy.c
- create mode 100644 drivers/gpu/drm/imx/cdn-mhdp-imxdrv.c
- create mode 100644 drivers/gpu/drm/imx/cdn-mhdp-phy.h
- create mode 100644 drivers/gpu/drm/imx/cdns-mhdp-imx.h
- create mode 100644 include/drm/bridge/cdns-mhdp-cbs.h
- create mode 100755 include/drm/bridge/cdns-mhdp-common.h
-
-diff --git a/drivers/gpu/drm/bridge/cadence/Kconfig b/drivers/gpu/drm/bridge/cadence/Kconfig
-index ef8c230e0f62..e5204d0f8d3f 100644
---- a/drivers/gpu/drm/bridge/cadence/Kconfig
-+++ b/drivers/gpu/drm/bridge/cadence/Kconfig
-@@ -22,3 +22,30 @@ config DRM_CDNS_MHDP8546_J721E
- 	  initializes the J721E Display Port and sets up the
- 	  clock and data muxes.
- endif
-+
-+config DRM_CDNS_MHDP
-+	tristate "Cadence MHDP COMMON API driver"
-+	select DRM_KMS_HELPER
-+	select DRM_PANEL_BRIDGE
-+	depends on OF
-+	help
-+	  Support Cadence MHDP API library.
-+
-+config DRM_CDNS_HDMI
-+	tristate "Cadence HDMI DRM driver"
-+	depends on DRM_CDNS_MHDP
-+
-+config DRM_CDNS_DP
-+	tristate "Cadence DP DRM driver"
-+	depends on DRM_CDNS_MHDP
-+
-+config DRM_CDNS_AUDIO
-+	tristate "Cadence MHDP Audio driver"
-+	depends on DRM_CDNS_MHDP
-+
-+config DRM_CDNS_HDMI_CEC
-+	tristate "Cadence MHDP HDMI CEC driver"
-+	depends on DRM_CDNS_HDMI
-+	select CEC_CORE
-+	select CEC_NOTIFIER
-+
-diff --git a/drivers/gpu/drm/bridge/cadence/Makefile b/drivers/gpu/drm/bridge/cadence/Makefile
-index 8f647991b374..a80daffb4f59 100644
---- a/drivers/gpu/drm/bridge/cadence/Makefile
-+++ b/drivers/gpu/drm/bridge/cadence/Makefile
-@@ -2,3 +2,13 @@
- obj-$(CONFIG_DRM_CDNS_MHDP8546) += cdns-mhdp8546.o
- cdns-mhdp8546-y := cdns-mhdp8546-core.o
- cdns-mhdp8546-$(CONFIG_DRM_CDNS_MHDP8546_J721E) += cdns-mhdp8546-j721e.o
-+
-+cdns_mhdp_drmcore-y := cdns-mhdp-common.o cdns-mhdp-hdmi.o
-+
-+cdns_mhdp_drmcore-$(CONFIG_DRM_CDNS_HDMI) += cdns-hdmi-core.o
-+#cdns_mhdp_drmcore-$(CONFIG_DRM_CDNS_DP) += cdns-dp-core.o
-+cdns_mhdp_drmcore-$(CONFIG_DRM_CDNS_AUDIO) += cdns-mhdp-audio.o
-+cdns_mhdp_drmcore-$(CONFIG_DRM_CDNS_HDMI_CEC) += cdns-mhdp-cec.o
-+
-+obj-$(CONFIG_DRM_CDNS_MHDP)             += cdns_mhdp_drmcore.o
-+
-diff --git a/drivers/gpu/drm/bridge/cadence/cdns-dp-core.c b/drivers/gpu/drm/bridge/cadence/cdns-dp-core.c
-new file mode 100644
-index 000000000000..42e0d94ef0fc
---- /dev/null
-+++ b/drivers/gpu/drm/bridge/cadence/cdns-dp-core.c
-@@ -0,0 +1,590 @@
-+/*
-+ * Cadence Display Port Interface (DP) driver
-+ *
-+ * Copyright (C) 2019 NXP Semiconductor, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ */
-+#include <drm/bridge/cdns-mhdp-common.h>
-+#include <drm/drm_atomic_helper.h>
-+#include <drm/drm_crtc_helper.h>
-+#include <drm/drm_edid.h>
-+#include <drm/drm_encoder_slave.h>
-+#include <drm/drm_of.h>
-+#include <drm/drm_probe_helper.h>
-+#include <linux/delay.h>
-+#include <linux/err.h>
-+#include <linux/irq.h>
-+#include <linux/module.h>
-+#include <linux/mutex.h>
-+#include <linux/of_device.h>
-+
-+/*
-+ * This function only implements native DPDC reads and writes
-+ */
-+static ssize_t dp_aux_transfer(struct drm_dp_aux *aux,
-+		struct drm_dp_aux_msg *msg)
-+{
-+	struct cdns_mhdp_device *mhdp = dev_get_drvdata(aux->dev);
-+	bool native = msg->request & (DP_AUX_NATIVE_WRITE & DP_AUX_NATIVE_READ);
-+	int ret;
-+
-+	/* Ignore address only message */
-+	if ((msg->size == 0) || (msg->buffer == NULL)) {
-+		msg->reply = native ?
-+			DP_AUX_NATIVE_REPLY_ACK : DP_AUX_I2C_REPLY_ACK;
-+		return msg->size;
-+	}
-+
-+	if (!native) {
-+		dev_err(mhdp->dev, "%s: only native messages supported\n", __func__);
-+		return -EINVAL;
-+	}
-+
-+	/* msg sanity check */
-+	if (msg->size > DP_AUX_MAX_PAYLOAD_BYTES) {
-+		dev_err(mhdp->dev, "%s: invalid msg: size(%zu), request(%x)\n",
-+						__func__, msg->size, (unsigned int)msg->request);
-+		return -EINVAL;
-+	}
-+
-+	if (msg->request == DP_AUX_NATIVE_WRITE) {
-+		const u8 *buf = msg->buffer;
-+		int i;
-+		for (i = 0; i < msg->size; ++i) {
-+			ret = cdns_mhdp_dpcd_write(mhdp,
-+						   msg->address + i, buf[i]);
-+			if (!ret)
-+				continue;
-+
-+			DRM_DEV_ERROR(mhdp->dev, "Failed to write DPCD\n");
-+
-+			return ret;
-+		}
-+	}
-+
-+	if (msg->request == DP_AUX_NATIVE_READ) {
-+		ret = cdns_mhdp_dpcd_read(mhdp, msg->address, msg->buffer, msg->size);
-+		if (ret < 0)
-+			return -EIO;
-+		msg->reply = DP_AUX_NATIVE_REPLY_ACK;
-+		return msg->size;
-+	}
-+	return 0;
-+}
-+
-+static int dp_aux_init(struct cdns_mhdp_device *mhdp,
-+		  struct device *dev)
-+{
-+	int ret;
-+
-+	mhdp->dp.aux.name = "imx_dp_aux";
-+	mhdp->dp.aux.dev = dev;
-+	mhdp->dp.aux.transfer = dp_aux_transfer;
-+
-+	ret = drm_dp_aux_register(&mhdp->dp.aux);
-+
-+	return ret;
-+}
-+
-+static int dp_aux_destroy(struct cdns_mhdp_device *mhdp)
-+{
-+	drm_dp_aux_unregister(&mhdp->dp.aux);
-+	return 0;
-+}
-+
-+static void dp_pixel_clk_reset(struct cdns_mhdp_device *mhdp)
-+{
-+	u32 val;
-+
-+	/* reset pixel clk */
-+	val = cdns_mhdp_reg_read(mhdp, SOURCE_HDTX_CAR);
-+	cdns_mhdp_reg_write(mhdp, SOURCE_HDTX_CAR, val & 0xFD);
-+	cdns_mhdp_reg_write(mhdp, SOURCE_HDTX_CAR, val);
-+}
-+
-+static void cdns_dp_mode_set(struct cdns_mhdp_device *mhdp)
-+{
-+	u32 lane_mapping = mhdp->lane_mapping;
-+	struct drm_dp_link *link = &mhdp->dp.link;
-+	char linkid[6];
-+	int ret;
-+
-+	cdns_mhdp_plat_call(mhdp, pclk_rate);
-+
-+	/* delay for DP FW stable after pixel clock relock */
-+	msleep(50);
-+
-+	dp_pixel_clk_reset(mhdp);
-+
-+	ret = drm_dp_downstream_id(&mhdp->dp.aux, linkid);
-+	if (ret < 0) {
-+		DRM_INFO("Failed to Get DP link ID: %d\n", ret);
-+		return;
-+	}
-+	DRM_INFO("DP link id: %s, 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n",
-+		 linkid, linkid[0], linkid[1], linkid[2], linkid[3], linkid[4],
-+		 linkid[5]);
-+
-+	/* Check dp link */
-+	ret = drm_dp_link_probe(&mhdp->dp.aux, link);
-+	if (ret < 0) {
-+		DRM_INFO("Failed to probe DP link: %d\n", ret);
-+		return;
-+	}
-+	DRM_INFO("DP revision: 0x%x\n", link->revision);
-+	DRM_INFO("DP rate: %d Mbps\n", link->rate);
-+	DRM_INFO("DP number of lanes: %d\n", link->num_lanes);
-+	DRM_INFO("DP capabilities: 0x%lx\n", link->capabilities);
-+
-+	/* check the max link rate */
-+	if (link->rate > CDNS_DP_MAX_LINK_RATE)
-+		link->rate = CDNS_DP_MAX_LINK_RATE;
-+
-+	drm_dp_link_power_up(&mhdp->dp.aux, link);
-+	if (ret < 0) {
-+		DRM_INFO("Failed to power DP link: %d\n", ret);
-+		return;
-+	}
-+
-+	/* Initialize link rate/num_lanes as panel max link rate/max_num_lanes */
-+	cdns_mhdp_plat_call(mhdp, phy_set);
-+
-+	/* Video off */
-+	ret = cdns_mhdp_set_video_status(mhdp, CONTROL_VIDEO_IDLE);
-+	if (ret) {
-+		DRM_DEV_ERROR(mhdp->dev, "Failed to valid video %d\n", ret);
-+		return;
-+	}
-+
-+	/* Line swaping */
-+	cdns_mhdp_reg_write(mhdp, LANES_CONFIG, 0x00400000 | lane_mapping);
-+
-+	/* Set DP host capability */
-+	ret = cdns_mhdp_set_host_cap(mhdp, false);
-+	if (ret) {
-+		DRM_DEV_ERROR(mhdp->dev, "Failed to set host cap %d\n", ret);
-+		return;
-+	}
-+
-+	ret = cdns_mhdp_config_video(mhdp);
-+	if (ret) {
-+		DRM_DEV_ERROR(mhdp->dev, "Failed to config video %d\n", ret);
-+		return;
-+	}
-+
-+	return;
-+}
-+
-+/* -----------------------------------------------------------------------------
-+ * dp TX Setup
-+ */
-+static enum drm_connector_status
-+cdns_dp_connector_detect(struct drm_connector *connector, bool force)
-+{
-+	struct cdns_mhdp_device *mhdp = container_of(connector,
-+					struct cdns_mhdp_device, connector.base);
-+	u8 hpd = 0xf;
-+
-+	hpd = cdns_mhdp_read_hpd(mhdp);
-+	if (hpd == 1)
-+		/* Cable Connected */
-+		return connector_status_connected;
-+	else if (hpd == 0)
-+		/* Cable Disconnedted */
-+		return connector_status_disconnected;
-+	else {
-+		/* Cable status unknown */
-+		DRM_INFO("Unknow cable status, hdp=%u\n", hpd);
-+		return connector_status_unknown;
-+	}
-+}
-+
-+static int cdns_dp_connector_get_modes(struct drm_connector *connector)
-+{
-+	struct cdns_mhdp_device *mhdp = container_of(connector,
-+					struct cdns_mhdp_device, connector.base);
-+	int num_modes = 0;
-+	struct edid *edid;
-+
-+	edid = drm_do_get_edid(&mhdp->connector.base,
-+				   cdns_mhdp_get_edid_block, mhdp);
-+	if (edid) {
-+		dev_info(mhdp->dev, "%x,%x,%x,%x,%x,%x,%x,%x\n",
-+			 edid->header[0], edid->header[1],
-+			 edid->header[2], edid->header[3],
-+			 edid->header[4], edid->header[5],
-+			 edid->header[6], edid->header[7]);
-+		drm_connector_update_edid_property(connector, edid);
-+		num_modes = drm_add_edid_modes(connector, edid);
-+		kfree(edid);
-+	}
-+
-+	if (num_modes == 0)
-+		DRM_ERROR("Invalid edid\n");
-+	return num_modes;
-+}
-+
-+static const struct drm_connector_funcs cdns_dp_connector_funcs = {
-+	.fill_modes = drm_helper_probe_single_connector_modes,
-+	.detect = cdns_dp_connector_detect,
-+	.destroy = drm_connector_cleanup,
-+	.reset = drm_atomic_helper_connector_reset,
-+	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
-+	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
-+};
-+
-+static const struct drm_connector_helper_funcs cdns_dp_connector_helper_funcs = {
-+	.get_modes = cdns_dp_connector_get_modes,
-+};
-+
-+static int cdns_dp_bridge_attach(struct drm_bridge *bridge)
-+{
-+	struct cdns_mhdp_device *mhdp = bridge->driver_private;
-+	struct drm_encoder *encoder = bridge->encoder;
-+	struct drm_connector *connector = &mhdp->connector.base;
-+
-+	connector->interlace_allowed = 1;
-+
-+	if (mhdp->is_hpd)
-+		connector->polled = DRM_CONNECTOR_POLL_HPD;
-+	else
-+		connector->polled = DRM_CONNECTOR_POLL_CONNECT |
-+		DRM_CONNECTOR_POLL_DISCONNECT;
-+
-+	drm_connector_helper_add(connector, &cdns_dp_connector_helper_funcs);
-+
-+	drm_connector_init(bridge->dev, connector, &cdns_dp_connector_funcs,
-+			   DRM_MODE_CONNECTOR_DisplayPort);
-+
-+	drm_connector_attach_encoder(connector, encoder);
-+
-+	return 0;
-+}
-+
-+static enum drm_mode_status
-+cdns_dp_bridge_mode_valid(struct drm_bridge *bridge,
-+			  const struct drm_display_mode *mode)
-+{
-+	enum drm_mode_status mode_status = MODE_OK;
-+
-+	/* We don't support double-clocked modes */
-+	if (mode->flags & DRM_MODE_FLAG_DBLCLK ||
-+			mode->flags & DRM_MODE_FLAG_INTERLACE)
-+		return MODE_BAD;
-+
-+	/* MAX support pixel clock rate 594MHz */
-+	if (mode->clock > 594000)
-+		return MODE_CLOCK_HIGH;
-+
-+	/* 4096x2160 is not supported now */
-+	if (mode->hdisplay > 3840)
-+		return MODE_BAD_HVALUE;
-+
-+	if (mode->vdisplay > 2160)
-+		return MODE_BAD_VVALUE;
-+
-+	return mode_status;
-+}
-+
-+static void cdns_dp_bridge_mode_set(struct drm_bridge *bridge,
-+				    const struct drm_display_mode *orig_mode,
-+				    const struct drm_display_mode *mode)
-+{
-+	struct cdns_mhdp_device *mhdp = bridge->driver_private;
-+	struct drm_display_info *display_info = &mhdp->connector.base.display_info;
-+	struct video_info *video = &mhdp->video_info;
-+
-+	switch (display_info->bpc) {
-+	case 10:
-+		video->color_depth = 10;
-+		break;
-+	case 6:
-+		video->color_depth = 6;
-+		break;
-+	default:
-+		video->color_depth = 8;
-+		break;
-+	}
-+
-+	video->color_fmt = PXL_RGB;
-+	video->v_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NVSYNC);
-+	video->h_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NHSYNC);
-+
-+	DRM_INFO("Mode: %dx%dp%d\n", mode->hdisplay, mode->vdisplay, mode->clock); 
-+	memcpy(&mhdp->mode, mode, sizeof(struct drm_display_mode));
-+
-+	mutex_lock(&mhdp->lock);
-+	cdns_dp_mode_set(mhdp);
-+	mutex_unlock(&mhdp->lock);
-+
-+	/* reset force mode set flag */
-+	mhdp->force_mode_set = false;
-+}
-+
-+static void cdn_dp_bridge_enable(struct drm_bridge *bridge)
-+{
-+	struct cdns_mhdp_device *mhdp = bridge->driver_private;
-+	int ret;
-+
-+	drm_dp_link_power_up(&mhdp->dp.aux, &mhdp->dp.link);
-+
-+	/* Link trainning */
-+	ret = cdns_mhdp_train_link(mhdp);
-+	if (ret) {
-+		DRM_DEV_ERROR(mhdp->dev, "Failed link train %d\n", ret);
-+		return;
-+	}
-+
-+	ret = cdns_mhdp_set_video_status(mhdp, CONTROL_VIDEO_VALID);
-+	if (ret) {
-+		DRM_DEV_ERROR(mhdp->dev, "Failed to valid video %d\n", ret);
-+		return;
-+	}
-+}
-+
-+static void cdn_dp_bridge_disable(struct drm_bridge *bridge)
-+{	
-+	struct cdns_mhdp_device *mhdp = bridge->driver_private;
-+
-+	cdns_mhdp_set_video_status(mhdp, CONTROL_VIDEO_IDLE);
-+}
-+
-+static const struct drm_bridge_funcs cdns_dp_bridge_funcs = {
-+	.attach = cdns_dp_bridge_attach,
-+	.enable = cdn_dp_bridge_enable,
-+	.disable = cdn_dp_bridge_disable,
-+	.mode_set = cdns_dp_bridge_mode_set,
-+	.mode_valid = cdns_dp_bridge_mode_valid,
-+};
-+
-+static void hotplug_work_func(struct work_struct *work)
-+{
-+	struct cdns_mhdp_device *mhdp = container_of(work,
-+					   struct cdns_mhdp_device, hotplug_work.work);
-+	struct drm_connector *connector = &mhdp->connector.base;
-+
-+	drm_helper_hpd_irq_event(connector->dev);
-+
-+	if (connector->status == connector_status_connected) {
-+		/* Cable connedted  */
-+		DRM_INFO("HDMI/DP Cable Plug In\n");
-+		enable_irq(mhdp->irq[IRQ_OUT]);
-+	} else if (connector->status == connector_status_disconnected) {
-+		/* Cable Disconnedted  */
-+		DRM_INFO("HDMI/DP Cable Plug Out\n");
-+		/* force mode set for cable replugin to recovery DP video modes */
-+		mhdp->force_mode_set = true;
-+		enable_irq(mhdp->irq[IRQ_IN]);
-+	}
-+}
-+
-+static irqreturn_t cdns_dp_irq_thread(int irq, void *data)
-+{
-+	struct cdns_mhdp_device *mhdp = data;
-+
-+	disable_irq_nosync(irq);
-+
-+	mod_delayed_work(system_wq, &mhdp->hotplug_work,
-+			msecs_to_jiffies(HOTPLUG_DEBOUNCE_MS));
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static void cdns_dp_parse_dt(struct cdns_mhdp_device *mhdp)
-+{
-+	struct device_node *of_node = mhdp->dev->of_node;
-+	int ret;
-+
-+	ret = of_property_read_u32(of_node, "lane-mapping",
-+						&mhdp->lane_mapping);
-+	if (ret) {
-+		mhdp->lane_mapping = 0xc6;
-+		dev_warn(mhdp->dev, "Failed to get lane_mapping - using default 0xc6\n");
-+	}
-+	dev_info(mhdp->dev, "lane-mapping 0x%02x\n", mhdp->lane_mapping);
-+}
-+
-+static int __cdns_dp_probe(struct platform_device *pdev,
-+		struct cdns_mhdp_device *mhdp)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct resource *iores = NULL;
-+	int ret;
-+
-+	mutex_init(&mhdp->lock);
-+	mutex_init(&mhdp->iolock);
-+
-+	INIT_DELAYED_WORK(&mhdp->hotplug_work, hotplug_work_func);
-+
-+	iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (iores) {
-+		mhdp->regs_base = devm_ioremap(dev, iores->start,
-+					       resource_size(iores));
-+		if (IS_ERR(mhdp->regs_base))
-+			return -ENOMEM;
-+	}
-+
-+	iores = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-+	if (iores) {
-+		mhdp->regs_sec = devm_ioremap(dev, iores->start,
-+					      resource_size(iores));
-+		if (IS_ERR(mhdp->regs_sec))
-+			return -ENOMEM;
-+	}
-+
-+	mhdp->is_hpd = true;
-+	mhdp->is_ls1028a = false;
-+
-+	mhdp->irq[IRQ_IN] = platform_get_irq_byname(pdev, "plug_in");
-+	if (mhdp->irq[IRQ_IN] < 0) {
-+		mhdp->is_hpd = false;
-+		dev_info(dev, "No plug_in irq number\n");
-+	}
-+
-+	mhdp->irq[IRQ_OUT] = platform_get_irq_byname(pdev, "plug_out");
-+	if (mhdp->irq[IRQ_OUT] < 0) {
-+		mhdp->is_hpd = false;
-+		dev_info(dev, "No plug_out irq number\n");
-+	}
-+
-+	cdns_dp_parse_dt(mhdp);
-+
-+	if (of_device_is_compatible(dev->of_node, "cdn,ls1028a-dp"))
-+		mhdp->is_ls1028a = true;
-+
-+	cdns_mhdp_plat_call(mhdp, power_on);
-+
-+	cdns_mhdp_plat_call(mhdp, firmware_init);
-+
-+	/* DP FW alive check */
-+	ret = cdns_mhdp_check_alive(mhdp);
-+	if (ret == false) {
-+		DRM_ERROR("NO dp FW running\n");
-+		return -ENXIO;
-+	}
-+
-+	/* DP PHY init before AUX init */
-+	cdns_mhdp_plat_call(mhdp, phy_set);
-+
-+	/* Enable Hotplug Detect IRQ thread */
-+	if (mhdp->is_hpd) {
-+		irq_set_status_flags(mhdp->irq[IRQ_IN], IRQ_NOAUTOEN);
-+		ret = devm_request_threaded_irq(dev, mhdp->irq[IRQ_IN],
-+						NULL, cdns_dp_irq_thread,
-+						IRQF_ONESHOT, dev_name(dev),
-+						mhdp);
-+	
-+		if (ret) {
-+			dev_err(dev, "can't claim irq %d\n",
-+					mhdp->irq[IRQ_IN]);
-+			return -EINVAL;
-+		}
-+
-+		irq_set_status_flags(mhdp->irq[IRQ_OUT], IRQ_NOAUTOEN);
-+		ret = devm_request_threaded_irq(dev, mhdp->irq[IRQ_OUT],
-+						NULL, cdns_dp_irq_thread,
-+						IRQF_ONESHOT, dev_name(dev),
-+						mhdp);
-+
-+		if (ret) {
-+			dev_err(dev, "can't claim irq %d\n",
-+					mhdp->irq[IRQ_OUT]);
-+			return -EINVAL;
-+		}
-+
-+		if (cdns_mhdp_read_hpd(mhdp))
-+			enable_irq(mhdp->irq[IRQ_OUT]);
-+		else
-+			enable_irq(mhdp->irq[IRQ_IN]);
-+	}
-+
-+	mhdp->bridge.base.driver_private = mhdp;
-+	mhdp->bridge.base.funcs = &cdns_dp_bridge_funcs;
-+#ifdef CONFIG_OF
-+	mhdp->bridge.base.of_node = dev->of_node;
-+#endif
-+
-+	dev_set_drvdata(dev, mhdp);
-+	
-+	/* register audio driver */
-+	cdns_mhdp_register_audio_driver(dev);
-+
-+	dp_aux_init(mhdp, dev);
-+
-+	return 0;
-+}
-+
-+static void __cdns_dp_remove(struct cdns_mhdp_device *mhdp)
-+{
-+	dp_aux_destroy(mhdp);
-+	cdns_mhdp_unregister_audio_driver(mhdp->dev);
-+}
-+
-+/* -----------------------------------------------------------------------------
-+ * Probe/remove API, used from platforms based on the DRM bridge API.
-+ */
-+int cdns_dp_probe(struct platform_device *pdev,
-+		  struct cdns_mhdp_device *mhdp)
-+{
-+	int ret;
-+
-+	ret = __cdns_dp_probe(pdev, mhdp);
-+	if (ret)
-+		return ret;
-+
-+	drm_bridge_add(&mhdp->bridge.base);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(cdns_dp_probe);
-+
-+void cdns_dp_remove(struct platform_device *pdev)
-+{
-+	struct cdns_mhdp_device *mhdp = platform_get_drvdata(pdev);
-+
-+	drm_bridge_remove(&mhdp->bridge.base);
-+
-+	__cdns_dp_remove(mhdp);
-+}
-+EXPORT_SYMBOL_GPL(cdns_dp_remove);
-+
-+/* -----------------------------------------------------------------------------
-+ * Bind/unbind API, used from platforms based on the component framework.
-+ */
-+int cdns_dp_bind(struct platform_device *pdev, struct drm_encoder *encoder,
-+		struct cdns_mhdp_device *mhdp)
-+{
-+	int ret;
-+
-+	ret = __cdns_dp_probe(pdev, mhdp);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret = drm_bridge_attach(encoder, &mhdp->bridge.base, NULL);
-+	if (ret) {
-+		cdns_dp_remove(pdev);
-+		DRM_ERROR("Failed to initialize bridge with drm\n");
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(cdns_dp_bind);
-+
-+void cdns_dp_unbind(struct device *dev)
-+{
-+	struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
-+
-+	__cdns_dp_remove(mhdp);
-+}
-+EXPORT_SYMBOL_GPL(cdns_dp_unbind);
-+
-+MODULE_AUTHOR("Sandor Yu <sandor.yu@nxp.com>");
-+MODULE_DESCRIPTION("Cadence Display Port transmitter driver");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("platform:cdn-dp");
-diff --git a/drivers/gpu/drm/bridge/cadence/cdns-hdmi-core.c b/drivers/gpu/drm/bridge/cadence/cdns-hdmi-core.c
-new file mode 100644
-index 000000000000..25e8717795bf
---- /dev/null
-+++ b/drivers/gpu/drm/bridge/cadence/cdns-hdmi-core.c
-@@ -0,0 +1,688 @@
-+/*
-+ * Cadence High-Definition Multimedia Interface (HDMI) driver
-+ *
-+ * Copyright (C) 2019 NXP Semiconductor, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ */
-+#include <drm/bridge/cdns-mhdp-common.h>
-+#include <drm/drm_atomic_helper.h>
-+#include <drm/drm_edid.h>
-+#include <drm/drm_encoder_slave.h>
-+#include <drm/drm_of.h>
-+#include <drm/drm_probe_helper.h>
-+#include <drm/drm_scdc_helper.h>
-+#include <linux/delay.h>
-+#include <linux/err.h>
-+#include <linux/hdmi.h>
-+#include <linux/irq.h>
-+#include <linux/module.h>
-+#include <linux/mfd/syscon.h>
-+#include <linux/mutex.h>
-+#include <linux/of_device.h>
-+
-+static void hdmi_sink_config(struct cdns_mhdp_device *mhdp)
-+{
-+	struct drm_scdc *scdc = &mhdp->connector.base.display_info.hdmi.scdc;
-+	u8 buff = 0;
-+
-+	/* Default work in HDMI1.4 */
-+	mhdp->hdmi.hdmi_type = MODE_HDMI_1_4;
-+
-+	/* check sink support SCDC or not */
-+	if (scdc->supported != true) {
-+		printk(KERN_ALERT "cdns-hdmi-core: Sink Not Support SCDC\n");
-+		return;
-+	}
-+
-+	if (mhdp->hdmi.char_rate > 340000) {
-+		/*
-+		 * TMDS Character Rate above 340MHz should working in HDMI2.0
-+		 * Enable scrambling and TMDS_Bit_Clock_Ratio
-+		 */
-+		buff = SCDC_TMDS_BIT_CLOCK_RATIO_BY_40 | SCDC_SCRAMBLING_ENABLE;
-+		mhdp->hdmi.hdmi_type = MODE_HDMI_2_0;
-+	} else  if (scdc->scrambling.low_rates) {
-+		/*
-+		 * Enable scrambling and HDMI2.0 when scrambling capability of sink
-+		 * be indicated in the HF-VSDB LTE_340Mcsc_scramble bit
-+		 */
-+		buff = SCDC_SCRAMBLING_ENABLE;
-+		mhdp->hdmi.hdmi_type = MODE_HDMI_2_0;
-+	}
-+
-+	/* TMDS config */
-+	cdns_hdmi_scdc_write(mhdp, 0x20, buff);
-+}
-+
-+static void hdmi_lanes_config(struct cdns_mhdp_device *mhdp)
-+{
-+	/* Line swapping */
-+	cdns_mhdp_reg_write(mhdp, LANES_CONFIG, 0x00400000 | mhdp->lane_mapping);
-+}
-+
-+static int hdmi_avi_info_set(struct cdns_mhdp_device *mhdp,
-+			     struct drm_display_mode *mode)
-+{
-+	struct hdmi_avi_infoframe frame;
-+	int format = mhdp->video_info.color_fmt;
-+	struct drm_connector_state *conn_state = mhdp->connector.base.state;
-+	struct drm_display_mode *adj_mode;
-+	enum hdmi_quantization_range qr;
-+	u8 buf[32];
-+	int ret;
-+
-+	/* Initialise info frame from DRM mode */
-+	drm_hdmi_avi_infoframe_from_display_mode(&frame, &mhdp->connector.base,
-+						 mode);
-+
-+	switch (format) {
-+	case YCBCR_4_4_4:
-+		frame.colorspace = HDMI_COLORSPACE_YUV444;
-+		break;
-+	case YCBCR_4_2_2:
-+		frame.colorspace = HDMI_COLORSPACE_YUV422;
-+		break;
-+	case YCBCR_4_2_0:
-+		frame.colorspace = HDMI_COLORSPACE_YUV420;
-+		break;
-+	default:
-+		frame.colorspace = HDMI_COLORSPACE_RGB;
-+		break;
-+	}
-+
-+	drm_hdmi_avi_infoframe_colorspace(&frame, conn_state);
-+
-+	adj_mode = &mhdp->bridge.base.encoder->crtc->state->adjusted_mode;
-+
-+	qr = drm_default_rgb_quant_range(adj_mode);
-+
-+	drm_hdmi_avi_infoframe_quant_range(&frame, &mhdp->connector.base,
-+					   adj_mode, qr);
-+
-+	ret = hdmi_avi_infoframe_check(&frame);
-+	if (WARN_ON(ret))
-+		return false;
-+
-+	ret = hdmi_avi_infoframe_pack(&frame, buf + 1, sizeof(buf) - 1);
-+	if (ret < 0) {
-+		printk(KERN_ALERT "cdns-hdmi-core: failed to pack AVI infoframe: %d\n", ret);
-+		return -1;
-+	}
-+
-+	buf[0] = 0;
-+	cdns_mhdp_infoframe_set(mhdp, 0, sizeof(buf), buf, HDMI_INFOFRAME_TYPE_AVI);
-+	return 0;
-+}
-+
-+static void hdmi_vendor_info_set(struct cdns_mhdp_device *mhdp,
-+				struct drm_display_mode *mode)
-+{
-+	struct hdmi_vendor_infoframe frame;
-+	u8 buf[32];
-+	int ret;
-+
-+	/* Initialise vendor frame from DRM mode */
-+	ret = drm_hdmi_vendor_infoframe_from_display_mode(&frame, &mhdp->connector.base, mode);
-+	if (ret < 0) {
-+		printk(KERN_ALERT "cdns-hdmi-core: No vendor infoframe\n");
-+		return;
-+	}
-+
-+	ret = hdmi_vendor_infoframe_pack(&frame, buf + 1, sizeof(buf) - 1);
-+	if (ret < 0) {
-+		printk(KERN_ALERT "cdns-hdmi-core: Unable to pack vendor infoframe: %d\n", ret);
-+		return;
-+	}
-+
-+	buf[0] = 0;
-+	cdns_mhdp_infoframe_set(mhdp, 3, sizeof(buf), buf, HDMI_INFOFRAME_TYPE_VENDOR);
-+}
-+
-+static void hdmi_drm_info_set(struct cdns_mhdp_device *mhdp)
-+{
-+	struct drm_connector_state *conn_state;
-+	struct hdmi_drm_infoframe frame;
-+	u8 buf[32];
-+	int ret;
-+
-+	conn_state = mhdp->connector.base.state;
-+
-+	if (!conn_state->hdr_output_metadata)
-+		return;
-+
-+	ret = drm_hdmi_infoframe_set_hdr_metadata(&frame, conn_state);
-+	if (ret < 0) {
-+		printk(KERN_ALERT "cdns-hdmi-core: couldn't set HDR metadata in infoframe\n");
-+		return;
-+	}
-+
-+	ret = hdmi_drm_infoframe_pack(&frame, buf + 1, sizeof(buf) - 1);
-+	if (ret < 0) {
-+		printk(KERN_ALERT "cdns-hdmi-core: couldn't pack HDR infoframe\n");
-+		return;
-+	}
-+
-+	buf[0] = 0;
-+	cdns_mhdp_infoframe_set(mhdp, 3, sizeof(buf),
-+				buf, HDMI_INFOFRAME_TYPE_DRM);
-+}
-+
-+void cdns_hdmi_mode_set(struct cdns_mhdp_device *mhdp)
-+{
-+	struct drm_display_mode *mode = &mhdp->mode;
-+	int ret;
-+
-+	/* video mode valid check */
-+	if (mode->clock == 0 || mode->hdisplay == 0 ||  mode->vdisplay == 0)
-+		return;
-+
-+	hdmi_lanes_config(mhdp);
-+
-+	cdns_mhdp_plat_call(mhdp, pclk_rate);
-+
-+	/* delay for HDMI FW stable after pixel clock relock */
-+	msleep(20);
-+
-+	cdns_mhdp_plat_call(mhdp, phy_set);
-+
-+	hdmi_sink_config(mhdp);
-+
-+	ret = cdns_hdmi_ctrl_init(mhdp, mhdp->hdmi.hdmi_type, mhdp->hdmi.char_rate);
-+	if (ret < 0) {
-+		printk(KERN_ALERT "cdns-hdmi-core: %s, ret = %d\n", __func__, ret);
-+		return;
-+	}
-+
-+	/* Config GCP */
-+	if (mhdp->video_info.color_depth == 8)
-+		cdns_hdmi_disable_gcp(mhdp);
-+	else
-+		cdns_hdmi_enable_gcp(mhdp);
-+
-+	ret = hdmi_avi_info_set(mhdp, mode);
-+	if (ret < 0) {
-+		printk(KERN_ALERT "cdns-hdmi-core: %s ret = %d\n", __func__, ret);
-+		return;
-+	}
-+
-+	/* vendor info frame is enable only  when HDMI1.4 4K mode */
-+	hdmi_vendor_info_set(mhdp, mode);
-+
-+	hdmi_drm_info_set(mhdp);
-+
-+	ret = cdns_hdmi_mode_config(mhdp, mode, &mhdp->video_info);
-+	if (ret < 0) {
-+		printk(KERN_ALERT "cdns-hdmi-core: CDN_API_HDMITX_SetVic_blocking ret = %d\n", ret);
-+		return;
-+	}
-+}
-+
-+static enum drm_connector_status
-+cdns_hdmi_connector_detect(struct drm_connector *connector, bool force)
-+{
-+	struct cdns_mhdp_device *mhdp =
-+				container_of(connector, struct cdns_mhdp_device, connector.base);
-+
-+	u8 hpd = 0xf;
-+
-+	hpd = cdns_mhdp_read_hpd(mhdp);
-+
-+	if (hpd == 1)
-+		/* Cable Connected */
-+		return connector_status_connected;
-+	else if (hpd == 0)
-+		/* Cable Disconnedted */
-+		return connector_status_disconnected;
-+	else {
-+		/* Cable status unknown */
-+		printk(KERN_ALERT "cdns-hdmi-core: Unknown cable status, hdp=%u\n", hpd);
-+		return connector_status_unknown;
-+	}
-+}
-+
-+static int cdns_hdmi_connector_get_modes(struct drm_connector *connector)
-+{
-+	struct cdns_mhdp_device *mhdp =
-+				container_of(connector, struct cdns_mhdp_device, connector.base);
-+	int num_modes = 0;
-+	struct edid *edid;
-+
-+	edid = drm_do_get_edid(&mhdp->connector.base,
-+				   cdns_hdmi_get_edid_block, mhdp);
-+	if (edid) {
-+		dev_info(mhdp->dev, "%x,%x,%x,%x,%x,%x,%x,%x\n",
-+			 edid->header[0], edid->header[1],
-+			 edid->header[2], edid->header[3],
-+			 edid->header[4], edid->header[5],
-+			 edid->header[6], edid->header[7]);
-+		drm_connector_update_edid_property(connector, edid);
-+		num_modes = drm_add_edid_modes(connector, edid);
-+		kfree(edid);
-+	}
-+
-+	if (num_modes == 0)
-+		printk(KERN_ALERT "cdns-hdmi-core: Invalid edid\n");
-+	return num_modes;
-+}
-+
-+static bool blob_equal(const struct drm_property_blob *a,
-+		       const struct drm_property_blob *b)
-+{
-+	if (a && b)
-+		return a->length == b->length &&
-+			!memcmp(a->data, b->data, a->length);
-+
-+	return !a == !b;
-+}
-+
-+static int cdns_hdmi_connector_atomic_check(struct drm_connector *connector,
-+					    struct drm_atomic_state *state)
-+{
-+	struct drm_connector_state *new_con_state =
-+		drm_atomic_get_new_connector_state(state, connector);
-+	struct drm_connector_state *old_con_state =
-+		drm_atomic_get_old_connector_state(state, connector);
-+	struct drm_crtc *crtc = new_con_state->crtc;
-+	struct drm_crtc_state *new_crtc_state;
-+
-+	if (!blob_equal(new_con_state->hdr_output_metadata,
-+			old_con_state->hdr_output_metadata) ||
-+	    new_con_state->colorspace != old_con_state->colorspace) {
-+		new_crtc_state = drm_atomic_get_crtc_state(state, crtc);
-+		if (IS_ERR(new_crtc_state))
-+			return PTR_ERR(new_crtc_state);
-+
-+		new_crtc_state->mode_changed =
-+			!new_con_state->hdr_output_metadata ||
-+			!old_con_state->hdr_output_metadata ||
-+			new_con_state->colorspace != old_con_state->colorspace;
-+	}
-+
-+	return 0;
-+}
-+
-+static const struct drm_connector_funcs cdns_hdmi_connector_funcs = {
-+	.fill_modes = drm_helper_probe_single_connector_modes,
-+	.detect = cdns_hdmi_connector_detect,
-+	.destroy = drm_connector_cleanup,
-+	.reset = drm_atomic_helper_connector_reset,
-+	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
-+	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
-+};
-+
-+static const struct drm_connector_helper_funcs cdns_hdmi_connector_helper_funcs = {
-+	.get_modes = cdns_hdmi_connector_get_modes,
-+	.atomic_check = cdns_hdmi_connector_atomic_check,
-+};
-+
-+static int cdns_hdmi_bridge_attach(struct drm_bridge *bridge, enum drm_bridge_attach_flags flags)
-+{
-+	struct cdns_mhdp_device *mhdp = bridge->driver_private;
-+	struct drm_mode_config *config = &bridge->dev->mode_config;
-+	struct drm_encoder *encoder = bridge->encoder;
-+	struct drm_connector *connector = &mhdp->connector.base;
-+
-+	connector->interlace_allowed = 1;
-+	connector->polled = DRM_CONNECTOR_POLL_HPD;
-+
-+	drm_connector_helper_add(connector, &cdns_hdmi_connector_helper_funcs);
-+
-+	drm_connector_init(bridge->dev, connector, &cdns_hdmi_connector_funcs,
-+			   DRM_MODE_CONNECTOR_HDMIA);
-+
-+	if (!strncmp("imx8mq-hdmi", mhdp->plat_data->plat_name, 11)) {
-+		drm_object_attach_property(&connector->base,
-+					   config->hdr_output_metadata_property,
-+					   0);
-+
-+		if (!drm_mode_create_hdmi_colorspace_property(connector))
-+			drm_object_attach_property(&connector->base,
-+						connector->colorspace_property,
-+						0);
-+	}
-+
-+	drm_connector_attach_encoder(connector, encoder);
-+
-+	return 0;
-+}
-+
-+static enum drm_mode_status
-+cdns_hdmi_bridge_mode_valid(struct drm_bridge *bridge,
-+				const struct drm_display_info *info,
-+				const struct drm_display_mode *mode)
-+{
-+	struct cdns_mhdp_device *mhdp = bridge->driver_private;
-+	enum drm_mode_status mode_status = MODE_OK;
-+	int ret;
-+
-+	/* We don't support double-clocked and Interlaced modes */
-+	if (mode->flags & DRM_MODE_FLAG_DBLCLK ||
-+			mode->flags & DRM_MODE_FLAG_INTERLACE)
-+		return MODE_BAD;
-+
-+	/* MAX support pixel clock rate 594MHz */
-+	if (mode->clock > 594000)
-+		return MODE_CLOCK_HIGH;
-+
-+	/* 4096x2160 is not supported */
-+	if (mode->hdisplay > 3840 || mode->vdisplay > 2160)
-+		return MODE_BAD_HVALUE;
-+
-+	mhdp->valid_mode = mode;
-+	ret = cdns_mhdp_plat_call(mhdp, phy_video_valid);
-+	if (ret == false)
-+		return MODE_CLOCK_RANGE;
-+
-+	return mode_status;
-+}
-+
-+static void cdns_hdmi_bridge_mode_set(struct drm_bridge *bridge,
-+				    const struct drm_display_mode *orig_mode,
-+				    const struct drm_display_mode *mode)
-+{
-+	struct cdns_mhdp_device *mhdp = bridge->driver_private;
-+	struct video_info *video = &mhdp->video_info;
-+
-+	video->v_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NVSYNC);
-+	video->h_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NHSYNC);
-+
-+	printk(KERN_ALERT "cdns-hdmi-core: Mode: %dx%dp%d\n", mode->hdisplay, mode->vdisplay, mode->clock);
-+	memcpy(&mhdp->mode, mode, sizeof(struct drm_display_mode));
-+
-+	mutex_lock(&mhdp->lock);
-+	cdns_hdmi_mode_set(mhdp);
-+	mutex_unlock(&mhdp->lock);
-+	/* reset force mode set flag */
-+	mhdp->force_mode_set = false;
-+}
-+
-+bool cdns_hdmi_bridge_mode_fixup(struct drm_bridge *bridge,
-+				 const struct drm_display_mode *mode,
-+				 struct drm_display_mode *adjusted_mode)
-+{
-+	struct cdns_mhdp_device *mhdp = bridge->driver_private;
-+	struct drm_display_info *di = &mhdp->connector.base.display_info;
-+	struct video_info *video = &mhdp->video_info;
-+	int vic = drm_match_cea_mode(mode);
-+
-+	video->color_depth = 8;
-+	video->color_fmt = PXL_RGB;
-+
-+	/* for all other platforms, other than imx8mq */
-+	if (strncmp("imx8mq-hdmi", mhdp->plat_data->plat_name, 11)) {
-+		if (di->bpc == 10 || di->bpc == 6)
-+			video->color_depth = di->bpc;
-+
-+		return true;
-+	}
-+
-+	/* imx8mq */
-+	if (vic == 97 || vic == 96) {
-+		if (di->hdmi.y420_dc_modes & DRM_EDID_YCBCR420_DC_36)
-+			video->color_depth = 12;
-+		else if (di->hdmi.y420_dc_modes & DRM_EDID_YCBCR420_DC_30)
-+			video->color_depth = 10;
-+
-+		if (drm_mode_is_420_only(di, mode) ||
-+		    (drm_mode_is_420_also(di, mode) &&
-+		     video->color_depth > 8)) {
-+			video->color_fmt = YCBCR_4_2_0;
-+
-+      // FIXME
-+			//adjusted_mode->private_flags = 1;
-+			return true;
-+		}
-+
-+		video->color_depth = 8;
-+		return true;
-+	}
-+
-+	/* Any defined maximum tmds clock limit we must not exceed*/
-+	if ((di->edid_hdmi_dc_modes & DRM_EDID_HDMI_DC_36) &&
-+	    (mode->clock * 3 / 2 <= di->max_tmds_clock))
-+		video->color_depth = 12;
-+	else if ((di->edid_hdmi_dc_modes & DRM_EDID_HDMI_DC_30) &&
-+		 (mode->clock * 5 / 4 <= di->max_tmds_clock))
-+		video->color_depth = 10;
-+
-+	/* 10-bit color depth for the following modes is not supported */
-+	if ((vic == 95 || vic == 94 || vic == 93) && video->color_depth == 10)
-+		video->color_depth = 8;
-+
-+	return true;
-+}
-+
-+static const struct drm_bridge_funcs cdns_hdmi_bridge_funcs = {
-+	.attach = cdns_hdmi_bridge_attach,
-+	.mode_set = cdns_hdmi_bridge_mode_set,
-+	.mode_valid = cdns_hdmi_bridge_mode_valid,
-+	.mode_fixup = cdns_hdmi_bridge_mode_fixup,
-+};
-+
-+static void hotplug_work_func(struct work_struct *work)
-+{
-+	struct cdns_mhdp_device *mhdp = container_of(work,
-+					   struct cdns_mhdp_device, hotplug_work.work);
-+	struct drm_connector *connector = &mhdp->connector.base;
-+
-+	drm_helper_hpd_irq_event(connector->dev);
-+
-+	if (connector->status == connector_status_connected) {
-+		printk(KERN_ALERT "cdns-hdmi-core: HDMI Cable Plug In\n");
-+		enable_irq(mhdp->irq[IRQ_OUT]);
-+	} else if (connector->status == connector_status_disconnected) {
-+		/* Cable Disconnedted  */
-+		printk(KERN_ALERT "cdns-hdmi-core: HDMI Cable Plug Out\n");
-+		/* force mode set for cable replugin to recovery HDMI2.0 video modes */
-+		mhdp->force_mode_set = true;
-+		enable_irq(mhdp->irq[IRQ_IN]);
-+	}
-+}
-+
-+static irqreturn_t cdns_hdmi_irq_thread(int irq, void *data)
-+{
-+	struct cdns_mhdp_device *mhdp = data;
-+
-+	disable_irq_nosync(irq);
-+
-+	mod_delayed_work(system_wq, &mhdp->hotplug_work,
-+			msecs_to_jiffies(HOTPLUG_DEBOUNCE_MS));
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static void cdns_hdmi_parse_dt(struct cdns_mhdp_device *mhdp)
-+{
-+	struct device_node *of_node = mhdp->dev->of_node;
-+	int ret;
-+
-+	ret = of_property_read_u32(of_node, "lane-mapping", &mhdp->lane_mapping);
-+	if (ret) {
-+		mhdp->lane_mapping = 0xc6;
-+		dev_warn(mhdp->dev, "Failed to get lane_mapping - using default 0xc6\n");
-+	}
-+	dev_info(mhdp->dev, "lane-mapping 0x%02x\n", mhdp->lane_mapping);
-+}
-+
-+static int __cdns_hdmi_probe(struct platform_device *pdev,
-+		  struct cdns_mhdp_device *mhdp)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct platform_device_info pdevinfo;
-+	struct resource *iores = NULL;
-+	int ret;
-+
-+	mutex_init(&mhdp->lock);
-+	mutex_init(&mhdp->iolock);
-+
-+	INIT_DELAYED_WORK(&mhdp->hotplug_work, hotplug_work_func);
-+
-+	iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	mhdp->regs_base = devm_ioremap(dev, iores->start, resource_size(iores));
-+	if (IS_ERR(mhdp->regs_base)) {
-+		dev_err(dev, "No regs_base memory\n");
-+		return -ENOMEM;
-+	}
-+
-+	/* sec register base */
-+	iores = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-+	mhdp->regs_sec = devm_ioremap(dev, iores->start, resource_size(iores));
-+	if (IS_ERR(mhdp->regs_sec)) {
-+		dev_err(dev, "No regs_sec memory\n");
-+		return -ENOMEM;
-+	}
-+
-+	mhdp->irq[IRQ_IN] = platform_get_irq_byname(pdev, "plug_in");
-+	if (mhdp->irq[IRQ_IN] < 0) {
-+		dev_info(dev, "No plug_in irq number\n");
-+		return -EPROBE_DEFER;
-+	}
-+
-+	mhdp->irq[IRQ_OUT] = platform_get_irq_byname(pdev, "plug_out");
-+	if (mhdp->irq[IRQ_OUT] < 0) {
-+		dev_info(dev, "No plug_out irq number\n");
-+		return -EPROBE_DEFER;
-+	}
-+
-+	cdns_mhdp_plat_call(mhdp, power_on);
-+
-+	/* Initialize FW */
-+	cdns_mhdp_plat_call(mhdp, firmware_init);
-+
-+	/* HDMI FW alive check */
-+	ret = cdns_mhdp_check_alive(mhdp);
-+	if (ret == false) {
-+		dev_err(dev, "NO HDMI FW running\n");
-+		return -ENXIO;
-+	}
-+
-+	/* Enable Hotplug Detect thread */
-+	irq_set_status_flags(mhdp->irq[IRQ_IN], IRQ_NOAUTOEN);
-+	ret = devm_request_threaded_irq(dev, mhdp->irq[IRQ_IN],
-+					NULL, cdns_hdmi_irq_thread,
-+					IRQF_ONESHOT, dev_name(dev),
-+					mhdp);
-+	if (ret < 0) {
-+		dev_err(dev, "can't claim irq %d\n",
-+						mhdp->irq[IRQ_IN]);
-+		return -EINVAL;
-+	}
-+
-+	irq_set_status_flags(mhdp->irq[IRQ_OUT], IRQ_NOAUTOEN);
-+	ret = devm_request_threaded_irq(dev, mhdp->irq[IRQ_OUT],
-+					NULL, cdns_hdmi_irq_thread,
-+					IRQF_ONESHOT, dev_name(dev),
-+					mhdp);
-+	if (ret < 0) {
-+		dev_err(dev, "can't claim irq %d\n",
-+						mhdp->irq[IRQ_OUT]);
-+		return -EINVAL;
-+	}
-+
-+	cdns_hdmi_parse_dt(mhdp);
-+
-+	if (cdns_mhdp_read_hpd(mhdp))
-+		enable_irq(mhdp->irq[IRQ_OUT]);
-+	else
-+		enable_irq(mhdp->irq[IRQ_IN]);
-+
-+	mhdp->bridge.base.driver_private = mhdp;
-+	mhdp->bridge.base.funcs = &cdns_hdmi_bridge_funcs;
-+#ifdef CONFIG_OF
-+	mhdp->bridge.base.of_node = dev->of_node;
-+#endif
-+
-+	memset(&pdevinfo, 0, sizeof(pdevinfo));
-+	pdevinfo.parent = dev;
-+	pdevinfo.id = PLATFORM_DEVID_AUTO;
-+
-+	dev_set_drvdata(dev, mhdp);
-+
-+	/* register audio driver */
-+	//cdns_mhdp_register_audio_driver(dev);
-+
-+	/* register cec driver */
-+#ifdef CONFIG_DRM_CDNS_HDMI_CEC
-+	cdns_mhdp_register_cec_driver(dev);
-+#endif
-+
-+	return 0;
-+}
-+
-+static void __cdns_hdmi_remove(struct cdns_mhdp_device *mhdp)
-+{
-+	/* unregister cec driver */
-+#ifdef CONFIG_DRM_CDNS_HDMI_CEC
-+	cdns_mhdp_unregister_cec_driver(mhdp->dev);
-+#endif
-+	//cdns_mhdp_unregister_audio_driver(mhdp->dev);
-+}
-+
-+/* -----------------------------------------------------------------------------
-+ * Probe/remove API, used from platforms based on the DRM bridge API.
-+ */
-+int cdns_hdmi_probe(struct platform_device *pdev,
-+		struct cdns_mhdp_device *mhdp)
-+{
-+	int ret;
-+
-+	ret  = __cdns_hdmi_probe(pdev, mhdp);
-+	if (ret < 0)
-+		return ret;
-+
-+	drm_bridge_add(&mhdp->bridge.base);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(cdns_hdmi_probe);
-+
-+void cdns_hdmi_remove(struct platform_device *pdev)
-+{
-+	struct cdns_mhdp_device *mhdp = platform_get_drvdata(pdev);
-+
-+	drm_bridge_remove(&mhdp->bridge.base);
-+
-+	__cdns_hdmi_remove(mhdp);
-+}
-+EXPORT_SYMBOL_GPL(cdns_hdmi_remove);
-+
-+/* -----------------------------------------------------------------------------
-+ * Bind/unbind API, used from platforms based on the component framework.
-+ */
-+int cdns_hdmi_bind(struct platform_device *pdev, struct drm_encoder *encoder,
-+			struct cdns_mhdp_device *mhdp)
-+{
-+	int ret;
-+
-+	ret = __cdns_hdmi_probe(pdev, mhdp);
-+	if (ret)
-+		return ret;
-+
-+	ret = drm_bridge_attach(encoder, &mhdp->bridge.base, NULL, 0); // FIXME flags?
-+	if (ret) {
-+		cdns_hdmi_remove(pdev);
-+		printk(KERN_ALERT "cdns-hdmi-core: Failed to initialize bridge with drm\n");
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(cdns_hdmi_bind);
-+
-+void cdns_hdmi_unbind(struct device *dev)
-+{
-+	struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
-+
-+	__cdns_hdmi_remove(mhdp);
-+}
-+EXPORT_SYMBOL_GPL(cdns_hdmi_unbind);
-+
-+MODULE_AUTHOR("Sandor Yu <sandor.yu@nxp.com>");
-+MODULE_DESCRIPTION("Cadence HDMI transmitter driver");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("platform:cdn-hdmi");
-diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp-audio.c b/drivers/gpu/drm/bridge/cadence/cdns-mhdp-audio.c
-new file mode 100644
-index 000000000000..5e71848ea30d
---- /dev/null
-+++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp-audio.c
-@@ -0,0 +1,393 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd
-+ * Author: Chris Zhong <zyw@rock-chips.com>
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ */
-+#include <linux/clk.h>
-+#include <linux/reset.h>
-+#include <drm/bridge/cdns-mhdp-common.h>
-+#include <sound/hdmi-codec.h>
-+#include <drm/drm_of.h>
-+
-+#define CDNS_DP_SPDIF_CLK		200000000
-+
-+static u32 TMDS_rate_table[7] = {
-+	25200, 27000, 54000, 74250, 148500, 297000, 594000,
-+};
-+
-+static u32 N_table_32k[7] = {
-+/* 25200/27000/54000/74250/148500/297000/594000 */
-+	4096, 4096, 4096, 4096, 4096, 3072, 3072,
-+};
-+
-+static u32 N_table_44k[7] = {
-+	6272, 6272, 6272, 6272, 6272, 4704, 9408,
-+};
-+
-+static u32 N_table_48k[7] = {
-+	6144, 6144, 6144, 6144, 6144, 5120, 6144,
-+};
-+
-+static int select_N_index(u32 pclk)
-+{
-+	int num = sizeof(TMDS_rate_table)/sizeof(int);
-+	int i = 0;
-+
-+	for (i = 0; i < num ; i++)
-+		if (pclk == TMDS_rate_table[i])
-+			break;
-+
-+	if (i == num) {
-+		printk("cdn-mhdp-audio: pclkc %d is not supported!\n", pclk);
-+		return num-1;
-+	}
-+
-+	return i;
-+}
-+
-+static void hdmi_audio_avi_set(struct cdns_mhdp_device *mhdp,
-+						u32 channels)
-+{
-+	struct hdmi_audio_infoframe frame;
-+	u8 buf[32];
-+	int ret;
-+
-+	hdmi_audio_infoframe_init(&frame);
-+
-+	frame.channels = channels;
-+	frame.coding_type = HDMI_AUDIO_CODING_TYPE_STREAM;
-+
-+	if (channels == 2)
-+		frame.channel_allocation = 0;
-+	else if (channels == 4)
-+		frame.channel_allocation = 0x3;
-+	else if (channels == 8)
-+		frame.channel_allocation = 0x13;
-+
-+	ret = hdmi_audio_infoframe_pack(&frame, buf + 1, sizeof(buf) - 1);
-+	if (ret < 0) {
-+		printk("cdns-mhdp-audio: failed to pack audio infoframe: %d\n", ret);
-+		return;
-+	}
-+
-+	buf[0] = 0;
-+
-+	cdns_mhdp_infoframe_set(mhdp, 1, sizeof(buf), buf, HDMI_INFOFRAME_TYPE_AUDIO);
-+}
-+
-+int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
-+			 struct audio_info *audio)
-+{
-+	int ret;
-+
-+	if (audio->connector_type == DRM_MODE_CONNECTOR_DisplayPort) {
-+		ret = cdns_mhdp_reg_write(mhdp, AUDIO_PACK_CONTROL, 0);
-+		if (ret) {
-+			dev_err(mhdp->dev, "audio stop failed: %d\n", ret);
-+			return ret;
-+		}
-+	}
-+
-+	cdns_mhdp_bus_write(0, mhdp, SPDIF_CTRL_ADDR);
-+
-+	/* clearn the audio config and reset */
-+	cdns_mhdp_bus_write(0, mhdp, AUDIO_SRC_CNTL);
-+	cdns_mhdp_bus_write(0, mhdp, AUDIO_SRC_CNFG);
-+	cdns_mhdp_bus_write(AUDIO_SW_RST, mhdp, AUDIO_SRC_CNTL);
-+	cdns_mhdp_bus_write(0, mhdp, AUDIO_SRC_CNTL);
-+
-+	/* reset smpl2pckt component  */
-+	cdns_mhdp_bus_write(0, mhdp, SMPL2PKT_CNTL);
-+	cdns_mhdp_bus_write(AUDIO_SW_RST, mhdp, SMPL2PKT_CNTL);
-+	cdns_mhdp_bus_write(0, mhdp, SMPL2PKT_CNTL);
-+
-+	/* reset FIFO */
-+	cdns_mhdp_bus_write(AUDIO_SW_RST, mhdp, FIFO_CNTL);
-+	cdns_mhdp_bus_write(0, mhdp, FIFO_CNTL);
-+
-+	if (audio->format == AFMT_SPDIF_INT)
-+		clk_disable_unprepare(mhdp->spdif_clk);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_audio_stop);
-+
-+int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable)
-+{
-+	struct audio_info *audio = &mhdp->audio_info;
-+	int ret = true;
-+
-+	if (audio->connector_type == DRM_MODE_CONNECTOR_DisplayPort) {
-+		ret = cdns_mhdp_reg_write_bit(mhdp, DP_VB_ID, 4, 1, enable);
-+		if (ret)
-+			dev_err(mhdp->dev, "audio mute failed: %d\n", ret);
-+	}
-+
-+	return ret;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_audio_mute);
-+
-+static void cdns_mhdp_audio_config_i2s(struct cdns_mhdp_device *mhdp,
-+				       struct audio_info *audio)
-+{
-+	int sub_pckt_num = 1, i2s_port_en_val = 0xf, i;
-+	int idx = select_N_index(mhdp->mode.clock);
-+	u32 val, ncts;
-+
-+	if (audio->channels == 2) {
-+		if (mhdp->dp.link.num_lanes == 1)
-+			sub_pckt_num = 2;
-+		else
-+			sub_pckt_num = 4;
-+
-+		i2s_port_en_val = 1;
-+	} else if (audio->channels == 4) {
-+		i2s_port_en_val = 3;
-+	}
-+
-+	cdns_mhdp_bus_write(0x0, mhdp, SPDIF_CTRL_ADDR);
-+
-+	cdns_mhdp_bus_write(SYNC_WR_TO_CH_ZERO, mhdp, FIFO_CNTL);
-+
-+	val = MAX_NUM_CH(audio->channels);
-+	val |= NUM_OF_I2S_PORTS(audio->channels);
-+	val |= AUDIO_TYPE_LPCM;
-+	val |= CFG_SUB_PCKT_NUM(sub_pckt_num);
-+	cdns_mhdp_bus_write(val, mhdp, SMPL2PKT_CNFG);
-+
-+	if (audio->sample_width == 16)
-+		val = 0;
-+	else if (audio->sample_width == 24)
-+		val = 1 << 9;
-+	else
-+		val = 2 << 9;
-+
-+	val |= AUDIO_CH_NUM(audio->channels);
-+	val |= I2S_DEC_PORT_EN(i2s_port_en_val);
-+	val |= TRANS_SMPL_WIDTH_32;
-+	cdns_mhdp_bus_write(val, mhdp, AUDIO_SRC_CNFG);
-+
-+	for (i = 0; i < (audio->channels + 1) / 2; i++) {
-+		if (audio->sample_width == 16)
-+			val = (0x02 << 8) | (0x02 << 20);
-+		else if (audio->sample_width == 24)
-+			val = (0x0b << 8) | (0x0b << 20);
-+
-+		val |= ((2 * i) << 4) | ((2 * i + 1) << 16);
-+		cdns_mhdp_bus_write(val, mhdp, STTS_BIT_CH(i));
-+	}
-+
-+	switch (audio->sample_rate) {
-+	case 32000:
-+		val = SAMPLING_FREQ(3) |
-+		      ORIGINAL_SAMP_FREQ(0xc);
-+		ncts = N_table_32k[idx];
-+		break;
-+	case 44100:
-+		val = SAMPLING_FREQ(0) |
-+		      ORIGINAL_SAMP_FREQ(0xf);
-+		ncts = N_table_44k[idx];
-+		break;
-+	case 48000:
-+		val = SAMPLING_FREQ(2) |
-+		      ORIGINAL_SAMP_FREQ(0xd);
-+		ncts = N_table_48k[idx];
-+		break;
-+	case 88200:
-+		val = SAMPLING_FREQ(8) |
-+		      ORIGINAL_SAMP_FREQ(0x7);
-+		ncts = N_table_44k[idx] * 2;
-+		break;
-+	case 96000:
-+		val = SAMPLING_FREQ(0xa) |
-+		      ORIGINAL_SAMP_FREQ(5);
-+		ncts = N_table_48k[idx] * 2;
-+		break;
-+	case 176400:
-+		val = SAMPLING_FREQ(0xc) |
-+		      ORIGINAL_SAMP_FREQ(3);
-+		ncts = N_table_44k[idx] * 4;
-+		break;
-+	case 192000:
-+	default:
-+		val = SAMPLING_FREQ(0xe) |
-+		      ORIGINAL_SAMP_FREQ(1);
-+		ncts = N_table_48k[idx] * 4;
-+		break;
-+	}
-+	val |= 4;
-+	cdns_mhdp_bus_write(val, mhdp, COM_CH_STTS_BITS);
-+
-+	if (audio->connector_type == DRM_MODE_CONNECTOR_HDMIA)
-+		cdns_mhdp_reg_write(mhdp, CM_I2S_CTRL, ncts | 0x4000000);
-+
-+	cdns_mhdp_bus_write(SMPL2PKT_EN, mhdp, SMPL2PKT_CNTL);
-+	cdns_mhdp_bus_write(I2S_DEC_START, mhdp, AUDIO_SRC_CNTL);
-+}
-+
-+static void cdns_mhdp_audio_config_spdif(struct cdns_mhdp_device *mhdp)
-+{
-+	u32 val;
-+
-+	cdns_mhdp_bus_write(SYNC_WR_TO_CH_ZERO, mhdp, FIFO_CNTL);
-+
-+	val = MAX_NUM_CH(2) | AUDIO_TYPE_LPCM | CFG_SUB_PCKT_NUM(4);
-+	cdns_mhdp_bus_write(val, mhdp, SMPL2PKT_CNFG);
-+	cdns_mhdp_bus_write(SMPL2PKT_EN, mhdp, SMPL2PKT_CNTL);
-+
-+	val = SPDIF_ENABLE | SPDIF_AVG_SEL | SPDIF_JITTER_BYPASS;
-+	cdns_mhdp_bus_write(val, mhdp, SPDIF_CTRL_ADDR);
-+
-+	clk_prepare_enable(mhdp->spdif_clk);
-+	clk_set_rate(mhdp->spdif_clk, CDNS_DP_SPDIF_CLK);
-+}
-+
-+int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
-+			   struct audio_info *audio)
-+{
-+	int ret;
-+
-+	/* reset the spdif clk before config */
-+	if (audio->format == AFMT_SPDIF_INT) {
-+		reset_control_assert(mhdp->spdif_rst);
-+		reset_control_deassert(mhdp->spdif_rst);
-+	}
-+
-+	if (audio->connector_type == DRM_MODE_CONNECTOR_DisplayPort) {
-+		ret = cdns_mhdp_reg_write(mhdp, CM_LANE_CTRL, LANE_REF_CYC);
-+		if (ret)
-+			goto err_audio_config;
-+
-+		ret = cdns_mhdp_reg_write(mhdp, CM_CTRL, 0);
-+		if (ret)
-+			goto err_audio_config;
-+	} else {
-+		/* HDMI Mode */
-+		ret = cdns_mhdp_reg_write(mhdp, CM_CTRL, 8);
-+		if (ret)
-+			goto err_audio_config;
-+	}
-+
-+	if (audio->format == AFMT_I2S)
-+		cdns_mhdp_audio_config_i2s(mhdp, audio);
-+	else if (audio->format == AFMT_SPDIF_INT)
-+		cdns_mhdp_audio_config_spdif(mhdp);
-+
-+	if (audio->connector_type == DRM_MODE_CONNECTOR_DisplayPort)
-+		ret = cdns_mhdp_reg_write(mhdp, AUDIO_PACK_CONTROL, AUDIO_PACK_EN);
-+
-+	if (audio->connector_type == DRM_MODE_CONNECTOR_HDMIA)
-+		hdmi_audio_avi_set(mhdp, audio->channels);
-+
-+err_audio_config:
-+	if (ret)
-+		dev_err(mhdp->dev, "audio config failed: %d\n", ret);
-+	return ret;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_audio_config);
-+
-+static int audio_hw_params(struct device *dev,  void *data,
-+				  struct hdmi_codec_daifmt *daifmt,
-+				  struct hdmi_codec_params *params)
-+{
-+	struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
-+	struct audio_info audio = {
-+		.sample_width = params->sample_width,
-+		.sample_rate = params->sample_rate,
-+		.channels = params->channels,
-+		.connector_type = mhdp->connector.base.connector_type,
-+	};
-+	int ret;
-+
-+	switch (daifmt->fmt) {
-+	case HDMI_I2S:
-+		audio.format = AFMT_I2S;
-+		break;
-+	case HDMI_SPDIF:
-+		audio.format = AFMT_SPDIF_EXT;
-+		break;
-+	default:
-+		dev_err(dev, "Invalid format %d\n", daifmt->fmt);
-+		ret = -EINVAL;
-+		goto out;
-+	}
-+
-+	ret = cdns_mhdp_audio_config(mhdp, &audio);
-+	if (!ret)
-+		mhdp->audio_info = audio;
-+
-+out:
-+	return ret;
-+}
-+
-+static void audio_shutdown(struct device *dev, void *data)
-+{
-+	struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
-+	int ret;
-+
-+	ret = cdns_mhdp_audio_stop(mhdp, &mhdp->audio_info);
-+	if (!ret)
-+		mhdp->audio_info.format = AFMT_UNUSED;
-+}
-+
-+static int audio_digital_mute(struct device *dev, void *data,
-+				     bool enable)
-+{
-+	struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
-+	int ret;
-+
-+	ret = cdns_mhdp_audio_mute(mhdp, enable);
-+
-+	return ret;
-+}
-+
-+static int audio_get_eld(struct device *dev, void *data,
-+				u8 *buf, size_t len)
-+{
-+	struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
-+
-+	memcpy(buf, mhdp->connector.base.eld,
-+	       min(sizeof(mhdp->connector.base.eld), len));
-+
-+	return 0;
-+}
-+
-+static const struct hdmi_codec_ops audio_codec_ops = {
-+	.hw_params = audio_hw_params,
-+	.audio_shutdown = audio_shutdown,
-+//.digital_mute = audio_digital_mute,
-+	.get_eld = audio_get_eld,
-+};
-+
-+int cdns_mhdp_register_audio_driver(struct device *dev)
-+{
-+	struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
-+	struct hdmi_codec_pdata codec_data = {
-+		.i2s = 1,
-+		.spdif = 1,
-+		.ops = &audio_codec_ops,
-+		.max_i2s_channels = 8,
-+	};
-+
-+	mhdp->audio_pdev = platform_device_register_data(
-+			      dev, HDMI_CODEC_DRV_NAME, 1,
-+			      &codec_data, sizeof(codec_data));
-+
-+	return PTR_ERR_OR_ZERO(mhdp->audio_pdev);
-+}
-+
-+void cdns_mhdp_unregister_audio_driver(struct device *dev)
-+{
-+	struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
-+
-+	platform_device_unregister(mhdp->audio_pdev);
-+}
-diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp-cec.c b/drivers/gpu/drm/bridge/cadence/cdns-mhdp-cec.c
-new file mode 100644
-index 000000000000..af8506444f6e
---- /dev/null
-+++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp-cec.c
-@@ -0,0 +1,341 @@
-+/*
-+ * Copyright 2019 NXP
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ */
-+#include <linux/module.h>
-+#include <linux/workqueue.h>
-+#include <linux/kthread.h>
-+#include <linux/freezer.h>
-+#include <drm/bridge/cdns-mhdp-common.h>
-+
-+#define CEC_NAME	"cdns-mhdp-cec"
-+
-+#define REG_ADDR_OFF 4
-+
-+/* regsiter define */
-+#define TX_MSG_HEADER 0x33800
-+#define TX_MSG_LENGTH 0x33840
-+#define TX_MSG_CMD 0x33844
-+#define RX_MSG_CMD 0x33850
-+#define RX_CLEAR_BUF 0x33854
-+#define LOGICAL_ADDRESS_LA0 0x33858
-+
-+#define CLK_DIV_MSB 0x3386c
-+#define CLK_DIV_LSB 0x33870
-+#define RX_MSG_DATA1 0x33900
-+#define RX_MSG_LENGTH 0x33940
-+#define RX_MSG_STATUS 0x33944
-+#define NUM_OF_MSG_RX_BUF 0x33948
-+#define TX_MSG_STATUS 0x3394c
-+#define DB_L_TIMER 0x33980
-+
-+/**
-+ * CEC Transceiver operation.
-+ */
-+enum {
-+	CEC_TX_STOP,
-+	CEC_TX_TRANSMIT,
-+	CEC_TX_ABORT,
-+	CEC_TX_ABORT_AND_TRANSMIT
-+};
-+
-+/**
-+ * CEC Transceiver status.
-+ */
-+enum {
-+	CEC_STS_IDLE,
-+	CEC_STS_BUSY,
-+	CEC_STS_SUCCESS,
-+	CEC_STS_ERROR
-+};
-+
-+/**
-+ * CEC Receiver operation.
-+ */
-+enum {
-+	CEC_RX_STOP,
-+	CEC_RX_READ,
-+	CEC_RX_DISABLE,
-+	CEC_RX_ABORT_AND_CLR_FIFO
-+};
-+/**
-+ * Maximum number of Messages in the RX Buffers.
-+ */
-+#define CEC_MAX_RX_MSGS 2
-+
-+static u32 mhdp_cec_read(struct cdns_mhdp_cec *cec, u32 offset)
-+{
-+	struct cdns_mhdp_device *mhdp =
-+			container_of(cec, struct cdns_mhdp_device, hdmi.cec);
-+	return cdns_mhdp_bus_read(mhdp, offset);
-+}
-+
-+static void mhdp_cec_write(struct cdns_mhdp_cec *cec, u32 offset, u32 val)
-+{
-+	struct cdns_mhdp_device *mhdp =
-+			container_of(cec, struct cdns_mhdp_device, hdmi.cec);
-+	cdns_mhdp_bus_write(val, mhdp, offset);
-+}
-+
-+static void mhdp_cec_clear_rx_buffer(struct cdns_mhdp_cec *cec)
-+{
-+	mhdp_cec_write(cec, RX_CLEAR_BUF, 1);
-+	mhdp_cec_write(cec, RX_CLEAR_BUF, 0);
-+}
-+
-+static void mhdp_cec_set_divider(struct cdns_mhdp_cec *cec)
-+{
-+	struct cdns_mhdp_device *mhdp =
-+			container_of(cec, struct cdns_mhdp_device, hdmi.cec);
-+	u32 clk_div;
-+
-+	/* Set clock divider */
-+	clk_div = cdns_mhdp_get_fw_clk(mhdp) * 10;
-+
-+	mhdp_cec_write(cec, CLK_DIV_MSB,
-+			  (clk_div >> 8) & 0xFF);
-+	mhdp_cec_write(cec, CLK_DIV_LSB, clk_div & 0xFF);
-+}
-+
-+static u32 mhdp_cec_read_message(struct cdns_mhdp_cec *cec)
-+{
-+	struct cec_msg *msg = &cec->msg;
-+	int len;
-+	int i;
-+
-+	mhdp_cec_write(cec, RX_MSG_CMD, CEC_RX_READ);
-+
-+	len = mhdp_cec_read(cec, RX_MSG_LENGTH);
-+	msg->len = len + 1;
-+	dev_dbg(cec->dev, "RX MSG len =%d\n", len);
-+
-+	/* Read RX MSG bytes */
-+	for (i = 0; i < msg->len; ++i) {
-+		msg->msg[i] = (u8) mhdp_cec_read(cec, RX_MSG_DATA1 + (i * REG_ADDR_OFF));
-+		dev_dbg(cec->dev, "RX MSG[%d]=0x%x\n", i, msg->msg[i]);
-+	}
-+
-+	mhdp_cec_write(cec, RX_MSG_CMD, CEC_RX_STOP);
-+
-+	return true;
-+}
-+
-+static u32 mhdp_cec_write_message(struct cdns_mhdp_cec *cec, struct cec_msg *msg)
-+{
-+	u8 i;
-+
-+	mhdp_cec_write(cec, TX_MSG_CMD, CEC_TX_STOP);
-+
-+	if (msg->len > CEC_MAX_MSG_SIZE) {
-+		dev_err(cec->dev, "Invalid MSG size!\n");
-+		return -EINVAL;
-+	}
-+
-+	for (i = 0; i < msg->len; ++i)
-+		printk("msg[%d]=0x%x\n",i, msg->msg[i]);
-+
-+	/* Write Message to register */
-+	for (i = 0; i < msg->len; ++i) {
-+		mhdp_cec_write(cec, TX_MSG_HEADER + (i * REG_ADDR_OFF),
-+			  msg->msg[i]);
-+	}
-+	/* Write Message Length (payload + opcode) */
-+	mhdp_cec_write(cec, TX_MSG_LENGTH, msg->len - 1);
-+
-+	mhdp_cec_write(cec, TX_MSG_CMD, CEC_TX_TRANSMIT);
-+
-+	return true;
-+}
-+
-+static int mhdp_cec_set_logical_addr(struct cdns_mhdp_cec *cec, u32 la)
-+{
-+	u8 la_reg;
-+	u8 i;
-+
-+	if (la == CEC_LOG_ADDR_INVALID)
-+		/* invalid all LA address */
-+		for (i = 0; i < CEC_MAX_LOG_ADDRS; ++i) {
-+			mhdp_cec_write(cec, LOGICAL_ADDRESS_LA0 + (i * REG_ADDR_OFF), 0);
-+			return 0;
-+		}
-+
-+	/* In fact cdns mhdp cec could support max 5 La address */
-+	for (i = 0; i < CEC_MAX_LOG_ADDRS; ++i) {
-+		la_reg = mhdp_cec_read(cec, LOGICAL_ADDRESS_LA0 + (i * REG_ADDR_OFF));
-+		/* Check LA already used */
-+		if (la_reg & 0x10)
-+			continue;
-+
-+		if ((la_reg & 0xF) == la) {
-+			dev_warn(cec->dev, "Warning. LA already in use.\n");
-+			return 0;
-+		}
-+
-+		la = (la & 0xF) | (1 << 4);
-+
-+		mhdp_cec_write(cec, LOGICAL_ADDRESS_LA0 + (i * REG_ADDR_OFF), la);
-+		return 0;
-+	}
-+
-+	dev_warn(cec->dev, "All LA in use\n");
-+
-+	return -ENXIO;
-+}
-+
-+static int mhdp_cec_poll_worker(void *_cec)
-+{
-+	struct cdns_mhdp_cec *cec = (struct cdns_mhdp_cec *)_cec;
-+	int num_rx_msgs, i;
-+	int sts;
-+
-+	set_freezable();
-+
-+	for (;;) {
-+		if (kthread_freezable_should_stop(NULL))
-+			break;
-+
-+		/* Check TX State */
-+		sts = mhdp_cec_read(cec, TX_MSG_STATUS);
-+		switch (sts) {
-+		case CEC_STS_SUCCESS:
-+			cec_transmit_done(cec->adap, CEC_TX_STATUS_OK, 0, 0, 0,
-+					  0);
-+			mhdp_cec_write(cec, TX_MSG_CMD, CEC_TX_STOP);
-+			break;
-+		case CEC_STS_ERROR:
-+			mhdp_cec_write(cec, TX_MSG_CMD, CEC_TX_STOP);
-+			cec_transmit_done(cec->adap,
-+					  CEC_TX_STATUS_MAX_RETRIES |
-+					  CEC_TX_STATUS_NACK, 0, 1, 0, 0);
-+			break;
-+		case CEC_STS_BUSY:
-+		default:
-+			break;
-+		}
-+
-+		/* Check RX State */
-+		sts = mhdp_cec_read(cec, RX_MSG_STATUS);
-+		num_rx_msgs = mhdp_cec_read(cec, NUM_OF_MSG_RX_BUF);
-+		switch (sts) {
-+		case CEC_STS_SUCCESS:
-+			if (num_rx_msgs == 0xf)
-+				num_rx_msgs = CEC_MAX_RX_MSGS;
-+
-+			if (num_rx_msgs > CEC_MAX_RX_MSGS) {
-+				dev_err(cec->dev, "Error rx msg num %d\n",
-+					num_rx_msgs);
-+				mhdp_cec_clear_rx_buffer(cec);
-+				break;
-+			}
-+
-+			/* Rx FIFO Depth 2 RX MSG */
-+			for (i = 0; i < num_rx_msgs; i++) {
-+				mhdp_cec_read_message(cec);
-+				cec->msg.rx_status = CEC_RX_STATUS_OK;
-+				cec_received_msg(cec->adap, &cec->msg);
-+			}
-+			break;
-+		default:
-+			break;
-+		}
-+
-+		if (!kthread_should_stop())
-+			schedule_timeout_idle(20);
-+	}
-+
-+	return 0;
-+}
-+
-+static int mhdp_cec_adap_enable(struct cec_adapter *adap, bool enable)
-+{
-+	struct cdns_mhdp_cec *cec = cec_get_drvdata(adap);
-+
-+	if (enable) {
-+		mhdp_cec_write(cec, DB_L_TIMER, 0x10);
-+		mhdp_cec_set_divider(cec);
-+	} else
-+		mhdp_cec_set_divider(cec);
-+
-+	return 0;
-+}
-+
-+static int mhdp_cec_adap_log_addr(struct cec_adapter *adap, u8 addr)
-+{
-+	struct cdns_mhdp_cec *cec = cec_get_drvdata(adap);
-+
-+	return mhdp_cec_set_logical_addr(cec, addr);
-+}
-+
-+static int mhdp_cec_adap_transmit(struct cec_adapter *adap, u8 attempts,
-+				 u32 signal_free_time, struct cec_msg *msg)
-+{
-+	struct cdns_mhdp_cec *cec = cec_get_drvdata(adap);
-+
-+	mhdp_cec_write_message(cec, msg);
-+
-+	return 0;
-+}
-+
-+static const struct cec_adap_ops cdns_mhdp_cec_adap_ops = {
-+	.adap_enable = mhdp_cec_adap_enable,
-+	.adap_log_addr = mhdp_cec_adap_log_addr,
-+	.adap_transmit = mhdp_cec_adap_transmit,
-+};
-+
-+int cdns_mhdp_register_cec_driver(struct device *dev)
-+{
-+	struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
-+	struct cdns_mhdp_cec *cec = &mhdp->hdmi.cec;
-+	int ret;
-+
-+	cec->adap = cec_allocate_adapter(&cdns_mhdp_cec_adap_ops, cec,
-+					 CEC_NAME,
-+					 CEC_CAP_PHYS_ADDR | CEC_CAP_LOG_ADDRS |
-+					 CEC_CAP_TRANSMIT | CEC_CAP_PASSTHROUGH
-+					 | CEC_CAP_RC, CEC_MAX_LOG_ADDRS);
-+	ret = PTR_ERR_OR_ZERO(cec->adap);
-+	if (ret)
-+		return ret;
-+	ret = cec_register_adapter(cec->adap, dev);
-+	if (ret) {
-+		cec_delete_adapter(cec->adap);
-+		return ret;
-+	}
-+
-+	cec->dev = dev;
-+
-+	cec->cec_worker = kthread_create(mhdp_cec_poll_worker, cec, "cdns-mhdp-cec");
-+	if (IS_ERR(cec->cec_worker))
-+		dev_err(cec->dev, "failed  create hdp cec thread\n");
-+
-+	wake_up_process(cec->cec_worker);
-+
-+	dev_dbg(dev, "CEC successfuly probed\n");
-+	return 0;
-+}
-+
-+int cdns_mhdp_unregister_cec_driver(struct device *dev)
-+{
-+	struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
-+	struct cdns_mhdp_cec *cec = &mhdp->hdmi.cec;
-+
-+	if (cec->cec_worker) {
-+		kthread_stop(cec->cec_worker);
-+		cec->cec_worker = NULL;
-+	}
-+	cec_unregister_adapter(cec->adap);
-+	return 0;
-+}
-+
-+MODULE_AUTHOR("Sandor.Yu@NXP.com");
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("NXP CDNS MHDP HDMI CEC driver");
-diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp-common.c b/drivers/gpu/drm/bridge/cadence/cdns-mhdp-common.c
-new file mode 100644
-index 000000000000..14a088887bc2
---- /dev/null
-+++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp-common.c
-@@ -0,0 +1,1060 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd
-+ * Author: Chris Zhong <zyw@rock-chips.com>
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ */
-+
-+#include <linux/clk.h>
-+#include <linux/delay.h>
-+#include <linux/device.h>
-+#include <linux/io.h>
-+#include <linux/iopoll.h>
-+#include <linux/reset.h>
-+#include <linux/unaligned/generic.h>
-+
-+#include <asm/unaligned.h>
-+
-+#include <drm/bridge/cdns-mhdp-common.h>
-+#include <drm/drm_modes.h>
-+#include <drm/drm_print.h>
-+#include <linux/regmap.h>
-+
-+#define CDNS_DP_SPDIF_CLK		200000000
-+#define FW_ALIVE_TIMEOUT_US		1000000
-+#define MAILBOX_RETRY_US		1000
-+#define MAILBOX_TIMEOUT_US		5000000
-+#define LINK_TRAINING_RETRY_MS		20
-+#define LINK_TRAINING_TIMEOUT_MS	500
-+
-+#define mhdp_readx_poll_timeout(op, addr, offset, val, cond, sleep_us, timeout_us)	\
-+({ \
-+	u64 __timeout_us = (timeout_us); \
-+	unsigned long __sleep_us = (sleep_us); \
-+	ktime_t __timeout = ktime_add_us(ktime_get(), __timeout_us); \
-+	might_sleep_if((__sleep_us) != 0); \
-+	for (;;) { \
-+		(val) = op(addr, offset); \
-+		if (cond) \
-+			break; \
-+		if (__timeout_us && \
-+		    ktime_compare(ktime_get(), __timeout) > 0) { \
-+			(val) = op(addr, offset); \
-+			break; \
-+		} \
-+		if (__sleep_us) \
-+			usleep_range((__sleep_us >> 2) + 1, __sleep_us); \
-+	} \
-+	(cond) ? 0 : -ETIMEDOUT; \
-+})
-+
-+/*static inline u32 get_unaligned_be24(const void *p)
-+{
-+	const u8 *_p = p;
-+
-+	return _p[0] << 16 | _p[1] << 8 | _p[2];
-+}
-+
-+static inline void put_unaligned_be24(u32 val, void *p)
-+{
-+	u8 *_p = p;
-+
-+	_p[0] = val >> 16;
-+	_p[1] = val >> 8;
-+	_p[2] = val;
-+}*/
-+
-+u32 cdns_mhdp_bus_read(struct cdns_mhdp_device *mhdp, u32 offset)
-+{
-+	u32 val;
-+
-+	mutex_lock(&mhdp->iolock);
-+
-+	if (mhdp->bus_type == BUS_TYPE_LOW4K_SAPB) {
-+		/* Remap address to low 4K SAPB bus */
-+		writel(offset >> 12, mhdp->regs_sec + 0xc);
-+		val = readl((offset & 0xfff) + mhdp->regs_base);
-+	} else if (mhdp->bus_type == BUS_TYPE_LOW4K_APB) {
-+		/* Remap address to low 4K memory */
-+		writel(offset >> 12, mhdp->regs_sec + 8);
-+		val = readl((offset & 0xfff) + mhdp->regs_base);
-+	} else if (mhdp->bus_type == BUS_TYPE_NORMAL_SAPB)
-+		val = readl(mhdp->regs_sec + offset);
-+	else
-+		val = readl(mhdp->regs_base + offset);
-+
-+	mutex_unlock(&mhdp->iolock);
-+
-+	return val;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_bus_read);
-+
-+void cdns_mhdp_bus_write(u32 val, struct cdns_mhdp_device *mhdp, u32 offset)
-+{
-+	mutex_lock(&mhdp->iolock);
-+
-+	if (mhdp->bus_type == BUS_TYPE_LOW4K_SAPB) {
-+		/* Remap address to low 4K SAPB bus */
-+		writel(offset >> 12, mhdp->regs_sec + 0xc);
-+		writel(val, (offset & 0xfff) + mhdp->regs_base);
-+	} else if (mhdp->bus_type == BUS_TYPE_LOW4K_APB) {
-+		/* Remap address to low 4K memory */
-+		writel(offset >> 12, mhdp->regs_sec + 8);
-+		writel(val, (offset & 0xfff) + mhdp->regs_base);
-+	} else if (mhdp->bus_type == BUS_TYPE_NORMAL_SAPB)
-+		writel(val, mhdp->regs_sec + offset);
-+	else
-+		writel(val, mhdp->regs_base + offset);
-+
-+	mutex_unlock(&mhdp->iolock);
-+}
-+EXPORT_SYMBOL(cdns_mhdp_bus_write);
-+
-+u32 cdns_mhdp_get_fw_clk(struct cdns_mhdp_device *mhdp)
-+{
-+	return cdns_mhdp_bus_read(mhdp, SW_CLK_H);
-+}
-+EXPORT_SYMBOL(cdns_mhdp_get_fw_clk);
-+
-+void cdns_mhdp_set_fw_clk(struct cdns_mhdp_device *mhdp, unsigned long clk)
-+{
-+	cdns_mhdp_bus_write(clk / 1000000, mhdp, SW_CLK_H);
-+}
-+EXPORT_SYMBOL(cdns_mhdp_set_fw_clk);
-+
-+void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp)
-+{
-+	u32 val;
-+	printk(KERN_ALERT "DEBUG: %s %d \n",__FUNCTION__,__LINE__);
-+
-+	val = DPTX_FRMR_DATA_CLK_RSTN_EN |
-+	      DPTX_FRMR_DATA_CLK_EN |
-+	      DPTX_PHY_DATA_RSTN_EN |
-+	      DPTX_PHY_DATA_CLK_EN |
-+	      DPTX_PHY_CHAR_RSTN_EN |
-+	      DPTX_PHY_CHAR_CLK_EN |
-+	      SOURCE_AUX_SYS_CLK_RSTN_EN |
-+	      SOURCE_AUX_SYS_CLK_EN |
-+	      DPTX_SYS_CLK_RSTN_EN |
-+	      DPTX_SYS_CLK_EN |
-+	      CFG_DPTX_VIF_CLK_RSTN_EN |
-+	      CFG_DPTX_VIF_CLK_EN;
-+	cdns_mhdp_bus_write(val, mhdp, SOURCE_DPTX_CAR);
-+
-+	val = SOURCE_PHY_RSTN_EN | SOURCE_PHY_CLK_EN;
-+	cdns_mhdp_bus_write(val, mhdp, SOURCE_PHY_CAR);
-+
-+	val = SOURCE_PKT_SYS_RSTN_EN |
-+	      SOURCE_PKT_SYS_CLK_EN |
-+	      SOURCE_PKT_DATA_RSTN_EN |
-+	      SOURCE_PKT_DATA_CLK_EN;
-+	cdns_mhdp_bus_write(val, mhdp, SOURCE_PKT_CAR);
-+
-+	val = SPDIF_CDR_CLK_RSTN_EN |
-+	      SPDIF_CDR_CLK_EN |
-+	      SOURCE_AIF_SYS_RSTN_EN |
-+	      SOURCE_AIF_SYS_CLK_EN |
-+	      SOURCE_AIF_CLK_RSTN_EN |
-+	      SOURCE_AIF_CLK_EN;
-+	cdns_mhdp_bus_write(val, mhdp, SOURCE_AIF_CAR);
-+
-+	val = SOURCE_CIPHER_SYSTEM_CLK_RSTN_EN |
-+	      SOURCE_CIPHER_SYS_CLK_EN |
-+	      SOURCE_CIPHER_CHAR_CLK_RSTN_EN |
-+	      SOURCE_CIPHER_CHAR_CLK_EN;
-+	cdns_mhdp_bus_write(val, mhdp, SOURCE_CIPHER_CAR);
-+
-+	val = SOURCE_CRYPTO_SYS_CLK_RSTN_EN |
-+	      SOURCE_CRYPTO_SYS_CLK_EN;
-+	cdns_mhdp_bus_write(val, mhdp, SOURCE_CRYPTO_CAR);
-+
-+	/* enable Mailbox and PIF interrupt */
-+	cdns_mhdp_bus_write(0, mhdp, APB_INT_MASK);
-+}
-+EXPORT_SYMBOL(cdns_mhdp_clock_reset);
-+
-+int cdns_mhdp_mailbox_read(struct cdns_mhdp_device *mhdp)
-+{
-+	int val, ret;
-+
-+	ret = mhdp_readx_poll_timeout(cdns_mhdp_bus_read, mhdp, MAILBOX_EMPTY_ADDR,
-+				 val, !val, MAILBOX_RETRY_US,
-+				 MAILBOX_TIMEOUT_US);
-+	if (ret < 0)
-+		return ret;
-+
-+	return cdns_mhdp_bus_read(mhdp, MAILBOX0_RD_DATA) & 0xff;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_mailbox_read);
-+
-+static int cdp_dp_mailbox_write(struct cdns_mhdp_device *mhdp, u8 val)
-+{
-+	int ret, full;
-+
-+	ret = mhdp_readx_poll_timeout(cdns_mhdp_bus_read, mhdp, MAILBOX_FULL_ADDR,
-+				 full, !full, MAILBOX_RETRY_US,
-+				 MAILBOX_TIMEOUT_US);
-+	if (ret < 0)
-+		return ret;
-+
-+	cdns_mhdp_bus_write(val, mhdp, MAILBOX0_WR_DATA);
-+
-+	return 0;
-+}
-+
-+int cdns_mhdp_mailbox_validate_receive(struct cdns_mhdp_device *mhdp,
-+					      u8 module_id, u8 opcode,
-+					      u16 req_size)
-+{
-+	u32 mbox_size, i;
-+	u8 header[4];
-+	int ret;
-+
-+	/* read the header of the message */
-+	for (i = 0; i < 4; i++) {
-+		ret = cdns_mhdp_mailbox_read(mhdp);
-+		if (ret < 0)
-+			return ret;
-+
-+		header[i] = ret;
-+	}
-+
-+	mbox_size = get_unaligned_be16(header + 2);
-+
-+	if (opcode != header[0] || module_id != header[1] ||
-+	    req_size != mbox_size) {
-+		/*
-+		 * If the message in mailbox is not what we want, we need to
-+		 * clear the mailbox by reading its contents.
-+		 */
-+		for (i = 0; i < mbox_size; i++)
-+			if (cdns_mhdp_mailbox_read(mhdp) < 0)
-+				break;
-+
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_mailbox_validate_receive);
-+
-+int cdns_mhdp_mailbox_read_receive(struct cdns_mhdp_device *mhdp,
-+					  u8 *buff, u16 buff_size)
-+{
-+	u32 i;
-+	int ret;
-+
-+	for (i = 0; i < buff_size; i++) {
-+		ret = cdns_mhdp_mailbox_read(mhdp);
-+		if (ret < 0)
-+			return ret;
-+
-+		buff[i] = ret;
-+	}
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_mailbox_read_receive);
-+
-+int cdns_mhdp_mailbox_send(struct cdns_mhdp_device *mhdp, u8 module_id,
-+				  u8 opcode, u16 size, u8 *message)
-+{
-+	u8 header[4];
-+	int ret, i;
-+
-+	header[0] = opcode;
-+	header[1] = module_id;
-+	put_unaligned_be16(size, header + 2);
-+
-+	for (i = 0; i < 4; i++) {
-+		ret = cdp_dp_mailbox_write(mhdp, header[i]);
-+		if (ret)
-+			return ret;
-+	}
-+
-+	for (i = 0; i < size; i++) {
-+		ret = cdp_dp_mailbox_write(mhdp, message[i]);
-+		if (ret)
-+			return ret;
-+	}
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_mailbox_send);
-+
-+int cdns_mhdp_reg_read(struct cdns_mhdp_device *mhdp, u32 addr)
-+{
-+	u8 msg[4], resp[8];
-+	u32 val;
-+	int ret;
-+
-+	if (addr == 0) {
-+		ret = -EINVAL;
-+		goto err_reg_read;
-+	}
-+
-+	put_unaligned_be32(addr, msg);
-+
-+	ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_GENERAL,
-+				     GENERAL_READ_REGISTER,
-+				     sizeof(msg), msg);
-+	if (ret)
-+		goto err_reg_read;
-+
-+	ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_GENERAL,
-+						 GENERAL_READ_REGISTER,
-+						 sizeof(resp));
-+	if (ret)
-+		goto err_reg_read;
-+
-+	ret = cdns_mhdp_mailbox_read_receive(mhdp, resp, sizeof(resp));
-+	if (ret)
-+		goto err_reg_read;
-+
-+	/* Returned address value should be the same as requested */
-+	if (memcmp(msg, resp, sizeof(msg))) {
-+		ret = -EINVAL;
-+		goto err_reg_read;
-+	}
-+
-+	val = get_unaligned_be32(resp + 4);
-+
-+	return val;
-+err_reg_read:
-+	DRM_DEV_ERROR(mhdp->dev, "Failed to read register.\n");
-+
-+	return ret;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_reg_read);
-+
-+int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u32 addr, u32 val)
-+{
-+	u8 msg[8];
-+
-+	put_unaligned_be32(addr, msg);
-+	put_unaligned_be32(val, msg + 4);
-+
-+	return cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_GENERAL,
-+				      GENERAL_WRITE_REGISTER, sizeof(msg), msg);
-+}
-+EXPORT_SYMBOL(cdns_mhdp_reg_write);
-+
-+int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
-+				   u8 start_bit, u8 bits_no, u32 val)
-+{
-+	u8 field[8];
-+
-+	put_unaligned_be16(addr, field);
-+	field[2] = start_bit;
-+	field[3] = bits_no;
-+	put_unaligned_be32(val, field + 4);
-+
-+	return cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
-+				      DPTX_WRITE_FIELD, sizeof(field), field);
-+}
-+EXPORT_SYMBOL(cdns_mhdp_reg_write_bit);
-+
-+int cdns_mhdp_dpcd_read(struct cdns_mhdp_device *mhdp,
-+			u32 addr, u8 *data, u16 len)
-+{
-+	u8 msg[5], reg[5];
-+	int ret;
-+
-+	put_unaligned_be16(len, msg);
-+	put_unaligned_be24(addr, msg + 2);
-+
-+	ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
-+				     DPTX_READ_DPCD, sizeof(msg), msg);
-+	if (ret)
-+		goto err_dpcd_read;
-+
-+	ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_DP_TX,
-+						 DPTX_READ_DPCD,
-+						 sizeof(reg) + len);
-+	if (ret)
-+		goto err_dpcd_read;
-+
-+	ret = cdns_mhdp_mailbox_read_receive(mhdp, reg, sizeof(reg));
-+	if (ret)
-+		goto err_dpcd_read;
-+
-+	ret = cdns_mhdp_mailbox_read_receive(mhdp, data, len);
-+
-+err_dpcd_read:
-+	return ret;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_dpcd_read);
-+
-+int cdns_mhdp_dpcd_write(struct cdns_mhdp_device *mhdp, u32 addr, u8 value)
-+{
-+	u8 msg[6], reg[5];
-+	int ret;
-+
-+	put_unaligned_be16(1, msg);
-+	put_unaligned_be24(addr, msg + 2);
-+	msg[5] = value;
-+
-+	ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
-+				     DPTX_WRITE_DPCD, sizeof(msg), msg);
-+	if (ret)
-+		goto err_dpcd_write;
-+
-+	ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_DP_TX,
-+						 DPTX_WRITE_DPCD, sizeof(reg));
-+	if (ret)
-+		goto err_dpcd_write;
-+
-+	ret = cdns_mhdp_mailbox_read_receive(mhdp, reg, sizeof(reg));
-+	if (ret)
-+		goto err_dpcd_write;
-+
-+	if (addr != get_unaligned_be24(reg + 2))
-+		ret = -EINVAL;
-+
-+err_dpcd_write:
-+	if (ret)
-+		DRM_DEV_ERROR(mhdp->dev, "dpcd write failed: %d\n", ret);
-+	return ret;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_dpcd_write);
-+
-+int cdns_mhdp_load_firmware(struct cdns_mhdp_device *mhdp, const u32 *i_mem,
-+			    u32 i_size, const u32 *d_mem, u32 d_size)
-+{
-+	u32 reg;
-+	int i, ret;
-+
-+	/* reset ucpu before load firmware*/
-+	cdns_mhdp_bus_write(APB_IRAM_PATH | APB_DRAM_PATH | APB_XT_RESET,
-+	       mhdp, APB_CTRL);
-+
-+	for (i = 0; i < i_size; i += 4)
-+		cdns_mhdp_bus_write(*i_mem++, mhdp, ADDR_IMEM + i);
-+
-+	for (i = 0; i < d_size; i += 4)
-+		cdns_mhdp_bus_write(*d_mem++, mhdp, ADDR_DMEM + i);
-+
-+	/* un-reset ucpu */
-+	cdns_mhdp_bus_write(0, mhdp, APB_CTRL);
-+
-+	/* check the keep alive register to make sure fw working */
-+	ret = mhdp_readx_poll_timeout(cdns_mhdp_bus_read, mhdp, KEEP_ALIVE,
-+				 reg, reg, 2000, FW_ALIVE_TIMEOUT_US);
-+	if (ret < 0) {
-+		DRM_DEV_ERROR(mhdp->dev, "failed to loaded the FW reg = %x\n",
-+			      reg);
-+		return -EINVAL;
-+	}
-+
-+	reg = cdns_mhdp_bus_read(mhdp, VER_L) & 0xff;
-+	mhdp->fw_version = reg;
-+	reg = cdns_mhdp_bus_read(mhdp, VER_H) & 0xff;
-+	mhdp->fw_version |= reg << 8;
-+	reg = cdns_mhdp_bus_read(mhdp, VER_LIB_L_ADDR) & 0xff;
-+	mhdp->fw_version |= reg << 16;
-+	reg = cdns_mhdp_bus_read(mhdp, VER_LIB_H_ADDR) & 0xff;
-+	mhdp->fw_version |= reg << 24;
-+
-+	DRM_DEV_DEBUG(mhdp->dev, "firmware version: %x\n", mhdp->fw_version);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_load_firmware);
-+
-+int cdns_mhdp_set_firmware_active(struct cdns_mhdp_device *mhdp, bool enable)
-+{
-+	u8 msg[5];
-+	int ret, i;
-+
-+	msg[0] = GENERAL_MAIN_CONTROL;
-+	msg[1] = MB_MODULE_ID_GENERAL;
-+	msg[2] = 0;
-+	msg[3] = 1;
-+	msg[4] = enable ? FW_ACTIVE : FW_STANDBY;
-+
-+	for (i = 0; i < sizeof(msg); i++) {
-+		ret = cdp_dp_mailbox_write(mhdp, msg[i]);
-+		if (ret)
-+			goto err_set_firmware_active;
-+	}
-+
-+	/* read the firmware state */
-+	for (i = 0; i < sizeof(msg); i++)  {
-+		ret = cdns_mhdp_mailbox_read(mhdp);
-+		if (ret < 0)
-+			goto err_set_firmware_active;
-+
-+		msg[i] = ret;
-+	}
-+
-+	ret = 0;
-+
-+err_set_firmware_active:
-+	if (ret < 0)
-+		DRM_DEV_ERROR(mhdp->dev, "set firmware active failed\n");
-+	return ret;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_set_firmware_active);
-+
-+int cdns_mhdp_set_host_cap(struct cdns_mhdp_device *mhdp, bool flip)
-+{
-+	u8 msg[8];
-+	int ret;
-+	
-+	printk(KERN_ALERT "DEBUG: %s %d \n",__FUNCTION__,__LINE__);
-+
-+	msg[0] = drm_dp_link_rate_to_bw_code(mhdp->dp.link.rate);
-+	msg[1] = mhdp->dp.link.num_lanes | SCRAMBLER_EN;
-+	msg[2] = VOLTAGE_LEVEL_2;
-+	msg[3] = PRE_EMPHASIS_LEVEL_3;
-+	msg[4] = PTS1 | PTS2 | PTS3 | PTS4;
-+	msg[5] = FAST_LT_NOT_SUPPORT;
-+	msg[6] = flip ? LANE_MAPPING_FLIPPED : LANE_MAPPING_NORMAL;
-+	msg[7] = ENHANCED;
-+
-+	ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
-+				     DPTX_SET_HOST_CAPABILITIES,
-+				     sizeof(msg), msg);
-+	if (ret)
-+		goto err_set_host_cap;
-+
-+/* TODO Sandor */
-+//	ret = cdns_mhdp_reg_write(mhdp, DP_AUX_SWAP_INVERSION_CONTROL,
-+//				  AUX_HOST_INVERT);
-+
-+err_set_host_cap:
-+	if (ret)
-+		DRM_DEV_ERROR(mhdp->dev, "set host cap failed: %d\n", ret);
-+	return ret;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_set_host_cap);
-+
-+int cdns_mhdp_event_config(struct cdns_mhdp_device *mhdp)
-+{
-+	u8 msg[5];
-+	int ret;
-+
-+	memset(msg, 0, sizeof(msg));
-+
-+	msg[0] = MHDP_EVENT_ENABLE_HPD | MHDP_EVENT_ENABLE_TRAINING;
-+
-+	ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
-+				     DPTX_ENABLE_EVENT, sizeof(msg), msg);
-+	if (ret)
-+		DRM_DEV_ERROR(mhdp->dev, "set event config failed: %d\n", ret);
-+
-+	return ret;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_event_config);
-+
-+u32 cdns_mhdp_get_event(struct cdns_mhdp_device *mhdp)
-+{
-+	return cdns_mhdp_bus_read(mhdp, SW_EVENTS0);
-+}
-+EXPORT_SYMBOL(cdns_mhdp_get_event);
-+
-+int cdns_mhdp_get_hpd_status(struct cdns_mhdp_device *mhdp)
-+{
-+	u8 status;
-+	int ret;
-+
-+	ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
-+				     DPTX_HPD_STATE, 0, NULL);
-+	if (ret)
-+		goto err_get_hpd;
-+
-+	ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_DP_TX,
-+						 DPTX_HPD_STATE,
-+						 sizeof(status));
-+	if (ret)
-+		goto err_get_hpd;
-+
-+	ret = cdns_mhdp_mailbox_read_receive(mhdp, &status, sizeof(status));
-+	if (ret)
-+		goto err_get_hpd;
-+
-+	return status;
-+
-+err_get_hpd:
-+	DRM_DEV_ERROR(mhdp->dev, "get hpd status failed: %d\n", ret);
-+	return ret;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_get_hpd_status);
-+
-+int cdns_mhdp_get_edid_block(void *data, u8 *edid,
-+			  unsigned int block, size_t length)
-+{
-+	struct cdns_mhdp_device *mhdp = data;
-+	u8 msg[2], reg[2], i;
-+	int ret;
-+
-+	for (i = 0; i < 4; i++) {
-+		msg[0] = block / 2;
-+		msg[1] = block % 2;
-+
-+		ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
-+					     DPTX_GET_EDID, sizeof(msg), msg);
-+		if (ret)
-+			continue;
-+
-+		ret = cdns_mhdp_mailbox_validate_receive(mhdp,
-+							 MB_MODULE_ID_DP_TX,
-+							 DPTX_GET_EDID,
-+							 sizeof(reg) + length);
-+		if (ret)
-+			continue;
-+
-+		ret = cdns_mhdp_mailbox_read_receive(mhdp, reg, sizeof(reg));
-+		if (ret)
-+			continue;
-+
-+		ret = cdns_mhdp_mailbox_read_receive(mhdp, edid, length);
-+		if (ret)
-+			continue;
-+
-+		if (reg[0] == length && reg[1] == block / 2)
-+			break;
-+	}
-+
-+	if (ret)
-+		DRM_DEV_ERROR(mhdp->dev, "get block[%d] edid failed: %d\n",
-+			      block, ret);
-+
-+	return ret;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_get_edid_block);
-+
-+static int cdns_mhdp_training_start(struct cdns_mhdp_device *mhdp)
-+{
-+	unsigned long timeout;
-+	u8 msg, event[2];
-+	int ret;
-+
-+	msg = LINK_TRAINING_RUN;
-+
-+	/* start training */
-+	ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
-+				     DPTX_TRAINING_CONTROL, sizeof(msg), &msg);
-+	if (ret)
-+		goto err_training_start;
-+
-+	timeout = jiffies + msecs_to_jiffies(LINK_TRAINING_TIMEOUT_MS);
-+	while (time_before(jiffies, timeout)) {
-+		msleep(LINK_TRAINING_RETRY_MS);
-+		ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
-+					     DPTX_READ_EVENT, 0, NULL);
-+		if (ret)
-+			goto err_training_start;
-+
-+		ret = cdns_mhdp_mailbox_validate_receive(mhdp,
-+							 MB_MODULE_ID_DP_TX,
-+							 DPTX_READ_EVENT,
-+							 sizeof(event));
-+		if (ret)
-+			goto err_training_start;
-+
-+		ret = cdns_mhdp_mailbox_read_receive(mhdp, event,
-+						     sizeof(event));
-+		if (ret)
-+			goto err_training_start;
-+
-+		if (event[1] & EQ_PHASE_FINISHED)
-+			return 0;
-+	}
-+
-+	ret = -ETIMEDOUT;
-+
-+err_training_start:
-+	DRM_DEV_ERROR(mhdp->dev, "training failed: %d\n", ret);
-+	return ret;
-+}
-+
-+static int cdns_mhdp_get_training_status(struct cdns_mhdp_device *mhdp)
-+{
-+	u8 status[10];
-+	int ret;
-+
-+	ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
-+				     DPTX_READ_LINK_STAT, 0, NULL);
-+	if (ret)
-+		goto err_get_training_status;
-+
-+	ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_DP_TX,
-+						 DPTX_READ_LINK_STAT,
-+						 sizeof(status));
-+	if (ret)
-+		goto err_get_training_status;
-+
-+	ret = cdns_mhdp_mailbox_read_receive(mhdp, status, sizeof(status));
-+	if (ret)
-+		goto err_get_training_status;
-+
-+	mhdp->dp.link.rate = drm_dp_bw_code_to_link_rate(status[0]); 
-+	mhdp->dp.link.num_lanes = status[1];
-+
-+err_get_training_status:
-+	if (ret)
-+		DRM_DEV_ERROR(mhdp->dev, "get training status failed: %d\n",
-+			      ret);
-+	return ret;
-+}
-+
-+int cdns_mhdp_train_link(struct cdns_mhdp_device *mhdp)
-+{
-+	int ret;
-+
-+	ret = cdns_mhdp_training_start(mhdp);
-+	if (ret) {
-+		DRM_DEV_ERROR(mhdp->dev, "Failed to start training %d\n",
-+			      ret);
-+		return ret;
-+	}
-+
-+	ret = cdns_mhdp_get_training_status(mhdp);
-+	if (ret) {
-+		DRM_DEV_ERROR(mhdp->dev, "Failed to get training stat %d\n",
-+			      ret);
-+		return ret;
-+	}
-+
-+	DRM_DEV_DEBUG_KMS(mhdp->dev, "rate:0x%x, lanes:%d\n", mhdp->dp.link.rate,
-+			  mhdp->dp.link.num_lanes);
-+	return ret;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_train_link);
-+
-+int cdns_mhdp_set_video_status(struct cdns_mhdp_device *mhdp, int active)
-+{
-+	u8 msg;
-+	int ret;
-+
-+	msg = !!active;
-+
-+	ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
-+				     DPTX_SET_VIDEO, sizeof(msg), &msg);
-+	if (ret)
-+		DRM_DEV_ERROR(mhdp->dev, "set video status failed: %d\n", ret);
-+
-+	return ret;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_set_video_status);
-+
-+static int cdns_mhdp_get_msa_misc(struct video_info *video,
-+				  struct drm_display_mode *mode)
-+{
-+	u32 msa_misc;
-+	u8 val[2] = {0};
-+
-+	switch (video->color_fmt) {
-+	case PXL_RGB:
-+	case Y_ONLY:
-+		val[0] = 0;
-+		break;
-+	/* set YUV default color space conversion to BT601 */
-+	case YCBCR_4_4_4:
-+		val[0] = 6 + BT_601 * 8;
-+		break;
-+	case YCBCR_4_2_2:
-+		val[0] = 5 + BT_601 * 8;
-+		break;
-+	case YCBCR_4_2_0:
-+		val[0] = 5;
-+		break;
-+	};
-+
-+	switch (video->color_depth) {
-+	case 6:
-+		val[1] = 0;
-+		break;
-+	case 8:
-+		val[1] = 1;
-+		break;
-+	case 10:
-+		val[1] = 2;
-+		break;
-+	case 12:
-+		val[1] = 3;
-+		break;
-+	case 16:
-+		val[1] = 4;
-+		break;
-+	};
-+
-+	msa_misc = 2 * val[0] + 32 * val[1] +
-+		   ((video->color_fmt == Y_ONLY) ? (1 << 14) : 0);
-+
-+	return msa_misc;
-+}
-+
-+int cdns_mhdp_config_video(struct cdns_mhdp_device *mhdp)
-+{
-+	struct video_info *video = &mhdp->video_info;
-+	struct drm_display_mode *mode = &mhdp->mode;
-+	u64 symbol;
-+	u32 val, link_rate, rem;
-+	u8 bit_per_pix, tu_size_reg = TU_SIZE;
-+	int ret;
-+
-+	bit_per_pix = (video->color_fmt == YCBCR_4_2_2) ?
-+		      (video->color_depth * 2) : (video->color_depth * 3);
-+
-+	link_rate = mhdp->dp.link.rate / 1000;
-+
-+	ret = cdns_mhdp_reg_write(mhdp, BND_HSYNC2VSYNC, VIF_BYPASS_INTERLACE);
-+	if (ret)
-+		goto err_config_video;
-+
-+	ret = cdns_mhdp_reg_write(mhdp, HSYNC2VSYNC_POL_CTRL, 0);
-+	if (ret)
-+		goto err_config_video;
-+
-+	/*
-+	 * get a best tu_size and valid symbol:
-+	 * 1. chose Lclk freq(162Mhz, 270Mhz, 540Mhz), set TU to 32
-+	 * 2. calculate VS(valid symbol) = TU * Pclk * Bpp / (Lclk * Lanes)
-+	 * 3. if VS > *.85 or VS < *.1 or VS < 2 or TU < VS + 4, then set
-+	 *    TU += 2 and repeat 2nd step.
-+	 */
-+	do {
-+		tu_size_reg += 2;
-+		symbol = tu_size_reg * mode->clock * bit_per_pix;
-+		do_div(symbol, mhdp->dp.link.num_lanes * link_rate * 8);
-+		rem = do_div(symbol, 1000);
-+		if (tu_size_reg > 64) {
-+			ret = -EINVAL;
-+			DRM_DEV_ERROR(mhdp->dev,
-+				      "tu error, clk:%d, lanes:%d, rate:%d\n",
-+				      mode->clock, mhdp->dp.link.num_lanes,
-+				      link_rate);
-+			goto err_config_video;
-+		}
-+	} while ((symbol <= 1) || (tu_size_reg - symbol < 4) ||
-+		 (rem > 850) || (rem < 100));
-+
-+	val = symbol + (tu_size_reg << 8);
-+	val |= TU_CNT_RST_EN;
-+	ret = cdns_mhdp_reg_write(mhdp, DP_FRAMER_TU, val);
-+	if (ret)
-+		goto err_config_video;
-+
-+	/* set the FIFO Buffer size */
-+	val = div_u64(mode->clock * (symbol + 1), 1000) + link_rate;
-+	val /= (mhdp->dp.link.num_lanes * link_rate);
-+	val = div_u64(8 * (symbol + 1), bit_per_pix) - val;
-+	val += 2;
-+	ret = cdns_mhdp_reg_write(mhdp, DP_VC_TABLE(15), val);
-+
-+	switch (video->color_depth) {
-+	case 6:
-+		val = BCS_6;
-+		break;
-+	case 8:
-+		val = BCS_8;
-+		break;
-+	case 10:
-+		val = BCS_10;
-+		break;
-+	case 12:
-+		val = BCS_12;
-+		break;
-+	case 16:
-+		val = BCS_16;
-+		break;
-+	};
-+
-+	val += video->color_fmt << 8;
-+	ret = cdns_mhdp_reg_write(mhdp, DP_FRAMER_PXL_REPR, val);
-+	if (ret)
-+		goto err_config_video;
-+
-+	val = video->h_sync_polarity ? DP_FRAMER_SP_HSP : 0;
-+	val |= video->v_sync_polarity ? DP_FRAMER_SP_VSP : 0;
-+	ret = cdns_mhdp_reg_write(mhdp, DP_FRAMER_SP, val);
-+	if (ret)
-+		goto err_config_video;
-+
-+	val = (mode->hsync_start - mode->hdisplay) << 16;
-+	val |= mode->htotal - mode->hsync_end;
-+	ret = cdns_mhdp_reg_write(mhdp, DP_FRONT_BACK_PORCH, val);
-+	if (ret)
-+		goto err_config_video;
-+
-+	val = mode->hdisplay * bit_per_pix / 8;
-+	ret = cdns_mhdp_reg_write(mhdp, DP_BYTE_COUNT, val);
-+	if (ret)
-+		goto err_config_video;
-+
-+	val = mode->htotal | ((mode->htotal - mode->hsync_start) << 16);
-+	ret = cdns_mhdp_reg_write(mhdp, MSA_HORIZONTAL_0, val);
-+	if (ret)
-+		goto err_config_video;
-+
-+	val = mode->hsync_end - mode->hsync_start;
-+	val |= (mode->hdisplay << 16) | (video->h_sync_polarity << 15);
-+	ret = cdns_mhdp_reg_write(mhdp, MSA_HORIZONTAL_1, val);
-+	if (ret)
-+		goto err_config_video;
-+
-+	val = mode->vtotal;
-+	val |= (mode->vtotal - mode->vsync_start) << 16;
-+	ret = cdns_mhdp_reg_write(mhdp, MSA_VERTICAL_0, val);
-+	if (ret)
-+		goto err_config_video;
-+
-+	val = mode->vsync_end - mode->vsync_start;
-+	val |= (mode->vdisplay << 16) | (video->v_sync_polarity << 15);
-+	ret = cdns_mhdp_reg_write(mhdp, MSA_VERTICAL_1, val);
-+	if (ret)
-+		goto err_config_video;
-+
-+	val = cdns_mhdp_get_msa_misc(video, mode);
-+	ret = cdns_mhdp_reg_write(mhdp, MSA_MISC, val);
-+	if (ret)
-+		goto err_config_video;
-+
-+	ret = cdns_mhdp_reg_write(mhdp, STREAM_CONFIG, 1);
-+	if (ret)
-+		goto err_config_video;
-+
-+	val = mode->hsync_end - mode->hsync_start;
-+	val |= mode->hdisplay << 16;
-+	ret = cdns_mhdp_reg_write(mhdp, DP_HORIZONTAL, val);
-+	if (ret)
-+		goto err_config_video;
-+
-+	val = mode->vdisplay;
-+	val |= (mode->vtotal - mode->vsync_start) << 16;
-+	ret = cdns_mhdp_reg_write(mhdp, DP_VERTICAL_0, val);
-+	if (ret)
-+		goto err_config_video;
-+
-+	val = mode->vtotal;
-+	ret = cdns_mhdp_reg_write(mhdp, DP_VERTICAL_1, val);
-+	if (ret)
-+		goto err_config_video;
-+
-+	ret = cdns_mhdp_reg_write_bit(mhdp, DP_VB_ID, 2, 1, 0);
-+
-+err_config_video:
-+	if (ret)
-+		DRM_DEV_ERROR(mhdp->dev, "config video failed: %d\n", ret);
-+	return ret;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_config_video);
-+
-+int cdns_mhdp_adjust_lt(struct cdns_mhdp_device *mhdp,
-+			u8 nlanes, u16 udelay, u8 *lanes_data, u8 *dpcd)
-+{
-+	u8 payload[7];
-+	u8 hdr[5]; /* For DPCD read response header */
-+	u32 addr;
-+	u8 const nregs = 6; /* Registers 0x202-0x207 */
-+	int ret;
-+
-+	if (nlanes != 4 && nlanes != 2 && nlanes != 1) {
-+		DRM_DEV_ERROR(mhdp->dev, "invalid number of lanes: %d\n",
-+			      nlanes);
-+		ret = -EINVAL;
-+		goto err_adjust_lt;
-+	}
-+
-+	payload[0] = nlanes;
-+	put_unaligned_be16(udelay, payload + 1);
-+	memcpy(payload + 3, lanes_data, nlanes);
-+
-+	ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
-+				     DPTX_ADJUST_LT,
-+				     sizeof(payload), payload);
-+	if (ret)
-+		goto err_adjust_lt;
-+
-+	/* Yes, read the DPCD read command response */
-+	ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_DP_TX,
-+						 DPTX_READ_DPCD,
-+						 sizeof(hdr) + nregs);
-+	if (ret)
-+		goto err_adjust_lt;
-+
-+	ret = cdns_mhdp_mailbox_read_receive(mhdp, hdr, sizeof(hdr));
-+	if (ret)
-+		goto err_adjust_lt;
-+
-+	addr = get_unaligned_be24(hdr + 2);
-+	if (addr != DP_LANE0_1_STATUS)
-+		goto err_adjust_lt;
-+
-+	ret = cdns_mhdp_mailbox_read_receive(mhdp, dpcd, nregs);
-+
-+err_adjust_lt:
-+	if (ret)
-+		DRM_DEV_ERROR(mhdp->dev, "Failed to adjust Link Training.\n");
-+
-+	return ret;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_adjust_lt);
-+
-+int cdns_phy_reg_write(struct cdns_mhdp_device *mhdp, u32 addr, u32 val)
-+{
-+	return cdns_mhdp_reg_write(mhdp, ADDR_PHY_AFE + (addr << 2), val);
-+}
-+EXPORT_SYMBOL(cdns_phy_reg_write);
-+
-+u32 cdns_phy_reg_read(struct cdns_mhdp_device *mhdp, u32 addr)
-+{
-+	return cdns_mhdp_reg_read(mhdp, ADDR_PHY_AFE + (addr << 2));
-+}
-+EXPORT_SYMBOL(cdns_phy_reg_read);
-+
-+int cdns_mhdp_read_hpd(struct cdns_mhdp_device *mhdp)
-+{
-+	u8 status;
-+	int ret;
-+
-+	ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_GENERAL, GENERAL_GET_HPD_STATE,
-+				  0, NULL);
-+	if (ret)
-+		goto err_get_hpd;
-+
-+	ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_GENERAL,
-+							GENERAL_GET_HPD_STATE, sizeof(status));
-+	if (ret)
-+		goto err_get_hpd;
-+
-+	ret = cdns_mhdp_mailbox_read_receive(mhdp, &status, sizeof(status));
-+	if (ret)
-+		goto err_get_hpd;
-+
-+	return status;
-+
-+err_get_hpd:
-+	DRM_ERROR("read hpd  failed: %d\n", ret);
-+	return ret;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_read_hpd);
-+
-+bool cdns_mhdp_check_alive(struct cdns_mhdp_device *mhdp)
-+{
-+	u32  alive, newalive;
-+	u8 retries_left = 50;
-+
-+	alive = cdns_mhdp_bus_read(mhdp, KEEP_ALIVE);
-+
-+	while (retries_left--) {
-+		udelay(2);
-+
-+		newalive = cdns_mhdp_bus_read(mhdp, KEEP_ALIVE);
-+		if (alive == newalive)
-+			continue;
-+		return true;
-+	}
-+	return false;
-+}
-+EXPORT_SYMBOL(cdns_mhdp_check_alive);
-diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp-hdmi.c b/drivers/gpu/drm/bridge/cadence/cdns-mhdp-hdmi.c
-new file mode 100644
-index 000000000000..9773202e0651
---- /dev/null
-+++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp-hdmi.c
-@@ -0,0 +1,357 @@
-+/*
-+ * Copyright (C) 2019 NXP Semiconductor, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ */
-+
-+#include <linux/io.h>
-+#include <drm/bridge/cdns-mhdp-common.h>
-+#include <linux/regmap.h>
-+
-+void cdns_mhdp_infoframe_set(struct cdns_mhdp_device *mhdp,
-+					u8 entry_id, u8 packet_len, u8 *packet, u8 packet_type)
-+{
-+	u32 *packet32, len32;
-+	u32 val, i;
-+	
-+	printk(KERN_ALERT "DEBUG: %s %d \n",__FUNCTION__,__LINE__);
-+
-+	/* invalidate entry */
-+	val = F_ACTIVE_IDLE_TYPE(1) | F_PKT_ALLOC_ADDRESS(entry_id);
-+	cdns_mhdp_bus_write(val, mhdp, SOURCE_PIF_PKT_ALLOC_REG);
-+	cdns_mhdp_bus_write(F_PKT_ALLOC_WR_EN(1), mhdp, SOURCE_PIF_PKT_ALLOC_WR_EN);
-+
-+	/* flush fifo 1 */
-+	cdns_mhdp_bus_write(F_FIFO1_FLUSH(1), mhdp, SOURCE_PIF_FIFO1_FLUSH);
-+
-+	/* write packet into memory */
-+	packet32 = (u32 *)packet;
-+	len32 = packet_len / 4;
-+	for (i = 0; i < len32; i++)
-+		cdns_mhdp_bus_write(F_DATA_WR(packet32[i]), mhdp, SOURCE_PIF_DATA_WR);
-+
-+	/* write entry id */
-+	cdns_mhdp_bus_write(F_WR_ADDR(entry_id), mhdp, SOURCE_PIF_WR_ADDR);
-+
-+	/* write request */
-+	cdns_mhdp_bus_write(F_HOST_WR(1), mhdp, SOURCE_PIF_WR_REQ);
-+
-+	/* update entry */
-+	val =  F_ACTIVE_IDLE_TYPE(1) | F_TYPE_VALID(1) |
-+			F_PACKET_TYPE(packet_type) | F_PKT_ALLOC_ADDRESS(entry_id);
-+	cdns_mhdp_bus_write(val, mhdp, SOURCE_PIF_PKT_ALLOC_REG);
-+
-+	cdns_mhdp_bus_write(F_PKT_ALLOC_WR_EN(1), mhdp, SOURCE_PIF_PKT_ALLOC_WR_EN);
-+}
-+
-+int cdns_hdmi_get_edid_block(void *data, u8 *edid,
-+			  u32 block, size_t length)
-+{
-+	struct cdns_mhdp_device *mhdp = data;
-+	u8 msg[2], reg[5], i;
-+	int ret;
-+
-+	for (i = 0; i < 4; i++) {
-+		msg[0] = block / 2;
-+		msg[1] = block % 2;
-+
-+		ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_HDMI_TX, HDMI_TX_EDID,
-+					  sizeof(msg), msg);
-+		if (ret)
-+			continue;
-+
-+		ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_HDMI_TX,
-+						      HDMI_TX_EDID, sizeof(reg) + length);
-+		if (ret)
-+			continue;
-+
-+		ret = cdns_mhdp_mailbox_read_receive(mhdp, reg, sizeof(reg));
-+		if (ret)
-+			continue;
-+
-+		ret = cdns_mhdp_mailbox_read_receive(mhdp, edid, length);
-+		if (ret)
-+			continue;
-+
-+		if ((reg[3] << 8 | reg[4]) == length)
-+			break;
-+	}
-+
-+	if (ret)
-+		printk(KERN_ALERT "cdns-mhdp-hdmi: get block[%d] edid failed: %d\n", block, ret);
-+		//DRM_ERROR("get block[%d] edid failed: %d\n", block, ret);
-+	return ret;
-+}
-+
-+int cdns_hdmi_scdc_read(struct cdns_mhdp_device *mhdp, u8 addr, u8 *data)
-+{
-+	u8 msg[4], reg[6];
-+	int ret;
-+
-+	msg[0] = 0x54;
-+	msg[1] = addr;
-+	msg[2] = 0;
-+	msg[3] = 1;
-+	ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_HDMI_TX, HDMI_TX_READ,
-+				  sizeof(msg), msg);
-+	if (ret)
-+		goto err_scdc_read;
-+
-+	ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_HDMI_TX,
-+					      HDMI_TX_READ, sizeof(reg));
-+	if (ret)
-+		goto err_scdc_read;
-+
-+	ret = cdns_mhdp_mailbox_read_receive(mhdp, reg, sizeof(reg));
-+	if (ret)
-+		goto err_scdc_read;
-+
-+	*data = reg[5];
-+
-+err_scdc_read:
-+	if (ret)
-+		printk(KERN_ALERT "cdns-mhdp-hdmi: scdc read failed: %d\n", ret);
-+	//DRM_ERROR("scdc read failed: %d\n", ret);
-+	return ret;
-+}
-+
-+int cdns_hdmi_scdc_write(struct cdns_mhdp_device *mhdp, u8 addr, u8 value)
-+{
-+	u8 msg[5], reg[5];
-+	int ret;
-+
-+	msg[0] = 0x54;
-+	msg[1] = addr;
-+	msg[2] = 0;
-+	msg[3] = 1;
-+	msg[4] = value;
-+	ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_HDMI_TX, HDMI_TX_WRITE,
-+				  sizeof(msg), msg);
-+	if (ret)
-+		goto err_scdc_write;
-+
-+	ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_HDMI_TX,
-+					      HDMI_TX_WRITE, sizeof(reg));
-+	if (ret)
-+		goto err_scdc_write;
-+
-+	ret = cdns_mhdp_mailbox_read_receive(mhdp, reg, sizeof(reg));
-+	if (ret)
-+		goto err_scdc_write;
-+
-+	if (reg[0] != 0)
-+		ret = -EINVAL;
-+
-+err_scdc_write:
-+	if (ret)
-+		printk(KERN_ALERT "cdns-mhdp-hdmi: scdc write failed: %d\n", ret);
-+	//DRM_ERROR("scdc write failed: %d\n", ret);
-+	return ret;
-+}
-+
-+int cdns_hdmi_ctrl_init(struct cdns_mhdp_device *mhdp,
-+				 int protocol,
-+				 u32 char_rate)
-+{
-+	u32 reg0;
-+	u32 reg1;
-+	u32 val;
-+	int ret;
-+
-+	printk(KERN_ALERT "DEBUG: %s %d proto: %d char_rate: %ul \n",__FUNCTION__,__LINE__,protocol,char_rate);
-+	
-+	/* Set PHY to HDMI data */
-+	ret = cdns_mhdp_reg_write(mhdp, PHY_DATA_SEL, F_SOURCE_PHY_MHDP_SEL(1));
-+	if (ret < 0)
-+		return ret;
-+
-+	printk(KERN_ALERT "DEBUG: %s %d \n",__FUNCTION__,__LINE__);
-+	
-+	ret = cdns_mhdp_reg_write(mhdp, HDTX_HPD,
-+					F_HPD_VALID_WIDTH(4) | F_HPD_GLITCH_WIDTH(0));
-+	if (ret < 0)
-+		return ret;
-+
-+	printk(KERN_ALERT "DEBUG: %s %d \n",__FUNCTION__,__LINE__);
-+	
-+	/* open CARS */
-+	ret = cdns_mhdp_reg_write(mhdp, SOURCE_PHY_CAR, 0xF);
-+	if (ret < 0)
-+		return ret;
-+	ret = cdns_mhdp_reg_write(mhdp, SOURCE_HDTX_CAR, 0xFF);
-+	if (ret < 0)
-+		return ret;
-+	ret = cdns_mhdp_reg_write(mhdp, SOURCE_PKT_CAR, 0xF);
-+	if (ret < 0)
-+		return ret;
-+	ret = cdns_mhdp_reg_write(mhdp, SOURCE_AIF_CAR, 0xF);
-+	if (ret < 0)
-+		return ret;
-+	ret = cdns_mhdp_reg_write(mhdp, SOURCE_CIPHER_CAR, 0xF);
-+	if (ret < 0)
-+		return ret;
-+	ret = cdns_mhdp_reg_write(mhdp, SOURCE_CRYPTO_CAR, 0xF);
-+	if (ret < 0)
-+		return ret;
-+	ret = cdns_mhdp_reg_write(mhdp, SOURCE_CEC_CAR, 3);
-+	if (ret < 0)
-+		return ret;
-+
-+	printk(KERN_ALERT "DEBUG: %s %d \n",__FUNCTION__,__LINE__);
-+	
-+	reg0 = reg1 = 0x7c1f;
-+	if (protocol == MODE_HDMI_2_0 && char_rate >= 340000) {
-+		reg0 = 0;
-+		reg1 = 0xFFFFF;
-+	}
-+	ret = cdns_mhdp_reg_write(mhdp, HDTX_CLOCK_REG_0, reg0);
-+	if (ret < 0)
-+		return ret;
-+	ret = cdns_mhdp_reg_write(mhdp, HDTX_CLOCK_REG_1, reg1);
-+	if (ret < 0)
-+		return ret;
-+
-+	printk(KERN_ALERT "DEBUG: %s %d \n",__FUNCTION__,__LINE__);
-+	
-+	/* set hdmi mode and preemble mode data enable */
-+	val = F_HDMI_MODE(protocol) | F_HDMI2_PREAMBLE_EN(1) |  F_DATA_EN(1) |
-+			F_HDMI2_CTRL_IL_MODE(1) | F_BCH_EN(1) | F_PIC_3D(0XF);
-+	ret = cdns_mhdp_reg_write(mhdp, HDTX_CONTROLLER, val);
-+
-+	printk(KERN_ALERT "DEBUG: %s %d \n",__FUNCTION__,__LINE__);
-+	
-+	return ret;
-+}
-+
-+int cdns_hdmi_mode_config(struct cdns_mhdp_device *mhdp,
-+					      struct drm_display_mode *mode,
-+						  struct video_info *video_info)
-+{
-+	int ret;
-+	u32 val;
-+	u32 vsync_lines = mode->vsync_end - mode->vsync_start;
-+	u32 eof_lines = mode->vsync_start - mode->vdisplay;
-+	u32 sof_lines = mode->vtotal - mode->vsync_end;
-+	u32 hblank = mode->htotal - mode->hdisplay;
-+	u32 hactive = mode->hdisplay;
-+	u32 vblank = mode->vtotal - mode->vdisplay;
-+	u32 vactive = mode->vdisplay;
-+	u32 hfront = mode->hsync_start - mode->hdisplay;
-+	u32 hback = mode->htotal - mode->hsync_end;
-+	u32 vfront = eof_lines;
-+	u32 hsync = hblank - hfront - hback;
-+	u32 vsync = vsync_lines;
-+	u32 vback = sof_lines;
-+	u32 v_h_polarity = ((mode->flags & DRM_MODE_FLAG_NHSYNC) ? 0 : 1) +
-+						((mode->flags & DRM_MODE_FLAG_NVSYNC) ? 0 : 2);
-+
-+	printk(KERN_ALERT "DEBUG: %s %d \n",__FUNCTION__,__LINE__);
-+
-+	ret = cdns_mhdp_reg_write(mhdp, SCHEDULER_H_SIZE, (hactive << 16) + hblank);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret = cdns_mhdp_reg_write(mhdp, SCHEDULER_V_SIZE, (vactive << 16) + vblank);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret = cdns_mhdp_reg_write(mhdp, HDTX_SIGNAL_FRONT_WIDTH, (vfront << 16) + hfront);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret = cdns_mhdp_reg_write(mhdp, HDTX_SIGNAL_SYNC_WIDTH, (vsync << 16) + hsync);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret = cdns_mhdp_reg_write(mhdp, HDTX_SIGNAL_BACK_WIDTH, (vback << 16) + hback);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret = cdns_mhdp_reg_write(mhdp, HSYNC2VSYNC_POL_CTRL, v_h_polarity);
-+	if (ret < 0)
-+		return ret;
-+	
-+	printk(KERN_ALERT "DEBUG: %s %d mode: %d x %d h: %d %d %d v: %d %d %d pol: %d\n",__FUNCTION__,__LINE__,hactive,vactive,hfront,hsync,hback,vfront,
-+		vsync,vback,v_h_polarity);
-+
-+	/* Reset Data Enable */
-+	val = cdns_mhdp_reg_read(mhdp, HDTX_CONTROLLER);
-+	val &= ~F_DATA_EN(1);
-+	ret = cdns_mhdp_reg_write(mhdp, HDTX_CONTROLLER, val);
-+	if (ret < 0)
-+		return ret;
-+	printk(KERN_ALERT "DEBUG: %s %d \n",__FUNCTION__,__LINE__);
-+
-+	/* Set bpc */
-+	val &= ~F_VIF_DATA_WIDTH(3);
-+	switch (video_info->color_depth) {
-+	case 10:
-+		val |= F_VIF_DATA_WIDTH(1);
-+		break;
-+	case 12:
-+		val |= F_VIF_DATA_WIDTH(2);
-+		break;
-+	case 16:
-+		val |= F_VIF_DATA_WIDTH(3);
-+		break;
-+	case 8:
-+	default:
-+		val |= F_VIF_DATA_WIDTH(0);
-+		break;
-+	}
-+	printk(KERN_ALERT "DEBUG: %s %d BPC: %d\n",__FUNCTION__,__LINE__,video_info->color_depth);
-+
-+	/* select color encoding */
-+	val &= ~F_HDMI_ENCODING(3);
-+	switch (video_info->color_fmt) {
-+	case YCBCR_4_4_4:
-+		val |= F_HDMI_ENCODING(2);
-+		break;
-+	case YCBCR_4_2_2:
-+		val |= F_HDMI_ENCODING(1);
-+		break;
-+	case YCBCR_4_2_0:
-+		val |= F_HDMI_ENCODING(3);
-+		break;
-+	case PXL_RGB:
-+	default:
-+		val |= F_HDMI_ENCODING(0);
-+		break;
-+	}
-+	printk(KERN_ALERT "DEBUG: %s %d color: %d\n",__FUNCTION__,__LINE__,video_info->color_fmt);
-+
-+	ret = cdns_mhdp_reg_write(mhdp, HDTX_CONTROLLER, val);
-+	if (ret < 0)
-+		return ret;
-+
-+	/* set data enable */
-+	val |= F_DATA_EN(1);
-+	ret = cdns_mhdp_reg_write(mhdp, HDTX_CONTROLLER, val);
-+
-+	printk(KERN_ALERT "DEBUG: %s %d \n",__FUNCTION__,__LINE__);
-+	
-+	return ret;
-+}
-+
-+int cdns_hdmi_disable_gcp(struct cdns_mhdp_device *mhdp)
-+{
-+	u32 val;
-+
-+	val = cdns_mhdp_reg_read(mhdp, HDTX_CONTROLLER);
-+	val &= ~F_GCP_EN(1);
-+
-+	return cdns_mhdp_reg_write(mhdp, HDTX_CONTROLLER, val);
-+}
-+
-+int cdns_hdmi_enable_gcp(struct cdns_mhdp_device *mhdp)
-+{
-+	u32 val;
-+
-+	val = cdns_mhdp_reg_read(mhdp, HDTX_CONTROLLER);
-+	val |= F_GCP_EN(1);
-+
-+	return cdns_mhdp_reg_write(mhdp, HDTX_CONTROLLER, val);
-+}
-diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp.h b/drivers/gpu/drm/bridge/cadence/cdns-mhdp.h
-new file mode 100644
-index 000000000000..399c3f6f86ad
---- /dev/null
-+++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp.h
-@@ -0,0 +1,209 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * Cadence MHDP DP MST bridge driver.
-+ *
-+ * Copyright: 2018 Cadence Design Systems, Inc.
-+ *
-+ * Author: Quentin Schulz <quentin.schulz@free-electrons.com>
-+ */
-+
-+
-+#ifndef CDNS_MHDP_H
-+#define CDNS_MHDP_H
-+
-+#include <drm/drm_dp_mst_helper.h>
-+
-+#define CDNS_APB_CFG				0x00000
-+#define CDNS_APB_CTRL				(CDNS_APB_CFG + 0x00)
-+#define CDNS_MAILBOX_FULL			(CDNS_APB_CFG + 0x08)
-+#define CDNS_MAILBOX_EMPTY			(CDNS_APB_CFG + 0x0c)
-+#define CDNS_MAILBOX_TX_DATA			(CDNS_APB_CFG + 0x10)
-+#define CDNS_MAILBOX_RX_DATA			(CDNS_APB_CFG + 0x14)
-+#define CDNS_KEEP_ALIVE				(CDNS_APB_CFG + 0x18)
-+#define CDNS_KEEP_ALIVE_MASK			GENMASK(7, 0)
-+
-+#define CDNS_MB_INT_MASK			(CDNS_APB_CFG + 0x34)
-+
-+#define CDNS_SW_CLK_L				(CDNS_APB_CFG + 0x3c)
-+#define CDNS_SW_CLK_H				(CDNS_APB_CFG + 0x40)
-+#define CDNS_SW_EVENT0				(CDNS_APB_CFG + 0x44)
-+#define CDNS_DPTX_HPD				BIT(0)
-+
-+#define CDNS_SW_EVENT1				(CDNS_APB_CFG + 0x48)
-+#define CDNS_SW_EVENT2				(CDNS_APB_CFG + 0x4c)
-+#define CDNS_SW_EVENT3				(CDNS_APB_CFG + 0x50)
-+
-+#define CDNS_APB_INT_MASK			(CDNS_APB_CFG + 0x6C)
-+#define CDNS_APB_INT_MASK_MAILBOX_INT		BIT(0)
-+#define CDNS_APB_INT_MASK_SW_EVENT_INT		BIT(1)
-+
-+#define CDNS_DPTX_CAR				(CDNS_APB_CFG + 0x904)
-+#define CDNS_VIF_CLK_EN				BIT(0)
-+#define CDNS_VIF_CLK_RSTN			BIT(1)
-+
-+#define CDNS_SOURCE_VIDEO_IF(s)			(0x00b00 + (s * 0x20))
-+#define CDNS_BND_HSYNC2VSYNC(s)			(CDNS_SOURCE_VIDEO_IF(s) + \
-+						 0x00)
-+#define CDNS_IP_DTCT_WIN			GENMASK(11, 0)
-+#define CDNS_IP_DET_INTERLACE_FORMAT		BIT(12)
-+#define CDNS_IP_BYPASS_V_INTERFACE		BIT(13)
-+
-+#define CDNS_HSYNC2VSYNC_POL_CTRL(s)		(CDNS_SOURCE_VIDEO_IF(s) + \
-+						 0x10)
-+#define CDNS_H2V_HSYNC_POL_ACTIVE_LOW		BIT(1)
-+#define CDNS_H2V_VSYNC_POL_ACTIVE_LOW		BIT(2)
-+
-+#define CDNS_DPTX_PHY_CONFIG			0x02000
-+#define CDNS_PHY_TRAINING_EN			BIT(0)
-+#define CDNS_PHY_TRAINING_TYPE(x)		(((x) & GENMASK(3, 0)) << 1)
-+#define CDNS_PHY_SCRAMBLER_BYPASS		BIT(5)
-+#define CDNS_PHY_ENCODER_BYPASS			BIT(6)
-+#define CDNS_PHY_SKEW_BYPASS			BIT(7)
-+#define CDNS_PHY_TRAINING_AUTO			BIT(8)
-+#define CDNS_PHY_LANE0_SKEW(x)			(((x) & GENMASK(2, 0)) << 9)
-+#define CDNS_PHY_LANE1_SKEW(x)			(((x) & GENMASK(2, 0)) << 12)
-+#define CDNS_PHY_LANE2_SKEW(x)			(((x) & GENMASK(2, 0)) << 15)
-+#define CDNS_PHY_LANE3_SKEW(x)			(((x) & GENMASK(2, 0)) << 18)
-+#define CDNS_PHY_COMMON_CONFIG			(CDNS_PHY_LANE1_SKEW(1) | \
-+						CDNS_PHY_LANE2_SKEW(2) |  \
-+						CDNS_PHY_LANE3_SKEW(3))
-+#define CDNS_PHY_10BIT_EN			BIT(21)
-+
-+#define CDNS_DPTX_FRAMER			0x02200
-+#define CDNS_DP_FRAMER_GLOBAL_CONFIG		(CDNS_DPTX_FRAMER + 0x00)
-+#define CDNS_DP_NUM_LANES(x)			(x - 1)
-+#define CDNS_DP_MST_EN				BIT(2)
-+#define CDNS_DP_FRAMER_EN			BIT(3)
-+#define CDNS_DP_RATE_GOVERNOR_EN		BIT(4)
-+#define CDNS_DP_NO_VIDEO_MODE			BIT(5)
-+#define CDNS_DP_DISABLE_PHY_RST			BIT(6)
-+#define CDNS_DP_WR_FAILING_EDGE_VSYNC		BIT(7)
-+
-+#define CDNS_DP_SW_RESET			(CDNS_DPTX_FRAMER + 0x04)
-+#define CDNS_DP_FRAMER_TU			(CDNS_DPTX_FRAMER + 0x08)
-+#define CDNS_DP_FRAMER_TU_SIZE(x)		(((x) & GENMASK(6, 0)) << 8)
-+#define CDNS_DP_FRAMER_TU_VS(x)			((x) & GENMASK(5, 0))
-+#define CDNS_DP_FRAMER_TU_CNT_RST_EN		BIT(15)
-+
-+#define CDNS_DPTX_STREAM(s)			(0x03000 + s * 0x80)
-+#define CDNS_DP_MSA_HORIZONTAL_0(s)		(CDNS_DPTX_STREAM(s) + 0x00)
-+#define CDNS_DP_MSAH0_H_TOTAL(x)		(x)
-+#define CDNS_DP_MSAH0_HSYNC_START(x)		((x) << 16)
-+
-+#define CDNS_DP_MSA_HORIZONTAL_1(s)		(CDNS_DPTX_STREAM(s) + 0x04)
-+#define CDNS_DP_MSAH1_HSYNC_WIDTH(x)		(x)
-+#define CDNS_DP_MSAH1_HSYNC_POL_LOW		BIT(15)
-+#define CDNS_DP_MSAH1_HDISP_WIDTH(x)		((x) << 16)
-+
-+#define CDNS_DP_MSA_VERTICAL_0(s)		(CDNS_DPTX_STREAM(s) + 0x08)
-+#define CDNS_DP_MSAV0_V_TOTAL(x)		(x)
-+#define CDNS_DP_MSAV0_VSYNC_START(x)		((x) << 16)
-+
-+#define CDNS_DP_MSA_VERTICAL_1(s)		(CDNS_DPTX_STREAM(s) + 0x0c)
-+#define CDNS_DP_MSAV1_VSYNC_WIDTH(x)		(x)
-+#define CDNS_DP_MSAV1_VSYNC_POL_LOW		BIT(15)
-+#define CDNS_DP_MSAV1_VDISP_WIDTH(x)		((x) << 16)
-+
-+#define CDNS_DP_MSA_MISC(s)			(CDNS_DPTX_STREAM(s) + 0x10)
-+#define CDNS_DP_STREAM_CONFIGs(s)		(CDNS_DPTX_STREAM(s) + 0x14)
-+#define CDNS_DP_STREAM_CONFIG_2(s)		(CDNS_DPTX_STREAM(s) + 0x2c)
-+#define CDNS_DP_SC2_TU_VS_DIFF(x)		((x) << 8)
-+
-+#define CDNS_DP_HORIZONTAL(s)			(CDNS_DPTX_STREAM(s) + 0x30)
-+#define CDNS_DP_H_HSYNC_WIDTH(x)		(x)
-+#define CDNS_DP_H_H_TOTAL(x)			((x) << 16)
-+
-+#define CDNS_DP_VERTICAL_0(s)			(CDNS_DPTX_STREAM(s) + 0x34)
-+#define CDNS_DP_V0_VHEIGHT(x)			(x)
-+#define CDNS_DP_V0_VSTART(x)			((x) << 16)
-+
-+#define CDNS_DP_VERTICAL_1(s)			(CDNS_DPTX_STREAM(s) + 0x38)
-+#define CDNS_DP_V1_VTOTAL(x)			(x)
-+#define CDNS_DP_V1_VTOTAL_EVEN			BIT(16)
-+
-+#define CDNS_DP_FRAMER_PXL_REPR(s)		(CDNS_DPTX_STREAM(s) + 0x4c)
-+#define CDNS_DP_FRAMER_6_BPC			BIT(0)
-+#define CDNS_DP_FRAMER_8_BPC			BIT(1)
-+#define CDNS_DP_FRAMER_10_BPC			BIT(2)
-+#define CDNS_DP_FRAMER_12_BPC			BIT(3)
-+#define CDNS_DP_FRAMER_16_BPC			BIT(4)
-+#define CDNS_DP_FRAMER_PXL_FORMAT		0x8
-+#define CDNS_DP_FRAMER_RGB			BIT(0)
-+#define CDNS_DP_FRAMER_YCBCR444			BIT(1)
-+#define CDNS_DP_FRAMER_YCBCR422			BIT(2)
-+#define CDNS_DP_FRAMER_YCBCR420			BIT(3)
-+#define CDNS_DP_FRAMER_Y_ONLY			BIT(4)
-+
-+#define CDNS_DP_FRAMER_SP(s)			(CDNS_DPTX_STREAM(s) + 0x10)
-+#define CDNS_DP_FRAMER_VSYNC_POL_LOW		BIT(0)
-+#define CDNS_DP_FRAMER_HSYNC_POL_LOW		BIT(1)
-+#define CDNS_DP_FRAMER_INTERLACE		BIT(2)
-+
-+#define CDNS_DP_LINE_THRESH(s)			(CDNS_DPTX_STREAM(s) + 0x64)
-+#define CDNS_DP_ACTIVE_LINE_THRESH(x)		(x)
-+
-+#define CDNS_DP_VB_ID(s)			(CDNS_DPTX_STREAM(s) + 0x68)
-+#define CDNS_DP_VB_ID_INTERLACED		BIT(2)
-+#define CDNS_DP_VB_ID_COMPRESSED		BIT(6)
-+
-+#define CDNS_DP_FRONT_BACK_PORCH(s)		(CDNS_DPTX_STREAM(s) + 0x78)
-+#define CDNS_DP_BACK_PORCH(x)			(x)
-+#define CDNS_DP_FRONT_PORCH(x)			((x) << 16)
-+
-+#define CDNS_DP_BYTE_COUNT(s)			(CDNS_DPTX_STREAM(s) + 0x7c)
-+#define CDNS_DP_BYTE_COUNT_BYTES_IN_CHUNK_SHIFT	16
-+
-+#define CDNS_DP_MST_STREAM_CONFIG(s)		(CDNS_DPTX_STREAM(s) + 0x14)
-+#define CDNS_DP_MST_STRM_CFG_STREAM_EN		BIT(0)
-+#define CDNS_DP_MST_STRM_CFG_NO_VIDEO		BIT(1)
-+
-+#define CDNS_DP_MST_SLOT_ALLOCATE(s)		(CDNS_DPTX_STREAM(s) + 0x44)
-+#define CDNS_DP_S_ALLOC_START_SLOT(x)		(x)
-+#define CDNS_DP_S_ALLOC_END_SLOT(x)		((x) << 8)
-+
-+#define CDNS_DP_RATE_GOVERNING(s)		(CDNS_DPTX_STREAM(s) + 0x48)
-+#define CDNS_DP_RG_TARG_AV_SLOTS_Y(x)		(x)
-+#define CDNS_DP_RG_TARG_AV_SLOTS_X(x)		(x << 4)
-+#define CDNS_DP_RG_ENABLE			BIT(10)
-+
-+#define CDNS_DP_MTPH_CONTROL			0x2264
-+#define CDNS_DP_MTPH_ECF_EN			BIT(0)
-+#define CDNS_DP_MTPH_ACT_EN			BIT(1)
-+#define CDNS_DP_MTPH_LVP_EN			BIT(2)
-+
-+#define CDNS_DP_MTPH_STATUS			0x226C
-+#define CDNS_DP_MTPH_ACT_STATUS			BIT(0)
-+
-+
-+#define CDNS_DPTX_GLOBAL			0x02300
-+#define CDNS_DP_LANE_EN				(CDNS_DPTX_GLOBAL + 0x00)
-+#define CDNS_DP_LANE_EN_LANES(x)		GENMASK(x - 1, 0)
-+#define CDNS_DP_ENHNCD				(CDNS_DPTX_GLOBAL + 0x04)
-+
-+
-+#define to_mhdp_connector(x) container_of(x, struct cdns_mhdp_connector, base)
-+#define to_mhdp_bridge(x) container_of(x, struct cdns_mhdp_bridge, base)
-+#define mgr_to_mhdp(x) container_of(x, struct cdns_mhdp_device, mst_mgr)
-+
-+#define CDNS_MHDP_MAX_STREAMS   4
-+
-+enum pixel_format {
-+	PIXEL_FORMAT_RGB = 1,
-+	PIXEL_FORMAT_YCBCR_444 = 2,
-+	PIXEL_FORMAT_YCBCR_422 = 4,
-+	PIXEL_FORMAT_YCBCR_420 = 8,
-+	PIXEL_FORMAT_Y_ONLY = 16,
-+};
-+
-+
-+int cdns_mhdp_mst_init(struct cdns_mhdp_device *mhdp);
-+void cdns_mhdp_mst_deinit(struct cdns_mhdp_device *mhdp);
-+bool cdns_mhdp_mst_probe(struct cdns_mhdp_device *mhdp);
-+enum pixel_format cdns_mhdp_get_pxlfmt(u32 color_formats);
-+u32 cdns_mhdp_get_bpp(u32 bpc, u32 color_formats);
-+void cdns_mhdp_configure_video(struct drm_bridge *bridge);
-+void cdns_mhdp_mst_enable(struct drm_bridge *bridge);
-+void cdns_mhdp_mst_disable(struct drm_bridge *bridge);
-+void cdns_mhdp_enable(struct drm_bridge *bridge);
-+
-+#endif
-diff --git a/drivers/gpu/drm/imx/Kconfig b/drivers/gpu/drm/imx/Kconfig
-index 6231048aa5aa..74592ac2889b 100644
---- a/drivers/gpu/drm/imx/Kconfig
-+++ b/drivers/gpu/drm/imx/Kconfig
-@@ -40,4 +40,13 @@ config DRM_IMX_HDMI
- 	help
- 	  Choose this if you want to use HDMI on i.MX6.
- 
-+config DRM_IMX_CDNS_MHDP
-+        tristate "NXP i.MX MX8 DRM HDMI/DP"
-+        select DRM_CDNS_MHDP
-+        select DRM_CDNS_DP
-+        select DRM_CDNS_HDMI
-+        select DRM_CDNS_AUDIO
-+        help
-+          Choose this if you want to use HDMI on i.MX8.
-+
- source "drivers/gpu/drm/imx/dcss/Kconfig"
-diff --git a/drivers/gpu/drm/imx/Makefile b/drivers/gpu/drm/imx/Makefile
-index b644deffe948..b43e3250b416 100644
---- a/drivers/gpu/drm/imx/Makefile
-+++ b/drivers/gpu/drm/imx/Makefile
-@@ -10,3 +10,7 @@ obj-$(CONFIG_DRM_IMX_LDB) += imx-ldb.o
- 
- obj-$(CONFIG_DRM_IMX_HDMI) += dw_hdmi-imx.o
- obj-$(CONFIG_DRM_IMX_DCSS) += dcss/
-+
-+cdns_mhdp_imx-objs := cdn-mhdp-imxdrv.o cdn-mhdp-dp-phy.o cdn-mhdp-hdmi-phy.o
-+obj-$(CONFIG_DRM_IMX_CDNS_MHDP) += cdns_mhdp_imx.o
-+
-diff --git a/drivers/gpu/drm/imx/cdn-mhdp-dp-phy.c b/drivers/gpu/drm/imx/cdn-mhdp-dp-phy.c
-new file mode 100644
-index 000000000000..60c1e6342875
---- /dev/null
-+++ b/drivers/gpu/drm/imx/cdn-mhdp-dp-phy.c
-@@ -0,0 +1,529 @@
-+/*
-+ * Cadence Display Port Interface (DP) PHY driver
-+ *
-+ * Copyright (C) 2019 NXP Semiconductor, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ */
-+#include <linux/clk.h>
-+#include <linux/kernel.h>
-+#include <drm/drm_dp_helper.h>
-+#include <drm/bridge/cdns-mhdp-common.h>
-+#include "cdn-mhdp-phy.h"
-+
-+enum dp_link_rate {
-+	RATE_1_6 = 162000,
-+	RATE_2_1 = 216000,
-+	RATE_2_4 = 243000,
-+	RATE_2_7 = 270000,
-+	RATE_3_2 = 324000,
-+	RATE_4_3 = 432000,
-+	RATE_5_4 = 540000,
-+	RATE_8_1 = 810000,
-+};
-+
-+struct phy_pll_reg {
-+	u16 val[7];
-+	u32 addr;
-+};
-+
-+static const struct phy_pll_reg phy_pll_27m_cfg[] = {
-+	/*  1.62    2.16    2.43    2.7     3.24    4.32    5.4      register address */
-+	{{ 0x010E, 0x010E, 0x010E, 0x010E, 0x010E, 0x010E, 0x010E }, CMN_PLL0_VCOCAL_INIT_TMR },
-+	{{ 0x001B, 0x001B, 0x001B, 0x001B, 0x001B, 0x001B, 0x001B }, CMN_PLL0_VCOCAL_ITER_TMR },
-+	{{ 0x30B9, 0x3087, 0x3096, 0x30B4, 0x30B9, 0x3087, 0x30B4 }, CMN_PLL0_VCOCAL_START },
-+	{{ 0x0077, 0x009F, 0x00B3, 0x00C7, 0x0077, 0x009F, 0x00C7 }, CMN_PLL0_INTDIV },
-+	{{ 0xF9DA, 0xF7CD, 0xF6C7, 0xF5C1, 0xF9DA, 0xF7CD, 0xF5C1 }, CMN_PLL0_FRACDIV },
-+	{{ 0x001E, 0x0028, 0x002D, 0x0032, 0x001E, 0x0028, 0x0032 }, CMN_PLL0_HIGH_THR },
-+	{{ 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020 }, CMN_PLL0_DSM_DIAG },
-+	{{ 0x0000, 0x1000, 0x1000, 0x1000, 0x0000, 0x1000, 0x1000 }, CMN_PLLSM0_USER_DEF_CTRL },
-+	{{ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }, CMN_DIAG_PLL0_OVRD },
-+	{{ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }, CMN_DIAG_PLL0_FBH_OVRD },
-+	{{ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }, CMN_DIAG_PLL0_FBL_OVRD },
-+	{{ 0x0006, 0x0007, 0x0007, 0x0007, 0x0006, 0x0007, 0x0007 }, CMN_DIAG_PLL0_V2I_TUNE },
-+	{{ 0x0043, 0x0043, 0x0043, 0x0042, 0x0043, 0x0043, 0x0042 }, CMN_DIAG_PLL0_CP_TUNE },
-+	{{ 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008 }, CMN_DIAG_PLL0_LF_PROG },
-+	{{ 0x0100, 0x0001, 0x0001, 0x0001, 0x0100, 0x0001, 0x0001 }, CMN_DIAG_PLL0_PTATIS_TUNE1 },
-+	{{ 0x0007, 0x0001, 0x0001, 0x0001, 0x0007, 0x0001, 0x0001 }, CMN_DIAG_PLL0_PTATIS_TUNE2 },
-+	{{ 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020 }, CMN_DIAG_PLL0_TEST_MODE},
-+	{{ 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0016 }, CMN_PSM_CLK_CTRL }
-+};
-+
-+static const struct phy_pll_reg phy_pll_24m_cfg[] = {
-+	/*  1.62    2.16    2.43    2.7     3.24    4.32    5.4      register address */
-+	{{ 0x00F0, 0x00F0, 0x00F0, 0x00F0, 0x00F0, 0x00F0, 0x00F0 }, CMN_PLL0_VCOCAL_INIT_TMR },
-+	{{ 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018 }, CMN_PLL0_VCOCAL_ITER_TMR },
-+	{{ 0x3061, 0x3092, 0x30B3, 0x30D0, 0x3061, 0x3092, 0x30D0 }, CMN_PLL0_VCOCAL_START },
-+	{{ 0x0086, 0x00B3, 0x00CA, 0x00E0, 0x0086, 0x00B3, 0x00E0 }, CMN_PLL0_INTDIV },
-+	{{ 0xF917, 0xF6C7, 0x75A1, 0xF479, 0xF917, 0xF6C7, 0xF479 }, CMN_PLL0_FRACDIV },
-+	{{ 0x0022, 0x002D, 0x0033, 0x0038, 0x0022, 0x002D, 0x0038 }, CMN_PLL0_HIGH_THR },
-+	{{ 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020 }, CMN_PLL0_DSM_DIAG },
-+	{{ 0x0000, 0x1000, 0x1000, 0x1000, 0x0000, 0x1000, 0x1000 }, CMN_PLLSM0_USER_DEF_CTRL },
-+	{{ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }, CMN_DIAG_PLL0_OVRD },
-+	{{ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }, CMN_DIAG_PLL0_FBH_OVRD },
-+	{{ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }, CMN_DIAG_PLL0_FBL_OVRD },
-+	{{ 0x0006, 0x0007, 0x0007, 0x0007, 0x0006, 0x0007, 0x0007 }, CMN_DIAG_PLL0_V2I_TUNE },
-+	{{ 0x0026, 0x0029, 0x0029, 0x0029, 0x0026, 0x0029, 0x0029 }, CMN_DIAG_PLL0_CP_TUNE },
-+	{{ 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008 }, CMN_DIAG_PLL0_LF_PROG },
-+	{{ 0x008C, 0x008C, 0x008C, 0x008C, 0x008C, 0x008C, 0x008C }, CMN_DIAG_PLL0_PTATIS_TUNE1 },
-+	{{ 0x002E, 0x002E, 0x002E, 0x002E, 0x002E, 0x002E, 0x002E }, CMN_DIAG_PLL0_PTATIS_TUNE2 },
-+	{{ 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022 }, CMN_DIAG_PLL0_TEST_MODE},
-+	{{ 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0016, 0x0016 }, CMN_PSM_CLK_CTRL }
-+};
-+
-+static int link_rate_index(u32 rate)
-+{
-+	switch (rate) {
-+	case RATE_1_6:
-+		return 0;
-+	case RATE_2_1:
-+		return 1;
-+	case RATE_2_4:
-+		return 2;
-+	case RATE_2_7:
-+		return 3;
-+	case RATE_3_2:
-+		return 4;
-+	case RATE_4_3:
-+		return 5;
-+	case RATE_5_4:
-+		return 6;
-+	default:
-+		return -1;
-+	}
-+}
-+
-+static void dp_aux_cfg(struct cdns_mhdp_device *mhdp)
-+{
-+	/* Power up Aux */
-+	cdns_phy_reg_write(mhdp, TXDA_CYA_AUXDA_CYA, 1);
-+
-+	cdns_phy_reg_write(mhdp, TX_DIG_CTRL_REG_2, 36);
-+	ndelay(150);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_2, 0x0100);
-+	ndelay(150);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_2, 0x0300);
-+	ndelay(150);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_3, 0x0000);
-+	ndelay(150);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_1, 0x2008);
-+	ndelay(150);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_1, 0x2018);
-+	ndelay(150);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_1, 0xA018);
-+	ndelay(150);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_2, 0x030C);
-+	ndelay(150);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_5, 0x0000);
-+	ndelay(150);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_4, 0x1001);
-+	ndelay(150);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_1, 0xA098);
-+	ndelay(150);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_1, 0xA198);
-+	ndelay(150);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_2, 0x030d);
-+	ndelay(150);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_2, 0x030f);
-+}
-+
-+/* PMA common configuration for 24MHz */
-+static void dp_phy_pma_cmn_cfg_24mhz(struct cdns_mhdp_device *mhdp)
-+{
-+	int k;
-+	u32 num_lanes = mhdp->dp.link.num_lanes;
-+	u16 val;
-+
-+	val = cdns_phy_reg_read(mhdp, PHY_PMA_CMN_CTRL1);
-+	val &= 0xFFF7;
-+	val |= 0x0008;
-+	cdns_phy_reg_write(mhdp, PHY_PMA_CMN_CTRL1, val);
-+
-+	for (k = 0; k < num_lanes; k++) {
-+		/* Transceiver control and diagnostic registers */
-+		cdns_phy_reg_write(mhdp, XCVR_DIAG_LANE_FCM_EN_MGN_TMR | (k << 9), 0x0090);
-+		/* Transmitter receiver detect registers */
-+		cdns_phy_reg_write(mhdp, TX_RCVDET_EN_TMR | (k << 9), 0x0960);
-+		cdns_phy_reg_write(mhdp, TX_RCVDET_ST_TMR | (k << 9), 0x0030);
-+	}
-+}
-+
-+/* Valid for 24 MHz only */
-+static void dp_phy_pma_cmn_pll0_24mhz(struct cdns_mhdp_device *mhdp)
-+{
-+	u32 num_lanes = mhdp->dp.link.num_lanes;
-+	u32 link_rate = mhdp->dp.link.rate;
-+	u16 val;
-+	int index, i, k;
-+
-+	/*
-+	 * PLL reference clock source select
-+	 * for single ended reference clock val |= 0x0030;
-+	 * for differential clock  val |= 0x0000;
-+	 */
-+	val = cdns_phy_reg_read(mhdp, PHY_PMA_CMN_CTRL1);
-+	val = val & 0xFF8F;
-+	val = val | 0x0030;
-+	cdns_phy_reg_write(mhdp, PHY_PMA_CMN_CTRL1, val);
-+
-+	/* DP PLL data rate 0/1 clock divider value */
-+	val = cdns_phy_reg_read(mhdp, PHY_HDP_CLK_CTL);
-+	val &= 0x00FF;
-+	if (link_rate <= RATE_2_7)
-+		val |= 0x2400;
-+	else
-+		val |= 0x1200;
-+	cdns_phy_reg_write(mhdp, PHY_HDP_CLK_CTL, val);
-+
-+	/* High speed clock 0/1 div */
-+	val = cdns_phy_reg_read(mhdp, CMN_DIAG_HSCLK_SEL);
-+	val &= 0xFFCC;
-+	if (link_rate <= RATE_2_7)
-+		val |= 0x0011;
-+	cdns_phy_reg_write(mhdp, CMN_DIAG_HSCLK_SEL, val);
-+
-+	for (k = 0; k < num_lanes; k = k + 1) {
-+		val = cdns_phy_reg_read(mhdp, (XCVR_DIAG_HSCLK_SEL | (k << 9)));
-+		val &= 0xCFFF;
-+		if (link_rate <= RATE_2_7)
-+			val |= 0x1000;
-+		cdns_phy_reg_write(mhdp, (XCVR_DIAG_HSCLK_SEL | (k << 9)), val);
-+	}
-+
-+	/* DP PHY PLL 24MHz configuration */
-+	index = link_rate_index(link_rate);
-+	for (i = 0; i < ARRAY_SIZE(phy_pll_24m_cfg); i++)
-+		cdns_phy_reg_write(mhdp, phy_pll_24m_cfg[i].addr, phy_pll_24m_cfg[i].val[index]);
-+
-+	/* Transceiver control and diagnostic registers */
-+	for (k = 0; k < num_lanes; k = k + 1) {
-+		val = cdns_phy_reg_read(mhdp, (XCVR_DIAG_PLLDRC_CTRL | (k << 9)));
-+		val &= 0x8FFF;
-+		if (link_rate <= RATE_2_7)
-+			val |= 0x2000;
-+		else
-+			val |= 0x1000;
-+		cdns_phy_reg_write(mhdp, (XCVR_DIAG_PLLDRC_CTRL | (k << 9)), val);
-+	}
-+
-+	for (k = 0; k < num_lanes; k = k + 1) {
-+		cdns_phy_reg_write(mhdp, (XCVR_PSM_RCTRL | (k << 9)), 0xBEFC);
-+		cdns_phy_reg_write(mhdp, (TX_PSC_A0 | (k << 9)), 0x6799);
-+		cdns_phy_reg_write(mhdp, (TX_PSC_A1 | (k << 9)), 0x6798);
-+		cdns_phy_reg_write(mhdp, (TX_PSC_A2 | (k << 9)), 0x0098);
-+		cdns_phy_reg_write(mhdp, (TX_PSC_A3 | (k << 9)), 0x0098);
-+	}
-+}
-+
-+/* PMA common configuration for 27MHz */
-+static void dp_phy_pma_cmn_cfg_27mhz(struct cdns_mhdp_device *mhdp)
-+{
-+	u32 num_lanes = mhdp->dp.link.num_lanes;
-+	u16 val;
-+	int k;
-+
-+	val = cdns_phy_reg_read(mhdp, PHY_PMA_CMN_CTRL1);
-+	val &= 0xFFF7;
-+	val |= 0x0008;
-+	cdns_phy_reg_write(mhdp, PHY_PMA_CMN_CTRL1, val);
-+
-+	/* Startup state machine registers */
-+	cdns_phy_reg_write(mhdp, CMN_SSM_BIAS_TMR, 0x0087);
-+	cdns_phy_reg_write(mhdp, CMN_PLLSM0_PLLEN_TMR, 0x001B);
-+	cdns_phy_reg_write(mhdp, CMN_PLLSM0_PLLPRE_TMR, 0x0036);
-+	cdns_phy_reg_write(mhdp, CMN_PLLSM0_PLLVREF_TMR, 0x001B);
-+	cdns_phy_reg_write(mhdp, CMN_PLLSM0_PLLLOCK_TMR, 0x006C);
-+
-+	/* Current calibration registers */
-+	cdns_phy_reg_write(mhdp, CMN_ICAL_INIT_TMR, 0x0044);
-+	cdns_phy_reg_write(mhdp, CMN_ICAL_ITER_TMR, 0x0006);
-+	cdns_phy_reg_write(mhdp, CMN_ICAL_ADJ_INIT_TMR, 0x0022);
-+	cdns_phy_reg_write(mhdp, CMN_ICAL_ADJ_ITER_TMR, 0x0006);
-+
-+	/* Resistor calibration registers */
-+	cdns_phy_reg_write(mhdp, CMN_TXPUCAL_INIT_TMR, 0x0022);
-+	cdns_phy_reg_write(mhdp, CMN_TXPUCAL_ITER_TMR, 0x0006);
-+	cdns_phy_reg_write(mhdp, CMN_TXPU_ADJ_INIT_TMR, 0x0022);
-+	cdns_phy_reg_write(mhdp, CMN_TXPU_ADJ_ITER_TMR, 0x0006);
-+	cdns_phy_reg_write(mhdp, CMN_TXPDCAL_INIT_TMR, 0x0022);
-+	cdns_phy_reg_write(mhdp, CMN_TXPDCAL_ITER_TMR, 0x0006);
-+	cdns_phy_reg_write(mhdp, CMN_TXPD_ADJ_INIT_TMR, 0x0022);
-+	cdns_phy_reg_write(mhdp, CMN_TXPD_ADJ_ITER_TMR, 0x0006);
-+	cdns_phy_reg_write(mhdp, CMN_RXCAL_INIT_TMR, 0x0022);
-+	cdns_phy_reg_write(mhdp, CMN_RXCAL_ITER_TMR, 0x0006);
-+	cdns_phy_reg_write(mhdp, CMN_RX_ADJ_INIT_TMR, 0x0022);
-+	cdns_phy_reg_write(mhdp, CMN_RX_ADJ_ITER_TMR, 0x0006);
-+
-+	for (k = 0; k < num_lanes; k = k + 1) {
-+		/* Power state machine registers */
-+		cdns_phy_reg_write(mhdp, XCVR_PSM_CAL_TMR  | (k << 9), 0x016D);
-+		cdns_phy_reg_write(mhdp, XCVR_PSM_A0IN_TMR | (k << 9), 0x016D);
-+		/* Transceiver control and diagnostic registers */
-+		cdns_phy_reg_write(mhdp, XCVR_DIAG_LANE_FCM_EN_MGN_TMR | (k << 9), 0x00A2);
-+		cdns_phy_reg_write(mhdp, TX_DIAG_BGREF_PREDRV_DELAY    | (k << 9), 0x0097);
-+		/* Transmitter receiver detect registers */
-+		cdns_phy_reg_write(mhdp, TX_RCVDET_EN_TMR | (k << 9), 0x0A8C);
-+		cdns_phy_reg_write(mhdp, TX_RCVDET_ST_TMR | (k << 9), 0x0036);
-+	}
-+}
-+
-+static void dp_phy_pma_cmn_pll0_27mhz(struct cdns_mhdp_device *mhdp)
-+{
-+	u32 num_lanes = mhdp->dp.link.num_lanes;
-+	u32 link_rate = mhdp->dp.link.rate;
-+	u16 val;
-+	int index, i, k;
-+
-+	/*
-+	 * PLL reference clock source select
-+	 * for single ended reference clock val |= 0x0030;
-+	 * for differential clock  val |= 0x0000;
-+	 */
-+	val = cdns_phy_reg_read(mhdp, PHY_PMA_CMN_CTRL1);
-+	val &= 0xFF8F;
-+	cdns_phy_reg_write(mhdp, PHY_PMA_CMN_CTRL1, val);
-+
-+	/* for differential clock on the refclk_p and refclk_m off chip pins:
-+	 * CMN_DIAG_ACYA[8]=1'b1
-+	 */
-+	cdns_phy_reg_write(mhdp, CMN_DIAG_ACYA, 0x0100);
-+
-+	/* DP PLL data rate 0/1 clock divider value */
-+	val = cdns_phy_reg_read(mhdp, PHY_HDP_CLK_CTL);
-+	val &= 0x00FF;
-+	if (link_rate <= RATE_2_7)
-+		val |= 0x2400;
-+	else
-+		val |= 0x1200;
-+	cdns_phy_reg_write(mhdp, PHY_HDP_CLK_CTL, val);
-+
-+	/* High speed clock 0/1 div */
-+	val = cdns_phy_reg_read(mhdp, CMN_DIAG_HSCLK_SEL);
-+	val &= 0xFFCC;
-+	if (link_rate <= RATE_2_7)
-+		val |= 0x0011;
-+	cdns_phy_reg_write(mhdp, CMN_DIAG_HSCLK_SEL, val);
-+
-+	for (k = 0; k < num_lanes; k++) {
-+		val = cdns_phy_reg_read(mhdp, (XCVR_DIAG_HSCLK_SEL | (k << 9)));
-+		val = val & 0xCFFF;
-+		if (link_rate <= RATE_2_7)
-+			val |= 0x1000;
-+		cdns_phy_reg_write(mhdp, (XCVR_DIAG_HSCLK_SEL | (k << 9)), val);
-+	}
-+
-+	/* DP PHY PLL 27MHz configuration */
-+	index = link_rate_index(link_rate);
-+	for (i = 0; i < ARRAY_SIZE(phy_pll_27m_cfg); i++)
-+		cdns_phy_reg_write(mhdp, phy_pll_27m_cfg[i].addr, phy_pll_27m_cfg[i].val[index]);
-+
-+	/* Transceiver control and diagnostic registers */
-+	for (k = 0; k < num_lanes; k++) {
-+		val = cdns_phy_reg_read(mhdp, (XCVR_DIAG_PLLDRC_CTRL | (k << 9)));
-+		val = val & 0x8FFF;
-+		if (link_rate <= RATE_2_7)
-+			val |= 0x2000;
-+		else
-+			val |= 0x1000;
-+		cdns_phy_reg_write(mhdp, (XCVR_DIAG_PLLDRC_CTRL | (k << 9)), val);
-+	}
-+
-+	for (k = 0; k < num_lanes; k = k + 1) {
-+		/* Power state machine registers */
-+		cdns_phy_reg_write(mhdp, (XCVR_PSM_RCTRL | (k << 9)),  0xBEFC);
-+		cdns_phy_reg_write(mhdp, (TX_PSC_A0 | (k << 9)), 0x6799);
-+		cdns_phy_reg_write(mhdp, (TX_PSC_A1 | (k << 9)), 0x6798);
-+		cdns_phy_reg_write(mhdp, (TX_PSC_A2 | (k << 9)), 0x0098);
-+		cdns_phy_reg_write(mhdp, (TX_PSC_A3 | (k << 9)), 0x0098);
-+		/* Receiver calibration power state definition register */
-+		val = cdns_phy_reg_read(mhdp, RX_PSC_CAL | (k << 9));
-+		val &= 0xFFBB;
-+		cdns_phy_reg_write(mhdp, (RX_PSC_CAL | (k << 9)), val);
-+		val = cdns_phy_reg_read(mhdp, RX_PSC_A0  | (k << 9));
-+		val &= 0xFFBB;
-+		cdns_phy_reg_write(mhdp, (RX_PSC_A0  | (k << 9)), val);
-+	}
-+}
-+
-+static void dp_phy_power_down(struct cdns_mhdp_device *mhdp)
-+{
-+	u16 val;
-+	int i;
-+
-+	if (!mhdp->power_up)
-+		return;
-+
-+	/* Place the PHY lanes in the A3 power state. */
-+	cdns_phy_reg_write(mhdp, PHY_HDP_MODE_CTRL, 0x8);
-+	/* Wait for Power State A3 Ack */
-+	for (i = 0; i < 10; i++) {
-+		val = cdns_phy_reg_read(mhdp, PHY_HDP_MODE_CTRL);
-+		if (val & (1 << 7))
-+			break;
-+		msleep(20);
-+	}
-+	if (i == 10) {
-+		dev_err(mhdp->dev, "Wait A3 Ack failed\n");
-+		return;
-+	}
-+
-+	/* Disable HDP PLL’s data rate and full rate clocks out of PMA. */
-+	val = cdns_phy_reg_read(mhdp, PHY_HDP_CLK_CTL);
-+	val &= ~(1 << 2);
-+	cdns_phy_reg_write(mhdp, PHY_HDP_CLK_CTL, val);
-+	/* Wait for PLL clock gate ACK */
-+	for (i = 0; i < 10; i++) {
-+		val = cdns_phy_reg_read(mhdp, PHY_HDP_CLK_CTL);
-+		if (!(val & (1 << 3)))
-+			break;
-+		msleep(20);
-+	}
-+	if (i == 10) {
-+		dev_err(mhdp->dev, "Wait PLL clock gate Ack failed\n");
-+		return;
-+	}
-+
-+	/* Disable HDP PLL’s for high speed clocks */
-+	val = cdns_phy_reg_read(mhdp, PHY_HDP_CLK_CTL);
-+	val &= ~(1 << 0);
-+	cdns_phy_reg_write(mhdp, PHY_HDP_CLK_CTL, val);
-+	/* Wait for PLL disable ACK */
-+	for (i = 0; i < 10; i++) {
-+		val = cdns_phy_reg_read(mhdp, PHY_HDP_CLK_CTL);
-+		if (!(val & (1 << 1)))
-+			break;
-+		msleep(20);
-+	}
-+	if (i == 10) {
-+		dev_err(mhdp->dev, "Wait PLL disable Ack failed\n");
-+		return;
-+	}
-+}
-+
-+static int dp_phy_power_up(struct cdns_mhdp_device *mhdp)
-+{
-+	u32 val, i;
-+
-+	/* Enable HDP PLL’s for high speed clocks */
-+	val = cdns_phy_reg_read(mhdp, PHY_HDP_CLK_CTL);
-+	val |= (1 << 0);
-+	cdns_phy_reg_write(mhdp, PHY_HDP_CLK_CTL, val);
-+	/* Wait for PLL ready ACK */
-+	for (i = 0; i < 10; i++) {
-+		val = cdns_phy_reg_read(mhdp, PHY_HDP_CLK_CTL);
-+		if (val & (1 << 1))
-+			break;
-+		msleep(20);
-+	}
-+	if (i == 10) {
-+		dev_err(mhdp->dev, "Wait PLL Ack failed\n");
-+		return -1;
-+	}
-+
-+	/* Enable HDP PLL’s data rate and full rate clocks out of PMA. */
-+	val = cdns_phy_reg_read(mhdp, PHY_HDP_CLK_CTL);
-+	val |= (1 << 2);
-+	cdns_phy_reg_write(mhdp, PHY_HDP_CLK_CTL, val);
-+	/* Wait for PLL clock enable ACK */
-+	for (i = 0; i < 10; i++) {
-+		val = cdns_phy_reg_read(mhdp, PHY_HDP_CLK_CTL);
-+		if (val & (1 << 3))
-+			break;
-+		msleep(20);
-+	}
-+	if (i == 10) {
-+		dev_err(mhdp->dev, "Wait PLL clock enable ACk failed\n");
-+		return -1;
-+	}
-+
-+	/* Configure PHY in A2 Mode */
-+	cdns_phy_reg_write(mhdp, PHY_HDP_MODE_CTRL, 0x0004);
-+	/* Wait for Power State A2 Ack */
-+	for (i = 0; i < 10; i++) {
-+		val = cdns_phy_reg_read(mhdp, PHY_HDP_MODE_CTRL);
-+		if (val & (1 << 6))
-+			break;
-+		msleep(20);
-+	}
-+	if (i == 10) {
-+		dev_err(mhdp->dev, "Wait A2 Ack failed\n");
-+		return -1;
-+	}
-+
-+	/* Configure PHY in A0 mode (PHY must be in the A0 power
-+	 * state in order to transmit data)
-+	 */
-+	cdns_phy_reg_write(mhdp, PHY_HDP_MODE_CTRL, 0x0101);
-+
-+	/* Wait for Power State A0 Ack */
-+	for (i = 0; i < 10; i++) {
-+		val = cdns_phy_reg_read(mhdp, PHY_HDP_MODE_CTRL);
-+		if (val & (1 << 4))
-+			break;
-+		msleep(20);
-+	}
-+	if (i == 10) {
-+		dev_err(mhdp->dev, "Wait A0 Ack failed\n");
-+		return -1;
-+	}
-+
-+	mhdp->power_up = true;
-+
-+	return 0;
-+}
-+
-+int cdns_dp_phy_set_imx8mq(struct cdns_mhdp_device *mhdp)
-+{
-+	int ret;
-+
-+	/* Disable phy clock if PHY in power up state */
-+	dp_phy_power_down(mhdp);
-+
-+	dp_phy_pma_cmn_cfg_27mhz(mhdp);
-+
-+	dp_phy_pma_cmn_pll0_27mhz(mhdp);
-+
-+	cdns_phy_reg_write(mhdp, TX_DIAG_ACYA_0, 1);
-+	cdns_phy_reg_write(mhdp, TX_DIAG_ACYA_1, 1);
-+	cdns_phy_reg_write(mhdp, TX_DIAG_ACYA_2, 1);
-+	cdns_phy_reg_write(mhdp, TX_DIAG_ACYA_3, 1);
-+
-+	/* PHY power up */
-+	ret = dp_phy_power_up(mhdp);
-+	if (ret < 0)
-+		return ret;
-+
-+	dp_aux_cfg(mhdp);
-+
-+	return ret;
-+}
-+
-+int cdns_dp_phy_set_imx8qm(struct cdns_mhdp_device *mhdp)
-+{
-+	int ret;
-+
-+	/* Disable phy clock if PHY in power up state */
-+	dp_phy_power_down(mhdp);
-+
-+	dp_phy_pma_cmn_cfg_24mhz(mhdp);
-+
-+	dp_phy_pma_cmn_pll0_24mhz(mhdp);
-+
-+	cdns_phy_reg_write(mhdp, TX_DIAG_ACYA_0, 1);
-+	cdns_phy_reg_write(mhdp, TX_DIAG_ACYA_1, 1);
-+	cdns_phy_reg_write(mhdp, TX_DIAG_ACYA_2, 1);
-+	cdns_phy_reg_write(mhdp, TX_DIAG_ACYA_3, 1);
-+
-+	/* PHY power up */
-+	ret = dp_phy_power_up(mhdp);
-+	if (ret < 0)
-+		return ret;
-+
-+	dp_aux_cfg(mhdp);
-+
-+	return true;
-+}
-diff --git a/drivers/gpu/drm/imx/cdn-mhdp-hdmi-phy.c b/drivers/gpu/drm/imx/cdn-mhdp-hdmi-phy.c
-new file mode 100644
-index 000000000000..ed0909a6bbdb
---- /dev/null
-+++ b/drivers/gpu/drm/imx/cdn-mhdp-hdmi-phy.c
-@@ -0,0 +1,777 @@
-+/*
-+ * Cadence High-Definition Multimedia Interface (HDMI) driver
-+ *
-+ * Copyright (C) 2019 NXP Semiconductor, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ */
-+#include <drm/drm_of.h>
-+#include <drm/drm_crtc_helper.h>
-+#include <linux/io.h>
-+#include <drm/drm_edid.h>
-+#include <drm/drm_encoder_slave.h>
-+#include <drm/drm_atomic.h>
-+#include <linux/io.h>
-+
-+#include <drm/bridge/cdns-mhdp-common.h>
-+#include "cdn-mhdp-phy.h"
-+
-+/* HDMI TX clock control settings */
-+struct hdmi_ctrl {
-+	u32 pixel_clk_freq_min;
-+	u32 pixel_clk_freq_max;
-+	u32 feedback_factor;
-+	u32 data_range_kbps_min;
-+	u32 data_range_kbps_max;
-+	u32 cmnda_pll0_ip_div;
-+	u32 cmn_ref_clk_dig_div;
-+	u32 ref_clk_divider_scaler;
-+	u32 pll_fb_div_total;
-+	u32 cmnda_pll0_fb_div_low;
-+	u32 cmnda_pll0_fb_div_high;
-+	u32 pixel_div_total;
-+	u32 cmnda_pll0_pxdiv_low;
-+	u32 cmnda_pll0_pxdiv_high;
-+	u32 vco_freq_min;
-+	u32 vco_freq_max;
-+	u32 vco_ring_select;
-+	u32 cmnda_hs_clk_0_sel;
-+	u32 cmnda_hs_clk_1_sel;
-+	u32 hsclk_div_at_xcvr;
-+	u32 hsclk_div_tx_sub_rate;
-+	u32 cmnda_pll0_hs_sym_div_sel;
-+	u32 cmnda_pll0_clk_freq_min;
-+	u32 cmnda_pll0_clk_freq_max;
-+};
-+
-+/* HDMI TX clock control settings, pixel clock is output */
-+static const struct hdmi_ctrl imx8mq_ctrl_table[] = {
-+/*Minclk  Maxclk Fdbak  DR_min   DR_max  ip_d  dig  DS    Totl */
-+{ 27000,  27000, 1000,  270000,  270000, 0x03, 0x1, 0x1,  240, 0x0BC, 0x030,  80, 0x026, 0x026, 2160000, 2160000, 0, 2, 2, 2, 4, 0x3,  27000,  27000},
-+{ 27000,  27000, 1250,  337500,  337500, 0x03, 0x1, 0x1,  300, 0x0EC, 0x03C, 100, 0x030, 0x030, 2700000, 2700000, 0, 2, 2, 2, 4, 0x3,  33750,  33750},
-+{ 27000,  27000, 1500,  405000,  405000, 0x03, 0x1, 0x1,  360, 0x11C, 0x048, 120, 0x03A, 0x03A, 3240000, 3240000, 0, 2, 2, 2, 4, 0x3,  40500,  40500},
-+{ 27000,  27000, 2000,  540000,  540000, 0x03, 0x1, 0x1,  240, 0x0BC, 0x030,  80, 0x026, 0x026, 2160000, 2160000, 0, 2, 2, 2, 4, 0x2,  54000,  54000},
-+{ 29700,  29700, 1000,  297000,  297000, 0x03, 0x1, 0x1,  264, 0x0d0, 0x034,  80, 0x026, 0x026, 2376000, 2376000, 0, 2, 2, 2, 4, 0x3,  29700,  29700},
-+
-+{ 54000,  54000, 1000,  540000,  540000, 0x03, 0x1, 0x1,  480, 0x17C, 0x060,  80, 0x026, 0x026, 4320000, 4320000, 1, 2, 2, 2, 4, 0x3,  54000,  54000},
-+{ 54000,  54000, 1250,  675000,  675000, 0x04, 0x1, 0x1,  400, 0x13C, 0x050,  50, 0x017, 0x017, 2700000, 2700000, 0, 1, 1, 2, 4, 0x2,  67500,  67500},
-+{ 54000,  54000, 1500,  810000,  810000, 0x04, 0x1, 0x1,  480, 0x17C, 0x060,  60, 0x01C, 0x01C, 3240000, 3240000, 0, 2, 2, 2, 2, 0x2,  81000,  81000},
-+{ 54000,  54000, 2000, 1080000, 1080000, 0x03, 0x1, 0x1,  240, 0x0BC, 0x030,  40, 0x012, 0x012, 2160000, 2160000, 0, 2, 2, 2, 1, 0x1, 108000, 108000},
-+{ 74250,  74250, 1000,  742500,  742500, 0x03, 0x1, 0x1,  660, 0x20C, 0x084,  80, 0x026, 0x026, 5940000, 5940000, 1, 2, 2, 2, 4, 0x3,  74250,  74250},
-+{ 74250,  74250, 1250,  928125,  928125, 0x04, 0x1, 0x1,  550, 0x1B4, 0x06E,  50, 0x017, 0x017, 3712500, 3712500, 1, 1, 1, 2, 4, 0x2,  92812,  92812},
-+{ 74250,  74250, 1500, 1113750, 1113750, 0x04, 0x1, 0x1,  660, 0x20C, 0x084,  60, 0x01C, 0x01C, 4455000, 4455000, 1, 2, 2, 2, 2, 0x2, 111375, 111375},
-+{ 74250,  74250, 2000, 1485000, 1485000, 0x03, 0x1, 0x1,  330, 0x104, 0x042,  40, 0x012, 0x012, 2970000, 2970000, 0, 2, 2, 2, 1, 0x1, 148500, 148500},
-+{ 99000,  99000, 1000,  990000,  990000, 0x03, 0x1, 0x1,  440, 0x15C, 0x058,  40, 0x012, 0x012, 3960000, 3960000, 1, 2, 2, 2, 2, 0x2,  99000,  99000},
-+{ 99000,  99000, 1250, 1237500, 1237500, 0x03, 0x1, 0x1,  275, 0x0D8, 0x037,  25, 0x00B, 0x00A, 2475000, 2475000, 0, 1, 1, 2, 2, 0x1, 123750, 123750},
-+{ 99000,  99000, 1500, 1485000, 1485000, 0x03, 0x1, 0x1,  330, 0x104, 0x042,  30, 0x00D, 0x00D, 2970000, 2970000, 0, 2, 2, 2, 1, 0x1, 148500, 148500},
-+{ 99000,  99000, 2000, 1980000, 1980000, 0x03, 0x1, 0x1,  440, 0x15C, 0x058,  40, 0x012, 0x012, 3960000, 3960000, 1, 2, 2, 2, 1, 0x1, 198000, 198000},
-+{148500, 148500, 1000, 1485000, 1485000, 0x03, 0x1, 0x1,  660, 0x20C, 0x084,  40, 0x012, 0x012, 5940000, 5940000, 1, 2, 2, 2, 2, 0x2, 148500, 148500},
-+{148500, 148500, 1250, 1856250, 1856250, 0x04, 0x1, 0x1,  550, 0x1B4, 0x06E,  25, 0x00B, 0x00A, 3712500, 3712500, 1, 1, 1, 2, 2, 0x1, 185625, 185625},
-+{148500, 148500, 1500, 2227500, 2227500, 0x03, 0x1, 0x1,  495, 0x188, 0x063,  30, 0x00D, 0x00D, 4455000, 4455000, 1, 1, 1, 2, 2, 0x1, 222750, 222750},
-+{148500, 148500, 2000, 2970000, 2970000, 0x03, 0x1, 0x1,  660, 0x20C, 0x084,  40, 0x012, 0x012, 5940000, 5940000, 1, 2, 2, 2, 1, 0x1, 297000, 297000},
-+{198000, 198000, 1000, 1980000, 1980000, 0x03, 0x1, 0x1,  220, 0x0AC, 0x02C,  10, 0x003, 0x003, 1980000, 1980000, 0, 1, 1, 2, 1, 0x0, 198000, 198000},
-+{198000, 198000, 1250, 2475000, 2475000, 0x03, 0x1, 0x1,  550, 0x1B4, 0x06E,  25, 0x00B, 0x00A, 4950000, 4950000, 1, 1, 1, 2, 2, 0x1, 247500, 247500},
-+{198000, 198000, 1500, 2970000, 2970000, 0x03, 0x1, 0x1,  330, 0x104, 0x042,  15, 0x006, 0x005, 2970000, 2970000, 0, 1, 1, 2, 1, 0x0, 297000, 297000},
-+{198000, 198000, 2000, 3960000, 3960000, 0x03, 0x1, 0x1,  440, 0x15C, 0x058,  20, 0x008, 0x008, 3960000, 3960000, 1, 1, 1, 2, 1, 0x0, 396000, 396000},
-+{297000, 297000, 1000, 2970000, 2970000, 0x03, 0x1, 0x1,  330, 0x104, 0x042,  10, 0x003, 0x003, 2970000, 2970000, 0, 1, 1, 2, 1, 0x0, 297000, 297000},
-+{297000, 297000, 1500, 4455000, 4455000, 0x03, 0x1, 0x1,  495, 0x188, 0x063,  15, 0x006, 0x005, 4455000, 4455000, 1, 1, 1, 2, 1, 0x0, 445500, 445500},
-+{297000, 297000, 2000, 5940000, 5940000, 0x03, 0x1, 0x1,  660, 0x20C, 0x084,  20, 0x008, 0x008, 5940000, 5940000, 1, 1, 1, 2, 1, 0x0, 594000, 594000},
-+{594000, 594000, 1000, 5940000, 5940000, 0x03, 0x1, 0x1,  660, 0x20C, 0x084,  10, 0x003, 0x003, 5940000, 5940000, 1, 1, 1, 2, 1, 0x0, 594000, 594000},
-+{594000, 594000,  750, 4455000, 4455000, 0x03, 0x1, 0x1,  495, 0x188, 0x063,  10, 0x003, 0x003, 4455000, 4455000, 1, 1, 1, 2, 1, 0x0, 445500, 445500},
-+{594000, 594000,  625, 3712500, 3712500, 0x04, 0x1, 0x1,  550, 0x1B4, 0x06E,  10, 0x003, 0x003, 3712500, 3712500, 1, 1, 1, 2, 1, 0x0, 371250, 371250},
-+{594000, 594000,  500, 2970000, 2970000, 0x03, 0x1, 0x1,  660, 0x20C, 0x084,  10, 0x003, 0x003, 5940000, 5940000, 1, 1, 1, 2, 2, 0x1, 297000, 297000},
-+};
-+
-+/* HDMI TX clock control settings, pixel clock is input */
-+static const struct hdmi_ctrl imx8qm_ctrl_table[] = {
-+/*pclk_l  pclk_h  fd    DRR_L    DRR_H   PLLD */
-+{ 25000,  42500, 1000,  250000,  425000, 0x05, 0x01, 0x01, 400, 0x182, 0x00A, 0, 0, 0, 2000000, 3400000, 0, 2, 2, 2, 4, 0x03,  25000,  42500},
-+{ 42500,  85000, 1000,  425000,  850000, 0x08, 0x03, 0x01, 320, 0x132, 0x00A, 0, 0, 0, 1700000, 3400000, 0, 1, 1, 2, 4, 0x02,  42500,  85000},
-+{ 85000, 170000, 1000,  850000, 1700000, 0x11, 0x00, 0x07, 340, 0x146, 0x00A, 0, 0, 0, 1700000, 3400000, 0, 1, 1, 2, 2, 0x01,  85000, 170000},
-+{170000, 340000, 1000, 1700000, 3400000, 0x22, 0x01, 0x07, 340, 0x146, 0x00A, 0, 0, 0, 1700000, 3400000, 0, 1, 1, 2, 1, 0x00, 170000, 340000},
-+{340000, 600000, 1000, 3400000, 6000000, 0x3C, 0x03, 0x06, 600, 0x24A, 0x00A, 0, 0, 0, 3400000, 6000000, 1, 1, 1, 2, 1, 0x00, 340000, 600000},
-+{ 25000,  34000, 1205,  312500,  425000, 0x04, 0x01, 0x01, 400, 0x182, 0x00A, 0, 0, 0, 2500000, 3400000, 0, 2, 2, 2, 4, 0x03,  31250,  42500},
-+{ 34000,  68000, 1205,  425000,  850000, 0x06, 0x02, 0x01, 300, 0x11E, 0x00A, 0, 0, 0, 1700000, 3400000, 0, 1, 1, 2, 4, 0x02,  42500,  85000},
-+{ 68000, 136000, 1205,  850000, 1700000, 0x0D, 0x02, 0x02, 325, 0x137, 0x00A, 0, 0, 0, 1700000, 3400000, 0, 1, 1, 2, 2, 0x01,  85000, 170000},
-+{136000, 272000, 1205, 1700000, 3400000, 0x1A, 0x02, 0x04, 325, 0x137, 0x00A, 0, 0, 0, 1700000, 3400000, 0, 1, 1, 2, 1, 0x00, 170000, 340000},
-+{272000, 480000, 1205, 3400000, 6000000, 0x30, 0x03, 0x05, 600, 0x24A, 0x00A, 0, 0, 0, 3400000, 6000000, 1, 1, 1, 2, 1, 0x00, 340000, 600000},
-+{ 25000,  28000, 1500,  375000,  420000, 0x03, 0x01, 0x01, 360, 0x15A, 0x00A, 0, 0, 0, 3000000, 3360000, 0, 2, 2, 2, 4, 0x03,  37500,  42000},
-+{ 28000,  56000, 1500,  420000,  840000, 0x06, 0x02, 0x01, 360, 0x15A, 0x00A, 0, 0, 0, 1680000, 3360000, 0, 1, 1, 2, 4, 0x02,  42000,  84000},
-+{ 56000, 113000, 1500,  840000, 1695000, 0x0B, 0x00, 0x05, 330, 0x13C, 0x00A, 0, 0, 0, 1680000, 3390000, 0, 1, 1, 2, 2, 0x01,  84000, 169500},
-+{113000, 226000, 1500, 1695000, 3390000, 0x16, 0x01, 0x05, 330, 0x13C, 0x00A, 0, 0, 0, 1695000, 3390000, 0, 1, 1, 2, 1, 0x00, 169500, 339000},
-+{226000, 400000, 1500, 3390000, 6000000, 0x28, 0x03, 0x04, 600, 0x24A, 0x00A, 0, 0, 0, 3390000, 6000000, 1, 1, 1, 2, 1, 0x00, 339000, 600000},
-+{ 25000,  42500, 2000,  500000,  850000, 0x05, 0x01, 0x01, 400, 0x182, 0x00A, 0, 0, 0, 2000000, 3400000, 0, 1, 1, 2, 4, 0x02,  50000,  85000},
-+{ 42500,  85000, 2000,  850000, 1700000, 0x08, 0x03, 0x01, 320, 0x132, 0x00A, 0, 0, 0, 1700000, 3400000, 0, 1, 1, 2, 2, 0x01,  85000, 170000},
-+{ 85000, 170000, 2000, 1700000, 3400000, 0x11, 0x00, 0x07, 340, 0x146, 0x00A, 0, 0, 0, 1700000, 3400000, 0, 1, 1, 2, 1, 0x00, 170000, 340000},
-+{170000, 300000, 2000, 3400000, 6000000, 0x22, 0x01, 0x06, 680, 0x29A, 0x00A, 0, 0, 0, 3400000, 6000000, 1, 1, 1, 2, 1, 0x00, 340000, 600000},
-+{594000, 594000, 5000, 2970000, 2970000, 0x3C, 0x03, 0x06, 600, 0x24A, 0x00A, 0, 0, 0, 5940000, 5940000, 1, 1, 1, 2, 2, 0x01, 297000, 297000},
-+{594000, 594000, 6250, 3712500, 3712500, 0x3C, 0x03, 0x06, 375, 0x169, 0x00A, 0, 0, 0, 3712500, 3712500, 1, 1, 1, 2, 1, 0x00, 371250, 371250},
-+{594000, 594000, 7500, 4455000, 4455000, 0x3C, 0x03, 0x06, 450, 0x1B4, 0x00A, 0, 0, 0, 4455000, 4455000, 1, 1, 1, 2, 1, 0x00, 445500, 445500},
-+};
-+
-+/* HDMI TX PLL tuning settings */
-+struct hdmi_pll_tuning {
-+	u32 vco_freq_bin;
-+	u32 vco_freq_min;
-+	u32 vco_freq_max;
-+	u32 volt_to_current_coarse;
-+	u32 volt_to_current;
-+	u32 ndac_ctrl;
-+	u32 pmos_ctrl;
-+	u32 ptat_ndac_ctrl;
-+	u32 feedback_div_total;
-+	u32 charge_pump_gain;
-+	u32 coarse_code;
-+	u32 v2i_code;
-+	u32 vco_cal_code;
-+};
-+
-+/* HDMI TX PLL tuning settings, pixel clock is output */
-+static const struct hdmi_pll_tuning imx8mq_pll_table[] = {
-+/*    bin VCO_freq min/max  coar  cod NDAC  PMOS PTAT div-T P-Gain Coa V2I CAL */
-+    {  1, 1980000, 1980000, 0x4, 0x3, 0x0, 0x09, 0x09, 220, 0x42, 160, 5, 183 },
-+    {  2, 2160000, 2160000, 0x4, 0x3, 0x0, 0x09, 0x09, 240, 0x42, 166, 6, 208 },
-+    {  2, 2376000, 2376000, 0x4, 0x3, 0x0, 0x09, 0x09, 264, 0x42, 166, 6, 208 },
-+    {  3, 2475000, 2475000, 0x5, 0x3, 0x1, 0x00, 0x07, 275, 0x42, 167, 6, 209 },
-+    {  4, 2700000, 2700000, 0x5, 0x3, 0x1, 0x00, 0x07, 300, 0x42, 188, 6, 230 },
-+    {  4, 2700000, 2700000, 0x5, 0x3, 0x1, 0x00, 0x07, 400, 0x4C, 188, 6, 230 },
-+    {  5, 2970000, 2970000, 0x6, 0x3, 0x1, 0x00, 0x07, 330, 0x42, 183, 6, 225 },
-+    {  6, 3240000, 3240000, 0x6, 0x3, 0x1, 0x00, 0x07, 360, 0x42, 203, 7, 256 },
-+    {  6, 3240000, 3240000, 0x6, 0x3, 0x1, 0x00, 0x07, 480, 0x4C, 203, 7, 256 },
-+    {  7, 3712500, 3712500, 0x4, 0x3, 0x0, 0x07, 0x0F, 550, 0x4C, 212, 7, 257 },
-+    {  8, 3960000, 3960000, 0x5, 0x3, 0x0, 0x07, 0x0F, 440, 0x42, 184, 6, 226 },
-+    {  9, 4320000, 4320000, 0x5, 0x3, 0x1, 0x07, 0x0F, 480, 0x42, 205, 7, 258 },
-+    { 10, 4455000, 4455000, 0x5, 0x3, 0x0, 0x07, 0x0F, 495, 0x42, 219, 7, 272 },
-+    { 10, 4455000, 4455000, 0x5, 0x3, 0x0, 0x07, 0x0F, 660, 0x4C, 219, 7, 272 },
-+    { 11, 4950000, 4950000, 0x6, 0x3, 0x1, 0x00, 0x07, 550, 0x42, 213, 7, 258 },
-+    { 12, 5940000, 5940000, 0x7, 0x3, 0x1, 0x00, 0x07, 660, 0x42, 244, 8, 292 },
-+};
-+
-+/* HDMI TX PLL tuning settings, pixel clock is input */
-+static const struct hdmi_pll_tuning imx8qm_pll_table[] = {
-+/*  bin VCO_freq min/max  coar  cod NDAC  PMOS PTAT div-T P-Gain  pad only */
-+	{ 0, 1700000, 2000000, 0x3, 0x1, 0x0, 0x8C, 0x2E, 300, 0x08D, 0, 0, 0 },
-+	{ 0, 1700000, 2000000, 0x3, 0x1, 0x0, 0x8C, 0x2E, 320, 0x08E, 0, 0, 0 },
-+	{ 0, 1700000, 2000000, 0x3, 0x1, 0x0, 0x8C, 0x2E, 325, 0x08E, 0, 0, 0 },
-+	{ 0, 1700000, 2000000, 0x3, 0x1, 0x0, 0x8C, 0x2E, 330, 0x08E, 0, 0, 0 },
-+	{ 0, 1700000, 2000000, 0x3, 0x1, 0x0, 0x8C, 0x2E, 340, 0x08F, 0, 0, 0 },
-+	{ 0, 1700000, 2000000, 0x3, 0x1, 0x0, 0x8C, 0x2E, 360, 0x0A7, 0, 0, 0 },
-+	{ 0, 1700000, 2000000, 0x3, 0x1, 0x0, 0x8C, 0x2E, 400, 0x0C5, 0, 0, 0 },
-+	{ 1, 2000000, 2400000, 0x3, 0x1, 0x0, 0x8C, 0x2E, 300, 0x086, 0, 0, 0 },
-+	{ 1, 2000000, 2400000, 0x3, 0x1, 0x0, 0x8C, 0x2E, 320, 0x087, 0, 0, 0 },
-+	{ 1, 2000000, 2400000, 0x3, 0x1, 0x0, 0x8C, 0x2E, 325, 0x087, 0, 0, 0 },
-+	{ 1, 2000000, 2400000, 0x3, 0x1, 0x0, 0x8C, 0x2E, 330, 0x104, 0, 0, 0 },
-+	{ 1, 2000000, 2400000, 0x3, 0x1, 0x0, 0x8C, 0x2E, 340, 0x08B, 0, 0, 0 },
-+	{ 1, 2000000, 2400000, 0x3, 0x1, 0x0, 0x8C, 0x2E, 360, 0x08D, 0, 0, 0 },
-+	{ 1, 2000000, 2400000, 0x3, 0x1, 0x0, 0x8C, 0x2E, 400, 0x0A6, 0, 0, 0 },
-+	{ 2, 2400000, 2800000, 0x3, 0x1, 0x0, 0x04, 0x0D, 300, 0x04E, 0, 0, 0 },
-+	{ 2, 2400000, 2800000, 0x3, 0x1, 0x0, 0x04, 0x0D, 320, 0x04F, 0, 0, 0 },
-+	{ 2, 2400000, 2800000, 0x3, 0x1, 0x0, 0x04, 0x0D, 325, 0x04F, 0, 0, 0 },
-+	{ 2, 2400000, 2800000, 0x3, 0x1, 0x0, 0x04, 0x0D, 330, 0x085, 0, 0, 0 },
-+	{ 2, 2400000, 2800000, 0x3, 0x1, 0x0, 0x04, 0x0D, 340, 0x085, 0, 0, 0 },
-+	{ 2, 2400000, 2800000, 0x3, 0x1, 0x0, 0x04, 0x0D, 360, 0x086, 0, 0, 0 },
-+	{ 2, 2400000, 2800000, 0x3, 0x1, 0x0, 0x04, 0x0D, 400, 0x08B, 0, 0, 0 },
-+	{ 3, 2800000, 3400000, 0x3, 0x1, 0x0, 0x04, 0x0D, 300, 0x047, 0, 0, 0 },
-+	{ 3, 2800000, 3400000, 0x3, 0x1, 0x0, 0x04, 0x0D, 320, 0x04B, 0, 0, 0 },
-+	{ 3, 2800000, 3400000, 0x3, 0x1, 0x0, 0x04, 0x0D, 325, 0x04B, 0, 0, 0 },
-+	{ 3, 2800000, 3400000, 0x3, 0x1, 0x0, 0x04, 0x0D, 330, 0x04B, 0, 0, 0 },
-+	{ 3, 2800000, 3400000, 0x3, 0x1, 0x0, 0x04, 0x0D, 340, 0x04D, 0, 0, 0 },
-+	{ 3, 2800000, 3400000, 0x3, 0x1, 0x0, 0x04, 0x0D, 360, 0x04E, 0, 0, 0 },
-+	{ 3, 2800000, 3400000, 0x3, 0x1, 0x0, 0x04, 0x0D, 400, 0x085, 0, 0, 0 },
-+	{ 4, 3400000, 3900000, 0x7, 0x1, 0x0, 0x8E, 0x2F, 375, 0x041, 0, 0, 0 },
-+	{ 4, 3400000, 3900000, 0x7, 0x1, 0x0, 0x8E, 0x2F, 600, 0x08D, 0, 0, 0 },
-+	{ 4, 3400000, 3900000, 0x7, 0x1, 0x0, 0x8E, 0x2F, 680, 0x0A6, 0, 0, 0 },
-+	{ 5, 3900000, 4500000, 0x7, 0x1, 0x0, 0x8E, 0x2F, 450, 0x041, 0, 0, 0 },
-+	{ 5, 3900000, 4500000, 0x7, 0x1, 0x0, 0x8E, 0x2F, 600, 0x087, 0, 0, 0 },
-+	{ 5, 3900000, 4500000, 0x7, 0x1, 0x0, 0x8E, 0x2F, 680, 0x0A4, 0, 0, 0 },
-+	{ 6, 4500000, 5200000, 0x7, 0x1, 0x0, 0x04, 0x0D, 600, 0x04F, 0, 0, 0 },
-+	{ 6, 4500000, 5200000, 0x7, 0x1, 0x0, 0x04, 0x0D, 680, 0x086, 0, 0, 0 },
-+	{ 7, 5200000, 6000000, 0x7, 0x1, 0x0, 0x04, 0x0D, 600, 0x04D, 0, 0, 0 },
-+	{ 7, 5200000, 6000000, 0x7, 0x1, 0x0, 0x04, 0x0D, 680, 0x04F, 0, 0, 0 }
-+};
-+
-+static void hdmi_arc_config(struct cdns_mhdp_device *mhdp)
-+{
-+	u16 txpu_calib_code;
-+	u16 txpd_calib_code;
-+	u16 txpu_adj_calib_code;
-+	u16 txpd_adj_calib_code;
-+	u16 prev_calib_code;
-+	u16 new_calib_code;
-+	u16 rdata;
-+
-+	/* Power ARC */
-+	cdns_phy_reg_write(mhdp, TXDA_CYA_AUXDA_CYA, 0x0001);
-+
-+	prev_calib_code = cdns_phy_reg_read(mhdp, TX_DIG_CTRL_REG_2);
-+	txpu_calib_code = cdns_phy_reg_read(mhdp, CMN_TXPUCAL_CTRL);
-+	txpd_calib_code = cdns_phy_reg_read(mhdp, CMN_TXPDCAL_CTRL);
-+	txpu_adj_calib_code = cdns_phy_reg_read(mhdp, CMN_TXPU_ADJ_CTRL);
-+	txpd_adj_calib_code = cdns_phy_reg_read(mhdp, CMN_TXPD_ADJ_CTRL);
-+
-+	new_calib_code = ((txpu_calib_code + txpd_calib_code) / 2)
-+		+ txpu_adj_calib_code + txpd_adj_calib_code;
-+
-+	if (new_calib_code != prev_calib_code) {
-+		rdata = cdns_phy_reg_read(mhdp, TX_ANA_CTRL_REG_1);
-+		rdata &= 0xDFFF;
-+		cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_1, rdata);
-+		cdns_phy_reg_write(mhdp, TX_DIG_CTRL_REG_2, new_calib_code);
-+		mdelay(10);
-+		rdata |= 0x2000;
-+		cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_1, rdata);
-+		udelay(150);
-+	}
-+
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_2, 0x0100);
-+	udelay(100);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_2, 0x0300);
-+	udelay(100);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_3, 0x0000);
-+	udelay(100);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_1, 0x2008);
-+	udelay(100);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_1, 0x2018);
-+	udelay(100);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_1, 0x2098);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_2, 0x030C);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_5, 0x0010);
-+	udelay(100);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_4, 0x4001);
-+	mdelay(5);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_1, 0x2198);
-+	mdelay(5);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_2, 0x030D);
-+	udelay(100);
-+	cdns_phy_reg_write(mhdp, TX_ANA_CTRL_REG_2, 0x030F);
-+}
-+
-+static void hdmi_phy_set_vswing(struct cdns_mhdp_device *mhdp)
-+{
-+	const u32 num_lanes = 4;
-+	u32 k;
-+
-+	for (k = 0; k < num_lanes; k++) {
-+		cdns_phy_reg_write(mhdp, (TX_DIAG_TX_DRV | (k << 9)), 0x7c0);
-+		cdns_phy_reg_write(mhdp, (TX_TXCC_CPOST_MULT_00_0 | (k << 9)), 0x0);
-+		cdns_phy_reg_write(mhdp, (TX_TXCC_CAL_SCLR_MULT_0 | (k << 9)), 0x120);
-+	}
-+}
-+
-+static int hdmi_feedback_factor(struct cdns_mhdp_device *mhdp)
-+{
-+	u32 feedback_factor;
-+
-+	switch (mhdp->video_info.color_fmt) {
-+	case YCBCR_4_2_2:
-+		feedback_factor = 1000;
-+		break;
-+	case YCBCR_4_2_0:
-+		switch (mhdp->video_info.color_depth) {
-+		case 8:
-+			feedback_factor = 500;
-+			break;
-+		case 10:
-+			feedback_factor = 625;
-+			break;
-+		case 12:
-+			feedback_factor = 750;
-+			break;
-+		case 16:
-+			feedback_factor = 1000;
-+			break;
-+		default:
-+			//DRM_ERROR("Invalid ColorDepth\n");
-+			printk(KERN_ALERT "Invalid ColorDepth %s %d \n",__FUNCTION__,__LINE__);
-+			return 0;
-+		}
-+		break;
-+	default:
-+		/* Assume RGB/YUV444 */
-+		switch (mhdp->video_info.color_depth) {
-+		case 10:
-+			feedback_factor = 1250;
-+			break;
-+		case 12:
-+			feedback_factor = 1500;
-+			break;
-+		case 16:
-+			feedback_factor = 2000;
-+			break;
-+		default:
-+			feedback_factor = 1000;
-+		}
-+	}
-+	return feedback_factor;
-+}
-+
-+static int hdmi_phy_config(struct cdns_mhdp_device *mhdp,
-+					const struct hdmi_ctrl *p_ctrl_table,
-+					const struct hdmi_pll_tuning *p_pll_table,
-+					char pclk_in)
-+{
-+	const u32 num_lanes = 4;
-+	u32 val, i, k;
-+
-+	/* enable PHY isolation mode only for CMN */
-+	cdns_phy_reg_write(mhdp, PHY_PMA_ISOLATION_CTRL, 0xD000);
-+
-+	/* set cmn_pll0_clk_datart1_div/cmn_pll0_clk_datart0_div dividers */
-+	val = cdns_phy_reg_read(mhdp, PHY_PMA_ISO_PLL_CTRL1);
-+	val &= 0xFF00;
-+	val |= 0x0012;
-+	cdns_phy_reg_write(mhdp, PHY_PMA_ISO_PLL_CTRL1, val);
-+
-+	/* assert PHY reset from isolation register */
-+	cdns_phy_reg_write(mhdp, PHY_ISO_CMN_CTRL, 0x0000);
-+	/* assert PMA CMN reset */
-+	cdns_phy_reg_write(mhdp, PHY_PMA_ISO_CMN_CTRL, 0x0000);
-+
-+	/* register XCVR_DIAG_BIDI_CTRL */
-+	for (k = 0; k < num_lanes; k++)
-+		cdns_phy_reg_write(mhdp, XCVR_DIAG_BIDI_CTRL | (k << 9), 0x00FF);
-+
-+	/* Describing Task phy_cfg_hdp */
-+
-+	val = cdns_phy_reg_read(mhdp, PHY_PMA_CMN_CTRL1);
-+	val &= 0xFFF7;
-+	val |= 0x0008;
-+	cdns_phy_reg_write(mhdp, PHY_PMA_CMN_CTRL1, val);
-+
-+	/* PHY Registers */
-+	val = cdns_phy_reg_read(mhdp, PHY_PMA_CMN_CTRL1);
-+	val &= 0xCFFF;
-+	val |= p_ctrl_table->cmn_ref_clk_dig_div << 12;
-+	cdns_phy_reg_write(mhdp, PHY_PMA_CMN_CTRL1, val);
-+
-+	val = cdns_phy_reg_read(mhdp, PHY_HDP_CLK_CTL);
-+	val &= 0x00FF;
-+	val |= 0x1200;
-+	cdns_phy_reg_write(mhdp, PHY_HDP_CLK_CTL, val);
-+
-+	/* Common control module control and diagnostic registers */
-+	val = cdns_phy_reg_read(mhdp, CMN_CDIAG_REFCLK_CTRL);
-+	val &= 0x8FFF;
-+	val |= p_ctrl_table->ref_clk_divider_scaler << 12;
-+	val |= 0x00C0;
-+	cdns_phy_reg_write(mhdp, CMN_CDIAG_REFCLK_CTRL, val);
-+
-+	/* High speed clock used */
-+	val = cdns_phy_reg_read(mhdp, CMN_DIAG_HSCLK_SEL);
-+	val &= 0xFF00;
-+	val |= (p_ctrl_table->cmnda_hs_clk_0_sel >> 1) << 0;
-+	val |= (p_ctrl_table->cmnda_hs_clk_1_sel >> 1) << 4;
-+	cdns_phy_reg_write(mhdp, CMN_DIAG_HSCLK_SEL, val);
-+
-+	for (k = 0; k < num_lanes; k++) {
-+		val = cdns_phy_reg_read(mhdp, (XCVR_DIAG_HSCLK_SEL | (k << 9)));
-+		val &= 0xCFFF;
-+		val |= (p_ctrl_table->cmnda_hs_clk_0_sel >> 1) << 12;
-+		cdns_phy_reg_write(mhdp, (XCVR_DIAG_HSCLK_SEL | (k << 9)), val);
-+	}
-+
-+	/* PLL 0 control state machine registers */
-+	val = p_ctrl_table->vco_ring_select << 12;
-+	cdns_phy_reg_write(mhdp, CMN_PLLSM0_USER_DEF_CTRL, val);
-+
-+	if (pclk_in == true)
-+		val = 0x30A0;
-+	else {
-+		val = cdns_phy_reg_read(mhdp, CMN_PLL0_VCOCAL_START);
-+		val &= 0xFE00;
-+		val |= p_pll_table->vco_cal_code;
-+	}
-+	cdns_phy_reg_write(mhdp, CMN_PLL0_VCOCAL_START, val);
-+
-+	cdns_phy_reg_write(mhdp, CMN_PLL0_VCOCAL_INIT_TMR, 0x0064);
-+	cdns_phy_reg_write(mhdp, CMN_PLL0_VCOCAL_ITER_TMR, 0x000A);
-+
-+	/* Common functions control and diagnostics registers */
-+	val = p_ctrl_table->cmnda_pll0_hs_sym_div_sel << 8;
-+	val |= p_ctrl_table->cmnda_pll0_ip_div;
-+	cdns_phy_reg_write(mhdp, CMN_DIAG_PLL0_INCLK_CTRL, val);
-+
-+	cdns_phy_reg_write(mhdp, CMN_DIAG_PLL0_OVRD, 0x0000);
-+
-+	val = p_ctrl_table->cmnda_pll0_fb_div_high;
-+	val |= (1 << 15);
-+	cdns_phy_reg_write(mhdp, CMN_DIAG_PLL0_FBH_OVRD, val);
-+
-+	val = p_ctrl_table->cmnda_pll0_fb_div_low;
-+	val |= (1 << 15);
-+	cdns_phy_reg_write(mhdp, CMN_DIAG_PLL0_FBL_OVRD, val);
-+
-+	if (pclk_in == false) {
-+		val = p_ctrl_table->cmnda_pll0_pxdiv_low;
-+		cdns_phy_reg_write(mhdp, CMN_DIAG_PLL0_PXL_DIVL, val);
-+
-+		val = p_ctrl_table->cmnda_pll0_pxdiv_high;
-+		val |= (1 << 15);
-+		cdns_phy_reg_write(mhdp, CMN_DIAG_PLL0_PXL_DIVH, val);
-+	}
-+
-+	val = p_pll_table->volt_to_current_coarse;
-+	val |= (p_pll_table->volt_to_current) << 4;
-+	cdns_phy_reg_write(mhdp, CMN_DIAG_PLL0_V2I_TUNE, val);
-+
-+	val = p_pll_table->charge_pump_gain;
-+	cdns_phy_reg_write(mhdp, CMN_DIAG_PLL0_CP_TUNE, val);
-+
-+	cdns_phy_reg_write(mhdp, CMN_DIAG_PLL0_LF_PROG, 0x0008);
-+
-+	val = p_pll_table->pmos_ctrl;
-+	val |= (p_pll_table->ndac_ctrl) << 8;
-+	cdns_phy_reg_write(mhdp, CMN_DIAG_PLL0_PTATIS_TUNE1, val);
-+
-+	val = p_pll_table->ptat_ndac_ctrl;
-+	cdns_phy_reg_write(mhdp, CMN_DIAG_PLL0_PTATIS_TUNE2, val);
-+
-+	if (pclk_in == true)
-+	cdns_phy_reg_write(mhdp, CMN_DIAG_PLL0_TEST_MODE, 0x0022);
-+	else
-+	cdns_phy_reg_write(mhdp, CMN_DIAG_PLL0_TEST_MODE, 0x0020);
-+	cdns_phy_reg_write(mhdp, CMN_PSM_CLK_CTRL, 0x0016);
-+
-+	/* Transceiver control and diagnostic registers */
-+	for (k = 0; k < num_lanes; k++) {
-+		val = cdns_phy_reg_read(mhdp, (XCVR_DIAG_PLLDRC_CTRL | (k << 9)));
-+		val &= 0xBFFF;
-+		cdns_phy_reg_write(mhdp, (XCVR_DIAG_PLLDRC_CTRL | (k << 9)), val);
-+	}
-+
-+	for (k = 0; k < num_lanes; k++) {
-+		val = cdns_phy_reg_read(mhdp, (TX_DIAG_TX_CTRL | (k << 9)));
-+		val &= 0xFF3F;
-+		val |= (p_ctrl_table->hsclk_div_tx_sub_rate >> 1) << 6;
-+		cdns_phy_reg_write(mhdp, (TX_DIAG_TX_CTRL | (k << 9)), val);
-+	}
-+
-+	/*
-+	 * for single ended reference clock val |= 0x0030;
-+	 * for differential clock  val |= 0x0000;
-+	 */
-+	val = cdns_phy_reg_read(mhdp, PHY_PMA_CMN_CTRL1);
-+	val &= 0xFF8F;
-+	if (pclk_in == true)
-+		val |= 0x0030;
-+	cdns_phy_reg_write(mhdp, PHY_PMA_CMN_CTRL1, val);
-+
-+	/* for differential clock on the refclk_p and
-+	 * refclk_m off chip pins: CMN_DIAG_ACYA[8]=1'b1 */
-+	cdns_phy_reg_write(mhdp, CMN_DIAG_ACYA, 0x0100);
-+
-+	/* Deassert PHY reset */
-+	cdns_phy_reg_write(mhdp, PHY_ISO_CMN_CTRL, 0x0001);
-+	cdns_phy_reg_write(mhdp, PHY_PMA_ISO_CMN_CTRL, 0x0003);
-+
-+	/* Power state machine registers */
-+	for (k = 0; k < num_lanes; k++)
-+		cdns_phy_reg_write(mhdp, XCVR_PSM_RCTRL | (k << 9), 0xFEFC);
-+
-+	/* Assert cmn_macro_pwr_en */
-+	cdns_phy_reg_write(mhdp, PHY_PMA_ISO_CMN_CTRL, 0x0013);
-+
-+	/* wait for cmn_macro_pwr_en_ack */
-+	for (i = 0; i < 10; i++) {
-+		val = cdns_phy_reg_read(mhdp, PHY_PMA_ISO_CMN_CTRL);
-+		if (val & (1 << 5))
-+			break;
-+		msleep(20);
-+	}
-+	if (i == 10) {
-+		//DRM_ERROR("PMA ouput macro power up failed\n");
-+		
-+		printk(KERN_ALERT "PMA ouput macro power up failed %s %d \n",__FUNCTION__,__LINE__);
-+		return false;
-+	}
-+
-+	/* wait for cmn_ready */
-+	for (i = 0; i < 10; i++) {
-+		val = cdns_phy_reg_read(mhdp, PHY_PMA_CMN_CTRL1);
-+		if (val & (1 << 0))
-+			break;
-+		msleep(20);
-+	}
-+	if (i == 10) {
-+		//DRM_ERROR("PMA output ready failed\n");
-+		
-+		printk(KERN_ALERT "PMA output ready failed %s %d \n",__FUNCTION__,__LINE__);
-+		return false;
-+	}
-+
-+	for (k = 0; k < num_lanes; k++) {
-+		cdns_phy_reg_write(mhdp, TX_PSC_A0 | (k << 9), 0x6791);
-+		cdns_phy_reg_write(mhdp, TX_PSC_A1 | (k << 9), 0x6790);
-+		cdns_phy_reg_write(mhdp, TX_PSC_A2 | (k << 9), 0x0090);
-+		cdns_phy_reg_write(mhdp, TX_PSC_A3 | (k << 9), 0x0090);
-+
-+		val = cdns_phy_reg_read(mhdp, RX_PSC_CAL | (k << 9));
-+		val &= 0xFFBB;
-+		cdns_phy_reg_write(mhdp, RX_PSC_CAL | (k << 9), val);
-+
-+		val = cdns_phy_reg_read(mhdp, RX_PSC_A0 | (k << 9));
-+		val &= 0xFFBB;
-+		cdns_phy_reg_write(mhdp, RX_PSC_A0 | (k << 9), val);
-+	}
-+	return true;
-+}
-+
-+static int hdmi_phy_cfg_t28hpc(struct cdns_mhdp_device *mhdp,
-+				struct drm_display_mode *mode)
-+{
-+	const struct hdmi_ctrl *p_ctrl_table;
-+	const struct hdmi_pll_tuning *p_pll_table;
-+	const u32 refclk_freq_khz = 27000;
-+	const u8 pclk_in = false;
-+	u32 pixel_freq = mode->clock;
-+	u32 vco_freq, char_freq;
-+	u32 div_total, feedback_factor;
-+	u32 i, ret;
-+
-+	feedback_factor = hdmi_feedback_factor(mhdp);
-+
-+	char_freq = pixel_freq * feedback_factor / 1000;
-+
-+	dev_info(mhdp->dev, "Pixel clock: %d KHz, character clock: %d, bpc is %0d-bit.\n",
-+	     pixel_freq, char_freq, mhdp->video_info.color_depth);
-+
-+	/* Get right row from the ctrl_table table.
-+	 * Check if 'pixel_freq_khz' value matches the PIXEL_CLK_FREQ column.
-+	 * Consider only the rows with FEEDBACK_FACTOR column matching feedback_factor. */
-+	for (i = 0; i < ARRAY_SIZE(imx8mq_ctrl_table); i++) {
-+		if (feedback_factor == imx8mq_ctrl_table[i].feedback_factor &&
-+				pixel_freq == imx8mq_ctrl_table[i].pixel_clk_freq_min) {
-+			p_ctrl_table = &imx8mq_ctrl_table[i];
-+			break;
-+		}
-+	}
-+	if (i == ARRAY_SIZE(imx8mq_ctrl_table)) {
-+		dev_warn(mhdp->dev,"Pixel clk (%d KHz) not supported, color depth (%0d-bit)\n",
-+		     pixel_freq, mhdp->video_info.color_depth);
-+		return 0;
-+	}
-+
-+	div_total = p_ctrl_table->pll_fb_div_total;
-+	vco_freq = refclk_freq_khz * div_total / p_ctrl_table->cmnda_pll0_ip_div;
-+
-+	/* Get right row from the imx8mq_pll_table table.
-+	 * Check if vco_freq_khz and feedback_div_total
-+	 * column matching with imx8mq_pll_table. */
-+	for (i = 0; i < ARRAY_SIZE(imx8mq_pll_table); i++) {
-+		if (vco_freq == imx8mq_pll_table[i].vco_freq_min &&
-+				div_total == imx8mq_pll_table[i].feedback_div_total) {
-+			p_pll_table = &imx8mq_pll_table[i];
-+			break;
-+		}
-+	}
-+	if (i == ARRAY_SIZE(imx8mq_pll_table)) {
-+		dev_warn(mhdp->dev,"VCO (%d KHz) not supported\n", vco_freq);
-+		return 0;
-+	}
-+	dev_info(mhdp->dev, "VCO frequency is %d KHz\n", vco_freq);
-+
-+	ret = hdmi_phy_config(mhdp, p_ctrl_table, p_pll_table, pclk_in);
-+	if (ret == false)
-+		return 0;
-+
-+	return char_freq;
-+}
-+
-+static int hdmi_phy_cfg_ss28fdsoi(struct cdns_mhdp_device *mhdp,
-+				struct drm_display_mode *mode)
-+{
-+	const struct hdmi_ctrl *p_ctrl_table;
-+	const struct hdmi_pll_tuning *p_pll_table;
-+	const u8 pclk_in = true;
-+	u32 pixel_freq = mode->clock;
-+	u32 vco_freq, char_freq;
-+	u32 div_total, feedback_factor;
-+	u32 ret, i;
-+
-+	feedback_factor = hdmi_feedback_factor(mhdp);
-+
-+	char_freq = pixel_freq * feedback_factor / 1000;
-+
-+	dev_info(mhdp->dev, "Pixel clock: %d KHz, character clock: %d, bpc is %0d-bit.\n",
-+	     pixel_freq, char_freq, mhdp->video_info.color_depth);
-+
-+	/* Get right row from the ctrl_table table.
-+	 * Check if 'pixel_freq_khz' value matches the PIXEL_CLK_FREQ column.
-+	 * Consider only the rows with FEEDBACK_FACTOR column matching feedback_factor. */
-+	for (i = 0; i < ARRAY_SIZE(imx8qm_ctrl_table); i++) {
-+		if (feedback_factor == imx8qm_ctrl_table[i].feedback_factor &&
-+				pixel_freq >= imx8qm_ctrl_table[i].pixel_clk_freq_min &&
-+				pixel_freq <= imx8qm_ctrl_table[i].pixel_clk_freq_max) {
-+			p_ctrl_table = &imx8qm_ctrl_table[i];
-+			break;
-+		}
-+	}
-+	if (i == ARRAY_SIZE(imx8qm_ctrl_table)) {
-+		dev_warn(mhdp->dev,"Pixel clk (%d KHz) not supported, color depth (%0d-bit)\n",
-+		     pixel_freq, mhdp->video_info.color_depth);
-+		return 0;
-+	}
-+
-+	div_total = p_ctrl_table->pll_fb_div_total;
-+	vco_freq = pixel_freq * div_total / p_ctrl_table->cmnda_pll0_ip_div;
-+
-+	/* Get right row from the imx8mq_pll_table table.
-+	 * Check if vco_freq_khz and feedback_div_total
-+	 * column matching with imx8mq_pll_table. */
-+	for (i = 0; i < ARRAY_SIZE(imx8qm_pll_table); i++) {
-+		if (vco_freq >= imx8qm_pll_table[i].vco_freq_min &&
-+				vco_freq < imx8qm_pll_table[i].vco_freq_max &&
-+				div_total == imx8qm_pll_table[i].feedback_div_total) {
-+			p_pll_table = &imx8qm_pll_table[i];
-+			break;
-+		}
-+	}
-+	if (i == ARRAY_SIZE(imx8qm_pll_table)) {
-+		dev_warn(mhdp->dev,"VCO (%d KHz) not supported\n", vco_freq);
-+		return 0;
-+	}
-+	
-+	dev_info(mhdp->dev, "VCO frequency is %d KHz\n", vco_freq);
-+
-+	ret = hdmi_phy_config(mhdp, p_ctrl_table, p_pll_table, pclk_in);
-+	if (ret == false)
-+		return 0;
-+
-+	return char_freq;
-+}
-+
-+static int hdmi_phy_power_up(struct cdns_mhdp_device *mhdp)
-+{
-+	u32 val, i;
-+
-+	/* set Power State to A2 */
-+	cdns_phy_reg_write(mhdp, PHY_HDP_MODE_CTRL, 0x0004);
-+
-+	cdns_phy_reg_write(mhdp, TX_DIAG_ACYA_0, 1);
-+	cdns_phy_reg_write(mhdp, TX_DIAG_ACYA_1, 1);
-+	cdns_phy_reg_write(mhdp, TX_DIAG_ACYA_2, 1);
-+	cdns_phy_reg_write(mhdp, TX_DIAG_ACYA_3, 1);
-+
-+	/* Wait for Power State A2 Ack */
-+	for (i = 0; i < 10; i++) {
-+		val = cdns_phy_reg_read(mhdp, PHY_HDP_MODE_CTRL);
-+		if (val & (1 << 6))
-+			break;
-+		msleep(20);
-+	}
-+	if (i == 10) {
-+		dev_err(mhdp->dev, "Wait A2 Ack failed\n");
-+		return -1;
-+	}
-+
-+	/* Power up ARC */
-+	hdmi_arc_config(mhdp);
-+
-+	/* Configure PHY in A0 mode (PHY must be in the A0 power
-+	 * state in order to transmit data)
-+	 */
-+
-+	printk(KERN_ALERT "DEBUG: %s %d \n",__FUNCTION__,__LINE__);
-+	
-+	// FIXME
-+	cdns_phy_reg_write(mhdp, PHY_HDP_MODE_CTRL, 0x0101); //imx8mq
-+	//cdns_phy_reg_write(mhdp, PHY_HDP_MODE_CTRL, 0x0001);
-+
-+	/* Wait for Power State A0 Ack */
-+	for (i = 0; i < 10; i++) {
-+		val = cdns_phy_reg_read(mhdp, PHY_HDP_MODE_CTRL);
-+		if (val & (1 << 4))
-+			break;
-+		msleep(20);
-+	}
-+	if (i == 10) {
-+		dev_err(mhdp->dev, "Wait A0 Ack failed\n");
-+		return -1;
-+	}
-+	
-+	printk(KERN_ALERT "DEBUG: %s %d \n",__FUNCTION__,__LINE__);
-+	return 0;
-+}
-+
-+bool cdns_hdmi_phy_video_valid_imx8mq(struct cdns_mhdp_device *mhdp)
-+{
-+	u32 rate = mhdp->valid_mode->clock;
-+	int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(imx8mq_ctrl_table); i++)
-+			if(rate == imx8mq_ctrl_table[i].pixel_clk_freq_min)
-+				return true;
-+	return false;
-+}
-+
-+int cdns_hdmi_phy_set_imx8mq(struct cdns_mhdp_device *mhdp)
-+{
-+	struct drm_display_mode *mode = &mhdp->mode;
-+	int ret;
-+
-+	/* Check HDMI FW alive before HDMI PHY init */
-+	ret = cdns_mhdp_check_alive(mhdp);
-+	if (ret == false) {
-+		dev_err(mhdp->dev, "NO HDMI FW running\n");
-+		return -ENXIO;
-+	}
-+
-+	/* Configure PHY */
-+	mhdp->hdmi.char_rate = hdmi_phy_cfg_t28hpc(mhdp, mode);
-+	if (mhdp->hdmi.char_rate == 0) {
-+		dev_err(mhdp->dev, "failed to set phy pclock\n");
-+		return -EINVAL;
-+	}
-+
-+	ret = hdmi_phy_power_up(mhdp);
-+	if (ret < 0)
-+		return ret;
-+
-+	hdmi_phy_set_vswing(mhdp);
-+
-+	return true;
-+}
-+
-+bool cdns_hdmi_phy_video_valid_imx8qm(struct cdns_mhdp_device *mhdp)
-+{
-+	u32 rate = mhdp->valid_mode->clock;
-+	int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(imx8qm_ctrl_table); i++)
-+			if(rate >= imx8qm_ctrl_table[i].pixel_clk_freq_min &&
-+				rate <= imx8qm_ctrl_table[i].pixel_clk_freq_max)
-+				return true;
-+	return false;
-+}
-+
-+int cdns_hdmi_phy_set_imx8qm(struct cdns_mhdp_device *mhdp)
-+{
-+	struct drm_display_mode *mode = &mhdp->mode;
-+	int ret;
-+
-+	/* Check HDMI FW alive before HDMI PHY init */
-+	ret = cdns_mhdp_check_alive(mhdp);
-+	if (ret == false) {
-+		dev_err(mhdp->dev, "NO HDMI FW running\n");
-+		return -ENXIO;
-+	}
-+
-+	/* Configure PHY */
-+	mhdp->hdmi.char_rate = hdmi_phy_cfg_ss28fdsoi(mhdp, mode);
-+	if (mhdp->hdmi.char_rate == 0) {
-+		dev_err(mhdp->dev, "failed to set phy pclock\n");
-+		return -EINVAL;
-+	}
-+
-+	ret = hdmi_phy_power_up(mhdp);
-+	if (ret < 0)
-+		return ret;
-+
-+	hdmi_phy_set_vswing(mhdp);
-+
-+	return true;
-+}
-diff --git a/drivers/gpu/drm/imx/cdn-mhdp-imxdrv.c b/drivers/gpu/drm/imx/cdn-mhdp-imxdrv.c
-new file mode 100644
-index 000000000000..daee92cb9ce5
---- /dev/null
-+++ b/drivers/gpu/drm/imx/cdn-mhdp-imxdrv.c
-@@ -0,0 +1,211 @@
-+/*
-+ * copyright (c) 2019 nxp semiconductor, inc.
-+ *
-+ * this program is free software; you can redistribute it and/or modify
-+ * it under the terms of the gnu general public license version 2 as
-+ * published by the free software foundation.
-+ */
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/component.h>
-+#include <drm/drm_of.h>
-+#include <drm/drm_crtc_helper.h>
-+#include <drm/drm_encoder_slave.h>
-+
-+#include "cdns-mhdp-imx.h"
-+#include "cdn-mhdp-phy.h"
-+#include "imx-drm.h"
-+
-+static void cdns_mhdp_imx_encoder_disable(struct drm_encoder *encoder)
-+{
-+	// FIXME
-+	struct drm_bridge* bridge = drm_bridge_chain_get_first_bridge(encoder);
-+	struct cdns_mhdp_device *mhdp = bridge->driver_private;
-+
-+	cdns_mhdp_plat_call(mhdp, plat_init);
-+}
-+
-+static void cdns_mhdp_imx_encoder_enable(struct drm_encoder *encoder)
-+{
-+	// FIXME
-+	struct drm_bridge* bridge = drm_bridge_chain_get_first_bridge(encoder);
-+	struct cdns_mhdp_device *mhdp = bridge->driver_private;
-+
-+	cdns_mhdp_plat_call(mhdp, plat_deinit);
-+}
-+
-+static int cdns_mhdp_imx_encoder_atomic_check(struct drm_encoder *encoder,
-+				    struct drm_crtc_state *crtc_state,
-+				    struct drm_connector_state *conn_state)
-+{
-+	// FIXME
-+	struct drm_bridge* bridge = drm_bridge_chain_get_first_bridge(encoder);
-+	struct imx_crtc_state *imx_crtc_state = to_imx_crtc_state(crtc_state);
-+	struct cdns_mhdp_device *mhdp = bridge->driver_private;
-+
-+	if (mhdp->plat_data->video_format != 0)
-+		imx_crtc_state->bus_format = mhdp->plat_data->video_format;
-+
-+	if (mhdp->force_mode_set)
-+	crtc_state->mode_changed = true;
-+
-+	return 0;
-+}
-+
-+static const struct drm_encoder_helper_funcs cdns_mhdp_imx_encoder_helper_funcs = {
-+	.enable     = cdns_mhdp_imx_encoder_enable,
-+	.disable    = cdns_mhdp_imx_encoder_disable,
-+	.atomic_check = cdns_mhdp_imx_encoder_atomic_check,
-+};
-+
-+static const struct drm_encoder_funcs cdns_mhdp_imx_encoder_funcs = {
-+	.destroy = drm_encoder_cleanup,
-+};
-+
-+static struct cdns_plat_data imx8mq_hdmi_drv_data = {
-+	.plat_name = "imx8mq-hdmi",
-+	.bind	= cdns_hdmi_bind,
-+	.unbind	= cdns_hdmi_unbind,
-+	.phy_set = cdns_hdmi_phy_set_imx8mq,
-+	.phy_video_valid = cdns_hdmi_phy_video_valid_imx8mq,
-+	.bus_type = BUS_TYPE_NORMAL_APB,
-+};
-+
-+static struct cdns_plat_data imx8mq_dp_drv_data = {
-+	.plat_name = "imx8mq-dp",
-+	.bind	= cdns_dp_bind,
-+	.unbind	= cdns_dp_unbind,
-+	.phy_set = cdns_dp_phy_set_imx8mq,
-+	.bus_type = BUS_TYPE_NORMAL_APB,
-+};
-+
-+static const struct of_device_id cdns_mhdp_imx_dt_ids[] = {
-+	{ .compatible = "cdn,imx8mq-hdmi",
-+	  .data = &imx8mq_hdmi_drv_data
-+	},
-+	/*{ .compatible = "cdn,imx8mq-dp",
-+	  .data = &imx8mq_dp_drv_data
-+	}*/
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, cdns_mhdp_imx_dt_ids);
-+
-+static int cdns_mhdp_imx_bind(struct device *dev, struct device *master,
-+			    void *data)
-+{
-+	struct platform_device *pdev = to_platform_device(dev);
-+	const struct cdns_plat_data *plat_data;
-+	const struct of_device_id *match;
-+	struct drm_device *drm = data;
-+	struct drm_encoder *encoder;
-+	struct imx_mhdp_device *imx_mhdp;
-+	int ret;
-+
-+	if (!pdev->dev.of_node)
-+		return -ENODEV;
-+
-+	imx_mhdp = devm_kzalloc(&pdev->dev, sizeof(*imx_mhdp), GFP_KERNEL);
-+	if (!imx_mhdp)
-+		return -ENOMEM;
-+
-+	match = of_match_node(cdns_mhdp_imx_dt_ids, pdev->dev.of_node);
-+	plat_data = match->data;
-+	encoder = &imx_mhdp->encoder;
-+
-+	encoder->possible_crtcs = drm_of_find_possible_crtcs(drm, dev->of_node);
-+
-+	ret = of_property_read_string(pdev->dev.of_node, "firmware-name",
-+					&imx_mhdp->firmware_name);
-+	/*
-+	 * If we failed to find the CRTC(s) which this encoder is
-+	 * supposed to be connected to, it's because the CRTC has
-+	 * not been registered yet.  Defer probing, and hope that
-+	 * the required CRTC is added later.
-+	 */
-+	if (encoder->possible_crtcs == 0) {
-+		printk(KERN_ALERT "DEBUG: %s %d encoder crtcs not found.\n",__FUNCTION__,__LINE__);
-+
-+		return -EPROBE_DEFER;
-+	}
-+
-+	drm_encoder_helper_add(encoder, &cdns_mhdp_imx_encoder_helper_funcs);
-+	drm_encoder_init(drm, encoder, &cdns_mhdp_imx_encoder_funcs,
-+			 DRM_MODE_ENCODER_TMDS, NULL);
-+
-+
-+	imx_mhdp->mhdp.plat_data = plat_data;
-+	imx_mhdp->mhdp.dev = dev;
-+	imx_mhdp->mhdp.bus_type = plat_data->bus_type;
-+	ret = plat_data->bind(pdev, encoder, &imx_mhdp->mhdp);
-+	/*
-+	 * If cdns_mhdp_bind() fails we'll never call cdns_mhdp_unbind(),
-+	 * which would have called the encoder cleanup.  Do it manually.
-+	 */
-+	if (ret < 0)
-+		drm_encoder_cleanup(encoder);
-+
-+	return ret;
-+}
-+
-+static void cdns_mhdp_imx_unbind(struct device *dev, struct device *master,
-+			       void *data)
-+{
-+	struct imx_mhdp_device *imx_mhdp = dev_get_drvdata(dev);
-+
-+	imx_mhdp->mhdp.plat_data->unbind(dev);
-+}
-+
-+static const struct component_ops cdns_mhdp_imx_ops = {
-+	.bind	= cdns_mhdp_imx_bind,
-+	.unbind	= cdns_mhdp_imx_unbind,
-+};
-+
-+static int cdns_mhdp_imx_suspend(struct device *dev)
-+{
-+	struct imx_mhdp_device *imx_mhdp = dev_get_drvdata(dev);
-+
-+	cdns_mhdp_plat_call(&imx_mhdp->mhdp, suspend);
-+
-+	return 0;
-+}
-+
-+static int cdns_mhdp_imx_resume(struct device *dev)
-+{
-+	struct imx_mhdp_device *imx_mhdp = dev_get_drvdata(dev);
-+
-+	cdns_mhdp_plat_call(&imx_mhdp->mhdp, resume);
-+
-+	return 0;
-+}
-+
-+static int cdns_mhdp_imx_probe(struct platform_device *pdev)
-+{
-+	return component_add(&pdev->dev, &cdns_mhdp_imx_ops);
-+}
-+
-+static int cdns_mhdp_imx_remove(struct platform_device *pdev)
-+{
-+	component_del(&pdev->dev, &cdns_mhdp_imx_ops);
-+
-+	return 0;
-+}
-+
-+static const struct dev_pm_ops cdns_mhdp_imx_pm_ops = {
-+        SET_LATE_SYSTEM_SLEEP_PM_OPS(cdns_mhdp_imx_suspend, cdns_mhdp_imx_resume)
-+};
-+
-+static struct platform_driver cdns_mhdp_imx_platform_driver = {
-+	.probe  = cdns_mhdp_imx_probe,
-+	.remove = cdns_mhdp_imx_remove,
-+	.driver = {
-+		.name = "cdns-mhdp-imx",
-+		.of_match_table = cdns_mhdp_imx_dt_ids,
-+		.pm = &cdns_mhdp_imx_pm_ops,
-+	},
-+};
-+
-+module_platform_driver(cdns_mhdp_imx_platform_driver);
-+
-+MODULE_AUTHOR("Sandor YU <sandor.yu@nxp.com>");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("platform:cdnhdmi-imx");
-diff --git a/drivers/gpu/drm/imx/cdn-mhdp-phy.h b/drivers/gpu/drm/imx/cdn-mhdp-phy.h
-new file mode 100644
-index 000000000000..6ad1f372d0b8
---- /dev/null
-+++ b/drivers/gpu/drm/imx/cdn-mhdp-phy.h
-@@ -0,0 +1,155 @@
-+/*
-+ * Copyright (C) 2019 NXP Semiconductor, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ */
-+
-+#ifndef _CDN_DP_PHY_H
-+#define _CDN_DP_PHY_H
-+
-+#include <drm/bridge/cdns-mhdp-common.h>
-+
-+#define CMN_SSM_BIAS_TMR                0x0022
-+#define CMN_PLLSM0_PLLEN_TMR            0x0029
-+#define CMN_PLLSM0_PLLPRE_TMR           0x002A
-+#define CMN_PLLSM0_PLLVREF_TMR          0x002B
-+#define CMN_PLLSM0_PLLLOCK_TMR          0x002C
-+#define CMN_PLLSM0_USER_DEF_CTRL        0x002F
-+#define CMN_PSM_CLK_CTRL                0x0061
-+#define CMN_CDIAG_REFCLK_CTRL           0x0062
-+#define CMN_PLL0_VCOCAL_START           0x0081
-+#define CMN_PLL0_VCOCAL_INIT_TMR        0x0084
-+#define CMN_PLL0_VCOCAL_ITER_TMR        0x0085
-+#define CMN_PLL0_INTDIV                 0x0094
-+#define CMN_PLL0_FRACDIV                0x0095
-+#define CMN_PLL0_HIGH_THR               0x0096
-+#define CMN_PLL0_DSM_DIAG               0x0097
-+#define CMN_PLL0_SS_CTRL1               0x0098
-+#define CMN_PLL0_SS_CTRL2               0x0099
-+#define CMN_ICAL_INIT_TMR               0x00C4
-+#define CMN_ICAL_ITER_TMR               0x00C5
-+#define CMN_RXCAL_INIT_TMR              0x00D4
-+#define CMN_RXCAL_ITER_TMR              0x00D5
-+#define CMN_TXPUCAL_CTRL                0x00E0
-+#define CMN_TXPUCAL_INIT_TMR            0x00E4
-+#define CMN_TXPUCAL_ITER_TMR            0x00E5
-+#define CMN_TXPDCAL_CTRL                0x00F0
-+#define CMN_TXPDCAL_INIT_TMR            0x00F4
-+#define CMN_TXPDCAL_ITER_TMR            0x00F5
-+#define CMN_ICAL_ADJ_INIT_TMR           0x0102
-+#define CMN_ICAL_ADJ_ITER_TMR           0x0103
-+#define CMN_RX_ADJ_INIT_TMR             0x0106
-+#define CMN_RX_ADJ_ITER_TMR             0x0107
-+#define CMN_TXPU_ADJ_CTRL               0x0108
-+#define CMN_TXPU_ADJ_INIT_TMR           0x010A
-+#define CMN_TXPU_ADJ_ITER_TMR           0x010B
-+#define CMN_TXPD_ADJ_CTRL               0x010c
-+#define CMN_TXPD_ADJ_INIT_TMR           0x010E
-+#define CMN_TXPD_ADJ_ITER_TMR           0x010F
-+#define CMN_DIAG_PLL0_FBH_OVRD          0x01C0
-+#define CMN_DIAG_PLL0_FBL_OVRD          0x01C1
-+#define CMN_DIAG_PLL0_OVRD              0x01C2
-+#define CMN_DIAG_PLL0_TEST_MODE         0x01C4
-+#define CMN_DIAG_PLL0_V2I_TUNE          0x01C5
-+#define CMN_DIAG_PLL0_CP_TUNE           0x01C6
-+#define CMN_DIAG_PLL0_LF_PROG           0x01C7
-+#define CMN_DIAG_PLL0_PTATIS_TUNE1      0x01C8
-+#define CMN_DIAG_PLL0_PTATIS_TUNE2      0x01C9
-+#define CMN_DIAG_PLL0_INCLK_CTRL        0x01CA
-+#define CMN_DIAG_PLL0_PXL_DIVH          0x01CB
-+#define CMN_DIAG_PLL0_PXL_DIVL          0x01CC
-+#define CMN_DIAG_HSCLK_SEL              0x01E0
-+#define CMN_DIAG_PER_CAL_ADJ            0x01EC
-+#define CMN_DIAG_CAL_CTRL               0x01ED
-+#define CMN_DIAG_ACYA                   0x01FF
-+#define XCVR_PSM_RCTRL                  0x4001
-+#define XCVR_PSM_CAL_TMR                0x4002
-+#define XCVR_PSM_A0IN_TMR               0x4003
-+#define TX_TXCC_CAL_SCLR_MULT_0         0x4047
-+#define TX_TXCC_CPOST_MULT_00_0         0x404C
-+#define TX_TXCC_MGNFS_MULT_000_0        0x4050
-+#define XCVR_DIAG_PLLDRC_CTRL           0x40E0
-+#define XCVR_DIAG_PLLDRC_CTRL           0x40E0
-+#define XCVR_DIAG_HSCLK_SEL             0x40E1
-+#define XCVR_DIAG_BIDI_CTRL             0x40E8
-+#define XCVR_DIAG_LANE_FCM_EN_MGN_TMR   0x40F2
-+#define XCVR_DIAG_LANE_FCM_EN_MGN       0x40F2
-+#define TX_PSC_A0                       0x4100
-+#define TX_PSC_A1                       0x4101
-+#define TX_PSC_A2                       0x4102
-+#define TX_PSC_A3                       0x4103
-+#define TX_RCVDET_CTRL                  0x4120
-+#define TX_RCVDET_EN_TMR                0x4122
-+#define TX_RCVDET_EN_TMR                0x4122
-+#define TX_RCVDET_ST_TMR                0x4123
-+#define TX_RCVDET_ST_TMR                0x4123
-+#define TX_BIST_CTRL                    0x4140
-+#define TX_BIST_UDDWR                   0x4141
-+#define TX_DIAG_TX_CTRL                 0x41E0
-+#define TX_DIAG_TX_DRV                  0x41E1
-+#define TX_DIAG_BGREF_PREDRV_DELAY      0x41E7
-+#define TX_DIAG_BGREF_PREDRV_DELAY      0x41E7
-+#define XCVR_PSM_RCTRL_1                0x4201
-+#define TX_TXCC_CAL_SCLR_MULT_1         0x4247
-+#define TX_TXCC_CPOST_MULT_00_1         0x424C
-+#define TX_TXCC_MGNFS_MULT_000_1        0x4250
-+#define XCVR_DIAG_PLLDRC_CTRL_1         0x42E0
-+#define XCVR_DIAG_HSCLK_SEL_1           0x42E1
-+#define XCVR_DIAG_LANE_FCM_EN_MGN_TMR_1 0x42F2
-+#define TX_RCVDET_EN_TMR_1              0x4322
-+#define TX_RCVDET_ST_TMR_1              0x4323
-+#define TX_DIAG_ACYA_0                  0x41FF
-+#define TX_DIAG_ACYA_1                  0x43FF
-+#define TX_DIAG_ACYA_2                  0x45FF
-+#define TX_DIAG_ACYA_3                  0x47FF
-+#define TX_ANA_CTRL_REG_1               0x5020
-+#define TX_ANA_CTRL_REG_2               0x5021
-+#define TXDA_COEFF_CALC                 0x5022
-+#define TX_DIG_CTRL_REG_1               0x5023
-+#define TX_DIG_CTRL_REG_2               0x5024
-+#define TXDA_CYA_AUXDA_CYA              0x5025
-+#define TX_ANA_CTRL_REG_3               0x5026
-+#define TX_ANA_CTRL_REG_4               0x5027
-+#define TX_ANA_CTRL_REG_5               0x5029
-+#define RX_PSC_A0                       0x8000
-+#define RX_PSC_CAL                      0x8006
-+#define PMA_LANE_CFG                    0xC000
-+#define PIPE_CMN_CTRL1                  0xC001
-+#define PIPE_CMN_CTRL2                  0xC002
-+#define PIPE_COM_LOCK_CFG1              0xC003
-+#define PIPE_COM_LOCK_CFG2              0xC004
-+#define PIPE_RCV_DET_INH                0xC005
-+#define PHY_HDP_MODE_CTRL               0xC008
-+#define PHY_HDP_CLK_CTL                 0xC009
-+#define STS                             0xC00F
-+#define PHY_ISO_CMN_CTRL                0xC010
-+#define PHY_ISO_CMN_CTRL                0xC010
-+#define PHY_HDP_TX_CTL_L0               0xC408
-+#define PHY_DP_TX_CTL                   0xC408
-+#define PHY_HDP_TX_CTL_L1               0xC448
-+#define PHY_HDP_TX_CTL_L2               0xC488
-+#define PHY_HDP_TX_CTL_L3               0xC4C8
-+#define PHY_PMA_CMN_CTRL1               0xC800
-+#define PMA_CMN_CTRL1                   0xC800
-+#define PHY_PMA_ISO_CMN_CTRL            0xC810
-+#define PHY_PMA_ISO_PLL_CTRL1           0xC812
-+#define PHY_PMA_ISOLATION_CTRL          0xC81F
-+#define PHY_ISOLATION_CTRL              0xC81F
-+#define PHY_PMA_ISO_XCVR_CTRL           0xCC11
-+#define PHY_PMA_ISO_LINK_MODE           0xCC12
-+#define PHY_PMA_ISO_PWRST_CTRL          0xCC13
-+#define PHY_PMA_ISO_TX_DATA_LO          0xCC14
-+#define PHY_PMA_ISO_TX_DATA_HI          0xCC15
-+#define PHY_PMA_ISO_RX_DATA_LO          0xCC16
-+#define PHY_PMA_ISO_RX_DATA_HI          0xCC17
-+
-+int cdns_dp_phy_set_imx8mq(struct cdns_mhdp_device *hdp);
-+int cdns_dp_phy_set_imx8qm(struct cdns_mhdp_device *hdp);
-+bool cdns_hdmi_phy_video_valid_imx8mq(struct cdns_mhdp_device *hdp);
-+bool cdns_hdmi_phy_video_valid_imx8qm(struct cdns_mhdp_device *hdp);
-+int cdns_hdmi_phy_set_imx8mq(struct cdns_mhdp_device *hdp);
-+int cdns_hdmi_phy_set_imx8qm(struct cdns_mhdp_device *hdp);
-+#endif /* _CDNS_MHDP_PHY_H */
-diff --git a/drivers/gpu/drm/imx/cdns-mhdp-imx.h b/drivers/gpu/drm/imx/cdns-mhdp-imx.h
-new file mode 100644
-index 000000000000..b95907ddc578
---- /dev/null
-+++ b/drivers/gpu/drm/imx/cdns-mhdp-imx.h
-@@ -0,0 +1,75 @@
-+/*
-+ * Cadence High-Definition Multimedia Interface (HDMI) driver
-+ *
-+ * Copyright (C) 2019 NXP Semiconductor, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ */
-+#ifndef CDNS_MHDP_IMX_H_
-+#define CDNS_MHDP_IMX_H_
-+
-+#include <drm/bridge/cdns-mhdp-common.h>
-+#include <drm/drm_encoder_slave.h>
-+
-+
-+struct imx_mhdp_device;
-+
-+struct imx_hdp_clks {
-+	struct clk *av_pll;
-+	struct clk *dig_pll;
-+	struct clk *clk_ipg;
-+	struct clk *clk_core;
-+	struct clk *clk_pxl;
-+	struct clk *clk_pxl_mux;
-+	struct clk *clk_pxl_link;
-+
-+	struct clk *lpcg_hdp;
-+	struct clk *lpcg_msi;
-+	struct clk *lpcg_pxl;
-+	struct clk *lpcg_vif;
-+	struct clk *lpcg_lis;
-+	struct clk *lpcg_apb;
-+	struct clk *lpcg_apb_csr;
-+	struct clk *lpcg_apb_ctrl;
-+
-+	struct clk *lpcg_i2s;
-+	struct clk *clk_i2s_bypass;
-+};
-+
-+struct imx_mhdp_device {
-+	struct cdns_mhdp_device mhdp;
-+	struct drm_encoder encoder;
-+
-+	struct mutex audio_mutex;
-+	spinlock_t audio_lock;
-+	bool connected;
-+	bool active;
-+	bool suspended;
-+	struct imx_hdp_clks clks;
-+	const struct firmware *fw;
-+	const char *firmware_name;
-+
-+	int bus_type;
-+
-+	struct device		*pd_mhdp_dev;
-+	struct device		*pd_pll0_dev;
-+	struct device		*pd_pll1_dev;
-+	struct device_link	*pd_mhdp_link;
-+	struct device_link	*pd_pll0_link;
-+	struct device_link	*pd_pll1_link;
-+};
-+
-+void cdns_mhdp_plat_init_imx8qm(struct cdns_mhdp_device *mhdp);
-+void cdns_mhdp_plat_deinit_imx8qm(struct cdns_mhdp_device *mhdp);
-+void cdns_mhdp_pclk_rate_imx8qm(struct cdns_mhdp_device *mhdp);
-+int cdns_mhdp_firmware_init_imx8qm(struct cdns_mhdp_device *mhdp);
-+int cdns_mhdp_resume_imx8qm(struct cdns_mhdp_device *mhdp);
-+int cdns_mhdp_suspend_imx8qm(struct cdns_mhdp_device *mhdp);
-+int cdns_mhdp_power_on_imx8qm(struct cdns_mhdp_device *mhdp);
-+int cdns_mhdp_power_on_ls1028a(struct cdns_mhdp_device *mhdp);
-+void cdns_mhdp_pclk_rate_ls1028a(struct cdns_mhdp_device *mhdp);
-+#endif /* CDNS_MHDP_IMX_H_ */
-diff --git a/drivers/gpu/drm/imx/dcss/dcss-dev.c b/drivers/gpu/drm/imx/dcss/dcss-dev.c
-index c849533ca83e..fe4600b8f833 100644
---- a/drivers/gpu/drm/imx/dcss/dcss-dev.c
-+++ b/drivers/gpu/drm/imx/dcss/dcss-dev.c
-@@ -17,6 +17,11 @@
- 
- static void dcss_clocks_enable(struct dcss_dev *dcss)
- {
-+	if (dcss->hdmi_output) {
-+		clk_prepare_enable(dcss->pll_phy_ref_clk);
-+		clk_prepare_enable(dcss->pll_src_clk);
-+	}
-+
- 	clk_prepare_enable(dcss->axi_clk);
- 	clk_prepare_enable(dcss->apb_clk);
- 	clk_prepare_enable(dcss->rtrm_clk);
-@@ -31,6 +36,11 @@ static void dcss_clocks_disable(struct dcss_dev *dcss)
- 	clk_disable_unprepare(dcss->rtrm_clk);
- 	clk_disable_unprepare(dcss->apb_clk);
- 	clk_disable_unprepare(dcss->axi_clk);
-+
-+	if (dcss->hdmi_output) {
-+		clk_disable_unprepare(dcss->pll_src_clk);
-+		clk_disable_unprepare(dcss->pll_phy_ref_clk);
-+	}
- }
- 
- static void dcss_disable_dtg_and_ss_cb(void *data)
-@@ -139,6 +149,8 @@ static int dcss_clks_init(struct dcss_dev *dcss)
- 		{"pix",   &dcss->pix_clk},
- 		{"rtrm",  &dcss->rtrm_clk},
- 		{"dtrc",  &dcss->dtrc_clk},
-+		{"pll_src",	 &dcss->pll_src_clk},
-+		{"pll_phy_ref",	 &dcss->pll_phy_ref_clk},
- 	};
- 
- 	for (i = 0; i < ARRAY_SIZE(clks); i++) {
-@@ -160,6 +172,8 @@ static void dcss_clks_release(struct dcss_dev *dcss)
- 	devm_clk_put(dcss->dev, dcss->pix_clk);
- 	devm_clk_put(dcss->dev, dcss->axi_clk);
- 	devm_clk_put(dcss->dev, dcss->apb_clk);
-+	devm_clk_put(dcss->dev, dcss->pll_src_clk);
-+	devm_clk_put(dcss->dev, dcss->pll_phy_ref_clk);
- }
- 
- struct dcss_dev *dcss_dev_create(struct device *dev, bool hdmi_output)
-@@ -254,7 +268,8 @@ int dcss_dev_suspend(struct device *dev)
- 	struct dcss_kms_dev *kms = container_of(ddev, struct dcss_kms_dev, base);
- 	int ret;
- 
--	drm_bridge_connector_disable_hpd(kms->connector);
-+	if (!dcss_drv_is_componentized(dev))
-+		drm_bridge_connector_disable_hpd(kms->connector);
- 
- 	drm_mode_config_helper_suspend(ddev);
- 
-@@ -289,7 +304,8 @@ int dcss_dev_resume(struct device *dev)
- 
- 	drm_mode_config_helper_resume(ddev);
- 
--	drm_bridge_connector_enable_hpd(kms->connector);
-+	if (!dcss_drv_is_componentized(dev))
-+		drm_bridge_connector_enable_hpd(kms->connector);
- 
- 	return 0;
- }
-diff --git a/drivers/gpu/drm/imx/dcss/dcss-dev.h b/drivers/gpu/drm/imx/dcss/dcss-dev.h
-index 1e582270c6ea..083edf6d715f 100644
---- a/drivers/gpu/drm/imx/dcss/dcss-dev.h
-+++ b/drivers/gpu/drm/imx/dcss/dcss-dev.h
-@@ -93,6 +93,7 @@ struct dcss_dev {
- 
- struct dcss_dev *dcss_drv_dev_to_dcss(struct device *dev);
- struct drm_device *dcss_drv_dev_to_drm(struct device *dev);
-+bool dcss_drv_is_componentized(struct device *dev);
- struct dcss_dev *dcss_dev_create(struct device *dev, bool hdmi_output);
- void dcss_dev_destroy(struct dcss_dev *dcss);
- int dcss_dev_runtime_suspend(struct device *dev);
-diff --git a/drivers/gpu/drm/imx/dcss/dcss-drv.c b/drivers/gpu/drm/imx/dcss/dcss-drv.c
-index 8dc2f85c514b..3e542c091d3d 100644
---- a/drivers/gpu/drm/imx/dcss/dcss-drv.c
-+++ b/drivers/gpu/drm/imx/dcss/dcss-drv.c
-@@ -6,6 +6,7 @@
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/platform_device.h>
-+#include <linux/component.h>
- #include <drm/drm_of.h>
- 
- #include "dcss-dev.h"
-@@ -14,6 +15,8 @@
- struct dcss_drv {
- 	struct dcss_dev *dcss;
- 	struct dcss_kms_dev *kms;
-+
-+	bool is_componentized;
- };
- 
- struct dcss_dev *dcss_drv_dev_to_dcss(struct device *dev)
-@@ -30,30 +33,24 @@ struct drm_device *dcss_drv_dev_to_drm(struct device *dev)
- 	return mdrv ? &mdrv->kms->base : NULL;
- }
- 
--static int dcss_drv_platform_probe(struct platform_device *pdev)
-+bool dcss_drv_is_componentized(struct device *dev)
-+{
-+	struct dcss_drv *mdrv = dev_get_drvdata(dev);
-+	return mdrv->is_componentized;
-+}
-+
-+static int dcss_drv_init(struct device *dev, bool componentized)
- {
--	struct device *dev = &pdev->dev;
--	struct device_node *remote;
- 	struct dcss_drv *mdrv;
- 	int err = 0;
--	bool hdmi_output = true;
--
--	if (!dev->of_node)
--		return -ENODEV;
--
--	remote = of_graph_get_remote_node(dev->of_node, 0, 0);
--	if (!remote)
--		return -ENODEV;
--
--	hdmi_output = !of_device_is_compatible(remote, "fsl,imx8mq-nwl-dsi");
--
--	of_node_put(remote);
- 
- 	mdrv = kzalloc(sizeof(*mdrv), GFP_KERNEL);
- 	if (!mdrv)
- 		return -ENOMEM;
- 
--	mdrv->dcss = dcss_dev_create(dev, hdmi_output);
-+	mdrv->is_componentized = componentized;
-+
-+	mdrv->dcss = dcss_dev_create(dev, componentized);
- 	if (IS_ERR(mdrv->dcss)) {
- 		err = PTR_ERR(mdrv->dcss);
- 		goto err;
-@@ -61,7 +58,7 @@ static int dcss_drv_platform_probe(struct platform_device *pdev)
- 
- 	dev_set_drvdata(dev, mdrv);
- 
--	mdrv->kms = dcss_kms_attach(mdrv->dcss);
-+	mdrv->kms = dcss_kms_attach(mdrv->dcss, componentized);
- 	if (IS_ERR(mdrv->kms)) {
- 		err = PTR_ERR(mdrv->kms);
- 		goto dcss_shutoff;
-@@ -79,19 +76,73 @@ static int dcss_drv_platform_probe(struct platform_device *pdev)
- 	return err;
- }
- 
--static int dcss_drv_platform_remove(struct platform_device *pdev)
-+static void dcss_drv_deinit(struct device *dev, bool componentized)
- {
--	struct dcss_drv *mdrv = dev_get_drvdata(&pdev->dev);
-+	struct dcss_drv *mdrv = dev_get_drvdata(dev);
- 
- 	if (!mdrv)
--		return 0;
-+		return;
- 
--	dcss_kms_detach(mdrv->kms);
-+	dcss_kms_detach(mdrv->kms, componentized);
- 	dcss_dev_destroy(mdrv->dcss);
- 
--	dev_set_drvdata(&pdev->dev, NULL);
-+	dev_set_drvdata(dev, NULL);
- 
- 	kfree(mdrv);
-+}
-+
-+static int dcss_drv_bind(struct device *dev)
-+{
-+	return dcss_drv_init(dev, true);
-+}
-+
-+static void dcss_drv_unbind(struct device *dev)
-+{
-+	return dcss_drv_deinit(dev, true);
-+}
-+
-+static const struct component_master_ops dcss_master_ops = {
-+	.bind	= dcss_drv_bind,
-+	.unbind	= dcss_drv_unbind,
-+};
-+
-+static int compare_of(struct device *dev, void *data)
-+{
-+	return dev->of_node == data;
-+}
-+
-+static int dcss_drv_platform_probe(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct component_match *match = NULL;
-+	struct device_node *remote;
-+
-+	if (!dev->of_node)
-+		return -ENODEV;
-+
-+	remote = of_graph_get_remote_node(dev->of_node, 0, 0);
-+	if (!remote)
-+		return -ENODEV;
-+
-+	if (of_device_is_compatible(remote, "fsl,imx8mq-nwl-dsi")) {
-+		of_node_put(remote);
-+		return dcss_drv_init(dev, false);
-+	}
-+
-+	drm_of_component_match_add(dev, &match, compare_of, remote);
-+	of_node_put(remote);
-+
-+	return component_master_add_with_match(dev, &dcss_master_ops, match);
-+}
-+
-+static int dcss_drv_platform_remove(struct platform_device *pdev)
-+{
-+	struct dcss_drv *mdrv = dev_get_drvdata(&pdev->dev);
-+
-+	if (mdrv->is_componentized)
-+		component_master_del(&pdev->dev, &dcss_master_ops);
-+	else
-+		dcss_drv_deinit(&pdev->dev, false);
- 
- 	return 0;
- }
-diff --git a/drivers/gpu/drm/imx/dcss/dcss-dtg.c b/drivers/gpu/drm/imx/dcss/dcss-dtg.c
-index 30de00540f63..c7a688b2a3b6 100644
---- a/drivers/gpu/drm/imx/dcss/dcss-dtg.c
-+++ b/drivers/gpu/drm/imx/dcss/dcss-dtg.c
-@@ -83,6 +83,7 @@ struct dcss_dtg {
- 	u32 ctx_id;
- 
- 	bool in_use;
-+	bool hdmi_output;
- 
- 	u32 dis_ulc_x;
- 	u32 dis_ulc_y;
-@@ -93,6 +94,9 @@ struct dcss_dtg {
- 
- 	int ctxld_kick_irq;
- 	bool ctxld_kick_irq_en;
-+
-+	struct clk *pll_src_clk;
-+	struct clk *pll_phy_ref_clk;
- };
- 
- static void dcss_dtg_write(struct dcss_dtg *dtg, u32 val, u32 ofs)
-@@ -159,6 +163,7 @@ int dcss_dtg_init(struct dcss_dev *dcss, unsigned long dtg_base)
- 	dcss->dtg = dtg;
- 	dtg->dev = dcss->dev;
- 	dtg->ctxld = dcss->ctxld;
-+	dtg->hdmi_output = dcss->hdmi_output;
- 
- 	dtg->base_reg = ioremap(dtg_base, SZ_4K);
- 	if (!dtg->base_reg) {
-@@ -170,6 +175,9 @@ int dcss_dtg_init(struct dcss_dev *dcss, unsigned long dtg_base)
- 	dtg->base_ofs = dtg_base;
- 	dtg->ctx_id = CTX_DB;
- 
-+	dtg->pll_src_clk = dcss->pll_src_clk;
-+	dtg->pll_phy_ref_clk = dcss->pll_phy_ref_clk;
-+
- 	dtg->alpha = 255;
- 
- 	dtg->control_status |= OVL_DATA_MODE | BLENDER_VIDEO_ALPHA_SEL |
-@@ -220,8 +228,22 @@ void dcss_dtg_sync_set(struct dcss_dtg *dtg, struct videomode *vm)
- 	dis_lrc_y = vm->vsync_len + vm->vfront_porch + vm->vback_porch +
- 		    vm->vactive - 1;
- 
-+	if (dtg->hdmi_output) {
-+		int err;
-+
-+		clk_disable_unprepare(dtg->pll_src_clk);
-+		err = clk_set_parent(dtg->pll_src_clk, dtg->pll_phy_ref_clk);
-+		if (err < 0)
-+			dev_warn(dtg->dev, "clk_set_parent() returned %d", err);
-+		clk_prepare_enable(dtg->pll_src_clk);
-+	}
-+
- 	clk_disable_unprepare(dcss->pix_clk);
--	clk_set_rate(dcss->pix_clk, vm->pixelclock);
-+	if (dtg->hdmi_output) {
-+		clk_set_rate(dcss->pix_clk, vm->pixelclock);
-+	} else {
-+		clk_set_rate(dcss->pix_clk, (vm->pixelclock * 700)/1000);
-+	}
- 	clk_prepare_enable(dcss->pix_clk);
- 
- 	actual_clk = clk_get_rate(dcss->pix_clk);
-@@ -406,4 +428,3 @@ bool dcss_dtg_vblank_irq_valid(struct dcss_dtg *dtg)
- {
- 	return !!(dcss_readl(dtg->base_reg + DCSS_DTG_INT_STATUS) & LINE1_IRQ);
- }
--
-diff --git a/drivers/gpu/drm/imx/dcss/dcss-kms.c b/drivers/gpu/drm/imx/dcss/dcss-kms.c
-index b549ce5e7607..da66c3151e85 100644
---- a/drivers/gpu/drm/imx/dcss/dcss-kms.c
-+++ b/drivers/gpu/drm/imx/dcss/dcss-kms.c
-@@ -13,6 +13,7 @@
- #include <drm/drm_of.h>
- #include <drm/drm_probe_helper.h>
- #include <drm/drm_vblank.h>
-+#include <linux/component.h>
- 
- #include "dcss-dev.h"
- #include "dcss-kms.h"
-@@ -70,6 +71,7 @@ static int dcss_kms_bridge_connector_init(struct dcss_kms_dev *kms)
- 	struct drm_crtc *crtc = (struct drm_crtc *)&kms->crtc;
- 	struct drm_panel *panel;
- 	struct drm_bridge *bridge;
-+	struct drm_connector_list_iter iter;
- 	int ret;
- 
- 	ret = drm_of_find_panel_or_bridge(ddev->dev->of_node, 0, 0,
-@@ -92,26 +94,26 @@ static int dcss_kms_bridge_connector_init(struct dcss_kms_dev *kms)
- 		return ret;
- 	}
- 
--	ret = drm_bridge_attach(encoder, bridge, NULL,
--				DRM_BRIDGE_ATTACH_NO_CONNECTOR);
-+	ret = drm_bridge_attach(encoder, bridge, NULL, 0);
- 	if (ret < 0) {
- 		dev_err(ddev->dev, "Unable to attach bridge %pOF\n",
- 			bridge->of_node);
- 		return ret;
- 	}
- 
--	kms->connector = drm_bridge_connector_init(ddev, encoder);
--	if (IS_ERR(kms->connector)) {
--		dev_err(ddev->dev, "Unable to create bridge connector.\n");
--		return PTR_ERR(kms->connector);
--	}
-+	/*
-+	 * FIXME: This hack to look up the connector is copied from mxsfb.
-+	 */
-+	drm_connector_list_iter_begin(ddev, &iter);
-+	kms->connector = drm_connector_list_iter_next(&iter);
-+	drm_connector_list_iter_end(&iter);
- 
- 	drm_connector_attach_encoder(kms->connector, encoder);
- 
- 	return 0;
- }
- 
--struct dcss_kms_dev *dcss_kms_attach(struct dcss_dev *dcss)
-+struct dcss_kms_dev *dcss_kms_attach(struct dcss_dev *dcss, bool componentized)
- {
- 	struct dcss_kms_dev *kms;
- 	struct drm_device *drm;
-@@ -136,19 +138,28 @@ struct dcss_kms_dev *dcss_kms_attach(struct dcss_dev *dcss)
- 
- 	drm->irq_enabled = true;
- 
--	ret = dcss_kms_bridge_connector_init(kms);
--	if (ret)
--		goto cleanup_mode_config;
-+	if (!componentized) {
-+		ret = dcss_kms_bridge_connector_init(kms);
-+		if (ret)
-+			goto cleanup_mode_config;
-+	}
- 
- 	ret = dcss_crtc_init(crtc, drm);
- 	if (ret)
- 		goto cleanup_mode_config;
- 
-+	if (componentized) {
-+		ret = component_bind_all(dcss->dev, kms);
-+		if (ret)
-+			goto cleanup_crtc;
-+	}
-+
- 	drm_mode_config_reset(drm);
- 
- 	drm_kms_helper_poll_init(drm);
- 
--	drm_bridge_connector_enable_hpd(kms->connector);
-+	if (!componentized)
-+		drm_bridge_connector_enable_hpd(kms->connector);
- 
- 	ret = drm_dev_register(drm, 0);
- 	if (ret)
-@@ -159,7 +170,8 @@ struct dcss_kms_dev *dcss_kms_attach(struct dcss_dev *dcss)
- 	return kms;
- 
- cleanup_crtc:
--	drm_bridge_connector_disable_hpd(kms->connector);
-+	if (!componentized)
-+		drm_bridge_connector_disable_hpd(kms->connector);
- 	drm_kms_helper_poll_fini(drm);
- 	dcss_crtc_deinit(crtc, drm);
- 
-@@ -170,17 +182,21 @@ struct dcss_kms_dev *dcss_kms_attach(struct dcss_dev *dcss)
- 	return ERR_PTR(ret);
- }
- 
--void dcss_kms_detach(struct dcss_kms_dev *kms)
-+void dcss_kms_detach(struct dcss_kms_dev *kms, bool componentized)
- {
- 	struct drm_device *drm = &kms->base;
-+	struct dcss_dev *dcss = drm->dev_private;
- 
- 	drm_dev_unregister(drm);
--	drm_bridge_connector_disable_hpd(kms->connector);
-+	if (!componentized)
-+		drm_bridge_connector_disable_hpd(kms->connector);
- 	drm_kms_helper_poll_fini(drm);
- 	drm_atomic_helper_shutdown(drm);
- 	drm_crtc_vblank_off(&kms->crtc.base);
- 	drm->irq_enabled = false;
- 	drm_mode_config_cleanup(drm);
- 	dcss_crtc_deinit(&kms->crtc, drm);
-+	if (componentized)
-+		component_unbind_all(dcss->dev, drm);
- 	drm->dev_private = NULL;
- }
-diff --git a/drivers/gpu/drm/imx/dcss/dcss-kms.h b/drivers/gpu/drm/imx/dcss/dcss-kms.h
-index dfe5dd99eea3..c3e0d0684785 100644
---- a/drivers/gpu/drm/imx/dcss/dcss-kms.h
-+++ b/drivers/gpu/drm/imx/dcss/dcss-kms.h
-@@ -32,8 +32,8 @@ struct dcss_kms_dev {
- 	struct drm_connector *connector;
- };
- 
--struct dcss_kms_dev *dcss_kms_attach(struct dcss_dev *dcss);
--void dcss_kms_detach(struct dcss_kms_dev *kms);
-+struct dcss_kms_dev *dcss_kms_attach(struct dcss_dev *dcss, bool componetized);
-+void dcss_kms_detach(struct dcss_kms_dev *kms, bool componetized);
- int dcss_crtc_init(struct dcss_crtc *crtc, struct drm_device *drm);
- void dcss_crtc_deinit(struct dcss_crtc *crtc, struct drm_device *drm);
- struct dcss_plane *dcss_plane_init(struct drm_device *drm,
-diff --git a/include/drm/bridge/cdns-mhdp-cbs.h b/include/drm/bridge/cdns-mhdp-cbs.h
-new file mode 100644
-index 000000000000..ed67e184d3ed
---- /dev/null
-+++ b/include/drm/bridge/cdns-mhdp-cbs.h
-@@ -0,0 +1,29 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * Cadence MHDP DP bridge callbacks.
-+ *
-+ * Copyright: 2018 Cadence Design Systems, Inc.
-+ *
-+ * Author: Piotr Sroka <piotrs@cadence.com>
-+ */
-+
-+#ifndef CDNS_MHDP_CBS_H
-+#define CDNS_MHDP_CBS_H
-+
-+#include <drm/drm_bridge.h>
-+
-+struct cdns_mhdp_mst_cbs_funcs {
-+	struct drm_encoder *(*create_mst_encoder)(void *priv_data,
-+						  struct drm_bridge *bridge);
-+	void (*destroy_mst_encoder)(void *priv_data, struct drm_bridge *bridge);
-+};
-+
-+struct cdns_mhdp_mst_cbs {
-+	struct cdns_mhdp_mst_cbs_funcs funcs;
-+	void *priv_data;
-+};
-+
-+int mhdp_bridge_attach_mst_cbs(struct drm_bridge *bridge,
-+			       struct cdns_mhdp_mst_cbs *cbs);
-+
-+#endif
-diff --git a/include/drm/bridge/cdns-mhdp-common.h b/include/drm/bridge/cdns-mhdp-common.h
-new file mode 100755
-index 000000000000..752bf493f026
---- /dev/null
-+++ b/include/drm/bridge/cdns-mhdp-common.h
-@@ -0,0 +1,812 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd
-+ * Author: Chris Zhong <zyw@rock-chips.com>
-+ *
-+ * This software is licensed under the terms of the GNU General Public
-+ * License version 2, as published by the Free Software Foundation, and
-+ * may be copied, distributed, and modified under those terms.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ */
-+
-+#ifndef CDNS_MHDP_COMMON_H_
-+#define CDNS_MHDP_COMMON_H_
-+
-+#include <drm/bridge/cdns-mhdp-cbs.h>
-+#include <drm/drm_bridge.h>
-+#include <drm/drm_connector.h>
-+#include <drm/drm_dp_helper.h>
-+#include <drm/drm_dp_mst_helper.h>
-+#include <media/cec.h>
-+#include <linux/bitops.h>
-+
-+#define ADDR_IMEM		0x10000
-+#define ADDR_DMEM		0x20000
-+#define ADDR_PHY_AFE	0x80000
-+
-+/* APB CFG addr */
-+#define APB_CTRL			0
-+#define XT_INT_CTRL			0x04
-+#define MAILBOX_FULL_ADDR		0x08
-+#define MAILBOX_EMPTY_ADDR		0x0c
-+#define MAILBOX0_WR_DATA		0x10
-+#define MAILBOX0_RD_DATA		0x14
-+#define KEEP_ALIVE			0x18
-+#define VER_L				0x1c
-+#define VER_H				0x20
-+#define VER_LIB_L_ADDR			0x24
-+#define VER_LIB_H_ADDR			0x28
-+#define SW_DEBUG_L			0x2c
-+#define SW_DEBUG_H			0x30
-+#define MAILBOX_INT_MASK		0x34
-+#define MAILBOX_INT_STATUS		0x38
-+#define SW_CLK_L			0x3c
-+#define SW_CLK_H			0x40
-+#define SW_EVENTS0			0x44
-+#define SW_EVENTS1			0x48
-+#define SW_EVENTS2			0x4c
-+#define SW_EVENTS3			0x50
-+#define XT_OCD_CTRL			0x60
-+#define APB_INT_MASK			0x6c
-+#define APB_STATUS_MASK			0x70
-+
-+/* audio decoder addr */
-+#define AUDIO_SRC_CNTL			0x30000
-+#define AUDIO_SRC_CNFG			0x30004
-+#define COM_CH_STTS_BITS		0x30008
-+#define STTS_BIT_CH(x)			(0x3000c + ((x) << 2))
-+#define SPDIF_CTRL_ADDR			0x3004c
-+#define SPDIF_CH1_CS_3100_ADDR		0x30050
-+#define SPDIF_CH1_CS_6332_ADDR		0x30054
-+#define SPDIF_CH1_CS_9564_ADDR		0x30058
-+#define SPDIF_CH1_CS_12796_ADDR		0x3005c
-+#define SPDIF_CH1_CS_159128_ADDR	0x30060
-+#define SPDIF_CH1_CS_191160_ADDR	0x30064
-+#define SPDIF_CH2_CS_3100_ADDR		0x30068
-+#define SPDIF_CH2_CS_6332_ADDR		0x3006c
-+#define SPDIF_CH2_CS_9564_ADDR		0x30070
-+#define SPDIF_CH2_CS_12796_ADDR		0x30074
-+#define SPDIF_CH2_CS_159128_ADDR	0x30078
-+#define SPDIF_CH2_CS_191160_ADDR	0x3007c
-+#define SMPL2PKT_CNTL			0x30080
-+#define SMPL2PKT_CNFG			0x30084
-+#define FIFO_CNTL			0x30088
-+#define FIFO_STTS			0x3008c
-+
-+/* source pif addr */
-+#define SOURCE_PIF_WR_ADDR		0x30800
-+#define SOURCE_PIF_WR_REQ		0x30804
-+#define SOURCE_PIF_RD_ADDR		0x30808
-+#define SOURCE_PIF_RD_REQ		0x3080c
-+#define SOURCE_PIF_DATA_WR		0x30810
-+#define SOURCE_PIF_DATA_RD		0x30814
-+#define SOURCE_PIF_FIFO1_FLUSH		0x30818
-+#define SOURCE_PIF_FIFO2_FLUSH		0x3081c
-+#define SOURCE_PIF_STATUS		0x30820
-+#define SOURCE_PIF_INTERRUPT_SOURCE	0x30824
-+#define SOURCE_PIF_INTERRUPT_MASK	0x30828
-+#define SOURCE_PIF_PKT_ALLOC_REG	0x3082c
-+#define SOURCE_PIF_PKT_ALLOC_WR_EN	0x30830
-+#define SOURCE_PIF_SW_RESET		0x30834
-+
-+/* bellow registers need access by mailbox */
-+/* source phy comp */
-+#define PHY_DATA_SEL			0x0818
-+#define LANES_CONFIG			0x0814
-+
-+/* source car addr */
-+#define SOURCE_HDTX_CAR			0x0900
-+#define SOURCE_DPTX_CAR			0x0904
-+#define SOURCE_PHY_CAR			0x0908
-+#define SOURCE_CEC_CAR			0x090c
-+#define SOURCE_CBUS_CAR			0x0910
-+#define SOURCE_PKT_CAR			0x0918
-+#define SOURCE_AIF_CAR			0x091c
-+#define SOURCE_CIPHER_CAR		0x0920
-+#define SOURCE_CRYPTO_CAR		0x0924
-+
-+/* mhdp tx_top_comp */
-+#define SCHEDULER_H_SIZE		0x1000
-+#define SCHEDULER_V_SIZE		0x1004
-+#define HDTX_SIGNAL_FRONT_WIDTH	0x100c
-+#define HDTX_SIGNAL_SYNC_WIDTH	0x1010
-+#define HDTX_SIGNAL_BACK_WIDTH	0x1014
-+#define HDTX_CONTROLLER			0x1018
-+#define HDTX_HPD				0x1020
-+#define HDTX_CLOCK_REG_0		0x1024
-+#define HDTX_CLOCK_REG_1		0x1028
-+
-+/* clock meters addr */
-+#define CM_CTRL				0x0a00
-+#define CM_I2S_CTRL			0x0a04
-+#define CM_SPDIF_CTRL			0x0a08
-+#define CM_VID_CTRL			0x0a0c
-+#define CM_LANE_CTRL			0x0a10
-+#define I2S_NM_STABLE			0x0a14
-+#define I2S_NCTS_STABLE			0x0a18
-+#define SPDIF_NM_STABLE			0x0a1c
-+#define SPDIF_NCTS_STABLE		0x0a20
-+#define NMVID_MEAS_STABLE		0x0a24
-+#define I2S_MEAS			0x0a40
-+#define SPDIF_MEAS			0x0a80
-+#define NMVID_MEAS			0x0ac0
-+
-+/* source vif addr */
-+#define BND_HSYNC2VSYNC			0x0b00
-+#define HSYNC2VSYNC_F1_L1		0x0b04
-+#define HSYNC2VSYNC_F2_L1		0x0b08
-+#define HSYNC2VSYNC_STATUS		0x0b0c
-+#define HSYNC2VSYNC_POL_CTRL		0x0b10
-+
-+/* dptx phy addr */
-+#define DP_TX_PHY_CONFIG_REG		0x2000
-+#define DP_TX_PHY_SW_RESET		0x2004
-+#define DP_TX_PHY_SCRAMBLER_SEED	0x2008
-+#define DP_TX_PHY_TRAINING_01_04	0x200c
-+#define DP_TX_PHY_TRAINING_05_08	0x2010
-+#define DP_TX_PHY_TRAINING_09_10	0x2014
-+#define TEST_COR			0x23fc
-+
-+/* dptx hpd addr */
-+#define HPD_IRQ_DET_MIN_TIMER		0x2100
-+#define HPD_IRQ_DET_MAX_TIMER		0x2104
-+#define HPD_UNPLGED_DET_MIN_TIMER	0x2108
-+#define HPD_STABLE_TIMER		0x210c
-+#define HPD_FILTER_TIMER		0x2110
-+#define HPD_EVENT_MASK			0x211c
-+#define HPD_EVENT_DET			0x2120
-+
-+/* dpyx framer addr */
-+#define DP_FRAMER_GLOBAL_CONFIG		0x2200
-+#define DP_SW_RESET			0x2204
-+#define DP_FRAMER_TU			0x2208
-+#define DP_FRAMER_PXL_REPR		0x220c
-+#define DP_FRAMER_SP			0x2210
-+#define AUDIO_PACK_CONTROL		0x2214
-+#define DP_VC_TABLE(x)			(0x2218 + ((x) << 2))
-+#define DP_VB_ID			0x2258
-+#define DP_MTPH_LVP_CONTROL		0x225c
-+#define DP_MTPH_SYMBOL_VALUES		0x2260
-+#define DP_MTPH_ECF_CONTROL		0x2264
-+#define DP_MTPH_ACT_CONTROL		0x2268
-+#define DP_MTPH_STATUS			0x226c
-+#define DP_INTERRUPT_SOURCE		0x2270
-+#define DP_INTERRUPT_MASK		0x2274
-+#define DP_FRONT_BACK_PORCH		0x2278
-+#define DP_BYTE_COUNT			0x227c
-+
-+/* dptx stream addr */
-+#define MSA_HORIZONTAL_0		0x2280
-+#define MSA_HORIZONTAL_1		0x2284
-+#define MSA_VERTICAL_0			0x2288
-+#define MSA_VERTICAL_1			0x228c
-+#define MSA_MISC			0x2290
-+#define STREAM_CONFIG			0x2294
-+#define AUDIO_PACK_STATUS		0x2298
-+#define VIF_STATUS			0x229c
-+#define PCK_STUFF_STATUS_0		0x22a0
-+#define PCK_STUFF_STATUS_1		0x22a4
-+#define INFO_PACK_STATUS		0x22a8
-+#define RATE_GOVERNOR_STATUS		0x22ac
-+#define DP_HORIZONTAL			0x22b0
-+#define DP_VERTICAL_0			0x22b4
-+#define DP_VERTICAL_1			0x22b8
-+#define DP_BLOCK_SDP			0x22bc
-+
-+/* dptx glbl addr */
-+#define DPTX_LANE_EN			0x2300
-+#define DPTX_ENHNCD			0x2304
-+#define DPTX_INT_MASK			0x2308
-+#define DPTX_INT_STATUS			0x230c
-+
-+/* dp aux addr */
-+#define DP_AUX_HOST_CONTROL		0x2800
-+#define DP_AUX_INTERRUPT_SOURCE		0x2804
-+#define DP_AUX_INTERRUPT_MASK		0x2808
-+#define DP_AUX_SWAP_INVERSION_CONTROL	0x280c
-+#define DP_AUX_SEND_NACK_TRANSACTION	0x2810
-+#define DP_AUX_CLEAR_RX			0x2814
-+#define DP_AUX_CLEAR_TX			0x2818
-+#define DP_AUX_TIMER_STOP		0x281c
-+#define DP_AUX_TIMER_CLEAR		0x2820
-+#define DP_AUX_RESET_SW			0x2824
-+#define DP_AUX_DIVIDE_2M		0x2828
-+#define DP_AUX_TX_PREACHARGE_LENGTH	0x282c
-+#define DP_AUX_FREQUENCY_1M_MAX		0x2830
-+#define DP_AUX_FREQUENCY_1M_MIN		0x2834
-+#define DP_AUX_RX_PRE_MIN		0x2838
-+#define DP_AUX_RX_PRE_MAX		0x283c
-+#define DP_AUX_TIMER_PRESET		0x2840
-+#define DP_AUX_NACK_FORMAT		0x2844
-+#define DP_AUX_TX_DATA			0x2848
-+#define DP_AUX_RX_DATA			0x284c
-+#define DP_AUX_TX_STATUS		0x2850
-+#define DP_AUX_RX_STATUS		0x2854
-+#define DP_AUX_RX_CYCLE_COUNTER		0x2858
-+#define DP_AUX_MAIN_STATES		0x285c
-+#define DP_AUX_MAIN_TIMER		0x2860
-+#define DP_AUX_AFE_OUT			0x2864
-+
-+/* crypto addr */
-+#define CRYPTO_HDCP_REVISION		0x5800
-+#define HDCP_CRYPTO_CONFIG		0x5804
-+#define CRYPTO_INTERRUPT_SOURCE		0x5808
-+#define CRYPTO_INTERRUPT_MASK		0x580c
-+#define CRYPTO22_CONFIG			0x5818
-+#define CRYPTO22_STATUS			0x581c
-+#define SHA_256_DATA_IN			0x583c
-+#define SHA_256_DATA_OUT_(x)		(0x5850 + ((x) << 2))
-+#define AES_32_KEY_(x)			(0x5870 + ((x) << 2))
-+#define AES_32_DATA_IN			0x5880
-+#define AES_32_DATA_OUT_(x)		(0x5884 + ((x) << 2))
-+#define CRYPTO14_CONFIG			0x58a0
-+#define CRYPTO14_STATUS			0x58a4
-+#define CRYPTO14_PRNM_OUT		0x58a8
-+#define CRYPTO14_KM_0			0x58ac
-+#define CRYPTO14_KM_1			0x58b0
-+#define CRYPTO14_AN_0			0x58b4
-+#define CRYPTO14_AN_1			0x58b8
-+#define CRYPTO14_YOUR_KSV_0		0x58bc
-+#define CRYPTO14_YOUR_KSV_1		0x58c0
-+#define CRYPTO14_MI_0			0x58c4
-+#define CRYPTO14_MI_1			0x58c8
-+#define CRYPTO14_TI_0			0x58cc
-+#define CRYPTO14_KI_0			0x58d0
-+#define CRYPTO14_KI_1			0x58d4
-+#define CRYPTO14_BLOCKS_NUM		0x58d8
-+#define CRYPTO14_KEY_MEM_DATA_0		0x58dc
-+#define CRYPTO14_KEY_MEM_DATA_1		0x58e0
-+#define CRYPTO14_SHA1_MSG_DATA		0x58e4
-+#define CRYPTO14_SHA1_V_VALUE_(x)	(0x58e8 + ((x) << 2))
-+#define TRNG_CTRL			0x58fc
-+#define TRNG_DATA_RDY			0x5900
-+#define TRNG_DATA			0x5904
-+
-+/* cipher addr */
-+#define HDCP_REVISION			0x60000
-+#define INTERRUPT_SOURCE		0x60004
-+#define INTERRUPT_MASK			0x60008
-+#define HDCP_CIPHER_CONFIG		0x6000c
-+#define AES_128_KEY_0			0x60010
-+#define AES_128_KEY_1			0x60014
-+#define AES_128_KEY_2			0x60018
-+#define AES_128_KEY_3			0x6001c
-+#define AES_128_RANDOM_0		0x60020
-+#define AES_128_RANDOM_1		0x60024
-+#define CIPHER14_KM_0			0x60028
-+#define CIPHER14_KM_1			0x6002c
-+#define CIPHER14_STATUS			0x60030
-+#define CIPHER14_RI_PJ_STATUS		0x60034
-+#define CIPHER_MODE			0x60038
-+#define CIPHER14_AN_0			0x6003c
-+#define CIPHER14_AN_1			0x60040
-+#define CIPHER22_AUTH			0x60044
-+#define CIPHER14_R0_DP_STATUS		0x60048
-+#define CIPHER14_BOOTSTRAP		0x6004c
-+
-+#define DPTX_FRMR_DATA_CLK_RSTN_EN	BIT(11)
-+#define DPTX_FRMR_DATA_CLK_EN		BIT(10)
-+#define DPTX_PHY_DATA_RSTN_EN		BIT(9)
-+#define DPTX_PHY_DATA_CLK_EN		BIT(8)
-+#define DPTX_PHY_CHAR_RSTN_EN		BIT(7)
-+#define DPTX_PHY_CHAR_CLK_EN		BIT(6)
-+#define SOURCE_AUX_SYS_CLK_RSTN_EN	BIT(5)
-+#define SOURCE_AUX_SYS_CLK_EN		BIT(4)
-+#define DPTX_SYS_CLK_RSTN_EN		BIT(3)
-+#define DPTX_SYS_CLK_EN			BIT(2)
-+#define CFG_DPTX_VIF_CLK_RSTN_EN	BIT(1)
-+#define CFG_DPTX_VIF_CLK_EN		BIT(0)
-+
-+#define SOURCE_PHY_RSTN_EN		BIT(1)
-+#define SOURCE_PHY_CLK_EN		BIT(0)
-+
-+#define SOURCE_PKT_SYS_RSTN_EN		BIT(3)
-+#define SOURCE_PKT_SYS_CLK_EN		BIT(2)
-+#define SOURCE_PKT_DATA_RSTN_EN		BIT(1)
-+#define SOURCE_PKT_DATA_CLK_EN		BIT(0)
-+
-+#define SPDIF_CDR_CLK_RSTN_EN		BIT(5)
-+#define SPDIF_CDR_CLK_EN		BIT(4)
-+#define SOURCE_AIF_SYS_RSTN_EN		BIT(3)
-+#define SOURCE_AIF_SYS_CLK_EN		BIT(2)
-+#define SOURCE_AIF_CLK_RSTN_EN		BIT(1)
-+#define SOURCE_AIF_CLK_EN		BIT(0)
-+
-+#define SOURCE_CIPHER_SYSTEM_CLK_RSTN_EN	BIT(3)
-+#define SOURCE_CIPHER_SYS_CLK_EN		BIT(2)
-+#define SOURCE_CIPHER_CHAR_CLK_RSTN_EN		BIT(1)
-+#define SOURCE_CIPHER_CHAR_CLK_EN		BIT(0)
-+
-+#define SOURCE_CRYPTO_SYS_CLK_RSTN_EN	BIT(1)
-+#define SOURCE_CRYPTO_SYS_CLK_EN	BIT(0)
-+
-+#define APB_IRAM_PATH			BIT(2)
-+#define APB_DRAM_PATH			BIT(1)
-+#define APB_XT_RESET			BIT(0)
-+
-+#define MAILBOX_INT_MASK_BIT		BIT(1)
-+#define PIF_INT_MASK_BIT		BIT(0)
-+#define ALL_INT_MASK			3
-+
-+/* mailbox */
-+#define MB_OPCODE_ID			0
-+#define MB_MODULE_ID			1
-+#define MB_SIZE_MSB_ID			2
-+#define MB_SIZE_LSB_ID			3
-+#define MB_DATA_ID			4
-+
-+#define MB_MODULE_ID_DP_TX			0x01
-+#define MB_MODULE_ID_HDMI_TX		0x03
-+#define MB_MODULE_ID_HDCP_TX		0x07
-+#define MB_MODULE_ID_HDCP_RX		0x08
-+#define MB_MODULE_ID_HDCP_GENERAL	0x09
-+#define MB_MODULE_ID_GENERAL		0x0A
-+
-+/* general opcode */
-+#define GENERAL_MAIN_CONTROL            0x01
-+#define GENERAL_TEST_ECHO               0x02
-+#define GENERAL_BUS_SETTINGS            0x03
-+#define GENERAL_TEST_ACCESS             0x04
-+#define GENERAL_WRITE_REGISTER          0x05
-+#define GENERAL_WRITE_FIELD             0x06
-+#define GENERAL_READ_REGISTER           0x07
-+#define GENERAL_GET_HPD_STATE           0x11
-+
-+/* DPTX opcode */
-+#define DPTX_SET_POWER_MNG			0x00
-+#define DPTX_SET_HOST_CAPABILITIES		0x01
-+#define DPTX_GET_EDID				0x02
-+#define DPTX_READ_DPCD				0x03
-+#define DPTX_WRITE_DPCD				0x04
-+#define DPTX_ENABLE_EVENT			0x05
-+#define DPTX_WRITE_REGISTER			0x06
-+#define DPTX_READ_REGISTER			0x07
-+#define DPTX_WRITE_FIELD			0x08
-+#define DPTX_TRAINING_CONTROL			0x09
-+#define DPTX_READ_EVENT				0x0a
-+#define DPTX_READ_LINK_STAT			0x0b
-+#define DPTX_SET_VIDEO				0x0c
-+#define DPTX_SET_AUDIO				0x0d
-+#define DPTX_GET_LAST_AUX_STAUS			0x0e
-+#define DPTX_SET_LINK_BREAK_POINT		0x0f
-+#define DPTX_FORCE_LANES			0x10
-+#define DPTX_HPD_STATE				0x11
-+#define DPTX_ADJUST_LT				0x12
-+
-+/* HDMI TX opcode */
-+#define HDMI_TX_READ				0x00
-+#define HDMI_TX_WRITE				0x01
-+#define HDMI_TX_UPDATE_READ			0x02
-+#define HDMI_TX_EDID				0x03
-+#define HDMI_TX_EVENTS				0x04
-+#define HDMI_TX_HPD_STATUS			0x05
-+#define HDMI_TX_DEBUG_ECHO			0xAA
-+#define HDMI_TX_TEST				0xBB
-+#define HDMI_TX_EDID_INTERNAL		0xF0
-+
-+#define FW_STANDBY				0
-+#define FW_ACTIVE				1
-+
-+#define MHDP_EVENT_ENABLE_HPD			BIT(0)
-+#define MHDP_EVENT_ENABLE_TRAINING		BIT(1)
-+
-+#define LINK_TRAINING_NOT_ACTIVE		0
-+#define LINK_TRAINING_RUN			1
-+#define LINK_TRAINING_RESTART			2
-+
-+#define CONTROL_VIDEO_IDLE			0
-+#define CONTROL_VIDEO_VALID			1
-+
-+#define TU_CNT_RST_EN				BIT(15)
-+#define VIF_BYPASS_INTERLACE			BIT(13)
-+#define INTERLACE_FMT_DET			BIT(12)
-+#define INTERLACE_DTCT_WIN			0x20
-+
-+#define DP_FRAMER_SP_INTERLACE_EN		BIT(2)
-+#define DP_FRAMER_SP_HSP			BIT(1)
-+#define DP_FRAMER_SP_VSP			BIT(0)
-+
-+/* capability */
-+#define AUX_HOST_INVERT				3
-+#define	FAST_LT_SUPPORT				1
-+#define FAST_LT_NOT_SUPPORT			0
-+#define LANE_MAPPING_NORMAL			0x1b
-+#define LANE_MAPPING_FLIPPED			0xe4
-+#define ENHANCED				1
-+#define SCRAMBLER_EN				BIT(4)
-+
-+#define	FULL_LT_STARTED				BIT(0)
-+#define FASE_LT_STARTED				BIT(1)
-+#define CLK_RECOVERY_FINISHED			BIT(2)
-+#define EQ_PHASE_FINISHED			BIT(3)
-+#define FASE_LT_START_FINISHED			BIT(4)
-+#define CLK_RECOVERY_FAILED			BIT(5)
-+#define EQ_PHASE_FAILED				BIT(6)
-+#define FASE_LT_FAILED				BIT(7)
-+
-+#define DPTX_HPD_EVENT				BIT(0)
-+#define DPTX_TRAINING_EVENT			BIT(1)
-+#define HDCP_TX_STATUS_EVENT			BIT(4)
-+#define HDCP2_TX_IS_KM_STORED_EVENT		BIT(5)
-+#define HDCP2_TX_STORE_KM_EVENT			BIT(6)
-+#define HDCP_TX_IS_RECEIVER_ID_VALID_EVENT	BIT(7)
-+
-+#define TU_SIZE					30
-+#define CDNS_DP_MAX_LINK_RATE	540000
-+
-+#define F_HDMI_ENCODING(x) (((x) & ((1 << 2) - 1)) << 16)
-+#define F_VIF_DATA_WIDTH(x) (((x) & ((1 << 2) - 1)) << 2)
-+#define F_HDMI_MODE(x) (((x) & ((1 << 2) - 1)) << 0)
-+#define F_GCP_EN(x) (((x) & ((1 << 1) - 1)) << 12)
-+#define F_DATA_EN(x) (((x) & ((1 << 1) - 1)) << 15)
-+#define F_HDMI2_PREAMBLE_EN(x) (((x) & ((1 << 1) - 1)) << 18)
-+#define F_PIC_3D(x) (((x) & ((1 << 4) - 1)) << 7)
-+#define F_BCH_EN(x) (((x) & ((1 << 1) - 1)) << 11)
-+#define F_SOURCE_PHY_MHDP_SEL(x) (((x) & ((1 << 2) - 1)) << 3)
-+#define F_HPD_VALID_WIDTH(x) (((x) & ((1 << 12) - 1)) << 0)
-+#define F_HPD_GLITCH_WIDTH(x) (((x) & ((1 << 8) - 1)) << 12)
-+#define F_HDMI2_CTRL_IL_MODE(x) (((x) & ((1 << 1) - 1)) << 19)
-+#define F_SOURCE_PHY_LANE0_SWAP(x) (((x) & ((1 << 2) - 1)) << 0)
-+#define F_SOURCE_PHY_LANE1_SWAP(x) (((x) & ((1 << 2) - 1)) << 2)
-+#define F_SOURCE_PHY_LANE2_SWAP(x) (((x) & ((1 << 2) - 1)) << 4)
-+#define F_SOURCE_PHY_LANE3_SWAP(x) (((x) & ((1 << 2) - 1)) << 6)
-+#define F_SOURCE_PHY_COMB_BYPASS(x) (((x) & ((1 << 1) - 1)) << 21)
-+#define F_SOURCE_PHY_20_10(x) (((x) & ((1 << 1) - 1)) << 22)
-+#define F_PKT_ALLOC_ADDRESS(x) (((x) & ((1 << 4) - 1)) << 0)
-+#define F_ACTIVE_IDLE_TYPE(x) (((x) & ((1 << 1) - 1)) << 17)
-+#define F_FIFO1_FLUSH(x) (((x) & ((1 << 1) - 1)) << 0)
-+#define F_PKT_ALLOC_WR_EN(x) (((x) & ((1 << 1) - 1)) << 0)
-+#define F_DATA_WR(x) (x)
-+#define F_WR_ADDR(x) (((x) & ((1 << 4) - 1)) << 0)
-+#define F_HOST_WR(x) (((x) & ((1 << 1) - 1)) << 0)
-+#define F_TYPE_VALID(x) (((x) & ((1 << 1) - 1)) << 16)
-+#define F_PACKET_TYPE(x) (((x) & ((1 << 8) - 1)) << 8)
-+
-+/* audio */
-+#define AUDIO_PACK_EN				BIT(8)
-+#define SAMPLING_FREQ(x)			(((x) & 0xf) << 16)
-+#define ORIGINAL_SAMP_FREQ(x)			(((x) & 0xf) << 24)
-+#define SYNC_WR_TO_CH_ZERO			BIT(1)
-+#define I2S_DEC_START				BIT(1)
-+#define AUDIO_SW_RST				BIT(0)
-+#define SMPL2PKT_EN				BIT(1)
-+#define MAX_NUM_CH(x)				(((x) & 0x1f) - 1)
-+#define NUM_OF_I2S_PORTS(x)			((((x) / 2 - 1) & 0x3) << 5)
-+#define AUDIO_TYPE_LPCM				(2 << 7)
-+#define CFG_SUB_PCKT_NUM(x)			((((x) - 1) & 0x7) << 11)
-+#define AUDIO_CH_NUM(x)				((((x) - 1) & 0x1f) << 2)
-+#define TRANS_SMPL_WIDTH_16			0
-+#define TRANS_SMPL_WIDTH_24			BIT(11)
-+#define TRANS_SMPL_WIDTH_32			(2 << 11)
-+#define I2S_DEC_PORT_EN(x)			(((x) & 0xf) << 17)
-+#define SPDIF_ENABLE				BIT(21)
-+#define SPDIF_AVG_SEL				BIT(20)
-+#define SPDIF_JITTER_BYPASS			BIT(19)
-+#define SPDIF_FIFO_MID_RANGE(x)			(((x) & 0xff) << 11)
-+#define SPDIF_JITTER_THRSH(x)			(((x) & 0xff) << 3)
-+#define SPDIF_JITTER_AVG_WIN(x)			((x) & 0x7)
-+
-+/* Reference cycles when using lane clock as reference */
-+#define LANE_REF_CYC				0x8000
-+
-+#define HOTPLUG_DEBOUNCE_MS		200
-+
-+#define IRQ_IN    0
-+#define IRQ_OUT   1
-+#define IRQ_NUM   2
-+
-+#define cdns_mhdp_plat_call(mhdp, operation)			\
-+	(!(mhdp) ? -ENODEV : (((mhdp)->plat_data && (mhdp)->plat_data->operation) ?	\
-+	 (mhdp)->plat_data->operation(mhdp) : ENOIOCTLCMD))
-+
-+/* bus access type */
-+enum {
-+	BUS_TYPE_NORMAL_APB = 0,
-+	BUS_TYPE_NORMAL_SAPB = 1,
-+	BUS_TYPE_LOW4K_APB = 2,
-+	BUS_TYPE_LOW4K_SAPB = 3,
-+};
-+
-+enum voltage_swing_level {
-+	VOLTAGE_LEVEL_0,
-+	VOLTAGE_LEVEL_1,
-+	VOLTAGE_LEVEL_2,
-+	VOLTAGE_LEVEL_3,
-+};
-+
-+enum pre_emphasis_level {
-+	PRE_EMPHASIS_LEVEL_0,
-+	PRE_EMPHASIS_LEVEL_1,
-+	PRE_EMPHASIS_LEVEL_2,
-+	PRE_EMPHASIS_LEVEL_3,
-+};
-+
-+enum pattern_set {
-+	PTS1		= BIT(0),
-+	PTS2		= BIT(1),
-+	PTS3		= BIT(2),
-+	PTS4		= BIT(3),
-+	DP_NONE		= BIT(4)
-+};
-+
-+enum vic_color_depth {
-+	BCS_6 = 0x1,
-+	BCS_8 = 0x2,
-+	BCS_10 = 0x4,
-+	BCS_12 = 0x8,
-+	BCS_16 = 0x10,
-+};
-+
-+enum vic_bt_type {
-+	BT_601 = 0x0,
-+	BT_709 = 0x1,
-+};
-+
-+enum audio_format {
-+	AFMT_I2S = 0,
-+	AFMT_SPDIF_INT = 1,
-+	AFMT_SPDIF_EXT = 2,
-+	AFMT_UNUSED,
-+};
-+
-+enum {
-+	MODE_DVI,
-+	MODE_HDMI_1_4,
-+	MODE_HDMI_2_0,
-+};
-+
-+struct audio_info {
-+	enum audio_format format;
-+	int sample_rate;
-+	int channels;
-+	int sample_width;
-+	int connector_type;
-+};
-+
-+enum vic_pxl_encoding_format {
-+	PXL_RGB = 0x1,
-+	YCBCR_4_4_4 = 0x2,
-+	YCBCR_4_2_2 = 0x4,
-+	YCBCR_4_2_0 = 0x8,
-+	Y_ONLY = 0x10,
-+};
-+
-+struct video_info {
-+	bool h_sync_polarity;
-+	bool v_sync_polarity;
-+	bool interlaced;
-+	int color_depth;
-+	enum vic_pxl_encoding_format color_fmt;
-+};
-+
-+struct cdns_mhdp_host {
-+	unsigned int	link_rate;
-+	u8	lanes_cnt;
-+	u8	volt_swing;
-+	u8	pre_emphasis;
-+	u8	pattern_supp;
-+	u8	fast_link;
-+	u8	lane_mapping;
-+	u8	enhanced;
-+};
-+
-+struct cdns_mhdp_sink {
-+	unsigned int	link_rate;
-+	u8	lanes_cnt;
-+	u8	pattern_supp;
-+	u8	fast_link;
-+	u8	enhanced;
-+};
-+
-+struct cdns_mhdp_bridge;
-+struct cdns_mhdp_connector;
-+
-+struct cdns_mhdp_bridge {
-+	struct cdns_mhdp_device *mhdp;
-+	struct drm_bridge base;
-+	int pbn;
-+	int8_t stream_id;
-+	struct cdns_mhdp_connector *connector;
-+	bool is_active;
-+};
-+
-+struct cdns_mhdp_connector {
-+	struct drm_connector base;
-+	bool is_mst_connector;
-+	struct drm_dp_mst_port *port;
-+	struct cdns_mhdp_bridge *bridge;
-+};
-+
-+struct cdns_mhdp_cec {
-+       struct cec_adapter *adap;
-+       struct device *dev;
-+       struct mutex lock;
-+
-+       struct cec_msg msg;
-+       struct task_struct *cec_worker;
-+};
-+
-+struct cdns_plat_data {
-+	/* Vendor PHY support */
-+	int (*bind)(struct platform_device *pdev,
-+			struct drm_encoder *encoder,
-+			struct cdns_mhdp_device *mhdp);
-+	void (*unbind)(struct device *dev);
-+
-+	void (*plat_init)(struct cdns_mhdp_device *mhdp);
-+	void (*plat_deinit)(struct cdns_mhdp_device *mhdp);
-+
-+	int (*phy_set)(struct cdns_mhdp_device *mhdp);
-+	bool (*phy_video_valid)(struct cdns_mhdp_device *mhdp);
-+	int (*firmware_init)(struct cdns_mhdp_device *mhdp);
-+	void (*pclk_rate)(struct cdns_mhdp_device *mhdp);
-+
-+	int (*suspend)(struct cdns_mhdp_device *mhdp);
-+	int (*resume)(struct cdns_mhdp_device *mhdp);
-+
-+	int (*power_on)(struct cdns_mhdp_device *mhdp);
-+	int (*power_off)(struct cdns_mhdp_device *mhdp);
-+
-+	int bus_type;
-+	int video_format;
-+	char is_dp;
-+	char *plat_name;
-+};
-+
-+struct drm_dp_link {
-+	unsigned char revision;
-+	unsigned int rate;
-+	unsigned int num_lanes;
-+	unsigned long capabilities;
-+};
-+
-+struct cdns_mhdp_device {
-+	void __iomem		*regs_base;
-+	void __iomem		*regs_sec;
-+
-+	int bus_type;
-+
-+	struct device		*dev;
-+
-+	struct cdns_mhdp_connector  connector;
-+	struct clk		*spdif_clk;
-+	struct reset_control	*spdif_rst;
-+
-+	struct platform_device	*audio_pdev;
-+	struct audio_info	audio_info;
-+
-+	struct cdns_mhdp_bridge	bridge;
-+	struct phy		*phy;
-+
-+	struct video_info	video_info;
-+	struct drm_display_mode	mode;
-+	const struct drm_display_mode	*valid_mode;
-+	unsigned int		fw_version;
-+
-+	struct drm_dp_mst_topology_mgr mst_mgr;
-+	struct delayed_work hotplug_work;
-+
-+	u32 lane_mapping;
-+	bool link_up;
-+	bool power_up;
-+	bool plugged;
-+	bool force_mode_set;
-+	bool is_hpd;
-+	bool is_ls1028a;
-+	struct mutex lock;
-+	struct mutex iolock;
-+
-+	int irq[IRQ_NUM];
-+
-+	union {
-+		struct _dp_data {
-+			struct drm_dp_link	link;
-+			struct drm_dp_aux	aux;
-+			struct cdns_mhdp_host	host;
-+			struct cdns_mhdp_sink	sink;
-+			struct cdns_mhdp_mst_cbs cbs;
-+			bool is_mst;
-+			bool can_mst;
-+		} dp;
-+		struct _hdmi_data {
-+			struct cdns_mhdp_cec cec;
-+			u32 char_rate;
-+			u32 hdmi_type;
-+		} hdmi;
-+	};
-+	const struct cdns_plat_data *plat_data;
-+
-+};
-+
-+u32 cdns_mhdp_bus_read(struct cdns_mhdp_device *mhdp, u32 offset);
-+void cdns_mhdp_bus_write(u32 val, struct cdns_mhdp_device *mhdp, u32 offset);
-+void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp);
-+void cdns_mhdp_set_fw_clk(struct cdns_mhdp_device *mhdp, unsigned long clk);
-+u32 cdns_mhdp_get_fw_clk(struct cdns_mhdp_device *mhdp);
-+int cdns_mhdp_load_firmware(struct cdns_mhdp_device *mhdp, const u32 *i_mem,
-+			    u32 i_size, const u32 *d_mem, u32 d_size);
-+int cdns_mhdp_set_firmware_active(struct cdns_mhdp_device *mhdp, bool enable);
-+int cdns_mhdp_set_host_cap(struct cdns_mhdp_device *mhdp, bool flip);
-+int cdns_mhdp_event_config(struct cdns_mhdp_device *mhdp);
-+u32 cdns_mhdp_get_event(struct cdns_mhdp_device *mhdp);
-+int cdns_mhdp_get_hpd_status(struct cdns_mhdp_device *mhdp);
-+int cdns_mhdp_dpcd_write(struct cdns_mhdp_device *mhdp, u32 addr, u8 value);
-+int cdns_mhdp_dpcd_read(struct cdns_mhdp_device *mhdp,
-+			u32 addr, u8 *data, u16 len);
-+int cdns_mhdp_get_edid_block(void *mhdp, u8 *edid,
-+			     unsigned int block, size_t length);
-+int cdns_mhdp_train_link(struct cdns_mhdp_device *mhdp);
-+int cdns_mhdp_set_video_status(struct cdns_mhdp_device *mhdp, int active);
-+int cdns_mhdp_config_video(struct cdns_mhdp_device *mhdp);
-+
-+/* Audio */
-+int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
-+			 struct audio_info *audio);
-+int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable);
-+int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
-+			   struct audio_info *audio);
-+int cdns_mhdp_register_audio_driver(struct device *dev);
-+void cdns_mhdp_unregister_audio_driver(struct device *dev);
-+
-+int cdns_mhdp_reg_read(struct cdns_mhdp_device *mhdp, u32 addr);
-+int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u32 addr, u32 val);
-+int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
-+			    u8 start_bit, u8 bits_no, u32 val);
-+int cdns_mhdp_adjust_lt(struct cdns_mhdp_device *mhdp, u8 nlanes,
-+			u16 udelay, u8 *lanes_data,
-+			u8 *dpcd);
-+
-+int cdns_mhdp_read_hpd(struct cdns_mhdp_device *mhdp);
-+u32 cdns_phy_reg_read(struct cdns_mhdp_device *mhdp, u32 addr);
-+int cdns_phy_reg_write(struct cdns_mhdp_device *mhdp, u32 addr, u32 val);
-+int cdns_mhdp_mailbox_send(struct cdns_mhdp_device *mhdp, u8 module_id,
-+				  u8 opcode, u16 size, u8 *message);
-+int cdns_mhdp_mailbox_read_receive(struct cdns_mhdp_device *mhdp,
-+					  u8 *buff, u16 buff_size);
-+int cdns_mhdp_mailbox_validate_receive(struct cdns_mhdp_device *mhdp,
-+					      u8 module_id, u8 opcode,
-+					      u16 req_size);
-+int cdns_mhdp_mailbox_read(struct cdns_mhdp_device *mhdp);
-+
-+void cdns_mhdp_infoframe_set(struct cdns_mhdp_device *mhdp,
-+					u8 entry_id, u8 packet_len, u8 *packet, u8 packet_type);
-+int cdns_hdmi_get_edid_block(void *data, u8 *edid, u32 block, size_t length);
-+int cdns_hdmi_scdc_read(struct cdns_mhdp_device *mhdp, u8 addr, u8 *data);
-+int cdns_hdmi_scdc_write(struct cdns_mhdp_device *mhdp, u8 addr, u8 value);
-+int cdns_hdmi_ctrl_init(struct cdns_mhdp_device *mhdp, int protocol, u32 char_rate);
-+int cdns_hdmi_mode_config(struct cdns_mhdp_device *mhdp, struct drm_display_mode *mode,
-+				struct video_info *video_info);
-+int cdns_hdmi_disable_gcp(struct cdns_mhdp_device *mhdp);
-+int cdns_hdmi_enable_gcp(struct cdns_mhdp_device *mhdp);
-+
-+bool cdns_mhdp_check_alive(struct cdns_mhdp_device *mhdp);
-+
-+/* HDMI */
-+int cdns_hdmi_probe(struct platform_device *pdev,
-+		 struct cdns_mhdp_device *mhdp);
-+void cdns_hdmi_remove(struct platform_device *pdev);
-+void cdns_hdmi_unbind(struct device *dev);
-+int cdns_hdmi_bind(struct platform_device *pdev,
-+			struct drm_encoder *encoder, struct cdns_mhdp_device *mhdp);
-+void cdns_hdmi_set_sample_rate(struct cdns_mhdp_device *mhdp, unsigned int rate);
-+void cdns_hdmi_audio_enable(struct cdns_mhdp_device *mhdp);
-+void cdns_hdmi_audio_disable(struct cdns_mhdp_device *mhdp);
-+/* DP  */
-+int cdns_dp_probe(struct platform_device *pdev,
-+		 struct cdns_mhdp_device *mhdp);
-+void cdns_dp_remove(struct platform_device *pdev);
-+void cdns_dp_unbind(struct device *dev);
-+int cdns_dp_bind(struct platform_device *pdev,
-+			struct drm_encoder *encoder, struct cdns_mhdp_device *mhdp);
-+
-+/* CEC */
-+#ifdef CONFIG_DRM_CDNS_HDMI_CEC
-+int cdns_mhdp_register_cec_driver(struct device *dev);
-+int cdns_mhdp_unregister_cec_driver(struct device *dev);
-+#endif
-+
-+#endif /* CDNS_MHDP_COMMON_H_ */
--- 
-2.30.0
-
diff --git a/reform2-imx8mq/template-skel/.config/sway/config b/reform2-imx8mq/template-skel/.config/sway/config
deleted file mode 100644
index db2754a548c6ad36e8f600bd91f154ae42ff74d5..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.config/sway/config
+++ /dev/null
@@ -1,286 +0,0 @@
-# Default config for sway
-#
-# Copy this to ~/.config/sway/config and edit it to your liking.
-#
-# Read `man 5 sway` for a complete reference.
-
-### Variables
-#
-# Logo key. Use Mod1 for Alt.
-set $mod Mod4
-# Home row direction keys, like vim
-set $left left
-set $down down
-set $up up
-set $right right
-# Your preferred terminal emulator
-set $term xfce4-terminal
-# Your preferred application launcher
-# Note: it's recommended that you pass the final command to sway
-#set $menu dmenu_path | dmenu | xargs swaymsg exec --
-set $menu rofi -show drun -font "Inter Bold 24" -display-drun "" -theme mnt-reform | xargs swaymsg exec --
-
-#xwayland disable
-
-### Output configuration
-#
-# Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/)
-#output * bg "#000000" fill
-exec swaybg -c "#000000"
-
-#
-# Example configuration:
-#
-#   output HDMI-A-1 resolution 1920x1080 position 1920,0
-#
-# You can get the names of your outputs by running: swaymsg -t get_outputs
-
-### Idle configuration
-#
-# Example configuration:
-#
-# exec swayidle -w \
-#          timeout 300 'swaylock -f -c 000000' \
-#          timeout 600 'swaymsg "output * dpms off"' \
-#               resume 'swaymsg "output * dpms on"' \
-#          before-sleep 'swaylock -f -c 000000'
-#
-# This will lock your screen after 300 seconds of inactivity, then turn off
-# your displays after another 300 seconds, and turn your screens back on when
-# resumed. It will also lock your screen before your computer goes to sleep.
-
-### Input configuration
-#
-# Example configuration:
-#
-#   input "2:14:SynPS/2_Synaptics_TouchPad" {
-#       dwt enabled
-#       tap enabled
-#       natural_scroll enabled
-#       middle_emulation enabled
-#   }
-#
-# You can get the names of your inputs by running: swaymsg -t get_inputs
-# Read `man 5 sway-input` for more information about this section.
-#
-
-# change to de if you have a QWERTZ keyboard, for example
-input * {
-	xkb_layout us
-	xkb_options compose:menu,lv3:ralt_switch
-}
-
-default_border pixel 10
-hide_edge_borders both
-
-### Key bindings
-#
-# Basics:
-#
-    # Start a terminal
-    bindsym $mod+Return exec $term
-    bindsym $mod+Shift+s exec grim ~/Pictures/$(date +'screenshot-%Y-%m-%d-%H-%M-%S').png
-    bindsym $mod+Shift+x exec grim -g "$(slurp)" ~/Pictures/$(date +'screenshot-%Y-%m-%d-%H-%M-%S').png
-    bindsym $mod+Shift+v exec reform-pavucontrol.sh
-    bindsym $mod+Shift+l exec swaylock
-
-    # Kill focused window
-    bindsym $mod+Escape kill
-
-    # Start your launcher
-    bindsym $mod+d exec $menu
-    bindsym $mod+Tab exec $menu
-    bindsym $mod+t exec thunar
-
-    # Drag floating windows by holding down $mod and left mouse button.
-    # Resize them with right mouse button + $mod.
-    # Despite the name, also works for non-floating windows.
-    # Change normal to inverse to use left mouse button for resizing and right
-    # mouse button for dragging.
-    floating_modifier $mod normal
-
-    # Reload the configuration file
-    bindsym $mod+Shift+c reload
-
-    # Exit sway (logs you out of your Wayland session)
-    bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
-#
-# Moving around:
-#
-    # Move your focus around
-    bindsym $mod+$left focus left
-    bindsym $mod+$down focus down
-    bindsym $mod+$up focus up
-    bindsym $mod+$right focus right
-    # Or use $mod+[up|down|left|right]
-    #bindsym $mod+Left focus left
-    #bindsym $mod+Down focus down
-    #bindsym $mod+Up focus up
-    #bindsym $mod+Right focus right
-
-    # Move the focused window with the same, but add Shift
-    bindsym $mod+Shift+$left move left
-    bindsym $mod+Shift+$down move down
-    bindsym $mod+Shift+$up move up
-    bindsym $mod+Shift+$right move right
-    # Ditto, with arrow keys
-    #bindsym $mod+Shift+Left move left
-    #bindsym $mod+Shift+Down move down
-    #bindsym $mod+Shift+Up move up
-    #bindsym $mod+Shift+Right move right
-
-    bindsym $mod+F1 exec brightnessctl s 1-
-    bindsym $mod+F2 exec brightnessctl s +1
-    bindsym $mod+F3 exec pactl set-sink-volume @DEFAULT_SINK@ -5%
-    bindsym $mod+F4 exec pactl set-sink-volume @DEFAULT_SINK@ +5%
-    bindsym $mod+F5 exec pactl set-sink-mute @DEFAULT_SINK@ toggle
-#
-# Workspaces:
-#
-    # Switch to workspace
-    bindsym $mod+1 workspace 1
-    bindsym $mod+2 workspace 2
-    bindsym $mod+3 workspace 3
-    bindsym $mod+4 workspace 4
-    bindsym $mod+5 workspace 5
-    bindsym $mod+6 workspace 6
-    bindsym $mod+7 workspace 7
-    bindsym $mod+8 workspace 8
-    bindsym $mod+9 workspace 9
-    bindsym $mod+0 workspace 10
-    # Move focused container to workspace
-    bindsym $mod+Shift+1 move container to workspace 1
-    bindsym $mod+Shift+2 move container to workspace 2
-    bindsym $mod+Shift+3 move container to workspace 3
-    bindsym $mod+Shift+4 move container to workspace 4
-    bindsym $mod+Shift+5 move container to workspace 5
-    bindsym $mod+Shift+6 move container to workspace 6
-    bindsym $mod+Shift+7 move container to workspace 7
-    bindsym $mod+Shift+8 move container to workspace 8
-    bindsym $mod+Shift+9 move container to workspace 9
-    bindsym $mod+Shift+0 move container to workspace 10
-    # Note: workspaces can have any name you want, not just numbers.
-    # We just use 1-10 as the default.
-#
-# Layout stuff:
-#
-    # You can "split" the current object of your focus with
-    # $mod+b or $mod+v, for horizontal and vertical splits
-    # respectively.
-    bindsym $mod+h splith
-    bindsym $mod+v splitv
-
-    # Switch the current container between different layout styles
-    bindsym $mod+s layout stacking
-    bindsym $mod+w layout tabbed
-    bindsym $mod+e layout toggle split
-
-    # Make the current focus fullscreen
-    bindsym $mod+f fullscreen
-
-    # Toggle the current focus between tiling and floating mode
-    bindsym $mod+space floating toggle
-
-    # Swap focus between the tiling area and the floating area
-    bindsym $mod+Shift+space focus mode_toggle
-
-    # Move focus to the parent container
-    bindsym $mod+a focus parent
-#
-# Scratchpad:
-#
-    # Sway has a "scratchpad", which is a bag of holding for windows.
-    # You can send windows there and get them back later.
-
-    # Move the currently focused window to the scratchpad
-    bindsym $mod+Shift+minus move scratchpad
-
-    # Show the next scratchpad window or hide the focused scratchpad window.
-    # If there are multiple scratchpad windows, this command cycles through them.
-    bindsym $mod+minus scratchpad show
-#
-# Resizing containers:
-#
-mode "resize" {
-    # left will shrink the containers width
-    # right will grow the containers width
-    # up will shrink the containers height
-    # down will grow the containers height
-    bindsym $left resize shrink width 10px
-    bindsym $down resize grow height 10px
-    bindsym $up resize shrink height 10px
-    bindsym $right resize grow width 10px
-
-    # Ditto, with arrow keys
-    #bindsym Left resize shrink width 10px
-    #bindsym Down resize grow height 10px
-    #bindsym Up resize shrink height 10px
-    #bindsym Right resize grow width 10px
-
-    # Return to default mode
-    bindsym Return mode "default"
-    bindsym Escape mode "default"
-}
-bindsym $mod+r mode "resize"
-
-# class                 border  backgr. text    indicator child_border
-client.focused          #000000 #ffffff #000000 #000000   #000000
-client.focused_inactive #000000 #eeeeee #000000 #000000   #000000
-client.unfocused        #000000 #222222 #888888 #000000   #000000
-client.urgent           #2f343a #900000 #ffffff #900000   #900000
-client.placeholder      #000000 #0c0c0c #ffffff #000000   #0c0c0c
-
-client.background       #ffffff
-
-font pango: Inter, Icons Bold 14
-
-#
-# Status Bar:
-#
-# Read `man 5 sway-bar` for more information about this section.
-#bar {
-#    position top
-#
-#    # When the status_command prints a new line to stdout, swaybar updates.
-#    # The default just shows the current date and time.
-#    status_command while ~/bin/status; do sleep 60; done
-#
-#    colors {
-#        statusline #ffffff
-#        background #000000
-#        focused_workspace #ffffff #ffffff #000000
-#        active_workspace #ffffff #888888 #000000
-#        inactive_workspace #000000 #000000 #ffffff
-#    }
-#
-#    font pango: Inter, Icons Bold Italic 14
-#}
-
-for_window [app_id="pavucontrol"] floating enable
-for_window [app_id="connman-gtk"] floating enable
-for_window [app_id="xfce4-appfinder"] floating enable
-
-include @sysconfdir@/sway/config.d/*
-
-# fix up to 20 second startup time of GTK applications
-exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
-exec hash dbus-update-activation-environment 2>/dev/null && \
-     dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
-
-# waybar
-exec /usr/local/bin/waybar
-
-# autostart gnome settings daemon
-exec /usr/libexec/gsd-xsettings
-
-# start a policykit agent
-exec lxpolkit
-
-exec gsettings set org.gnome.desktop.interface font-name 'Inter 14'
-exec gsettings set org.gnome.desktop.interface monospace-font-name 'Iosevka Term Light 14'
-exec gsettings set org.gnome.desktop.interface gtk-theme 'Arc-Dark'
-
-exec gsettings set org.gnome.gedit.preferences.editor scheme 'cobalt'
-
-# autostart a terminal
-exec xfce4-terminal -e 'bash -c "reform-desktop-help; bash"'
diff --git a/reform2-imx8mq/template-skel/.config/waybar/config b/reform2-imx8mq/template-skel/.config/waybar/config
deleted file mode 100644
index cfb595bb543bbd3df4884a465ea9d819c897540e..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.config/waybar/config
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    // "layer": "top", // Waybar at top layer
-    // "position": "bottom", // Waybar position (top|bottom|left|right)
-    "height": 34, // Waybar height (to be removed for auto height)
-    // "width": 1280, // Waybar width
-    // Choose the order of the modules
-    "modules-left": ["sway/workspaces", "sway/mode", "sway/window"],
-    "modules-center": [],
-    "modules-right": ["tray", "network", "custom/stat", "memory", "temperature", "pulseaudio", "clock"],
-    "sway/window": {
-	"on-click": "xfce4-appfinder"
-    },
-    "sway/mode": {
-        "format": "<span>{}</span>"
-    },
-    "tray": {
-        "icon-size": 32,
-        "spacing": 16
-    },
-    "clock": {
-        "tooltip-format": "{:%Y %B}",
-        "format-alt": "{:%Y-%m-%d}",
-        "tooltip": false
-    },
-    "cpu": {
-        "format": "CPU {usage}%",
-        "tooltip": false
-    },
-    "memory": {
-        "format": "MEM {}%",
-        "tooltip": false
-    },
-    "temperature": {
-        "thermal-zone": 0,
-        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
-        "critical-threshold": 80,
-        // "format-critical": "{temperatureC}°C {icon}",
-        "format": "{temperatureC}°C"
-    },
-    "network": {
-        // "interface": "wlp2*", // (Optional) To force the use of this interface
-        "format-wifi": "NET {essid} {signalStrength}%",
-        "format-ethernet": "NET {ifname}: {ipaddr}/{cidr}",
-        "format-linked": "NET {ifname} NO IP",
-        "format-disconnected": "NET ×",
-        //"format-alt": "NET {ifname}: {ipaddr}/{cidr}"
-        "on-click": "reform-connman-gtk.sh"
-    },
-    "pulseaudio": {
-        // "scroll-step": 1,
-        "format": "VOL {volume}%",
-        "format-bluetooth": "{volume}% {icon} {format_source}",
-        "format-bluetooth-muted": " {icon} {format_source}",
-        "format-muted": "MUTED {format_source}",
-        "format-source": "{volume}%",
-        "format-source-muted": "MUTE",
-        "on-click": "reform-pavucontrol.sh"
-    },
-    "custom/stat": {
-        "format": "{}",
-        "max-length": 20,
-        "interval": 0,
-        "exec": "reform-compstat.sh",
-        "on-click": "gnome-system-monitor"
-    }
-}
diff --git a/reform2-imx8mq/template-skel/.config/waybar/style.css b/reform2-imx8mq/template-skel/.config/waybar/style.css
deleted file mode 100644
index bd2cfab0a4a08d2e7a4850738d9ff0b609d414c0..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.config/waybar/style.css
+++ /dev/null
@@ -1,44 +0,0 @@
-* {
-	font-size: 18px;
-	font-family: Inter;
-	font-weight: bold;
-	border-radius: 0;
-}
-
-window#waybar {
-	background: #000000;
-	color: #ffffff;
-}
-
-#sway-mode {
-	background-color: #330000;
-}
-
-widget label {
-	padding: 0px 20px;
-}
-
-#workspaces label {
-	padding: 0px 0px;
-}
-
-#workspaces button {
-	color: #ffffff;
-	font-size: 20px;
-	font-style: italic;
-}
-#workspaces button.focused {
-	background: #ffffff;
-	color: #000000;
-}
-#workspaces button:hover {
-	box-shadow: inherit;
-	text-shadow: inherit;
-}
-#workspaces button:hover {
-	background: #888888;
-}
-
-#clock {
-	padding-right: 0px;
-}
diff --git a/reform2-imx8mq/template-skel/.config/xfce4/terminal/terminalrc b/reform2-imx8mq/template-skel/.config/xfce4/terminal/terminalrc
deleted file mode 100644
index 8352332b2a5a4d7e470a665beb53027a7b1b0029..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.config/xfce4/terminal/terminalrc
+++ /dev/null
@@ -1,37 +0,0 @@
-[Configuration]
-MiscAlwaysShowTabs=FALSE
-MiscBell=FALSE
-MiscBellUrgent=FALSE
-MiscBordersDefault=TRUE
-MiscCursorBlinks=TRUE
-MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK
-MiscDefaultGeometry=80x24
-MiscInheritGeometry=FALSE
-MiscMenubarDefault=TRUE
-MiscMouseAutohide=FALSE
-MiscMouseWheelZoom=TRUE
-MiscToolbarDefault=FALSE
-MiscConfirmClose=TRUE
-MiscCycleTabs=TRUE
-MiscTabCloseButtons=TRUE
-MiscTabCloseMiddleClick=TRUE
-MiscTabPosition=GTK_POS_TOP
-MiscHighlightUrls=TRUE
-MiscMiddleClickOpensUri=FALSE
-MiscCopyOnSelect=FALSE
-MiscShowRelaunchDialog=TRUE
-MiscRewrapOnResize=TRUE
-MiscUseShiftArrowsToScroll=FALSE
-MiscSlimTabs=FALSE
-MiscNewTabAdjacent=FALSE
-MiscSearchDialogOpacity=100
-MiscShowUnsafePasteDialog=TRUE
-FontName=Iosevka Term Light 14
-ScrollingLines=10000
-TitleMode=TERMINAL_TITLE_REPLACE
-;
-; snazzy theme: https://github.com/tunnckoCore/xfce4-terminal-snazzy
-ColorBackground=#282a36
-ColorForeground=#ecf1f3
-ColorCursor=#ecf1f3
-ColorPalette=#2E3436;#ff5c57;#5af78e;#f3f99d;#57c7ff;#ff6ac1;#9aedfe;#f1f1f0;#686868;#ff5c57;#5af78e;#f3f99d;#57c7ff;#ff6ac1;#9aedfe;#f1f1f0
diff --git a/reform2-imx8mq/template-skel/.ircrc b/reform2-imx8mq/template-skel/.ircrc
deleted file mode 100644
index 6c154c503842007df963000b6df445033617a011..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.ircrc
+++ /dev/null
@@ -1,3 +0,0 @@
-/set INPUT_ENCODING UTF-8
-/set DISPLAY_ENCODING UTF-8
-/set IRC_ENCODING UTF-8
diff --git a/reform2-imx8mq/template-skel/.local/bin/gnome b/reform2-imx8mq/template-skel/.local/bin/gnome
deleted file mode 100755
index da5f51be2fa31f26c0e5e9bbeec9ec9143062028..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.local/bin/gnome
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# enable the connman integration (shell extension to manage network interfaces)
-gnome-shell-extension-tool -e gnome-extension-connman@jaakko.hannikainen.intel.com
-
-# fix Xwayland (and anything using modifiers) graphics problems
-gsettings set org.gnome.mutter experimental-features "['kms-modifiers']"
-# disable autosuspend, because we need to suspend with reform-standby only
-gsettings set org.gnome.desktop.session idle-delay 0
-
-# launch a GNOME session using mutter's wayland compositor
-export XDG_SESSION_TYPE=wayland
-dbus-run-session gnome-session
diff --git a/reform2-imx8mq/template-skel/.local/bin/reform-windowmaker b/reform2-imx8mq/template-skel/.local/bin/reform-windowmaker
deleted file mode 100755
index 36957f842f9be63323841989da1b9d7667d607ca..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.local/bin/reform-windowmaker
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-#
-# This is a script to demonstrate cage + Xwayland as a replacement for standalone Xorg.
-# You can modify this to launch classic X window managers / DEs.
-#
-# Note that you should disable any x11 compositors. I.e. to launch xfce4:
-# xfwm4 --compositor=off &
-# exec xfce4-session
-#
-
-DNUM=:0
-
-cage -- /usr/local/bin/Xwayland $DNUM -retro -noreset &
-
-export DISPLAY=$DNUM
-
-# idea lifted from https://gist.github.com/tullmann/476cc71169295d5c3fe6
-MAX=10
-CT=0
-while ! xdpyinfo >/dev/null 2>&1; do
-    sleep 0.50s
-    CT=$(( CT + 1 ))
-    if [ "$CT" -ge "$MAX" ]; then
-        LOG "FATAL: $0: Gave up waiting for X server $DISPLAY"
-        exit 11
-    fi
-done
-
-export WAYLAND_DISPLAY=null # Hack, but works
-export GDK_BACKEND=x11
-unset SDL_VIDEODRIVER
-
-exec wmaker
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/.uuid b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/.uuid
deleted file mode 100644
index 22076022dba45c9cbb3db73b162f3da350fe3f40..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/.uuid	
+++ /dev/null
@@ -1 +0,0 @@
-814db1b1-f4fc-4c51-b66a-c701f568cd8d
\ No newline at end of file
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-Black.otf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-Black.otf
deleted file mode 100644
index 86842872f34f8c128ce459249407be136c7c2825..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-Black.otf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-BlackItalic.otf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-BlackItalic.otf
deleted file mode 100644
index 70014340446c1e67b6a2c38998c59130e3a617ba..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-BlackItalic.otf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-Bold.otf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-Bold.otf
deleted file mode 100644
index 502bba341c3abe71a282970af1106a9255cd252b..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-Bold.otf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-BoldItalic.otf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-BoldItalic.otf
deleted file mode 100644
index a1f7d883394d3ab18660212c6134a460014ca736..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-BoldItalic.otf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-ExtraBold.otf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-ExtraBold.otf
deleted file mode 100644
index 7410f73cffcaa1789423019496957153646c3383..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-ExtraBold.otf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-ExtraBoldItalic.otf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-ExtraBoldItalic.otf
deleted file mode 100644
index 7d451cbb9d598c54bc9ca58109f5ccc1ec412324..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-ExtraBoldItalic.otf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-ExtraLight-BETA.otf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-ExtraLight-BETA.otf
deleted file mode 100644
index 6e9672f6b45236c9c961598a63c98ca48d2265a3..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-ExtraLight-BETA.otf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-ExtraLightItalic-BETA.otf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-ExtraLightItalic-BETA.otf
deleted file mode 100644
index e7789f95aae0241711df75ce7f98e994a7a5f5bf..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-ExtraLightItalic-BETA.otf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-Italic.otf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-Italic.otf
deleted file mode 100644
index 4e2906e5ff8c8a4711e1cac5565c6a8822ae33a0..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-Italic.otf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-Light-BETA.otf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-Light-BETA.otf
deleted file mode 100644
index 80ee72b8c0595a15034034e5185693d365ec2001..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-Light-BETA.otf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-LightItalic-BETA.otf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-LightItalic-BETA.otf
deleted file mode 100644
index ba2cb1b834a3e5a1b98c6b1d951e4314fc872a5a..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-LightItalic-BETA.otf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-Medium.otf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-Medium.otf
deleted file mode 100644
index 6604db39da814bb3b3cd33ce312284bb2cf78e30..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-Medium.otf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-MediumItalic.otf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-MediumItalic.otf
deleted file mode 100644
index ea66c5a6292f55d37c6ddce212e6c0b7167bf9f8..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-MediumItalic.otf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-Regular.otf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-Regular.otf
deleted file mode 100644
index fdb121dd6b4399eda7877fe0f1f4c15e16a6e3d8..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-Regular.otf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-SemiBold.otf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-SemiBold.otf
deleted file mode 100644
index 78482e60f41a4df3aafe791bea8ebb143f23d21a..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-SemiBold.otf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-SemiBoldItalic.otf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-SemiBoldItalic.otf
deleted file mode 100644
index e74b87411dced4fce6e5b0a2a311ba6a86672973..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-SemiBoldItalic.otf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-Thin-BETA.otf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-Thin-BETA.otf
deleted file mode 100644
index 90def70df2041c5e0e5e8511e937c6ea22c704e7..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-Thin-BETA.otf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-ThinItalic-BETA.otf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-ThinItalic-BETA.otf
deleted file mode 100644
index cc7419c354c3332e8bc09c4bb81b09f6eb9abb97..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (OTF)/Inter-ThinItalic-BETA.otf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/.uuid b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/.uuid
deleted file mode 100644
index d90eb4df78bb0f4ae64746a56f15c3e0810b6a76..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/.uuid	
+++ /dev/null
@@ -1 +0,0 @@
-e783b632-fd3f-493a-ad74-ca017985efa9
\ No newline at end of file
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-Black.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-Black.ttf
deleted file mode 100644
index 5071b12bae57db8525506623ea036af54105fcc1..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-Black.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-BlackItalic.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-BlackItalic.ttf
deleted file mode 100644
index 6a3acd109cfc8f7331c2564968a027320cdc6aa2..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-BlackItalic.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-Bold.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-Bold.ttf
deleted file mode 100644
index cc065b681fb5b94cfd5d7707b416d1392070015b..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-Bold.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-BoldItalic.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-BoldItalic.ttf
deleted file mode 100644
index 503b9e0ae6847a8a485843a9e68b5d9e8e4dca97..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-BoldItalic.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-ExtraBold.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-ExtraBold.ttf
deleted file mode 100644
index e244ac9b6eb2e35a40a8a089c9c424a9474101c2..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-ExtraBold.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-ExtraBoldItalic.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-ExtraBoldItalic.ttf
deleted file mode 100644
index 11148851eafe0363f56f90986766ac168efe72f2..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-ExtraBoldItalic.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-ExtraLight-BETA.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-ExtraLight-BETA.ttf
deleted file mode 100644
index e49f4d90a009d149db761c45cb810f6502885f2b..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-ExtraLight-BETA.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-ExtraLightItalic-BETA.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-ExtraLightItalic-BETA.ttf
deleted file mode 100644
index 4c84fe40727fae5f2ea6c850280431d428767514..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-ExtraLightItalic-BETA.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-Italic.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-Italic.ttf
deleted file mode 100644
index 598db24121e4baf1b3b40a837cb23856f923b0cd..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-Italic.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-Light-BETA.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-Light-BETA.ttf
deleted file mode 100644
index 81f56263c99b15d897b12cb38d62727069cfba05..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-Light-BETA.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-LightItalic-BETA.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-LightItalic-BETA.ttf
deleted file mode 100644
index e5e453849bfe0be5c009ddf68fbdd22f30ac8716..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-LightItalic-BETA.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-Medium.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-Medium.ttf
deleted file mode 100644
index 5fb476d84f603e8029810d1748a1f280f425d446..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-Medium.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-MediumItalic.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-MediumItalic.ttf
deleted file mode 100644
index e8a7259484013a9b2569568d22a5139fdf1788d4..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-MediumItalic.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-Regular.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-Regular.ttf
deleted file mode 100644
index 8c04c5bc834bd3ff0633e869784ed7a9e2f405f1..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-Regular.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-SemiBold.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-SemiBold.ttf
deleted file mode 100644
index af40294e597e13d9bcf1ab10dfbcbe29a9e901a2..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-SemiBold.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-SemiBoldItalic.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-SemiBoldItalic.ttf
deleted file mode 100644
index 894a65fd613eb572ab1ab2ef8bc55d9112dd7bab..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-SemiBoldItalic.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-Thin-BETA.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-Thin-BETA.ttf
deleted file mode 100644
index b6ba236653ea6938b69ed34dac895f9013c81a0f..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-Thin-BETA.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-ThinItalic-BETA.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-ThinItalic-BETA.ttf
deleted file mode 100644
index 1df838c7042571f66f819380ab7b70a519d84844..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Inter (TTF)/Inter-ThinItalic-BETA.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/.uuid b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/.uuid
deleted file mode 100644
index e9cc4238d7fde83c6fca09ec2ba8fae651983b61..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/.uuid
+++ /dev/null
@@ -1 +0,0 @@
-3cb7a8ba-f529-40b0-b27f-20335c73b69e
\ No newline at end of file
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-bold.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-bold.ttf
deleted file mode 100644
index f2028820bc615fda48499c4c9d10e9fe060dacf8..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-bold.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-bolditalic.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-bolditalic.ttf
deleted file mode 100644
index c6a39df515e7f1a3df299900c30439f171c22e7f..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-bolditalic.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-boldoblique.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-boldoblique.ttf
deleted file mode 100644
index 3e8b74f8ddc47e4e0c6fff53b0c5b65c9d710f61..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-boldoblique.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extrabold.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extrabold.ttf
deleted file mode 100644
index 8d75261701ddd9cf81c35b72d384a33413565db2..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extrabold.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extrabolditalic.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extrabolditalic.ttf
deleted file mode 100644
index 996dc10a3a3f0b1381c529e091b50440edae57be..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extrabolditalic.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extraboldoblique.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extraboldoblique.ttf
deleted file mode 100644
index f55aef15384552e07c86908ee6094d17d8a991ba..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extraboldoblique.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extralight.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extralight.ttf
deleted file mode 100644
index 2db05a1e91100cea3832370e511cbeafcbc4be24..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extralight.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extralightitalic.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extralightitalic.ttf
deleted file mode 100644
index a2d59d640b90c9e6af016cf28de37fce2384a9e1..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extralightitalic.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extralightoblique.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extralightoblique.ttf
deleted file mode 100644
index 014d8cd789e7baabe26951858e384dcba42f6a2f..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extralightoblique.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-heavy.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-heavy.ttf
deleted file mode 100644
index 2f018c0d9e0569af7a7505cb2b2bf8e4096d0925..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-heavy.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-heavyitalic.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-heavyitalic.ttf
deleted file mode 100644
index b6487367628941514adcf7a0db4b88e160dd731c..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-heavyitalic.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-heavyoblique.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-heavyoblique.ttf
deleted file mode 100644
index 0c6e153fc0f136bcd6df4db334abc3435e4cd1cf..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-heavyoblique.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-italic.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-italic.ttf
deleted file mode 100644
index f3b67b616fcd37bb36db0d952670c3af95af767d..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-italic.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-light.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-light.ttf
deleted file mode 100644
index c1b4e5623b2c750ec78f33447a1b11e82b4695ba..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-light.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-lightitalic.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-lightitalic.ttf
deleted file mode 100644
index 7870f55c866b378d84495aebae1c63738b8d8480..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-lightitalic.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-lightoblique.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-lightoblique.ttf
deleted file mode 100644
index 0b7723e96ebea2e65d8cf21cf361cb4830967690..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-lightoblique.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-medium.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-medium.ttf
deleted file mode 100644
index 908b93ec03dc41342a572fa02b85cdf7f8e26ce0..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-medium.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-mediumitalic.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-mediumitalic.ttf
deleted file mode 100644
index 059110b147c6645c337c85e2ea685d2e143d3b1d..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-mediumitalic.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-mediumoblique.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-mediumoblique.ttf
deleted file mode 100644
index 80dd361276748158f466877e62235c4a9ce3e8fd..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-mediumoblique.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-oblique.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-oblique.ttf
deleted file mode 100644
index 298b3bce39e6d730043b1b97e158396fb1b30a49..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-oblique.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-regular.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-regular.ttf
deleted file mode 100644
index 7fe718a72b05f0ac5b54d02247bf31487cb718a4..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-regular.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-semibold.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-semibold.ttf
deleted file mode 100644
index f351ec2d4788a4fe6460a843c567eef85a203adb..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-semibold.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-semibolditalic.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-semibolditalic.ttf
deleted file mode 100644
index f81c47c8034690c1f284168d67b605e2a4aab896..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-semibolditalic.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-semiboldoblique.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-semiboldoblique.ttf
deleted file mode 100644
index fd877801316dd839751c805ea835d37180bceaec..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-semiboldoblique.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-thin.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-thin.ttf
deleted file mode 100644
index 0d3a438ae636986789327cc949a94c245dd0e7bb..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-thin.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-thinitalic.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-thinitalic.ttf
deleted file mode 100644
index 0397ba7661f52898d783ab294340246298a8ec1e..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-thinitalic.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-thinoblique.ttf b/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-thinoblique.ttf
deleted file mode 100644
index 40ff34c0a4c2896c255c0c257c9ffe8d2ff1871f..0000000000000000000000000000000000000000
Binary files a/reform2-imx8mq/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-thinoblique.ttf and /dev/null differ
diff --git a/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/agent.js b/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/agent.js
deleted file mode 100644
index ea98238935d1c33d147a65f79c2b28a4fdcc155d..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/agent.js
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright (C) 2015 Intel Corporation. All rights reserved.
- * Author: Jaakko Hannikainen <jaakko.hannikainen@intel.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-const Lang = imports.lang;
-
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const St = imports.gi.St;
-const Pango = imports.gi.Pango;
-const GObject = imports.gi.GObject;
-
-const ModalDialog = imports.ui.modalDialog;
-const ShellEntry = imports.ui.shellEntry;
-
-const ExtensionUtils = imports.misc.extensionUtils;
-const Ext = ExtensionUtils.getCurrentExtension();
-const Interface = Ext.imports.interface;
-const Logger = Ext.imports.logger;
-
-const Gettext = imports.gettext.domain('gnome-extension-connman');
-const _ = Gettext.gettext;
-
-var DialogField = class DialogField {
-
-    constructor(label) {
-        this.addLabel(label);
-        this.addEntry();
-    }
-
-    addLabel(label) {
-        this.label = new St.Label({
-            style_class: 'cm-prompt-dialog-password-label',
-            text: label,
-            x_align: Clutter.ActorAlign.START,
-            y_align: Clutter.ActorAlign.CENTER
-        });
-        this.label.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-    }
-
-    addEntry() {
-        this.entry = new St.PasswordEntry({
-            style_class: 'cm-prompt-dialog-password-entry',
-            can_focus: true,
-            reactive: true,
-            x_expand: true
-        });
-        ShellEntry.addContextMenu(this.entry);
-        this.entry.clutter_text.set_password_char('\u25cf');
-    }
-
-    getLabel() {
-        return this.label.text;
-    }
-
-    getValue() {
-        return this.entry.get_text();
-    }
-
-    valid() {
-        return true;
-    }
-};
-
-var Dialog = GObject.registerClass(class Dialog extends ModalDialog.ModalDialog {
-
-    _init(fields, callback) {
-        super._init({
-            styleClass: 'cm-prompt-dialog'
-        });
-        this._fields = [];
-        this._callback = callback;
-        let mainContentBox = new St.BoxLayout({
-            style_class: 'cm-prompt-dialog-main-layout',
-            vertical: false
-        });
-        let icon = new St.Icon({
-            icon_name: 'dialog-password-symbolic'
-        });
-        let messageBox = new St.BoxLayout({
-            style_class: 'cm-prompt-dialog-message-layout',
-            vertical: true,
-            x_expand: true
-        });
-        let subjectLabel = new St.Label({
-            style_class: 'cm-prompt-dialog-headline headline',
-            text: _("Connection requires authentication")
-        });
-
-        icon.x_fill = true;
-        icon.y_fill = true;
-        icon.x_align = St.Align.END;
-        icon.y_align = St.Align.START;
-        messageBox.y_align = true;
-
-        mainContentBox.add_child(icon);
-        mainContentBox.add_child(messageBox);
-
-        subjectLabel.x_fill = true;
-        subjectLabel.y_fill = false;
-        subjectLabel.y_align = St.Align.START;
-
-        messageBox.add_child(subjectLabel);
-
-        mainContentBox.x_fill = true;
-        mainContentBox.y_fill = true;
-
-        this.contentLayout.add_child(mainContentBox);
-
-        let layout = new Clutter.GridLayout({
-            orientation: Clutter.Orientation.VERTICAL
-        });
-        let secretTable = new St.Widget({
-            style_class: 'cm-network-dialog-secret-table',
-            layout_manager: layout
-        });
-        layout.hookup_style(secretTable);
-        for(let i = 0; i < fields.length; i++) {
-            let field = fields[i];
-            layout.attach(field.label, 0, i, 1, 1);
-            layout.attach(field.entry, 1, i, 1, 1);
-            this._fields[i] = field;
-        }
-        messageBox.add(secretTable);
-
-        this._okButton = {
-            label: _("Connect"),
-            action: this._onOk.bind(this),
-            default: true
-        };
-        this._cancelButton = {
-            label: _("Cancel"),
-            action: this._onCancel.bind(this),
-            key: Clutter.KEY_Escape
-        };
-        this.setButtons([this._cancelButton, this._okButton]);
-        this.open();
-    }
-
-    _onOk() {
-        this.close();
-        if(!this._fields.reduce(function(a, b) {
-                return a && b.valid()
-            }, true))
-            return;
-        let values = {};
-        Object.keys(this._fields).map(function(key) {
-            values[this._fields[key].getLabel()] = this._fields[key].getValue();
-        }.bind(this));
-        this._callback(values);
-    }
-
-    _onCancel() {
-        this.close();
-        this._callback();
-    }
-});
-
-var AbstractAgent = class AbstractAgent {
-
-    constructor() {
-    }
-
-    Release() {
-        this.destroy();
-    }
-
-    ReportErrorAsync([service, error], invocation) {
-        Logger.logDebug('Service reported error: ' + error);
-        invocation.return_dbus_error(this._retryError, '');
-    }
-
-    RequestInputAsync([service, _fields], invocation) {
-        Logger.logDebug('Requested password');
-        var fields = _fields;
-        fields = Object.keys(_fields)
-            .map(function(key) {
-                fields[key] = fields[key].deep_unpack();
-                Object.keys(fields[key]).map(function(innerKey) {
-                    fields[key][innerKey] = fields[key][innerKey].deep_unpack();
-                });
-                return [key, fields[key]];
-            });
-        let dialogFields = [];
-        for(let i = 0; i < fields.length; i++)
-            if(fields[i][1]['Requirement'] == 'mandatory')
-                dialogFields.push(new DialogField(fields[i][0]));
-
-        let callback = function(fields) {
-            if(!fields) {
-                invocation.return_dbus_error(this._canceledError,
-                    'User canceled password dialog');
-                return;
-            }
-            Object.keys(fields).map(function(key) {
-                fields[key] = GLib.Variant.new('s', fields[key]);
-            });
-            invocation.return_value(GLib.Variant.new('(a{sv})', [fields]));
-        }.bind(this);
-        this._dialog = new Dialog(dialogFields, callback);
-    }
-
-    Cancel(params, invocation) {
-        Logger.logDebug('Password dialog canceled');
-        this._dialog._onCancel();
-        this._dialog = null;
-    }
-
-    destroy() {
-        if(this._dialog)
-            this._dialog._onCancel();
-        this._dialog = null;
-    }
-};
-
-var Agent = class Agent extends AbstractAgent {
-
-    constructor() {
-        super();
-        this._dbusImpl = Interface.addAgentImplementation(this);
-        this._canceledError = 'net.connman.Agent.Error.Canceled';
-        this._retryError = 'net.connman.Agent.Error.Retry';
-    }
-
-    RequestBrowser(service, url) {
-        Logger.logDebug('Requested browser');
-    }
-
-    destroy() {
-        super.destroy();
-        Interface.removeAgentImplementation(this._dbusImpl);
-    }
-};
-
-var VPNAgent = class VPNAgent extends AbstractAgent {
-
-    constructor() {
-        super();
-        this._dbusImpl = Interface.addVPNAgentImplementation(this);
-        this._canceledError = 'net.connman.vpn.Agent.Error.Canceled';
-        this._retryError = 'net.connman.vpn.Agent.Error.Retry';
-    }
-
-    destroy() {
-        super.destroy();
-        Interface.removeVPNAgentImplementation(this._dbusImpl);
-    }
-};
diff --git a/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/applet.js b/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/applet.js
deleted file mode 100644
index 8ff2e3a0e99de760a82d16a052d7ef7088638956..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/applet.js
+++ /dev/null
@@ -1,413 +0,0 @@
-/*
- * Copyright (C) 2015 Intel Corporation. All rights reserved.
- * Author: Jaakko Hannikainen <jaakko.hannikainen@intel.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-const Lang = imports.lang;
-
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-
-const PanelMenu = imports.ui.panelMenu;
-const PopupMenu = imports.ui.popupMenu;
-
-const ExtensionUtils = imports.misc.extensionUtils;
-const Ext = ExtensionUtils.getCurrentExtension();
-const Agent = Ext.imports.agent;
-const Interface = Ext.imports.interface;
-const Logger = Ext.imports.logger;
-const Service = Ext.imports.service;
-const Technology = Ext.imports.technology;
-
-/* menu with technologies and services */
-var Menu = class extends PopupMenu.PopupMenuSection {
-
-    constructor(params) {
-        super(params);
-        this._technologies = {};
-        this._serviceTypes = {};
-    }
-
-    hide() {
-        this.actor.hide();
-    }
-
-    show() {
-        this.actor.show();
-    }
-
-    _addSorted(technology) {
-        let items = this._getMenuItems();
-        for(let i = 0; i < items.length; i++) {
-            if(items[i].getValue() < technology.getValue())
-                continue;
-            this.addMenuItem(technology, i);
-            return;
-        }
-        this.addMenuItem(technology);
-    }
-
-    addTechnology(path, properties) {
-        let type = properties.Type.deep_unpack();
-        if(this._technologies[type])
-            this.removeTechnology(path);
-        let proxy = new Interface.TechnologyProxy(path);
-        for(let i in properties)
-            properties[i] = properties[i].deep_unpack();
-        try {
-            this._technologies[type] = Technology.createTechnology(type,
-                    properties, proxy, this._manager);
-        } catch(error) {
-            Logger.logException(error, 'Failed to add technology');
-            return;
-        }
-        this._addSorted(this._technologies[type]);
-    }
-
-    /* FIXME: for some reason destroying an item from the menu
-     * leaves a hole, but for some reason this fixes it */
-    fixMenu() {
-        this.addMenuItem(new PopupMenu.PopupMenuItem('Connman'), 0);
-        this.firstMenuItem.destroy();
-    }
-
-    removeTechnology(path) {
-        let type = path.split('/').pop();
-        Logger.logInfo('Removing technology ' + type);
-        let technology = this._technologies[type];
-        if(!technology) {
-            Logger.logInfo('Tried to remove unknown technology ' + type);
-            return;
-        }
-        technology.destroy();
-        delete this._technologies[type];
-        this.fixMenu();
-    }
-
-    getService(path) {
-        if(!this._serviceTypes[path])
-            return null;
-        if(!this._technologies[this._serviceTypes[path]])
-            return null;
-        return this._technologies[this._serviceTypes[path]].getService(path);
-    }
-
-    addService(path, properties, indicator) {
-        if (!('Type' in properties)) return;
-        let type;
-        if(properties.Type.deep_unpack) {
-            type = properties.Type.deep_unpack();
-            if(type == 'vpn') {
-                indicator.destroy();
-                return;
-            }
-        }
-        else {
-            type = 'vpn';
-            properties.Type = {deep_unpack: function() {
-                return 'vpn';
-            }};
-        }
-        this._serviceTypes[path] = type;
-
-        let proxy;
-        if(type != 'vpn')
-            proxy = new Interface.ServiceProxy(path);
-        else
-            proxy = new Interface.ConnectionProxy(path);
-        let service = Service.createService(type, proxy, indicator);
-        service.update(properties);
-        this._technologies[type].addService(path, service);
-    }
-
-    updateService(path, properties) {
-        if(this._serviceTypes[path]) {
-            var type = this._serviceTypes[path];
-            this._technologies[type].updateService(path, properties);
-            return;
-        } else
-            this.addService(path, properties);
-    }
-
-    removeService(path) {
-        if(!this._serviceTypes[path]) {
-            log('Tried to remove unknown service ' + path);
-            return;
-        }
-        if(this._technologies[this._serviceTypes[path]]) {
-            log('Removing service ' + path);
-            this._technologies[this._serviceTypes[path]].removeService(path);
-        }
-        delete this._serviceTypes[path];
-        this.fixMenu();
-    }
-
-    clear() {
-        for(let type in this._technologies) {
-            try {
-                if(type != "vpn") {
-                    this._technologies[type].destroy();
-                    delete this._technologies[type];
-                }
-            } catch(error) {
-                Logger.logException(error, 'Failed to clear technology ' + type);
-            }
-        }
-    }
-
-    vpnClear() {
-        if(!this._technologies["vpn"])
-            return;
-        try {
-            this._technologies["vpn"].destroy();
-            delete this._technologies["vpn"];
-        } catch(error) {
-            Logger.logException(error, 'Failed to clear VPN connections');
-        }
-    }
-};
-
-/* main applet class handling everything */
-var Applet = GObject.registerClass(class Applet extends PanelMenu.SystemIndicator {
-
-    _init() {
-        super._init();
-
-        this._menu = new Menu();
-        this.menu.addMenuItem(this._menu);
-        this.menu.actor.show();
-
-        log('Enabling Connman applet');
-        this._watch = Gio.DBus.system.watch_name(Interface.BUS_NAME,
-                Gio.BusNameWatcherFlags.NONE,
-                this._connectEvent.bind(this),
-                this._disconnectEvent.bind(this));
-        this._vpnwatch = Gio.DBus.system.watch_name(Interface.VPN_BUS_NAME,
-                Gio.BusNameWatcherFlags.NONE,
-                this._vpnConnectEvent.bind(this),
-                this._vpnDisconnectEvent.bind(this));
-    }
-
-    _addIndicator() {
-        let indicator = super._addIndicator();
-        indicator.hide();
-        return indicator;
-    }
-
-    _updateService(path, properties) {
-        if(path.indexOf("service/vpn") != -1)
-            return;
-        if(this._menu.getService(path))
-            this._menu.updateService(path, properties);
-        else
-            this._menu.addService(path, properties, this._addIndicator());
-    }
-
-    _updateAllServices() {
-        this._manager.GetServicesRemote(function(result, exception) {
-            if(!result || exception) {
-                Logger.logError('Error fetching services: ' + exception);
-                return;
-            }
-            let services = result[0];
-            for (var o of services)
-                this._updateService(o[0], o[1]);
-
-        }.bind(this));
-    }
-
-    _updateAllTechnologies() {
-        this._menu.clear();
-        this._manager.GetTechnologiesRemote(function(result, exception) {
-            if(!result || exception) {
-                Logger.logError('Error fetching technologies: ' + exception);
-                return;
-            }
-            let technologies = result[0];
-            for (var o of technologies)
-                this._menu.addTechnology(o[0], o[1]);
-            this._updateAllServices();
-        }.bind(this));
-    }
-
-    _updateAllConnections() {
-        this._menu.vpnClear();
-
-        this._menu._technologies['vpn'] = Technology.createTechnology('vpn',
-                {Powered: true});
-        this._menu.addMenuItem(this._menu._technologies['vpn']);
-
-        this._vpnManager.GetConnectionsRemote(function(result, exception) {
-            if(!result || exception) {
-                Logger.logError('Error fetching VPN connections: ' + exception);
-                return;
-            }
-            let connections = result[0];
-            for (var o of connections) {
-                o[1]['Type'] = 'vpn';
-                this._menu.addService(o[0], o[1], this._addIndicator());
-            }
-        }.bind(this));
-    }
-
-    _updateVisibility() {
-        if(this._manager || this._vpnManager) {
-            this.menu.actor.show();
-            //this.indicators.show();
-        }
-        else {
-            this.menu.actor.hide();
-            //this.indicators.hide();
-        }
-    }
-
-    _connectEvent() {
-        Logger.logInfo('Connected to Connman');
-
-        this._manager = new Interface.ManagerProxy();
-        this._menu._manager = this._manager;
-        this._agent = new Agent.Agent();
-
-        this._manager.RegisterAgentRemote(Interface.AGENT_PATH);
-        this._asig = this._manager.connectSignal('TechnologyAdded',
-            function(proxy, sender, o) {
-                try {
-                    this._menu.addTechnology(o[0], o[1]);
-                } catch(error) {
-                    Logger.logException(error);
-                }
-            }.bind(this));
-        this._rsig = this._manager.connectSignal('TechnologyRemoved',
-            function(proxy, sender, [path, properties]) {
-                this._menu.removeTechnology(path);
-            }.bind(this));
-        this._psig = this._manager.connectSignal('PropertyChanged',
-            function(proxy, sender, [property, value]) {
-                Logger.logDebug('Global property ' + property +
-                    ' changed: ' + value.deep_unpack());
-            }.bind(this));
-        this._ssig = this._manager.connectSignal('ServicesChanged',
-            function(proxy, sender, [changed, removed]) {
-                try {
-                    for (var o of changed)
-                        this._updateService(o[0], o[1]);
-                    for (var path of removed)
-                        this._menu.removeService(path);
-                } catch(error) {
-                    Logger.logException(error);
-                }
-            }.bind(this));
-
-        this._updateAllTechnologies();
-        this._updateVisibility();
-    }
-
-    _vpnConnectEvent() {
-        this._vpnManager = new Interface.VPNManagerProxy();
-        this._vpnAgent = new Agent.VPNAgent();
-        this._vpnManager.RegisterAgentRemote(Interface.VPN_AGENT_PATH);
-        this._updateVisibility();
-
-        this._vasig = this._vpnManager.connectSignal('ConnectionAdded',
-            function(proxy, sender, [path, properties]) {
-                try {
-                    properties['Type'] = 'vpn';
-                    this._menu.addService(path, properties, this._addIndicator());
-                } catch(error) {
-                    Logger.logException(error);
-                }
-            }.bind(this));
-        this._vrsig = this._vpnManager.connectSignal('ConnectionRemoved',
-            function(proxy, sender, [path, properties]) {
-                this._menu.removeService(path);
-            }.bind(this));
-
-        this._updateAllConnections();
-    }
-
-    _vpnDisconnectEvent() {
-        let signals = [this._vasig, this._vrsig];
-        if(this._vpnManager) {
-            Logger.logDebug('Disconnecting vpn signals');
-            for(let signalId in signals) {
-                try {
-                    Logger.logDebug('Disconnecting signal ' + signals[signalId]);
-                    this._vpnManager.disconnectSignal(signals[signalId]);
-                } catch(error) {
-                    Logger.logException(error, 'Failed to disconnect signal');
-                }
-            }
-        }
-        try {
-            if(this._vpnManager)
-                this._vpnManager.UnregisterAgentRemote(Interface.VPN_AGENT_PATH);
-        } catch(error) {
-            Logger.logException(error, 'Failed to unregister vpn agent');
-        }
-        this._vpnManager = null;
-        if(this._vpnAgent)
-            this._vpnAgent.destroy();
-        this.vpnAgent = null;
-        this._updateVisibility();
-    }
-
-    _disconnectEvent() {
-        Logger.logInfo('Disconnected from Connman');
-        this._menu.clear();
-        this._menu._manager = null;
-        let signals = [this._asig, this._rsig, this._ssig, this._psig];
-        if(this._manager) {
-            Logger.logDebug('Disconnecting signals');
-            for(let signalId in signals) {
-                try {
-                    Logger.logDebug('Disconnecting signal ' + signals[signalId]);
-                    this._manager.disconnectSignal(signals[signalId]);
-                } catch(error) {
-                    Logger.logException(error, 'Failed to disconnect signal');
-                }
-            }
-        }
-        try {
-            this._manager.UnregisterAgentRemote(Interface.AGENT_PATH);
-        } catch(error) {
-        }
-        this._manager = null;
-        if(this._agent)
-            this._agent.destroy();
-        this._agent = null;
-        this._updateVisibility();
-    }
-
-    destroy() {
-        Logger.logInfo('Destroying Connman applet');
-        this._disconnectEvent();
-        this._menu.clear();
-        //this.indicators.destroy();
-        this.menu.actor.destroy();
-        if(this._watch)
-            Gio.DBus.system.unwatch_name(this._watch);
-        if(this._vpnwatch)
-            Gio.DBus.system.unwatch_name(this._vpnwatch);
-        if(this._agent)
-            this._agent.destroy();
-        if(this._vpnAgent)
-            this._vpnAgent.destroy();
-        this._agent = null;
-        this._vpnAgent = null;
-        this._watch = null;
-    }
-});
diff --git a/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/extension.js b/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/extension.js
deleted file mode 100644
index 35249e5f2e0143ce0fd706f61169c933949fc0d9..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/extension.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2015 Intel Corporation. All rights reserved.
- * Author: Jaakko Hannikainen <jaakko.hannikainen@intel.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-const Lang = imports.lang;
-
-const Main = imports.ui.main;
-
-const ExtensionUtils = imports.misc.extensionUtils;
-const Ext = ExtensionUtils.getCurrentExtension();
-const Applet = Ext.imports.applet;
-
-let applet;
-let menu = Main.panel.statusArea.aggregateMenu;
-
-function init() {
-}
-
-function enable() {
-    applet = new Applet.Applet();
-    // XXX: Magic numbers
-    menu.menu.addMenuItem(applet.menu, 3);
-    menu._indicators.insert_child_at_index(applet.indicators, 3);
-}
-
-function disable() {
-    if(applet)
-        applet.destroy();
-}
diff --git a/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/interface.js b/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/interface.js
deleted file mode 100644
index 33f0f7d5c7808adc42d784355ab4716ae954c8fd..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/interface.js
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (C) 2015 Intel Corporation. All rights reserved.
- * Author: Jaakko Hannikainen <jaakko.hannikainen@intel.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-const Gio = imports.gi.Gio;
-
-var BUS_NAME = 'net.connman';
-var VPN_BUS_NAME = 'net.connman.vpn';
-var MANAGER_PATH = '/';
-var AGENT_PATH = '/net/connman/gnome3/agent';
-var VPN_AGENT_PATH = '/net/connman/gnome3/vpn/agent';
-
-const _MANAGER_INTERFACE = '<node>\
-<interface name="net.connman.Manager">\
-    <method name="GetProperties">\
-        <arg name="properties" type="a{sv}" direction="out"/>\
-    </method>\
-    <method name="SetProperty">\
-        <arg name="name" type="s" direction="in"/>\
-        <arg name="value" type="v" direction="in"/>\
-    </method>\
-    <method name="GetTechnologies">\
-        <arg name="technologies" type="a(oa{sv})" direction="out"/>\
-    </method>\
-    <method name="GetServices">\
-        <arg name="services" type="a(oa{sv})" direction="out"/>\
-    </method>\
-    <method name="RegisterAgent">\
-        <arg name="path" type="o" direction="in"/>\
-    </method>\
-    <method name="UnregisterAgent">\
-        <arg name="path" type="o" direction="in"/>\
-    </method>\
-    <signal name="PropertyChanged">\
-        <arg name="name" type="s"/>\
-        <arg name="value" type="v"/>\
-    </signal>\
-    <signal name="TechnologyAdded">\
-        <arg name="path" type="o"/>\
-        <arg name="properties" type="a{sv}"/>\
-    </signal>\
-    <signal name="TechnologyRemoved">\
-        <arg name="path" type="o"/>\
-    </signal>\
-    <signal name="ServicesChanged">\
-        <arg name="changed" type="a(oa{sv})"/>\
-        <arg name="removed" type="ao"/>\
-    </signal>\
-</interface>\
-</node>';
-
-const _TECHNOLOGY_INTERFACE = '<node>\
-<interface name="net.connman.Technology">\
-    <method name="SetProperty">\
-        <arg name="name" type="s" direction="in"/>\
-        <arg name="value" type="v" direction="in"/>\
-    </method>\
-    <method name="GetProperties">\
-        <arg name="properties" type="a{sv}" direction="out"/>\
-    </method>\
-    <method name="Scan"></method>\
-    <signal name="PropertyChanged">\
-        <arg name="name" type="s"/>\
-        <arg name="value" type="v"/>\
-    </signal>\
-</interface>\
-</node>';
-
-const _SERVICE_INTERFACE = '<node>\
-<interface name="net.connman.Service">\
-    <method name="SetProperty">\
-        <arg name="name" type="s" direction="in"/>\
-        <arg name="value" type="v" direction="in"/>\
-    </method>\
-    <method name="Connect"></method>\
-    <method name="Disconnect"></method>\
-    <signal name="PropertyChanged">\
-        <arg name="name" type="s"/>\
-        <arg name="value" type="v"/>\
-    </signal>\
-</interface>\
-</node>';
-
-const _AGENT_INTERFACE = '<node>\
-<interface name="net.connman.Agent">\
-    <method name="Release"></method>\
-    <method name="ReportError">\
-        <arg name="service" type="o" direction="in"/>\
-        <arg name="error" type="s" direction="in"/>\
-    </method>\
-    <method name="RequestBrowser">\
-        <arg name="service" type="o" direction="in"/>\
-        <arg name="url" type="s" direction="in"/>\
-    </method>\
-    <method name="RequestInput">\
-        <arg name="service" type="o" direction="in"/>\
-        <arg name="fields" type="a{sv}" direction="in"/>\
-        <arg name="values" type="a{sv}" direction="out"/>\
-    </method>\
-    <method name="Cancel"></method>\
-</interface>\
-</node>';
-
-const _CONNECTION_INTERFACE = '<node>\
-<interface name="net.connman.vpn.Connection">\
-    <method name="SetProperty">\
-        <arg name="name" type="s" direction="in"/>\
-        <arg name="value" type="v" direction="in"/>\
-    </method>\
-    <method name="Connect"></method>\
-    <method name="Disconnect"></method>\
-    <signal name="PropertyChanged">\
-        <arg name="name" type="s"/>\
-        <arg name="value" type="v"/>\
-    </signal>\
-</interface>\
-</node>';
-
-
-const _VPN_MANAGER_INTERFACE = '<node>\
-<interface name="net.connman.vpn.Manager">\
-    <method name="Create">\
-        <arg name="settings" type="a{sv}" direction="in"/>\
-    </method>\
-    <method name="Remove">\
-        <arg name="vpn" type="o" direction="in"/>\
-    </method>\
-    <method name="GetConnections">\
-        <arg name="connections" type="a(oa{sv})" direction="out"/>\
-    </method>\
-    <method name="RegisterAgent">\
-        <arg name="path" type="o" direction="in"/>\
-    </method>\
-    <method name="UnregisterAgent">\
-        <arg name="path" type="o" direction="in"/>\
-    </method>\
-    <signal name="ConnectionAdded">\
-        <arg name="path" type="o"/>\
-        <arg name="properties" type="a{sv}"/>\
-    </signal>\
-    <signal name="ConnectionRemoved">\
-        <arg name="path" type="o"/>\
-    </signal>\
-</interface>\
-</node>';
-
-const _VPN_AGENT_INTERFACE = '<node>\
-<interface name="net.connman.vpn.Agent">\
-    <method name="Release"></method>\
-    <method name="ReportError">\
-        <arg name="service" type="o" direction="in"/>\
-        <arg name="error" type="s" direction="in"/>\
-    </method>\
-    <method name="RequestInput">\
-        <arg name="service" type="o" direction="in"/>\
-        <arg name="fields" type="a{sv}" direction="in"/>\
-        <arg name="values" type="a{sv}" direction="out"/>\
-    </method>\
-    <method name="Cancel"></method>\
-</interface>\
-</node>';
-
-const _ManagerProxyWrapper = Gio.DBusProxy.makeProxyWrapper(_MANAGER_INTERFACE);
-const _TechnologyProxyWrapper = Gio.DBusProxy.makeProxyWrapper(_TECHNOLOGY_INTERFACE);
-const _ServiceProxyWrapper = Gio.DBusProxy.makeProxyWrapper(_SERVICE_INTERFACE);
-const _ConnectionProxyWrapper = Gio.DBusProxy.makeProxyWrapper(_CONNECTION_INTERFACE);
-const _VPNManagerProxyWrapper = Gio.DBusProxy.makeProxyWrapper(_VPN_MANAGER_INTERFACE);
-
-function ManagerProxy() {
-    return new _ManagerProxyWrapper(Gio.DBus.system, BUS_NAME, MANAGER_PATH);
-}
-
-function VPNManagerProxy() {
-    return new _VPNManagerProxyWrapper(Gio.DBus.system, VPN_BUS_NAME, MANAGER_PATH);
-}
-
-function TechnologyProxy(path) {
-    return new _TechnologyProxyWrapper(Gio.DBus.system, BUS_NAME, path);
-}
-
-function ServiceProxy(path) {
-    return new _ServiceProxyWrapper(Gio.DBus.system, BUS_NAME, path);
-}
-
-function ConnectionProxy(path) {
-    return new _ConnectionProxyWrapper(Gio.DBus.system, VPN_BUS_NAME, path);
-}
-
-function addAgentImplementation(agent) {
-    let dbusImpl = Gio.DBusExportedObject.wrapJSObject(_AGENT_INTERFACE, agent);
-    dbusImpl.export(Gio.DBus.system, AGENT_PATH);
-    return dbusImpl;
-}
-
-function removeAgentImplementation(dbusImpl) {
-    dbusImpl.unexport(Gio.DBus.system, AGENT_PATH);
-}
-
-function addVPNAgentImplementation(agent) {
-    let dbusImpl = Gio.DBusExportedObject.wrapJSObject(_VPN_AGENT_INTERFACE, agent);
-    dbusImpl.export(Gio.DBus.system, VPN_AGENT_PATH);
-    return dbusImpl;
-}
-
-function removeVPNAgentImplementation(dbusImpl) {
-    dbusImpl.unexport(Gio.DBus.system, VPN_AGENT_PATH);
-}
diff --git a/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/logger.js b/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/logger.js
deleted file mode 100644
index 1261d31a37aac19d43c762491787cd2492584881..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/logger.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2015 Intel Corporation. All rights reserved.
- * Author: Jaakko Hannikainen <jaakko.hannikainen@intel.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-const Lang = imports.lang;
-
-var enabled = true;
-var logLevel = 2;
-var infoEnabled = true;
-
-function logMessage(msg) {
-    log('Connman-applet: ' + msg);
-}
-
-function logError(error) {
-    logMessage('ERROR: ' + error);
-}
-
-function logException(exception, msg) {
-    if(msg)
-        logMessage('Exception: ' + msg);
-    logMessage('Exception: ' + exception + ': ' + exception.stack);
-}
-
-function logWarning(error) {
-    if(loglevel > 1)
-        logMessage('WARNING: ' + error);
-}
-
-function logInfo(msg) {
-    if(logLevel > 2)
-        logMessage('INFO: ' + msg);
-}
-
-function logDebug(msg) {
-    if(logLevel > 3)
-        logMessage('DEBUG: ' + msg);
-}
diff --git a/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/metadata.json b/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/metadata.json
deleted file mode 100644
index f9488ccbe1d819fd0843256e2d0163a10c5dc0e1..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/metadata.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "uuid": "gnome-extension-connman@jaakko.hannikainen.intel.com",
-    "name": "ConnMan Extension",
-    "description": "Gnome-Shell ConnMan extension",
-    "shell-version": ["3.14", "3.16", "3.18", "3.20"],
-    "url": "https://github.com/mntmn/gnome-extension-connman"
-}
diff --git a/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/service.js b/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/service.js
deleted file mode 100644
index 682f530dc01eb9895e5f1c9dc2d08137403fd5b9..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/service.js
+++ /dev/null
@@ -1,582 +0,0 @@
-/*
- * Copyright (C) 2015 Intel Corporation. All rights reserved.
- * Author: Jaakko Hannikainen <jaakko.hannikainen@intel.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Signals = imports.signals;
-
-const Clutter = imports.gi.Clutter;
-const Gtk = imports.gi.Gtk;
-const St = imports.gi.St;
-const GObject = imports.gi.GObject;
-
-const Util = imports.misc.util;
-
-const PopupMenu = imports.ui.popupMenu;
-const ModalDialog = imports.ui.modalDialog;
-const Dialog = imports.ui.dialog;
-
-const Gettext = imports.gettext.domain('gnome-extension-connman');
-const _ = Gettext.gettext;
-
-const ExtensionUtils = imports.misc.extensionUtils;
-const Ext = ExtensionUtils.getCurrentExtension();
-const Version = Ext.imports.version;
-const version = Version.version();
-
-const Logger = Ext.imports.logger;
-
-const DialogServiceItem = class DialogServiceItem {
-
-    constructor(service, callback) {
-        let name = service.name || service.label.text;
-        if(!name)
-            return;
-        let icon = service.getIcon();
-        let securityIcon = service.securityIcon ? service.securityIcon() : '';
-        this.service = service;
-        this.actor = new St.BoxLayout({
-            style_class: 'cm-dialog-item',
-            can_focus: true,
-            reactive: true
-        });
-        this.actor.connect('key-focus-in', function() {
-            callback(this);
-        }.bind(this));
-        let action = new Clutter.ClickAction();
-        action.connect('clicked', function() {
-            this.actor.grab_key_focus();
-        }.bind(this));
-        this.actor.add_action(action);
-
-        this._label = new St.Label({
-            text: name
-        });
-        this.actor.label_actor = this._label;
-        this._icons = new St.BoxLayout({
-            style_class: 'cm-dialog-icons'
-        });
-        this._icon = new St.Icon({
-            style_class: 'cm-dialog-icon'
-        });
-        this._securityIcon = new St.Icon({
-            style_class: 'cm-dialog-icon'
-        });
-        this._icon.icon_name = icon;
-        this._securityIcon.icon_name = securityIcon;
-        if(service._properties['Favorite']) {
-            let icon = new St.Icon({
-                style_class: 'cm-dialog-icon',
-                icon_name: 'object-select-symbolic'
-            });
-            icon.add_style_pseudo_class('favourite');
-            this.actor.add_style_pseudo_class('favourite');
-            this.actor.add(icon);
-        }
-        this._icons.add_actor(this._securityIcon);
-        this._icons.add_actor(this._icon);
-        this._label.x_align = St.Align.START;
-        this.actor.add_child(this._label);
-        this._icons.expand = true;
-        this._icons.x_fill = true;
-        this._icons.x_align = St.Align.END;
-        this.actor.add_child(this._icons);
-    }
-
-    enable() {
-        this.actor.can_focus = true;
-        this.actor.reactive = true;
-        this.actor.remove_style_pseudo_class('passive');
-    }
-
-    disable() {
-        this.actor.can_focus = false;
-        this.actor.reactive = false;
-        this.actor.add_style_pseudo_class('passive');
-    }
-};
-
-var ServiceChooser = GObject.registerClass(class ServiceChooser extends ModalDialog.ModalDialog {
-
-    _init(proxy, services, callback) {
-        super._init({});
-        this._proxy = proxy;
-        this._services = {};
-
-        let content = new Dialog.MessageDialogContent({ title: _('Select Wireless Network') });
-        this.contentLayout.add_actor(content);
-
-        this._stack = new St.Widget({
-            layout_manager: new Clutter.BinLayout()
-        });
-        this._itemBox = new St.BoxLayout({
-            vertical: true,
-            style_class: 'cm-dialog-box'
-        });
-        this._boxes = {};
-        this._scrollView = new St.ScrollView({
-            style_class: 'cm-dialog-scroll-view'
-        });
-        this._scrollView.set_x_expand(true);
-        this._scrollView.set_y_expand(true);
-        this._scrollView.set_policy(Gtk.PolicyType.NEVER,
-            Gtk.PolicyType.AUTOMATIC);
-        this._scrollView.add_actor(this._itemBox);
-        this._stack.add_child(this._scrollView);
-
-        this.contentLayout.x_expand = true;
-        this.contentLayout.add_child(this._stack);
-
-        for(let id in services)
-            this.addService(services[id]);
-        this.scanRemote();
-        this._closed = false;
-        this._timeout = Mainloop.timeout_add_seconds(15, function() {
-            this.scanRemote();
-            return !this._closed;
-        }.bind(this));
-
-        this._cancelButton = this.addButton({
-            action: this.cancel.bind(this),
-            label: _("Cancel"),
-            key: Clutter.Escape
-        });
-
-        this._connectButton = this.addButton({
-            action: this.buttonEvent.bind(this),
-            label: _("Connect"),
-            key: Clutter.Enter
-        });
-        this._connectButton.reactive = true;
-        this._connectButton.can_focus = true;
-
-        this._callback = callback;
-
-        this.open();
-    }
-
-    scanRemote() {
-        this._proxy.ScanRemote();
-    }
-
-    selectedEvent(service) {
-        if(this._selected)
-            this._selected.actor.remove_style_pseudo_class('selected');
-        Util.ensureActorVisibleInScrollView(this._scrollView, service.actor);
-        this._selected = service;
-        this._selected.actor.add_style_pseudo_class('selected');
-        this._connectButton.reactive = true;
-        this._connectButton.can_focus = true;
-    }
-
-    close() {
-        super.close();
-        this._closed = true;
-        Mainloop.source_remove(this._timeout);
-        this.destroy();
-    }
-
-    buttonEvent() {
-        this.close();
-        this._callback(this._selected && this._selected.service);
-    }
-
-    cancel() {
-        this._callback();
-        this.close();
-    }
-
-    addService(service) {
-        if(this._services[service[0].id]) {
-            this._services[service[0].id].enable();
-            return;
-        }
-        let item = new DialogServiceItem(service[0], this.selectedEvent.bind(this));
-        if(!item.actor)
-            return;
-        let intf = service[1];
-        if(!this._boxes[intf]) {
-            if(Object.keys(this._boxes).length == 1)
-                this._boxes[Object.keys(this._boxes)[0]]['label'].show();
-            let label = new St.Label({
-                text: intf,
-                style_class: 'cm-dialog-interface',
-            });
-            let box = new St.BoxLayout({
-                vertical: true,
-                style_class: 'cm-dialog-box'
-            });
-            this._boxes[intf] = {};
-            this._boxes[intf]['label'] = label;
-            this._boxes[intf]['box'] = box;
-            label.hide();
-            if(Object.keys(this._boxes).length > 1)
-                label.show();
-            this._itemBox.add_child(label);
-            this._itemBox.add_child(box);
-        }
-        this._boxes[intf]['box'].add_child(item.actor);
-        this._services[service[0].id] = item;
-    }
-
-    updateService(service) {
-        if(this._closed)
-            return;
-        if(!this._services[service[0].id])
-            this.addService(service);
-        else
-            this._services[service[0].id]._label.text = service[0].name || service[0].label.text;
-    }
-
-    removeService(id) {
-        if(this._services[id])
-            this._services[id].disable();
-    }
-});
-
-var Service = GObject.registerClass(class Service extends PopupMenu.PopupSubMenuMenuItem {
-
-    _init(type, proxy, indicator) {
-        super._init('', true);
-
-        this.type = type;
-
-        this._properties = {};
-
-        this._proxy = proxy;
-
-        this._connected = true;
-        this._connectionSwitch = new PopupMenu.PopupMenuItem(_("Connect"));
-        this._connectionSwitch.connect('activate', this.buttonEvent.bind(this));
-
-        this._sig = this._proxy.connectSignal('PropertyChanged',
-            function(proxy, sender, [name, value]) {
-                let obj = {};
-                obj[name] = value;
-                this.update(obj);
-            }.bind(this));
-
-        this.state = 'idle'
-        this.hidden = true;
-
-        this._icons = {
-            'ok': 'network-transmit-receive-symbolic',
-            'acquiring': 'network-no-route-symbolic',
-            'offline': 'network-offline-symbolic',
-            'error': 'network-error-symbolic'
-        };
-
-        this._indicator = indicator;
-        this.label.text = '';
-
-        this._settings = new PopupMenu.PopupMenuItem(_("Settings"));
-        this._settings.connect('activate', this.openSettings.bind(this));
-
-        if(version < 318)
-            this.status.text = this.state;
-        else
-            this.label.text = this.state;
-
-        this.menu.addMenuItem(this._connectionSwitch);
-        this.menu.addMenuItem(this._settings);
-        this.show();
-    }
-
-    openSettings() {
-        Util.spawnApp(['connman-gtk', '--page', this.type]);
-    }
-
-    buttonEvent() {
-        if(this.state == 'idle' || this.state == 'failure' || this.state == 'disconnect')
-            this._proxy.ConnectRemote();
-        else
-            this._proxy.DisconnectRemote();
-    }
-
-    update(properties) {
-        for(let key in properties) {
-            let newProperty = properties[key].deep_unpack();
-            if(newProperty instanceof Object && !(newProperty instanceof Array)) {
-                if(!this._properties[key])
-                    this._properties[key] = {};
-                for(let innerKey in newProperty) {
-                    this._properties[key][innerKey] =
-                        newProperty[innerKey].deep_unpack();
-                }
-            } else {
-                this._properties[key] = newProperty;
-            }
-        }
-        if(properties.State)
-            this.state = properties.State.deep_unpack();
-        if(this.state == 'idle' || this.state == 'disconnect')
-            this._connectionSwitch.label.text = _("Connect");
-        else if(this.state == 'failure')
-            this._connectionSwitch.label.text = _("Reconnect");
-        else
-            this._connectionSwitch.label.text = _("Disconnect");
-        if(this._properties['Name']) {
-            this.name = this._properties['Name'];
-            this.hidden = false;
-        }
-        if(this.state == 'idle' || this.state == 'disconnect' ||
-                this.state == 'failure')
-            this._indicator.hide();
-        else
-            this._indicator.show();
-        if(version < 318)
-            this.status.text = this.getStateString();
-        else
-            this.label.text = this.name + " - " + this.getStateString();
-        this.setIcon(this.getStatusIcon());
-    }
-
-    signalToIcon() {
-        let value = this._properties['Strength'];
-        if(value > 80)
-            return 'excellent';
-        if(value > 55)
-            return 'good';
-        if(value > 30)
-            return 'ok';
-        if(value > 5)
-            return 'weak';
-        return 'none';
-    }
-
-    getStateString() {
-        let states = {
-            idle: _("Idle"),
-            failure: _("Failure"),
-            association: _("Association"),
-            configuration: _("Configuration"),
-            ready: _("Ready"),
-            disconnect: _("Disconnected"),
-            online: _("Online") };
-        return states[this.state] || this.state;
-    }
-
-    setIcon(iconName) {
-        this._indicator.icon_name = iconName;
-        this.icon.icon_name = iconName;
-    }
-
-    destroy() {
-        this._indicator.destroy();
-        try {
-            this._proxy.disconnectSignal(this._sig);
-        } catch(error) {
-            Logger.logException(error, 'Failed to disconnect service proxy');
-        }
-        super.destroy();
-    }
-
-    getIcon() {
-        return this._icons['ok'];
-    }
-
-    getAcquiringIcon() {
-        return this._icons['acquiring'];
-    }
-
-    getOfflineIcon() {
-        return this._icons['offline'];
-    }
-
-    getErrorIcon() {
-        return this._icons['error'];
-    }
-
-    getStatusIcon() {
-        let iconGetters = {
-            online: this.getIcon,
-            ready: this.getIcon,
-            configuration: this.getAcquiringIcon,
-            association: this.getAcquiringIcon,
-            disconnect: this.getOfflineIcon,
-            idle: this.getOfflineIcon,
-        };
-        if(iconGetters[this.state])
-            return iconGetters[this.state].bind(this)();
-        return this.getErrorIcon();
-    }
-
-    show() {
-        //this.actor.show();
-        this._indicator.show();
-    }
-
-    hide() {
-        //this.actor.hide();
-        this._indicator.hide();
-    }
-});
-
-var EthernetService = GObject.registerClass(class EthernetService extends Service {
-
-    _init(proxy, indicator) {
-        super._init('ethernet', proxy, indicator);
-        this.name = _("Wired");
-        this.label.text = this.name;
-        this._settings.label.text = _("Wired Settings");
-        this._icons = {
-            'ok': 'network-wired-symbolic',
-            'acquiring': 'network-wired-acquiring-symbolic',
-            'offline': 'network-wired-offline-symbolic',
-            'error': 'network-error-symbolic'
-        };
-
-        this.show();
-    }
-
-    update(properties) {
-        super.update(properties);
-        if(version < 318 && this._properties['Name'] == 'Wired') {
-            /* ensure translated name */
-            this._properties['Name'] = _("Wired");
-            this.label.text = _("Wired");
-        }
-    }
-});
-
-var WirelessService = GObject.registerClass(class WirelessService extends Service {
-
-    _init(proxy, indicator) {
-        super._init('wifi', proxy, indicator);
-        this.name = _("Hidden");
-        this._settings.label.text = _("Wireless Settings");
-        this._icons = {
-            'ok': 'network-wireless-connected-symbolic',
-            'acquiring': 'network-wireless-acquiring-symbolic',
-            'offline': 'network-wireless-offline-symbolic',
-            'error': 'network-error-symbolic'
-        };
-    }
-
-    securityIcon() {
-        let security = this._properties['Security'][0];
-        if(!security || security == 'none')
-            return '';
-        let icons = {
-            ieee8021x: 'security-high-symbolic',
-            wep: 'security-low-symbolic',
-        };
-        return icons[security] || 'security-medium-symbolic';
-    }
-
-    getIcon() {
-        return 'network-wireless-signal-' + this.signalToIcon() + '-symbolic';
-    }
-
-    update(properties) {
-        super.update(properties);
-
-        if(this.state == 'idle' || this.state == 'disconnect' ||
-                this.state == 'failure')
-            this.hide();
-        else
-            this.show();
-
-        if(this.hidden) {
-                let security = this._properties['Security'][0];
-                if(!security)
-                        security = 'none';
-                let names = {
-                        ieee8021x: _("Hidden ieee8021x secured network"),
-                        psk: _("Hidden WPA secured network"),
-                        wep: _("Hidden WEP secured network"),
-                        wps: _("Hidden WPS secured network"),
-                        none: _("Hidden unsecured network")
-                };
-                this.name = names[security] || _("Hidden network");
-        }
-    }
-});
-
-var BluetoothService = GObject.registerClass(class BluetoothService extends Service {
-
-    _init(proxy, indicator) {
-        super._init('bluetooth', proxy, indicator);
-        this._settings.label.text = _("Bluetooth Settings");
-        this._icons = {
-            'ok': 'bluetooth-active-symbolic',
-            'acquiring': 'bluetooth-active-symbolic',
-            'offline': 'bluetooth-disabled-symbolic',
-            'error': 'network-error-symbolic'
-        };
-
-        this.show();
-    }
-});
-
-var CellularService = GObject.registerClass(class CellularService extends Service {
-
-    _init(proxy, indicator) {
-        super._init('cellular', proxy, indicator);
-        this._settings.label.text = _("Cellular Settings");
-        this._icons = {
-            'ok': 'network-cellular-connected-symbolic',
-            'acquiring': 'network-cellular-acquiring-symbolic',
-            'offline': 'network-cellular-offline-symbolic',
-            'error': 'network-error-symbolic'
-        };
-
-        this.show();
-    }
-
-    getIcon() {
-        return 'network-cellular-signal-' + this.signalToIcon() + '-symbolic';
-    }
-});
-
-var VPNService = GObject.registerClass(class VPNService extends Service {
-
-    _init(proxy, indicator) {
-        super._init('vpn', proxy, indicator);
-        this._settings.label.text = _("VPN Settings");
-        this._icons = {
-            'ok': 'network-vpn-symbolic',
-            'acquiring': 'network-vpn-acquiring-symbolic',
-            'offline': 'network-offline-symbolic',
-            'error': 'network-error-symbolic',
-        };
-
-        this.show();
-    }
-
-    getAcquiringIcon() {
-        return 'network-vpn-acquiring-symbolic';
-    }
-
-    getIcon() {
-        return 'network-vpn-symbolic';
-    }
-});
-
-function createService(type, proxy, indicator) {
-    let services = {
-        ethernet: EthernetService,
-        wifi: WirelessService,
-        bluetooth: BluetoothService,
-        cellular: CellularService,
-        vpn: VPNService
-    };
-    if (services[type])
-        return new services[type](proxy, indicator);
-    return new Service('other', proxy, indicator);
-}
diff --git a/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/stylesheet.css b/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/stylesheet.css
deleted file mode 100644
index ebd26dcf3a98b4e8c161d078d302829dcf2439f1..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/stylesheet.css
+++ /dev/null
@@ -1,97 +0,0 @@
-/* Password or Authentication Dialog */
-.cm-prompt-dialog {
-  width: 500px;
-  border: 3px solid rgba(238, 238, 236, 0.2); }
-
-.cm-prompt-dialog-main-layout {
-  spacing: 24px;
-  padding: 10px; }
-
-.cm-prompt-dialog-message-layout {
-  spacing: 16px; }
-
-.cm-prompt-dialog-headline {
-  font-weight: bold;
-  color: #b2b2a9; }
-
-.cm-prompt-dialog-description:rtl {
-  text-align: right; }
-
-.cm-prompt-dialog-password-box {
-  spacing: 1em;
-  padding-bottom: 1em; }
-
-.cm-prompt-dialog-error-label {
-  font-size: 10pt;
-  color: #cc0000;
-  padding-bottom: 8px; }
-
-.cm-prompt-dialog-info-label {
-  font-size: 10pt;
-  padding-bottom: 8px; }
-
-.cm-hidden {
-  color: transparent; }
-
-.cm-prompt-dialog-null-label {
-  font-size: 10pt;
-  padding-bottom: 8px; }
-
-/* NETWORK DIALOGS */
-.cm-dialog {
-  max-height: 500px;
-  min-height: 450px;
-  min-width: 470px; }
-
-.cm-dialog-content {
-  spacing: 20px; }
-
-.cm-dialog-interface {
-  color: #606060;
-  padding: 15px; }
-
-.cm-dialog-header-hbox {
-  spacing: 10px; }
-
-.cm-dialog-header-icon {
-  icon-size: 32px; }
-
-.cm-dialog-scroll-view {
-  border: 2px solid #1c1f1f; }
-
-.cm-dialog-header {
-  font-weight: bold; }
-
-.cm-dialog-item {
-  font-size: 110%;
-  border-bottom: 1px solid #1c1f1f;
-  padding: 12px 12px 12px 36px; }
-
-.cm-dialog-item:favourite {
-  padding: 12px 12px 12px 0px; }
-
-.cm-dialog-item:selected {
-  background-color: #215d9c;
-  color: #ffffff; }
-
-.cm-dialog-item:passive {
-    color: #606060; }
-
-.cm-dialog-icons {
-  spacing: .5em; }
-
-.cm-dialog-icon {
-  icon-size: 16px;
-  padding-left: 5px; }
-
-.cm-dialog-icon:favourite {
-  padding: 0px 10px 0px 10px;}
-
-/* Network Agent Dialog */
-.cm-network-dialog-secret-table {
-  spacing-rows: 15px;
-  spacing-columns: 1em; }
-
-.cm-keyring-dialog-control-table {
-  spacing-rows: 15px;
-  spacing-columns: 1em; }
diff --git a/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/technology.js b/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/technology.js
deleted file mode 100644
index cb964a9eb5f6cff6eacaf6dd9315c926313eb873..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/technology.js
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * Copyright (C) 2015 Intel Corporation. All rights reserved.
- * Author: Jaakko Hannikainen <jaakko.hannikainen@intel.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-const Lang = imports.lang;
-const Util = imports.misc.util;
-
-const PopupMenu = imports.ui.popupMenu;
-const GObject = imports.gi.GObject;
-
-const ExtensionUtils = imports.misc.extensionUtils;
-const Ext = ExtensionUtils.getCurrentExtension();
-const Service = Ext.imports.service;
-const Logger = Ext.imports.logger;
-
-const Gettext = imports.gettext.domain('gnome-extension-connman');
-const _ = Gettext.gettext;
-
-const Version = Ext.imports.version;
-const version = Version.version();
-
-var Technology = class extends PopupMenu.PopupMenuSection {
-
-    constructor(properties, type, proxy) {
-        super();
-        this._type = type;
-        this._services = {}
-        this._dialog = null;
-        this._properties = properties;
-
-        this._proxy = proxy;
-        if (this._proxy)
-            this._sig = this._proxy.connectSignal('PropertyChanged',
-                function(proxy, sender, [name, value]) {
-                    this.propertyChanged(name, value.deep_unpack());
-                }.bind(this));
-        if (this._properties['Powered'])
-            this.show();
-        else
-            this.hide();
-    }
-
-    getValue() {
-        let values = ["ethernet", "wifi", "bluetooth",
-                      "p2p", "cellular", "vpn", "other"];
-        return values.indexOf(this._type);
-    }
-
-    propertyChanged(name, value) {
-        if(name == 'Powered') {
-            if(value)
-                this.show();
-            else
-                this.hide();
-        }
-    }
-
-    addService(id, service) {
-        if(this._services[id])
-            this._services[id].destroy();
-        this._services[id] = service;
-        service.id = id;
-        this.addMenuItem(service);
-        this.serviceUpdated(id);
-        this.updateIcon();
-    }
-
-    getService(id) {
-        return this._services[id];
-    }
-
-    updateService(id, properties) {
-        if(!this._services[id])
-            return false;
-        this._services[id].update(properties);
-        this.serviceUpdated(id);
-        this.updateIcon();
-        return true;
-    }
-
-    removeService(id) {
-        if(!this._services[id])
-            return false;
-        this._services[id].destroy();
-        delete this._services[id];
-        this.serviceUpdated(id);
-        this.updateIcon();
-        return true;
-    }
-
-    destroy() {
-        for(let path in this._services) {
-            try {
-                this.removeService(path);
-            } catch(error) {}
-        }
-        try {
-            if(this._proxy)
-                this._proxy.disconnectSignal(this._sig);
-        } catch(error) {
-            Logger.logException(error, 'Failed to disconnect service proxy');
-        }
-        super.destroy();
-    }
-
-    serviceUpdated(id) {}
-
-    updateIcon() {
-        if(Object.keys(this._services)) {
-            this._indicator = this._services[Object.keys(this._services)[0]];
-            for(let path in this._services) {
-                let state = this._services[path]._properties['State'];
-                if(state != 'idle')
-                    this._indicator = this._services[path]._indicator;
-            }
-            for(let path in this._services) {
-                let state = this._services[path]._properties['State'];
-                if(state != 'idle' && state != 'failure')
-                    this._indicator = this._services[path]._indicator;
-            }
-        }
-    }
-
-    show() {
-        this.actor.show();
-        if(this._indicator)
-            this._indicator.show();
-    }
-
-    hide() {
-        this.actor.hide();
-        if(this._indicator)
-            this._indicator.hide();
-    }
-};
-
-var EthernetTechnology = class extends Technology {
-
-    constructor(properties, proxy) {
-        super(properties, 'ethernet', proxy);
-    }
-};
-
-var WirelessTechnology = class extends Technology {
-
-    constructor(properties, proxy, manager) {
-        super(properties, 'wifi', proxy);
-
-        this._menu = new PopupMenu.PopupSubMenuMenuItem('', true);
-
-        this._settings = new PopupMenu.PopupMenuItem(_("Wireless Settings"));
-        this._settings.connect('activate', this.openSettings.bind(this));
-
-        if (version < 318) {
-            this._menu.label.text = _("Wireless");
-            this._menu.status.text = _("Idle");
-        } else {
-            this._menu.label.text = _("Wireless") + " - " + _("Idle");
-        }
-        this._menu.icon.icon_name = 'network-wireless-signal-none-symbolic';
-        this._manager = manager;
-        this.addMenuItem(this._menu);
-        this._menu.menu.addMenuItem(this._createConnectionMenuItem());
-        this._menu.menu.addMenuItem(this._settings);
-        this._connected = {};
-        this._connectedCount = 0;
-        this.show();
-    }
-
-    openSettings() {
-        Util.spawnApp(['connman-gtk', '--page', 'wifi']);
-    }
-
-    _createConnectionMenuItem() {
-        let connectionItem = new PopupMenu.PopupMenuItem(
-            _("Select wireless network"));
-        connectionItem.connect('activate', this.selectWifi.bind(this));
-        return connectionItem;
-    }
-
-    selectWifi() {
-        let serviceList = [];
-        let result = this._manager.GetServicesSync();
-        let services = result[0];
-        for(let i = 0; i < services.length; i++) {
-            let service = this._services[services[i][0]];
-            if(service && service._properties['Name'])
-                serviceList.push([service, service._properties['Ethernet']['Interface']]);
-        }
-        let callback = function(service) {
-            this._dialog = null;
-            if(service)
-                service.buttonEvent();
-            else
-                Logger.logInfo('User canceled wifi dialog');
-        }.bind(this);
-        this._dialog = new Service.ServiceChooser(this._proxy,
-            serviceList, callback);
-    }
-
-    addService(id, service) {
-        super.addService(id, service);
-        service.menu.addMenuItem(this._createConnectionMenuItem(), 1);
-        let state = this._services[id].state;
-        if(state != 'idle' && state != 'disconnect' && state != 'failure') {
-            this._connected[id] = true;
-            this._menu.actor.hide();
-            this._connectedCount++;
-        }
-        if(this._dialog)
-            this._dialog.addService([service, service._properties['Ethernet']['Interface']]);
-    }
-
-    updateService(id, properties) {
-        super.updateService(id, properties);
-        let state = this._services[id]._properties['State'];
-        if(state != 'idle' && state != 'disconnect' && state != 'failure') {
-            if(!this._connected[id]) {
-                this._connected[id] = true;
-                this._connectedCount++;
-                this._menu.actor.hide();
-            }
-        }
-        else {
-            if(this._connected[id]) {
-                this._connected[id] = false;
-                this._connectedCount--;
-                if(!this._connectedCount)
-                    this._menu.actor.show();
-            }
-        }
-        if(this._dialog)
-            this._dialog.updateService([this._services[id],
-                this._services[id]._properties['Ethernet']['Interface']]);
-    }
-
-    removeService(id) {
-        let state = this._services[id]._properties['State'];
-        if(state != 'idle' && state != 'disconnect' && state != 'failure') {
-            this._services[id].hide();
-            if(this._connected[id]) {
-                this._connected[id] = false;
-                this._connectedCount--;
-                if(!this._connectedCount)
-                    this._menu.actor.show();
-            }
-        }
-        super.removeService(id);
-        this.serviceUpdated(id);
-        this.updateIcon();
-        if(this._dialog)
-            this._dialog.removeService(id);
-    }
-
-    destroy() {
-        this._proxy = null;
-        super.destroy();
-    }
-};
-
-var BluetoothTechnology = class extends Technology {
-
-    constructor(properties, proxy) {
-        super(properties, 'bluetooth', proxy);
-    }
-};
-
-var P2PTechnology = class extends Technology {
-
-    constructor(properties, proxy) {
-        super(properties, 'p2p', proxy);
-    }
-};
-
-var CellularTechnology = class extends Technology {
-
-    constructor(properties, proxy) {
-        super(properties, 'cellular', proxy);
-    }
-};
-
-class VPNTechnology extends Technology {
-
-    constructor(properties, proxy) {
-        super(properties, 'vpn', proxy);
-    }
-};
-
-function createTechnology(type, properties, proxy, manager) {
-    let technologies = {
-        ethernet: EthernetTechnology,
-        wifi: WirelessTechnology,
-        bluetooth: BluetoothTechnology,
-        p2p: P2PTechnology,
-        cellular: CellularTechnology,
-        vpn: VPNTechnology
-    };
-    if(technologies[type])
-        return new technologies[type](properties, proxy, manager);
-    return new Technology(properties, 'other', proxy);
-}
diff --git a/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/version.js b/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/version.js
deleted file mode 100644
index 06c9b3aa92afeb5e3a5275d0434f161b25e516e7..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.local/share/gnome-shell/extensions/gnome-extension-connman@jaakko.hannikainen.intel.com/version.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2016 Intel Corporation. All rights reserved.
- * Author: Jaakko Hannikainen <jaakko.hannikainen@intel.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-const ExtensionUtils = imports.misc.extensionUtils;
-const Config = imports.misc.config;
-
-function version() {
-        var split = Config.PACKAGE_VERSION.split('.');
-        return parseInt(split[0])*100 + parseInt(split[1]);
-}
diff --git a/reform2-imx8mq/template-skel/.local/share/rofi/themes/mnt-reform.rasi b/reform2-imx8mq/template-skel/.local/share/rofi/themes/mnt-reform.rasi
deleted file mode 100644
index 5602d38eefb81c9164098ceb424a2167794bc677..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.local/share/rofi/themes/mnt-reform.rasi
+++ /dev/null
@@ -1,28 +0,0 @@
-//! ------------------------------------------------------------------------------
-//! ROFI MNT Reform Color theme
-//! User: MNT Research GmbH
-//! ------------------------------------------------------------------------------
-
-* {
-	background-color: #000000;
-        text-color: #ffffff;
-}
-
-prompt {
-        text-color: #000000;
-        font-size: 0;
-}
-
-window {
-        padding: 32px;
-}
-
-element normal {
-        text-color: #ffffff;
-}
-
-element selected {
-        background-color: #ffffff;
-        text-color: #000000;
-}
-
diff --git a/reform2-imx8mq/template-skel/.profile b/reform2-imx8mq/template-skel/.profile
deleted file mode 100644
index 260edf0671b97880284e001b1a243f78a729151d..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-skel/.profile
+++ /dev/null
@@ -1,33 +0,0 @@
-# ~/.profile: executed by the command interpreter for login shells.
-# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
-# exists.
-# see /usr/share/doc/bash/examples/startup-files for examples.
-# the files are located in the bash-doc package.
-
-# the default umask is set in /etc/profile; for setting the umask
-# for ssh logins, install and configure the libpam-umask package.
-#umask 022
-
-# if running bash
-if [ -n "$BASH_VERSION" ]; then
-    # include .bashrc if it exists
-    if [ -f "$HOME/.bashrc" ]; then
-	. "$HOME/.bashrc"
-    fi
-fi
-
-# set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/bin" ] ; then
-    PATH="$HOME/bin:$PATH"
-fi
-
-# set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/.local/bin" ] ; then
-    PATH="$HOME/.local/bin:$PATH"
-fi
-
-if [ $(whoami) == "root" ]; then
-   cat /etc/reform-root-help
-elif [ -z $WAYLAND_DISPLAY ]; then
-   cat /etc/reform-help
-fi
diff --git a/reform2-imx8mq/template-userland/patches-mesa/7603.patch b/reform2-imx8mq/template-userland/patches-mesa/7603.patch
deleted file mode 100644
index 37b8618427b5d5816696bdf8f834b8b8700cda07..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-userland/patches-mesa/7603.patch
+++ /dev/null
@@ -1,436 +0,0 @@
-From 96106df17897b862b87937d6222a3e6483f45480 Mon Sep 17 00:00:00 2001
-From: Lucas Stach <l.stach@pengutronix.de>
-Date: Fri, 13 Nov 2020 14:26:23 +0100
-Subject: [PATCH 1/6] frontend/dri: copy image use in dup_image
-
-Don't lose the use flags when dup'ing an image.
-
-Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
----
- src/gallium/frontends/dri/dri2.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/gallium/frontends/dri/dri2.c b/src/gallium/frontends/dri/dri2.c
-index 0c0168497a2..1cd42cd8114 100644
---- a/src/gallium/frontends/dri/dri2.c
-+++ b/src/gallium/frontends/dri/dri2.c
-@@ -1308,6 +1308,7 @@ dri2_dup_image(__DRIimage *image, void *loaderPrivate)
-    img->dri_format = image->dri_format;
-    /* This should be 0 for sub images, but dup is also used for base images. */
-    img->dri_components = image->dri_components;
-+   img->use = image->use;
-    img->loader_private = loaderPrivate;
- 
-    return img;
--- 
-GitLab
-
-
-From 00add4be8620175ccc69869e22479962dacdce9d Mon Sep 17 00:00:00 2001
-From: Lucas Stach <l.stach@pengutronix.de>
-Date: Fri, 13 Nov 2020 14:38:41 +0100
-Subject: [PATCH 2/6] dri: bring back use flags for createImageWithModifiers
-
-createImageWithModifiers dropped the use flags that were present with
-the createImage interface as it was believed at the time that all those
-use flags could be expressed as a modifier. This turned out to be untrue,
-as there are some use flags like SCANOUT and the BACKBUFFER hint that
-won't ever get a eqivalent modifier expression.
-
-Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
----
- include/GL/internal/dri_interface.h      | 1 +
- src/egl/drivers/dri2/platform_wayland.c  | 4 ++--
- src/gallium/frontends/dri/dri2.c         | 5 ++---
- src/gbm/backends/dri/gbm_dri.c           | 2 +-
- src/loader/loader_dri3_helper.c          | 3 +++
- src/mesa/drivers/dri/i965/intel_screen.c | 2 +-
- 6 files changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
-index 39d5dd07533..222821428d0 100644
---- a/include/GL/internal/dri_interface.h
-+++ b/include/GL/internal/dri_interface.h
-@@ -1678,6 +1678,7 @@ struct __DRIimageExtensionRec {
-                                            int width, int height, int format,
-                                            const uint64_t *modifiers,
-                                            const unsigned int modifier_count,
-+                                           unsigned int use,
-                                            void *loaderPrivate);
- 
-    /*
-diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
-index c0b26c4b623..bb508cbe421 100644
---- a/src/egl/drivers/dri2/platform_wayland.c
-+++ b/src/egl/drivers/dri2/platform_wayland.c
-@@ -595,7 +595,7 @@ get_back_bo(struct dri2_egl_surface *dri2_surf)
-                                                       dri2_surf->base.Height,
-                                                       linear_dri_image_format,
-                                                       &linear_mod,
--                                                      1,
-+                                                      1, use_flags,
-                                                       NULL);
-       } else {
-          dri2_surf->back->linear_copy =
-@@ -624,7 +624,7 @@ get_back_bo(struct dri2_egl_surface *dri2_surf)
-                                                      dri2_surf->base.Height,
-                                                      dri_image_format,
-                                                      modifiers,
--                                                     num_modifiers,
-+                                                     num_modifiers, use_flags,
-                                                      NULL);
-       } else {
-          dri2_surf->back->dri_image =
-diff --git a/src/gallium/frontends/dri/dri2.c b/src/gallium/frontends/dri/dri2.c
-index 1cd42cd8114..1f1e7a9a65e 100644
---- a/src/gallium/frontends/dri/dri2.c
-+++ b/src/gallium/frontends/dri/dri2.c
-@@ -1074,12 +1074,11 @@ static __DRIimage *
- dri2_create_image_with_modifiers(__DRIscreen *dri_screen,
-                                  int width, int height, int format,
-                                  const uint64_t *modifiers,
--                                 const unsigned count,
-+                                 const unsigned count, unsigned int use,
-                                  void *loaderPrivate)
- {
-    return dri2_create_image_common(dri_screen, width, height, format,
--                                   __DRI_IMAGE_USE_SHARE, modifiers, count,
--                                   loaderPrivate);
-+                                   use, modifiers, count, loaderPrivate);
- }
- 
- static bool
-diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c
-index b5634741554..aff3a107e7d 100644
---- a/src/gbm/backends/dri/gbm_dri.c
-+++ b/src/gbm/backends/dri/gbm_dri.c
-@@ -1173,7 +1173,7 @@ gbm_dri_bo_create(struct gbm_device *gbm,
-                                               width, height,
-                                               dri_format,
-                                               modifiers, count,
--                                              bo);
-+                                              dri_use, bo);
- 
-       if (bo->image) {
-          /* The client passed in a list of invalid modifiers */
-diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c
-index ccf8d1795e7..6fc6a2b705a 100644
---- a/src/loader/loader_dri3_helper.c
-+++ b/src/loader/loader_dri3_helper.c
-@@ -1407,6 +1407,9 @@ dri3_alloc_render_buffer(struct loader_dri3_drawable *draw, unsigned int format,
-                                                                        format,
-                                                                        modifiers,
-                                                                        count,
-+                                                                       __DRI_IMAGE_USE_SHARE |
-+                                                                       __DRI_IMAGE_USE_SCANOUT |
-+                                                                       __DRI_IMAGE_USE_BACKBUFFER,
-                                                                        buffer);
-          }
- 
-diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
-index 4492d43c040..4511b962eef 100644
---- a/src/mesa/drivers/dri/i965/intel_screen.c
-+++ b/src/mesa/drivers/dri/i965/intel_screen.c
-@@ -893,7 +893,7 @@ static __DRIimage *
- intel_create_image_with_modifiers(__DRIscreen *dri_screen,
-                                   int width, int height, int format,
-                                   const uint64_t *modifiers,
--                                  const unsigned count,
-+                                  const unsigned count, unsigned int use,
-                                   void *loaderPrivate)
- {
-    return intel_create_image_common(dri_screen, width, height, format, 0,
--- 
-GitLab
-
-
-From 587aac46dbadf2aca1489aadd4216e592e11e17b Mon Sep 17 00:00:00 2001
-From: Lucas Stach <l.stach@pengutronix.de>
-Date: Fri, 13 Nov 2020 14:59:52 +0100
-Subject: [PATCH 3/6] frontend/dri: add EXPLICIT_FLUSH hint in
- dri2_resource_get_param
-
-dri2_resource_get_param() is called from two different places right now.
-Only one of them adds the EXPLICIT_FLUSH hint to the handle usage, which
-may disable the optimizations provided by this hint without a reason.
-
-Make sure to always add this hint when appropriate.
-
-Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
----
- src/gallium/frontends/dri/dri2.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/gallium/frontends/dri/dri2.c b/src/gallium/frontends/dri/dri2.c
-index 1f1e7a9a65e..7851ebceb3e 100644
---- a/src/gallium/frontends/dri/dri2.c
-+++ b/src/gallium/frontends/dri/dri2.c
-@@ -1198,6 +1198,9 @@ dri2_resource_get_param(__DRIimage *image, enum pipe_resource_param param,
-    if (!pscreen->resource_get_param)
-       return false;
- 
-+   if (image->use & __DRI_IMAGE_USE_BACKBUFFER)
-+      handle_usage |= PIPE_HANDLE_USAGE_EXPLICIT_FLUSH;
-+
-    return pscreen->resource_get_param(pscreen, NULL, image->texture,
-                                       image->plane, 0, 0, param, handle_usage,
-                                       value);
-@@ -1242,9 +1245,6 @@ dri2_query_image_by_resource_param(__DRIimage *image, int attrib, int *value)
- 
-    handle_usage = PIPE_HANDLE_USAGE_FRAMEBUFFER_WRITE;
- 
--   if (image->use & __DRI_IMAGE_USE_BACKBUFFER)
--      handle_usage |= PIPE_HANDLE_USAGE_EXPLICIT_FLUSH;
--
-    if (!dri2_resource_get_param(image, param, handle_usage, &res_param))
-       return false;
- 
--- 
-GitLab
-
-
-From 59f74212bbb5e28badd0775929e42856c9a01d35 Mon Sep 17 00:00:00 2001
-From: Lucas Stach <l.stach@pengutronix.de>
-Date: Fri, 13 Nov 2020 15:03:37 +0100
-Subject: [PATCH 4/6] etnaviv: remove double assigment of surface->texture
-
-surf->base.texture is already assigned earlier via a proper
-pipe_resource_reference call. Remove the superfluous assignement.
-
-Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
-Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
----
- src/gallium/drivers/etnaviv/etnaviv_surface.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/gallium/drivers/etnaviv/etnaviv_surface.c b/src/gallium/drivers/etnaviv/etnaviv_surface.c
-index c78973bdb09..52a937652d2 100644
---- a/src/gallium/drivers/etnaviv/etnaviv_surface.c
-+++ b/src/gallium/drivers/etnaviv/etnaviv_surface.c
-@@ -112,7 +112,6 @@ etna_create_surface(struct pipe_context *pctx, struct pipe_resource *prsc,
-       etna_screen_resource_alloc_ts(pctx->screen, rsc);
-    }
- 
--   surf->base.texture = &rsc->base;
-    surf->base.format = templat->format;
-    surf->base.width = rsc->levels[level].width;
-    surf->base.height = rsc->levels[level].height;
--- 
-GitLab
-
-
-From 570908323e02c4558f5a9abc2d82621056cd65ab Mon Sep 17 00:00:00 2001
-From: Lucas Stach <l.stach@pengutronix.de>
-Date: Tue, 17 Nov 2020 12:08:13 +0100
-Subject: [PATCH 5/6] etnaviv: compact etna_state_updates
-
-Just reclaim a bit of screen real estate, purely cosmetic change.
-
-Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
----
- src/gallium/drivers/etnaviv/etnaviv_state.c | 18 ++++++------------
- 1 file changed, 6 insertions(+), 12 deletions(-)
-
-diff --git a/src/gallium/drivers/etnaviv/etnaviv_state.c b/src/gallium/drivers/etnaviv/etnaviv_state.c
-index 1b4a7040b50..84fea58ecb5 100644
---- a/src/gallium/drivers/etnaviv/etnaviv_state.c
-+++ b/src/gallium/drivers/etnaviv/etnaviv_state.c
-@@ -749,24 +749,18 @@ struct etna_state_updater {
- static const struct etna_state_updater etna_state_updates[] = {
-    {
-       etna_shader_update_vertex, ETNA_DIRTY_SHADER | ETNA_DIRTY_VERTEX_ELEMENTS,
--   },
--   {
-+   }, {
-       etna_shader_link, ETNA_DIRTY_SHADER,
--   },
--   {
-+   }, {
-       etna_update_blend, ETNA_DIRTY_BLEND | ETNA_DIRTY_FRAMEBUFFER
--   },
--   {
-+   }, {
-       etna_update_blend_color, ETNA_DIRTY_BLEND_COLOR | ETNA_DIRTY_FRAMEBUFFER,
--   },
--   {
-+   }, {
-       etna_update_ts_config, ETNA_DIRTY_DERIVE_TS,
--   },
--   {
-+   }, {
-       etna_update_clipping, ETNA_DIRTY_SCISSOR | ETNA_DIRTY_FRAMEBUFFER |
-                             ETNA_DIRTY_RASTERIZER | ETNA_DIRTY_VIEWPORT,
--   },
--   {
-+   }, {
-       etna_update_zsa, ETNA_DIRTY_ZSA | ETNA_DIRTY_SHADER,
-    }
- };
--- 
-GitLab
-
-
-From 537c7a6ea3fd2e5a6433e52b406ba39b89f520d9 Mon Sep 17 00:00:00 2001
-From: Lucas Stach <l.stach@pengutronix.de>
-Date: Fri, 13 Nov 2020 15:05:55 +0100
-Subject: [PATCH 6/6] etnaviv: flush used render buffers on context flush when
- neccessary
-
-Some resources like backbuffers are explicitly flushed by the frontend
-at the appropriate time, others however won't get flushed explicitly.
-Remember those resources when they get emitted as a render buffer and
-flush them on a context flush to make their content visible to other
-entities sharing the buffer.
-
-We still keep the optimized path for most resources where the frontend
-promises to do the flushing for us and only enable implicit flushing
-when a buffer handle is exported/imported without the
-PIPE_HANDLE_USAGE_EXPLICIT_FLUSH flag set.
-
-Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
----
- src/gallium/drivers/etnaviv/etnaviv_context.c  | 16 ++++++++++++++++
- src/gallium/drivers/etnaviv/etnaviv_context.h  |  3 +++
- src/gallium/drivers/etnaviv/etnaviv_resource.c |  7 +++++++
- src/gallium/drivers/etnaviv/etnaviv_resource.h |  2 ++
- src/gallium/drivers/etnaviv/etnaviv_state.c    | 17 +++++++++++++++++
- 5 files changed, 45 insertions(+)
-
-diff --git a/src/gallium/drivers/etnaviv/etnaviv_context.c b/src/gallium/drivers/etnaviv/etnaviv_context.c
-index 9c334a450c6..80c5d430419 100644
---- a/src/gallium/drivers/etnaviv/etnaviv_context.c
-+++ b/src/gallium/drivers/etnaviv/etnaviv_context.c
-@@ -128,6 +128,9 @@ etna_context_destroy(struct pipe_context *pctx)
-       _mesa_set_destroy(ctx->used_resources_write, NULL);
- 
-    }
-+   if (ctx->flush_resources)
-+      _mesa_set_destroy(ctx->flush_resources, NULL);
-+
-    mtx_unlock(&ctx->lock);
- 
-    if (ctx->dummy_desc_bo)
-@@ -475,6 +478,14 @@ etna_flush(struct pipe_context *pctx, struct pipe_fence_handle **fence,
-    list_for_each_entry(struct etna_acc_query, aq, &ctx->active_acc_queries, node)
-       etna_acc_query_suspend(aq, ctx);
- 
-+   /* flush all resources that need an implicit flush */
-+   set_foreach(ctx->flush_resources, entry) {
-+      struct pipe_resource *prsc = (struct pipe_resource *)entry->key;
-+
-+      pctx->flush_resource(pctx, prsc);
-+   }
-+   _mesa_set_clear(ctx->flush_resources, NULL);
-+
-    etna_cmd_stream_flush(ctx->stream, ctx->in_fence_fd,
-                           (flags & PIPE_FLUSH_FENCE_FD) ? &out_fence_fd : NULL);
- 
-@@ -581,6 +592,11 @@ etna_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags)
-    if (!ctx->used_resources_write)
-       goto fail;
- 
-+   ctx->flush_resources = _mesa_set_create(NULL, _mesa_hash_pointer,
-+                                           _mesa_key_pointer_equal);
-+   if (!ctx->flush_resources)
-+      goto fail;
-+
-    mtx_init(&ctx->lock, mtx_recursive);
- 
-    /* context ctxate setup */
-diff --git a/src/gallium/drivers/etnaviv/etnaviv_context.h b/src/gallium/drivers/etnaviv/etnaviv_context.h
-index dd6af3d93e6..112902aac8a 100644
---- a/src/gallium/drivers/etnaviv/etnaviv_context.h
-+++ b/src/gallium/drivers/etnaviv/etnaviv_context.h
-@@ -206,6 +206,9 @@ struct etna_context {
-    struct set *used_resources_read;
-    struct set *used_resources_write;
- 
-+   /* resources that must be flushed implicitly at the context flush time */
-+   struct set *flush_resources;
-+
-    mtx_t lock;
- };
- 
-diff --git a/src/gallium/drivers/etnaviv/etnaviv_resource.c b/src/gallium/drivers/etnaviv/etnaviv_resource.c
-index ae4f24b9b44..0c8c28e66aa 100644
---- a/src/gallium/drivers/etnaviv/etnaviv_resource.c
-+++ b/src/gallium/drivers/etnaviv/etnaviv_resource.c
-@@ -265,6 +265,7 @@ etna_resource_alloc(struct pipe_screen *pscreen, unsigned layout,
-    rsc->base.nr_samples = nr_samples;
-    rsc->layout = layout;
-    rsc->halign = halign;
-+   rsc->explicit_flush = true;
- 
-    pipe_reference_init(&rsc->base.reference, 1);
-    util_range_init(&rsc->valid_buffer_range);
-@@ -519,6 +520,9 @@ etna_resource_from_handle(struct pipe_screen *pscreen,
-    rsc->layout = modifier_to_layout(handle->modifier);
-    rsc->halign = TEXTURE_HALIGN_FOUR;
- 
-+   if (usage & PIPE_HANDLE_USAGE_EXPLICIT_FLUSH)
-+      rsc->explicit_flush = true;
-+
-    level->width = tmpl->width0;
-    level->height = tmpl->height0;
-    level->depth = tmpl->depth0;
-@@ -584,6 +588,9 @@ etna_resource_get_handle(struct pipe_screen *pscreen,
-    handle->offset = rsc->levels[0].offset;
-    handle->modifier = layout_to_modifier(rsc->layout);
- 
-+   if (!(usage & PIPE_HANDLE_USAGE_EXPLICIT_FLUSH))
-+      rsc->explicit_flush = false;
-+
-    if (handle->type == WINSYS_HANDLE_TYPE_SHARED) {
-       return etna_bo_get_name(rsc->bo, &handle->handle) == 0;
-    } else if (handle->type == WINSYS_HANDLE_TYPE_KMS) {
-diff --git a/src/gallium/drivers/etnaviv/etnaviv_resource.h b/src/gallium/drivers/etnaviv/etnaviv_resource.h
-index cb83e891d34..167cf4ed069 100644
---- a/src/gallium/drivers/etnaviv/etnaviv_resource.h
-+++ b/src/gallium/drivers/etnaviv/etnaviv_resource.h
-@@ -93,6 +93,8 @@ struct etna_resource {
-    struct pipe_resource *texture;
-    /* for when PE doesn't support the base layout */
-    struct pipe_resource *render;
-+   /* frontend flushes resource via an explicit call to flush_resource */
-+   bool explicit_flush;
- 
-    enum etna_resource_status status;
- 
-diff --git a/src/gallium/drivers/etnaviv/etnaviv_state.c b/src/gallium/drivers/etnaviv/etnaviv_state.c
-index 84fea58ecb5..5848735ab14 100644
---- a/src/gallium/drivers/etnaviv/etnaviv_state.c
-+++ b/src/gallium/drivers/etnaviv/etnaviv_state.c
-@@ -741,6 +741,21 @@ etna_update_zsa(struct etna_context *ctx)
-    return true;
- }
- 
-+static bool
-+etna_record_flush_resources(struct etna_context *ctx)
-+{
-+   struct pipe_framebuffer_state *fb = &ctx->framebuffer_s;
-+
-+   if (fb->nr_cbufs > 0) {
-+      struct etna_surface *surf = etna_surface(fb->cbufs[0]);
-+
-+      if (!etna_resource(surf->prsc)->explicit_flush)
-+         _mesa_set_add(ctx->flush_resources, surf->prsc);
-+   }
-+
-+   return true;
-+}
-+
- struct etna_state_updater {
-    bool (*update)(struct etna_context *ctx);
-    uint32_t dirty;
-@@ -762,6 +777,8 @@ static const struct etna_state_updater etna_state_updates[] = {
-                             ETNA_DIRTY_RASTERIZER | ETNA_DIRTY_VIEWPORT,
-    }, {
-       etna_update_zsa, ETNA_DIRTY_ZSA | ETNA_DIRTY_SHADER,
-+   }, {
-+      etna_record_flush_resources, ETNA_DIRTY_FRAMEBUFFER,
-    }
- };
- 
--- 
-GitLab
-
diff --git a/reform2-imx8mq/template-userland/patches-mesa/8618.patch b/reform2-imx8mq/template-userland/patches-mesa/8618.patch
deleted file mode 100644
index a3b4da708a5e421e81106195b605a04b90c7c983..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-userland/patches-mesa/8618.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From 9a5fc97e70dd9f7ed37dfca66aac7a73ec1ab3e7 Mon Sep 17 00:00:00 2001
-From: Marek Vasut <marex@denx.de>
-Date: Thu, 21 Jan 2021 02:12:31 +0100
-Subject: [PATCH] etnaviv: Fix point sprite Z,W coordinate replacement
-
-Mesa fixed pipeline texture loading on programmable pipeline hardware emits
-a generic fragment shader program which contains gl_TexCoord.xyzw as a vec4
-and then expects to configure the varying assignments to the shader in the
-pipeline command stream, to select what is wired to the XYZW fragment shader
-inputs.
-
-This gl_TexCoord.xyzw is turned into texture load with projection (TGSI TXP
-opcode, similar for NIR). Texture load with projection does not exist in the
-Vivante GPU as a dedicated opcode and is emulated. The shader program first
-divides texture coordinates XYZ by projector W and then applies regular TEX
-opcode to load the texture (i.e. TEX(gl_TexCoord.xyzw/gl_TexCoord.wwww)).
-
-For point sprites, XY are the point coordinates from VS, Z=0 and W=1, always.
-The Vivante GPU can only configure varying to be either of -- point coord X,
-point coord Y, used, unused -- which covers XYZ, but not W. Z is fine because
-unused means 0.
-
-W used to be 0 too before this patch and that led to division by 0 in shader.
-The only known way to solve this is to set Z=0, W=1 in the shader program
-itself if the point sprites are enabled. This means we have to generate a
-special shader variant which does extra SET to set the W=1 in case the point
-sprites are enabled.
-
-In case of TGSI, emitting the SET.TRUE opcode permits setting W=1 without
-allocating additional constants. With NIR, use nir_lower_texcoord_replace()
-to lower TEXn to PNTC, which sets Z=0, W=1, and let NIR optimize the shader.
-Note that nir_lower_texcoord_replace() must be called before input linking
-is set up, as it might add new FS input.
-
-Also note that it should be possible to simply drop PIPE_CAP_POINT_SPRITE
-in the long run, ST would then apply the same optimization pass, but that
-option is so far misbehaving. And for etnaviv TGSI this is not applicable
-yet.
-
-This fixes neverball point sprites (exit cylinder stars) and eglretrace of
-gl4es pointsprite test:
-https://github.com/ptitSeb/gl4es/blob/master/traces/pointsprite.tgz
-
-Signed-off-by: Marek Vasut <marex@denx.de>
----
- .../drivers/etnaviv/etnaviv_compiler_nir.c    | 16 +++++++++++++-
- .../drivers/etnaviv/etnaviv_compiler_tgsi.c   | 22 ++++++++++++++++---
- src/gallium/drivers/etnaviv/etnaviv_context.c |  1 +
- src/gallium/drivers/etnaviv/etnaviv_shader.h  |  3 +++
- 4 files changed, 38 insertions(+), 4 deletions(-)
-
-diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c
-index be0b52757e5..5f1e00ebf64 100644
---- a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c
-+++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c
-@@ -1067,6 +1067,13 @@ etna_compile_shader_nir(struct etna_shader_variant *v)
-    v->ps_color_out_reg = 0; /* 0 for shader that doesn't write fragcolor.. */
-    v->ps_depth_out_reg = -1;
- 
-+   /*
-+    * Lower glTexCoord, fixes e.g. neverball point sprite (exit cylinder stars)
-+    * and gl4es pointsprite.trace apitrace
-+    */
-+   if (s->info.stage == MESA_SHADER_FRAGMENT && v->key.sprite_coord_enable)
-+      NIR_PASS_V(s, nir_lower_texcoord_replace, v->key.sprite_coord_enable, false);
-+
-    /* setup input linking */
-    struct etna_shader_io_file *sf = &v->infile;
-    if (s->info.stage == MESA_SHADER_VERTEX) {
-@@ -1231,7 +1238,7 @@ etna_link_shader_nir(struct etna_shader_link_info *info,
-       varying->use[2] = VARYING_COMPONENT_USE_UNUSED;
-       varying->use[3] = VARYING_COMPONENT_USE_UNUSED;
- 
--      /* point coord is an input to the PS without matching VS output,
-+      /* point/tex coord is an input to the PS without matching VS output,
-        * so it gets a varying slot without being assigned a VS register.
-        */
-       if (fsio->slot == VARYING_SLOT_PNTC) {
-@@ -1239,6 +1246,13 @@ etna_link_shader_nir(struct etna_shader_link_info *info,
-          varying->use[1] = VARYING_COMPONENT_USE_POINTCOORD_Y;
- 
-          info->pcoord_varying_comp_ofs = comp_ofs;
-+      } else if (util_varying_is_point_coord(fsio->slot, fs->key.sprite_coord_enable)) {
-+         /*
-+	  * Do nothing, TexCoord is lowered to PointCoord above
-+	  * and the TexCoord here is just a remnant. This needs
-+	  * to be removed with some nir_remove_dead_variables(),
-+	  * but that one removes all FS inputs ... why?
-+	  */
-       } else {
-          if (vsio == NULL) { /* not found -- link error */
-             BUG("Semantic value not found in vertex shader outputs\n");
-diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_tgsi.c b/src/gallium/drivers/etnaviv/etnaviv_compiler_tgsi.c
-index 743ee0b5ace..7f7e0b6704c 100644
---- a/src/gallium/drivers/etnaviv/etnaviv_compiler_tgsi.c
-+++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_tgsi.c
-@@ -1882,12 +1882,27 @@ etna_compile_pass_generate_code(struct etna_compile *c)
- 
-          for (int i = 0; i < tgsi->num_src && i < ETNA_NUM_SRC; i++) {
-             const struct tgsi_full_src_register *reg = &inst->Src[i];
--            const struct etna_native_reg *n = &etna_get_src_reg(c, reg->Register)->native;
-+            const struct etna_reg_desc *srcreg = etna_get_src_reg(c, reg->Register);
-+            const struct etna_native_reg *n = &srcreg->native;
- 
-             if (!n->valid || n->is_tex)
-                continue;
- 
-             src[i] = etna_create_src(reg, n);
-+
-+            /*
-+	     * Replace W=1.0 for point sprite coordinates, since hardware
-+	     * can only replace X,Y and leaves Z,W=0,0 instead of Z,W=0,1
-+	     */
-+            if (srcreg && srcreg->has_semantic &&
-+                srcreg->semantic.Name == TGSI_SEMANTIC_TEXCOORD &&
-+                (c->key->sprite_coord_enable & BITFIELD_BIT(srcreg->semantic.Index))) {
-+               emit_inst(c, &(struct etna_inst) {
-+                  .opcode = INST_OPCODE_SET,
-+                  .cond = INST_CONDITION_TRUE,
-+                  .dst = etna_native_to_dst(srcreg->native, INST_COMPS_W),
-+               });
-+            }
-          }
- 
-          const unsigned opc = inst->Instruction.Opcode;
-@@ -2084,6 +2099,7 @@ permute_ps_inputs(struct etna_compile *c)
-     * gl_FragCoord   VARYING_SLOT_POS   TGSI_SEMANTIC_POSITION
-     * gl_FrontFacing VARYING_SLOT_FACE  TGSI_SEMANTIC_FACE
-     * gl_PointCoord  VARYING_SLOT_PNTC  TGSI_SEMANTIC_PCOORD
-+    * gl_TexCoord    VARYING_SLOT_TEX   TGSI_SEMANTIC_TEXCOORD
-     */
-    uint native_idx = 1;
- 
-@@ -2551,10 +2567,10 @@ etna_link_shader(struct etna_shader_link_info *info,
-       varying->use[2] = VARYING_COMPONENT_USE_UNUSED;
-       varying->use[3] = VARYING_COMPONENT_USE_UNUSED;
- 
--      /* point coord is an input to the PS without matching VS output,
-+      /* point/tex coord is an input to the PS without matching VS output,
-        * so it gets a varying slot without being assigned a VS register.
-        */
--      if (fsio->slot == VARYING_SLOT_PNTC) {
-+      if (util_varying_is_point_coord(fsio->slot, fs->key.sprite_coord_enable)) {
-          varying->use[0] = VARYING_COMPONENT_USE_POINTCOORD_X;
-          varying->use[1] = VARYING_COMPONENT_USE_POINTCOORD_Y;
- 
-diff --git a/src/gallium/drivers/etnaviv/etnaviv_context.c b/src/gallium/drivers/etnaviv/etnaviv_context.c
-index 90cd0ea87f2..b920e7545e0 100644
---- a/src/gallium/drivers/etnaviv/etnaviv_context.c
-+++ b/src/gallium/drivers/etnaviv/etnaviv_context.c
-@@ -308,6 +308,7 @@ etna_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info,
- 
-    struct etna_shader_key key = {
-       .front_ccw = ctx->rasterizer->front_ccw,
-+      .sprite_coord_enable = ctx->rasterizer->sprite_coord_enable,
-    };
- 
-    if (pfb->cbufs[0])
-diff --git a/src/gallium/drivers/etnaviv/etnaviv_shader.h b/src/gallium/drivers/etnaviv/etnaviv_shader.h
-index ccba5c858db..7fddbe37d35 100644
---- a/src/gallium/drivers/etnaviv/etnaviv_shader.h
-+++ b/src/gallium/drivers/etnaviv/etnaviv_shader.h
-@@ -27,6 +27,7 @@
- #ifndef H_ETNAVIV_SHADER
- #define H_ETNAVIV_SHADER
- 
-+#include "mesa/main/config.h"
- #include "pipe/p_state.h"
- #include "util/disk_cache.h"
- 
-@@ -46,6 +47,8 @@ struct etna_shader_key
-          unsigned frag_rb_swap : 1;
-          /* do we need to invert front facing value? */
-          unsigned front_ccw : 1;
-+         /* do we need to replace glTexCoord.xy ? */
-+         unsigned sprite_coord_enable : MAX_TEXTURE_COORD_UNITS;
-       };
-       uint32_t global;
-    };
--- 
-GitLab
-
diff --git a/reform2-imx8mq/template-userland/patches-mesa/9214.patch b/reform2-imx8mq/template-userland/patches-mesa/9214.patch
deleted file mode 100644
index e6480862819820d8f71efd2ac00c937a50b3b2f5..0000000000000000000000000000000000000000
--- a/reform2-imx8mq/template-userland/patches-mesa/9214.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4ca47a8e8e00e13c4432f4a6473627aa1f4f4da3 Mon Sep 17 00:00:00 2001
-From: Marek Vasut <marex@denx.de>
-Date: Sat, 6 Feb 2021 04:23:55 +0100
-Subject: [PATCH] compiler/nir: Increment shader input count and mark as used
- when adding new gl_PointCoord
-
-In case a new gl_PointCoord shader input is created, increment shader
-input count and set valid driver_location to the new input variable,
-otherwise the input gets aliased to input 0 and shows up in NIR_PRINT
-output as whatever shader input 0 is instead of gl_PointCoord. Also
-set the input as used, otherwise it might get removed.
-
-Signed-off-by: Marek Vasut <marex@denx.de>
----
- src/compiler/nir/nir_lower_texcoord_replace.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/compiler/nir/nir_lower_texcoord_replace.c b/src/compiler/nir/nir_lower_texcoord_replace.c
-index f0a03e8cef8..5df7cb6f6d0 100644
---- a/src/compiler/nir/nir_lower_texcoord_replace.c
-+++ b/src/compiler/nir/nir_lower_texcoord_replace.c
-@@ -80,6 +80,8 @@ nir_lower_texcoord_replace_impl(nir_function_impl *impl,
-          pntc = nir_variable_create(b.shader, nir_var_shader_in,
-                                     glsl_vec_type(2), "gl_PointCoord");
-          pntc->data.location = VARYING_SLOT_PNTC;
-+         pntc->data.driver_location = b.shader->num_inputs++;
-+         b.shader->info.inputs_read |= BITFIELD64_BIT(VARYING_SLOT_PNTC);
-       }
- 
-       new_coord = nir_load_var(&b, pntc);
--- 
-GitLab
-