Moved rk322x-dev to rk322x-current (current now is 5.7.y) (#2153)

Adapted rk322x-dev to kernel 5.8.y Added ssv6x5x driver to legacy kernel, rk322x-config now allows the user to select which driver load at boot Added esp8089 kernel module, device tree overlay and detection in rk322x-config script Fixed some indentation Added reset button binding Added sdcard debounce Fixes indentation, added device tree overlay for high-leakage cpus Added support for bluetooth device tree overlay and realtek systemd service for rk322x targets
2026-05-20 11:48:25 -07:00 · 2020-08-28 18:48:55 +02:00
parent a2cfc820a6
commit 804a6b60d4
42 changed files with 266648 additions and 598 deletions
@@ -4,5 +4,5 @@ BOARDFAMILY="rk322x"
 BOOTCONFIG="rk322x-box_defconfig"
 BOOT_FDT_FILE="rk322x-box.dtb"
 MODULES_LEGACY="hci_uart rfcomm hidp"
-MODULES_BLACKLIST_LEGACY="ssv6051 8723cs r8188eu"
-KERNEL_TARGET="legacy,current"
+MODULES_BLACKLIST_LEGACY="ssv6051 8723cs r8188eu ssv6x5x"
+KERNEL_TARGET="legacy,current,dev"
@@ -1925,9 +1925,6 @@ CONFIG_MVL88W8977=m
 #
 CONFIG_SSV6051=m
 # CONFIG_WL_TI is not set
-CONFIG_RTL8822BU=m
-# CONFIG_RTL8821CU is not set
-CONFIG_88XXAU=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_MWIFIEX=y
@@ -1935,6 +1932,9 @@ CONFIG_MWIFIEX_SDIO=y
 # CONFIG_MWIFIEX_USB is not set
 # CONFIG_CW1200 is not set
 # CONFIG_RSI_91X is not set
+CONFIG_ESP8089=m
+CONFIG_ESP8089_DEBUG_FS=y
+CONFIG_SSV6X5X=m

 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -19,14 +19,14 @@ case $BRANCH in

 	current)

-		KERNELBRANCH='branch:linux-5.6.y'
+		KERNELBRANCH='branch:linux-5.7.y'
 		AUFS=no

 	;;

 	dev)

-		KERNELBRANCH='branch:master'
+		KERNELBRANCH='branch:linux-5.8.y'

 	;;

@@ -90,9 +90,8 @@ family_tweaks_bsp()
 	cp $SRC/packages/bsp/rockchip/71-i2c.rules $destination/etc/udev/rules.d

 	# Bluetooth
-	install -m 755 $SRC/packages/bsp/rockchip/rtk_hciattach $destination/usr/bin
-	install -m 755 $SRC/packages/bsp/rockchip/start_bt.sh $destination/usr/local/bin
-	cp $SRC/packages/bsp/rockchip/tinker-bluetooth.service $destination/lib/systemd/system/
+	install -m 755 $SRC/packages/bsp/rk322x/rtk_hciattach $destination/usr/bin
+	cp $SRC/packages/bsp/rk322x/rtk-bluetooth.service $destination/lib/systemd/system/

 	# Sound
 	cp $SRC/packages/bsp/rockchip/asound.conf $destination/etc/
@@ -29,6 +29,7 @@ declare -A WIFI_CHIPS
 declare -A DT_FLASH_OVERLAYS
 declare -A DT_LED_OVERLAYS
 declare -A DT_CPU_OVERLAYS
+declare -A DT_WIFI_OVERLAYS

 # Declarations for the various SoCs IDs
 CHIP_IDS+=(["524b2382"]="RK3228A/B")
@@ -38,11 +39,18 @@ CHIP_IDS+=(["524b2392"]="RK3229")
 WIFI_NAMES+=(["3030:3030"]="South Silicon Valley 6051p/6256p")
 WIFI_NAMES+=(["024c:b703"]="Realtek RTL8703bs")
 WIFI_NAMES+=(["024c:8179"]="Realtek RTL8189ES/ETV")
+WIFI_NAMES+=(["6666:1111"]="Espressif ESP8089")

 # Declarations for the various wifi IDs -> kernel modules
-WIFI_CHIPS+=(["3030:3030"]=ssv6051)
-WIFI_CHIPS+=(["024c:b703"]=8723cs)
-WIFI_CHIPS+=(["024c:8179"]=8189es)
+# In case the vendor has the same vendor:device ids for more than one
+# device (the infamouse ssv6051p/6256p), modules are separated by comma
+# and the user is asked which one she pefers.
+# Note: this is only for legacy kernel for rockchip_wlan modules which
+# load themselves without declaring their device ids.
+WIFI_CHIPS+=(["3030:3030"]="ssv6051 ssv6x5x")
+WIFI_CHIPS+=(["024c:b703"]="8723cs")
+WIFI_CHIPS+=(["024c:8179"]="8189es")
+WIFI_CHIPS+=(["6666:1111"]="")

 # Declarations for device tree overlays
 DT_FLASH_OVERLAYS+=(["emmc"]="eMMC only flash memory")
@@ -54,6 +62,8 @@ DT_LED_OVERLAYS+=(["led-conf2"]="LED configuration #2 (R329q)")

 DT_CPU_OVERLAYS+=(["cpu-hs"]="RK3228B or RK3229")

+DT_WIFI_OVERLAYS+=(["6666:1111"]="wlan-esp8089")
+
 KERNEL_VERSION=$(uname -r | cut -d "-" -f 1)
 if [[ "$KERNEL_VERSION" < "4.5.0" ]]; then
 	LEGACY_KERNEL=1
@@ -142,48 +152,74 @@ function get_internal_flash_type() {

 }

+function select_wifi_module() {
+
+	MODULES=$1
+
+	declare -a DIALOG_ENTRIES
+	declare -a MODULES
+
+	IDX=0
+	for MODULE in $WIFI_MODULE; do
+		MODULES[$IDX]="$MODULE"
+		DIALOG_ENTRIES+=("$IDX" "$MODULE")
+		IDX=$((IDX + 1))
+	done
+
+	MENU_TITLE="${BOARD_INFO}Please choose the wifi module suitable for your configuration\n"
+	MENU_CMD=(dialog --colors --backtitle "$BACKTITLE" --title "$TITLE" --default-item "0" --menu "$MENU_TITLE" 24 0 20)
+	SELECTION=$("${MENU_CMD[@]}" "${DIALOG_ENTRIES[@]}" 2>&1 >/dev/tty)
+
+	if [[ $? -ne 0 ]]; then
+		return 1
+	fi
+
+	WIFI_MODULE="${MODULES[$SELECTION]}"
+
+	echo $WIFI_MODULE
+
+	return 0
+
+}
+
 # Blacklists all the modules buth whitelist only that one
 # that has been detected
 function apply_wifi_blacklist() {

-	WIFI_ID=$1
-
 	# Detect wifi chip on legacy kernel and unblacklist it
-	WIFI_MODULE=""
+	WIFI_MODULE=$1

-	if [ -n "$WIFI_ID" ]; then
+	if [ ! -f $BLACKLIST_MODPROBE_CONF ]; then
+		touch $BLACKLIST_MODPROBE_CONF
+	fi

-		# blacklist all the modules and unblacklist only the one which is matching
-		WIFI_MODULE="${WIFI_CHIPS[$WIFI_ID]}"
+	if [ -n "$WIFI_MODULE" ]; then

-		if [ ! -f $BLACKLIST_MODPROBE_CONF ]; then
-			touch $BLACKLIST_MODPROBE_CONF
-		fi
-
-		if [ -n "$WIFI_MODULE" ]; then
-
-			for MODULE in "${WIFI_CHIPS[@]}"; do
+		for MODULES in "${WIFI_CHIPS[@]}"; do
+			for MODULE in $MODULES; do
 				sed -i "/blacklist $MODULE/d" $BLACKLIST_MODPROBE_CONF
 			done
+		done

-			declare -A BLACKLIST_MODULES
+		declare -A BLACKLIST_MODULES

-			for VALUE in "${WIFI_CHIPS[@]}"; do
-				if [ "$VALUE" != "$WIFI_MODULE" ]; then
-					BLACKLIST_MODULES+=([$VALUE]=1)
+		for MODULES in "${WIFI_CHIPS[@]}"; do
+			for MODULE in $MODULES; do
+				if [ "$MODULE" != "$WIFI_MODULE" ]; then
+					BLACKLIST_MODULES+=([$MODULE]=1)
 				fi
 			done
+		done

-			for MODULE in "${!BLACKLIST_MODULES[@]}"; do
-				echo "blacklist $MODULE" >> $BLACKLIST_MODPROBE_CONF
-			done
+		for MODULE in "${!BLACKLIST_MODULES[@]}"; do
+			echo "blacklist $MODULE" >> $BLACKLIST_MODPROBE_CONF
+		done

-			echo "#blacklist $WIFI_MODULE" >> $BLACKLIST_MODPROBE_CONF
-
-		fi
+		echo "#blacklist $WIFI_MODULE" >> $BLACKLIST_MODPROBE_CONF

 	fi

+
 	# unsupported wifi_chip_type: blacklist all known wifi
 	# modules if the blacklist file exists. If the blacklist file does not exist just skip over
 	if [ -z $WIFI_MODULE ]; then
@@ -198,10 +234,6 @@ function apply_wifi_blacklist() {

 	fi

-	echo $WIFI_MODULE
-
-	return 0
-
 }

 function select_soc() {
@@ -363,6 +395,11 @@ DT_OVERLAYS_TO_APPLY+=($SELECTION)
 SELECTION=$(select_led_configuration) || exit 1
 DT_OVERLAYS_TO_APPLY+=($SELECTION)

+# Apply overlays for wifi chips
+if [[ -n $WIFI_ID ]] && [[ -n "${DT_WIFI_OVERLAYS[$WIFI_ID]}" ]]; then
+	DT_OVERLAYS_TO_APPLY+=(${DT_WIFI_OVERLAYS[$WIFI_ID]})
+fi
+
 sed -i '/^overlays=/d' $ARMBIAN_ENV_TXT

 if [ $? -ne 0 ]; then
@@ -378,8 +415,30 @@ if [ $? -ne 0 ]; then
 fi

 # Apply the wifi blacklist only with legacy kernel
-if [[ $LEGACY_KERNEL -eq 1 ]]; then
-	WIFI_MODULE=$(apply_wifi_blacklist "$WIFI_ID")
+if [[ $LEGACY_KERNEL -eq 1 ]] && [[ -n "$WIFI_ID" ]]; then
+
+	WIFI_MODULE="${WIFI_CHIPS[$WIFI_ID]}"
+
+	if [[ -n $WIFI_MODULE ]]; then
+		
+		echo "$WIFI_MODULE" | grep " " > /dev/null 2>&1
+
+		if [[ $? -eq 0 ]]; then
+
+			WIFI_MODULE=$(select_wifi_module "$WIFI_MODULE")
+
+			if [[ $? -ne 0 ]]; then
+				WIFI_MODULE=""
+			fi
+
+		fi
+
+		if [[ -n "$WIFI_MODULE" ]]; then
+			apply_wifi_blacklist "$WIFI_MODULE"
+		fi
+
+	fi
+
 fi

 echo ""
@@ -390,11 +449,11 @@ echo "Device tree overlays enabled: ${DT_OVERLAYS_TO_APPLY[@]}"
 # Mainline kernel is supposed to work ok by itself with hardware recognition
 if [[ $LEGACY_KERNEL -eq 1 ]]; then

-	if [ -n "$WIFI_MODULE" ]; then
-		echo "Enabled wifi module $WIFI_MODULE"
+	if [[ -n "$WIFI_MODULE" ]]; then
+		echo "Forcefully enabled wifi module $WIFI_MODULE"
 	fi

-	if [ -n "$WIFI_ID" ] && [ -z "$WIFI_MODULE" ]; then
+	if [[ -n "$WIFI_ID" ]] && [[ ! -v WIFI_CHIPS[$WIFI_ID] ]]; then
 		echo "Wifi chip $WIFI_ID has been detected, but currently it is unsupported"
 		echo "Please report to: https://forum.armbian.com/topic/12656-wip-armbian-for-rk322x-devices/"
 	fi
@@ -0,0 +1,11 @@
+[Unit]
+Description=Realtek H5 protocol bluetooth support 
+Before=bluetooth.service
+
+[Service]
+Type=forking
+RemainAfterExit=Yes
+ExecStart=/usr/bin/rtk_hciattach -n -s 115200 /dev/ttyS1 rtk_h5 1500000
+
+[Install]
+WantedBy=multi-user.target
@@ -1,152 +1,3 @@
-diff --git a/Documentation/devicetree/bindings/media/rockchip-rga.txt b/Documentation/devicetree/bindings/media/rockchip-rga.txt
-index fd5276abf..c53a8e513 100644
--- a/Documentation/devicetree/bindings/media/rockchip-rga.txt
-+++ b/Documentation/devicetree/bindings/media/rockchip-rga.txt
-@@ -6,8 +6,9 @@ BitBLT, alpha blending and image blur/sharpness.
- 
- Required properties:
- - compatible: value should be one of the following
-		"rockchip,rk3288-rga";
-		"rockchip,rk3399-rga";
-+  "rockchip,rk3228-rga", "rockchip,rk3288-rga": for Rockchip RK3228
-+  "rockchip,rk3288-rga": for Rockchip RK3288
-+  "rockchip,rk3399-rga": for Rockchip RK3399
- 
- - interrupts: RGA interrupt specifier.
- 
-
-From patchwork Mon Feb  3 22:40:16 2020
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Justin Swartz <justin.swartz@risingedge.co.za>
-X-Patchwork-Id: 11363539
-Return-Path: 
- <SRS0=GAr4=3X=lists.infradead.org=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@kernel.org>
-Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
- [172.30.200.123])
-	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8F24B13B4
-	for <patchwork-linux-rockchip@patchwork.kernel.org>;
- Mon,  3 Feb 2020 22:44:23 +0000 (UTC)
-Received: from bombadil.infradead.org (bombadil.infradead.org
- [198.137.202.133])
-	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
-	(No client certificate requested)
-	by mail.kernel.org (Postfix) with ESMTPS id 6D7A520720
-	for <patchwork-linux-rockchip@patchwork.kernel.org>;
- Mon,  3 Feb 2020 22:44:23 +0000 (UTC)
-Authentication-Results: mail.kernel.org;
-	dkim=pass (2048-bit key) header.d=lists.infradead.org
- header.i=@lists.infradead.org header.b="Rk95K6Mw"
-DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6D7A520720
-Authentication-Results: mail.kernel.org;
- dmarc=none (p=none dis=none) header.from=risingedge.co.za
-Authentication-Results: mail.kernel.org;
- spf=none
- smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org
-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
-	d=lists.infradead.org; s=bombadil.20170209; h=Sender:
-	Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe:
-	List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References:
-	In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID:
-	Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc
-	:Resent-Message-ID:List-Owner;
-	bh=Mr3ZsKOLBMyntVt7QVaqLPXjoGli9v17XimegPwfo5E=; b=Rk95K6MwDe/k1jTL1oE89GZ7jD
-	Df0s6yzzlU4KnuA/LMujDMQkOy/cXepljEOjNqeiUV4jLTxBtwkKSD3wf80l4yckFm3hFfNIwWMsR
-	t6JORVjyFPZXkx43QyVBSJJAPsLnWNuM2CqvwSTgNNB5atctQjqbqefws8u/0StFVEobFvVExznkF
-	98U9Mkrvy8Pnvami6Tm5n9h2DE2Am3Uv8MkSmfTz2LAahHbfLf6uRwOYO0M3zVNXhkHILAA0bT5Lk
-	vpPMUywtyX0roHZzhDpsTHMHHuG/6eqM7dHkZi1KXOnbguOs0eS+oKki6qYnxAYX7JZk9cRwTyz+L
-	Qb1Zyt3g==;
-Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
-	by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux))
-	id 1iykS3-0002t8-1Z; Mon, 03 Feb 2020 22:44:19 +0000
-Received: from outgoing19.flk.host-h.net ([197.242.87.53])
- by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux))
- id 1iykRc-0002Qb-2W; Mon, 03 Feb 2020 22:43:53 +0000
-Received: from www31.flk1.host-h.net ([188.40.1.173])
- by antispam5-flk1.host-h.net with esmtpsa
- (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92)
- (envelope-from <justin.swartz@risingedge.co.za>)
- id 1iykRT-00043D-NX; Tue, 04 Feb 2020 00:43:47 +0200
-Received: from [130.255.73.16] (helo=v01.28459.vpscontrol.net)
- by www31.flk1.host-h.net with esmtpsa
- (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89)
- (envelope-from <justin.swartz@risingedge.co.za>)
- id 1iykRN-0001Vj-Ig; Tue, 04 Feb 2020 00:43:37 +0200
-From: Justin Swartz <justin.swartz@risingedge.co.za>
-To: Heiko Stuebner <heiko@sntech.de>, Rob Herring <robh+dt@kernel.org>,
- Mark Rutland <mark.rutland@arm.com>
-Subject: [PATCH v4 2/3] ARM: dts: rockchip: add rga node for rk322x
-Date: Mon,  3 Feb 2020 22:40:16 +0000
-Message-Id: 
- <be4f2c802a64562cbab629abc82dd7d228a1a747.1580768038.git.justin.swartz@risingedge.co.za>
-X-Mailer: git-send-email 2.11.0
-In-Reply-To: <cover.1580768038.git.justin.swartz@risingedge.co.za>
-References: <cover.1580768038.git.justin.swartz@risingedge.co.za>
-X-Authenticated-Sender: justin.swartz@risingedge.co.za
-X-Virus-Scanned: Clear
-X-Originating-IP: 188.40.1.173
-X-SpamExperts-Domain: risingedge.co.za
-X-SpamExperts-Username: 
-Authentication-Results: host-h.net;
- auth=pass (login) smtp.auth=@risingedge.co.za
-X-SpamExperts-Outgoing-Class: ham
-X-SpamExperts-Outgoing-Evidence: Combined (0.02)
-X-Recommended-Action: accept
-X-Filter-ID: 
- Mvzo4OR0dZXEDF/gcnlw0S9sfM/nP8gxoqs1zeWkeM2pSDasLI4SayDByyq9LIhVs+Mi0mrjo7ud
- QWat9IMBR0TNWdUk1Ol2OGx3IfrIJKyP9eGNFz9TW9u+Jt8z2T3K7uDjV/sFUXQr+CDrNQuIHgQg
- mAX8Bxy/iUu0ThNZg0jxJtcVJProrT987X1VDPOqN+OoDzRTdku7DidYUZdNf38Sp7Of4wP429AA
- f49baR+f3He7jw4SoVhmTJ/3eP9ORQWVx8ds1M4qmk3/bYr2p8zbg4Paoa3pNVQ0zl7t/+UfQLYB
- qEPnp1U88kqVD8AM2G81dFO0E3gi+MOI1foZYzDggRXhpvoPtF3cVkniFXU3qJSqpdJudO6+rkiw
- E5i8Wl78Q18OeOfsy4h7jF1Uv9lnibl3vcBqVmvQB4A18acp2SHDVKJPvzF61PUldigVAVXirbLu
- Jjy3NtnGWLbnBGfrUBEXB2fYGLNieGQuoHtJvp0r29Rf3ZjFwL+MhHEWw/0qBlNDp8uABz3dkWV+
- tgmYFaNu+2UDArzT1gq7P+ZTycYLFeAN4+MGwnsp7SkU6CLbyF0Zq4b1/7rjUzETJrWks4pbbQJq
- 6gWopI3ep45X19ZysgQ+31LcAX8eoFXAhohfegXGH2GIVQVglJFbK771YV8YbC29CtmpcTqTfSIf
- CWq9oj7OiT8GwpAriB+3/81I3rvR8KJ2fK9jiDYgijyqqY0rATpzHKGfmtNsYTr4SmDZ/bGW8xZC
- RRs6ZD24UhFcZZEpLhnBCwImTQNvxaLyCc35VA7RvW/HGiGqxL09Cymermt8NAa/gGopT3kKfO4C
- gvcKmV0o9jYzsFpuc43pp/LzIs3ornuRuAAdgrkq+6l7ZLNYJcf7Z6PCydDzoYZgInuDxgFOs7AZ
- TwbwMWQbSR6Wmuan/Ls9Qsz9RDDNbvm/+LalXn8ssqxyW1yX38NrFoXSENXH6UXfnav35JPA4YfM
- 6tBkXsqvKY6zoLLTPpuFqUUQz+mM8JAD4ECWNo09vb0YLIRnK477e9Xake5PIWKjIXX7qe2zOXoS
- foyabLOzJfoDhdDs/9NevXg27n3YPTZnj10duuFw8+p3/2bjO41FyBEqIaDudcVplPE6wCr6GXU1
- lCw88ijyus1sGnWknJqS8gGhNQxpB5P3qu7c1xMljx2PG/R+pKBSKy8hXOgvE1zSS7XUhkYEQYeb
- 3jR5NeVaJQBh0uawl0Cg8j+knAzOA9mmoJvkuhKHiekUuskYaI6ERCKp8gXWqnT9kLHhStr5fiGK
- 7KncpWELuTEvuGslKTrRIXcXpFg5ivY=
-X-Report-Abuse-To: spam@antispammaster.host-h.net
-X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 
-X-CRM114-CacheID: sfid-20200203_144352_167656_2A074D4B 
-X-CRM114-Status: UNSURE (   9.81  )
-X-CRM114-Notice: Please train this message.
-X-Spam-Score: -0.7 (/)
-X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary:
- Content analysis details:   (-0.7 points)
- pts rule name              description
- ---- ----------------------
- --------------------------------------------------
- -0.7 RCVD_IN_DNSWL_LOW      RBL: Sender listed at https://www.dnswl.org/,
- low trust [197.242.87.53 listed in list.dnswl.org]
- 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
- -0.0 SPF_PASS               SPF: sender matches SPF record
-X-BeenThere: linux-rockchip@lists.infradead.org
-X-Mailman-Version: 2.1.29
-Precedence: list
-List-Id: Upstream kernel work for Rockchip platforms
- <linux-rockchip.lists.infradead.org>
-List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-rockchip>,
- <mailto:linux-rockchip-request@lists.infradead.org?subject=unsubscribe>
-List-Archive: <http://lists.infradead.org/pipermail/linux-rockchip/>
-List-Post: <mailto:linux-rockchip@lists.infradead.org>
-List-Help: <mailto:linux-rockchip-request@lists.infradead.org?subject=help>
-List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-rockchip>,
- <mailto:linux-rockchip-request@lists.infradead.org?subject=subscribe>
-Cc: linux-rockchip@lists.infradead.org,
- Justin Swartz <justin.swartz@risingedge.co.za>, linux-kernel@vger.kernel.org,
- linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org
-MIME-Version: 1.0
-Sender: "Linux-rockchip" <linux-rockchip-bounces@lists.infradead.org>
-Errors-To: 
- linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org
-
 Add a node to define the presence of RGA, a 2D raster
 graphic acceleration unit.

@@ -178,138 +29,6 @@ index 340ed6ccb..29d50bebc 100644
 		compatible = "rockchip,iommu";
 		reg = <0x20070800 0x100>;

-From patchwork Mon Feb  3 22:40:17 2020
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Justin Swartz <justin.swartz@risingedge.co.za>
-X-Patchwork-Id: 11363533
-Return-Path: 
- <SRS0=GAr4=3X=lists.infradead.org=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@kernel.org>
-Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
- [172.30.200.123])
-	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 38C9C138D
-	for <patchwork-linux-rockchip@patchwork.kernel.org>;
- Mon,  3 Feb 2020 22:43:53 +0000 (UTC)
-Received: from bombadil.infradead.org (bombadil.infradead.org
- [198.137.202.133])
-	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
-	(No client certificate requested)
-	by mail.kernel.org (Postfix) with ESMTPS id DFCE520732
-	for <patchwork-linux-rockchip@patchwork.kernel.org>;
- Mon,  3 Feb 2020 22:43:52 +0000 (UTC)
-Authentication-Results: mail.kernel.org;
-	dkim=pass (2048-bit key) header.d=lists.infradead.org
- header.i=@lists.infradead.org header.b="ZPPD3mYU"
-DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DFCE520732
-Authentication-Results: mail.kernel.org;
- dmarc=none (p=none dis=none) header.from=risingedge.co.za
-Authentication-Results: mail.kernel.org;
- spf=none
- smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org
-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
-	d=lists.infradead.org; s=bombadil.20170209; h=Sender:
-	Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe:
-	List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References:
-	In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID:
-	Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc
-	:Resent-Message-ID:List-Owner;
-	bh=EuLRCmJksZCffcAB30Jmojhx9ACJFycNIoXd8Mvzba4=; b=ZPPD3mYUt8BEU6UlINqRsHKA3e
-	MKCDg7cZNfkBV15/m6E8M7HwqFvW7qi2Jbve6P0qpXE5fTvjzSrxMsN8xhunCyWs2mxmYQo+VS/No
-	ngEOaUjaIEbFpF2e2OPoFcV978WHndFC1+kaSKPOQFMWycEcZSi1fErrQrgbqJ38StVipC/M/CutW
-	vJVXTHtB4fkya1fIcLPNzEvCA+q9qR2seQSiIUBaqsyjUYLKiHE3WAQT4rL2euUmAomDB8z67eaSO
-	jLnmIedFz4Dzcsoi1QuokQWT5PUP0yWLyL3N9EdFFSwVZWJDH1G3vo1VHgoZte641qn4xMoXTeEsR
-	kutRoIrQ==;
-Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
-	by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux))
-	id 1iykRV-0002Lb-CZ; Mon, 03 Feb 2020 22:43:45 +0000
-Received: from outgoing3.flk.host-h.net ([188.40.0.89])
- by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux))
- id 1iykRS-0002L3-V7; Mon, 03 Feb 2020 22:43:44 +0000
-Received: from www31.flk1.host-h.net ([188.40.1.173])
- by antispam1-flk1.host-h.net with esmtpsa
- (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92)
- (envelope-from <justin.swartz@risingedge.co.za>)
- id 1iykRR-00057b-1o; Tue, 04 Feb 2020 00:43:41 +0200
-Received: from [130.255.73.16] (helo=v01.28459.vpscontrol.net)
- by www31.flk1.host-h.net with esmtpsa
- (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89)
- (envelope-from <justin.swartz@risingedge.co.za>)
- id 1iykRQ-0001Vj-9F; Tue, 04 Feb 2020 00:43:40 +0200
-From: Justin Swartz <justin.swartz@risingedge.co.za>
-To: Heiko Stuebner <heiko@sntech.de>, Rob Herring <robh+dt@kernel.org>,
- Mark Rutland <mark.rutland@arm.com>
-Subject: [PATCH v4 3/3] ARM: dts: rockchip: enable rga for rk3229-xms6
-Date: Mon,  3 Feb 2020 22:40:17 +0000
-Message-Id: 
- <e359f70b58cce7ae2c446d976d989382752a8ee9.1580768038.git.justin.swartz@risingedge.co.za>
-X-Mailer: git-send-email 2.11.0
-In-Reply-To: <cover.1580768038.git.justin.swartz@risingedge.co.za>
-References: <cover.1580768038.git.justin.swartz@risingedge.co.za>
-X-Authenticated-Sender: justin.swartz@risingedge.co.za
-X-Virus-Scanned: Clear
-X-Originating-IP: 188.40.1.173
-X-SpamExperts-Domain: risingedge.co.za
-X-SpamExperts-Username: 
-Authentication-Results: host-h.net;
- auth=pass (login) smtp.auth=@risingedge.co.za
-X-SpamExperts-Outgoing-Class: ham
-X-SpamExperts-Outgoing-Evidence: Combined (0.02)
-X-Recommended-Action: accept
-X-Filter-ID: 
- Mvzo4OR0dZXEDF/gcnlw0S9sfM/nP8gxoqs1zeWkeM2pSDasLI4SayDByyq9LIhVfgT6iyTGIFx4
- t4v1bPiGd0TNWdUk1Ol2OGx3IfrIJKyP9eGNFz9TW9u+Jt8z2T3K7uDjV/sFUXQr+CDrNQuIHgQg
- mAX8Bxy/iUu0ThNZg0jxJtcVJProrT987X1VDPOqN+OoDzRTdku7DidYUZdNf38Sp7Of4wP429AA
- f49baR+f3He7jw4SoVhmTJ/3eP9ORQWVx8ds1M4qmk3/bYr2p8zbg4Paoa3pNVQ0zl7t/+UfQLYB
- qEPnp1U88kqVD8AM2G81dFO0E3gi+MOI1foZYzDggRXhpvoPtF3cVkniFXU3qJSqpdJudO6+rkiw
- E5i8Wl78Q18OeOfsy4h7jF1Uv9lnibl3vcBqVmvQB4A18acDbZipvP/Qnob2BGYE/rMFAVXirbLu
- Jjy3NtnGWLbnBGfrUBEXB2fYGLNieGQuoHtJvp0r29Rf3ZjFwL+MhHEWw/0qBlNDp8uABz3dkWV+
- tqvfVptXu2ZPaDzh52R7cx1TycYLFeAN4+MGwnsp7SkU6CLbyF0Zq4b1/7rjUzETJrWks4pbbQJq
- 6gWopI3ep45X19ZysgQ+31LcAX8eoFXAhohfegXGH2GIVQVglJFbK771YV8YbC29CtmpcTqTfSIf
- CWq9oj7OiT8GwpAriB+3/81I3rvR8KJ2fK9jiDYgijyqqY0rATpzHKGfmtNsYTr4SmDZ/bGW8xZC
- RRs6ZD24UhFcZZEpLhnBCwImTQNvxaLyCc35VA7RvW/HGiGqxL09Cymermt8NAa/gGopT3kKfO4C
- gvcKmV0o9jYzsFpuc43pp/LzIs3ornuRuAAdgrkq+6l7ZLNYJcf7Z6PCydDzoYZgInuDxgFOs7AZ
- TwbwMQ+abPksLFqImdiM/AYysXvbKb2VdvW5w3MvmFzSUS/S38NrFoXSENXH6UXfnav35JPA4YfM
- 6tBkXsqvKY6zoLLTPpuFqUUQz+mM8JAD4ECWNo09vb0YLIRnK477e9Xake5PIWKjIXX7qe2zOXoS
- foz0bgFikLHoXc2uAxQnRRu7n7r+eM6iYfrDoYc1hgAawGbjO41FyBEqIaDudcVplPE6wCr6GXU1
- lCw88ijyus1sGnWknJqS8gGhNQxpB5P3qu7c1xMljx2PG/R+pKBSKy8hXOgvE1zSS7XUhkYEQYeb
- 3jR5NeVaJQBh0uawl0Cg8j+knAzOA9mmoJvkuhKHiekUuskYaI6ERCKp8gXWqnT9kLHhStr5fiGK
- 7KncpWELuTEvuGslKTrRIXcXpFg5ivY=
-X-Report-Abuse-To: spam@antispammaster.host-h.net
-X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 
-X-CRM114-CacheID: sfid-20200203_144343_004138_EA933486 
-X-CRM114-Status: UNSURE (   8.20  )
-X-CRM114-Notice: Please train this message.
-X-Spam-Score: 0.0 (/)
-X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary:
- Content analysis details:   (0.0 points)
- pts rule name              description
- ---- ----------------------
- --------------------------------------------------
- -0.0 RCVD_IN_DNSWL_NONE     RBL: Sender listed at https://www.dnswl.org/,
- no trust [188.40.0.89 listed in list.dnswl.org]
- 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
- -0.0 SPF_PASS               SPF: sender matches SPF record
-X-BeenThere: linux-rockchip@lists.infradead.org
-X-Mailman-Version: 2.1.29
-Precedence: list
-List-Id: Upstream kernel work for Rockchip platforms
- <linux-rockchip.lists.infradead.org>
-List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-rockchip>,
- <mailto:linux-rockchip-request@lists.infradead.org?subject=unsubscribe>
-List-Archive: <http://lists.infradead.org/pipermail/linux-rockchip/>
-List-Post: <mailto:linux-rockchip@lists.infradead.org>
-List-Help: <mailto:linux-rockchip-request@lists.infradead.org?subject=help>
-List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-rockchip>,
- <mailto:linux-rockchip-request@lists.infradead.org?subject=subscribe>
-Cc: linux-rockchip@lists.infradead.org,
- Justin Swartz <justin.swartz@risingedge.co.za>, linux-kernel@vger.kernel.org,
- linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org
-MIME-Version: 1.0
-Sender: "Linux-rockchip" <linux-rockchip-bounces@lists.infradead.org>
-Errors-To: 
- linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org
-
 Enable RGA for Mecer Xtreme Mini S6.

 Signed-off-by: Justin Swartz <justin.swartz@risingedge.co.za>
@@ -683,21 +683,7 @@ index 000000000000..a0c45e05cf03
 +                power-domains = <&power RK3328_PD_VPU>;
 +                iommus = <&vpu_mmu>;
 +        };
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 0bff05c4c96d..ca95e804aae0 100644
--- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -14319,7 +14319,7 @@ M:	Ezequiel Garcia <ezequiel@collabora.com>
- L:	linux-media@vger.kernel.org
- S:	Maintained
- F:	drivers/staging/media/hantro/
-F:	Documentation/devicetree/bindings/media/rockchip-vpu.txt
-+F:	Documentation/devicetree/bindings/media/rockchip-vpu.yaml
- 
- ROCKER DRIVER
- M:	Jiri Pirko <jiri@resnulli.us>
-- 
-2.17.1
+


 From 1eba04297572f566a06ab9fe50f901640c77b091 Mon Sep 17 00:00:00 2001
@@ -1,8 +1,8 @@
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index d6546d2676b9..26fbba6273ed 100644
+index e8dd99201..02d9d3ae7 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -938,6 +938,12 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
+@@ -952,6 +952,12 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 	rk3188-px3-evb.dtb \
 	rk3188-radxarock.dtb \
 	rk3228-evb.dtb \
@@ -17,7 +17,7 @@ index d6546d2676b9..26fbba6273ed 100644
 	rk3288-evb-act8846.dtb \
 diff --git a/arch/arm/boot/dts/rk3228a-box-h96mini.dts b/arch/arm/boot/dts/rk3228a-box-h96mini.dts
 new file mode 100644
-index 000000000000..c624500d1470
+index 000000000..c624500d1
 --- /dev/null
 +++ b/arch/arm/boot/dts/rk3228a-box-h96mini.dts
@@ -0,0 +1,106 @@
@@ -129,7 +129,7 @@ index 000000000000..c624500d1470
 +};
 diff --git a/arch/arm/boot/dts/rk3228a-box-nand.dts b/arch/arm/boot/dts/rk3228a-box-nand.dts
 new file mode 100644
-index 000000000000..f3e5ab89462b
+index 000000000..f3e5ab894
 --- /dev/null
 +++ b/arch/arm/boot/dts/rk3228a-box-nand.dts
@@ -0,0 +1,57 @@
@@ -192,7 +192,7 @@ index 000000000000..f3e5ab89462b
 +};
 diff --git a/arch/arm/boot/dts/rk3228a-box.dts b/arch/arm/boot/dts/rk3228a-box.dts
 new file mode 100644
-index 000000000000..e68ef44b95c9
+index 000000000..e68ef44b9
 --- /dev/null
 +++ b/arch/arm/boot/dts/rk3228a-box.dts
@@ -0,0 +1,47 @@
@@ -245,7 +245,7 @@ index 000000000000..e68ef44b95c9
 +};
 diff --git a/arch/arm/boot/dts/rk3228a-box.dtsi b/arch/arm/boot/dts/rk3228a-box.dtsi
 new file mode 100644
-index 000000000000..dbd5c5dc4491
+index 000000000..dbd5c5dc4
 --- /dev/null
 +++ b/arch/arm/boot/dts/rk3228a-box.dtsi
@@ -0,0 +1,12 @@
@@ -263,7 +263,7 @@ index 000000000000..dbd5c5dc4491
 +};
 diff --git a/arch/arm/boot/dts/rk3229-box-a95xr1.dts b/arch/arm/boot/dts/rk3229-box-a95xr1.dts
 new file mode 100644
-index 000000000000..b3695fb0b255
+index 000000000..b3695fb0b
 --- /dev/null
 +++ b/arch/arm/boot/dts/rk3229-box-a95xr1.dts
@@ -0,0 +1,57 @@
@@ -326,7 +326,7 @@ index 000000000000..b3695fb0b255
 +};
 diff --git a/arch/arm/boot/dts/rk3229-box-nand.dts b/arch/arm/boot/dts/rk3229-box-nand.dts
 new file mode 100644
-index 000000000000..5eca0f335c55
+index 000000000..5eca0f335
 --- /dev/null
 +++ b/arch/arm/boot/dts/rk3229-box-nand.dts
@@ -0,0 +1,60 @@
@@ -392,7 +392,7 @@ index 000000000000..5eca0f335c55
 +};
 diff --git a/arch/arm/boot/dts/rk3229-box.dts b/arch/arm/boot/dts/rk3229-box.dts
 new file mode 100644
-index 000000000000..b63e61cda257
+index 000000000..b63e61cda
 --- /dev/null
 +++ b/arch/arm/boot/dts/rk3229-box.dts
@@ -0,0 +1,50 @@
@@ -448,7 +448,7 @@ index 000000000000..b63e61cda257
 +};
 diff --git a/arch/arm/boot/dts/rk3229-box.dtsi b/arch/arm/boot/dts/rk3229-box.dtsi
 new file mode 100644
-index 000000000000..79e2524e07f2
+index 000000000..79e2524e0
 --- /dev/null
 +++ b/arch/arm/boot/dts/rk3229-box.dtsi
@@ -0,0 +1,21 @@
@@ -475,7 +475,7 @@ index 000000000000..79e2524e07f2
 +};
 diff --git a/arch/arm/boot/dts/rk3229-cpu-opp.dtsi b/arch/arm/boot/dts/rk3229-cpu-opp.dtsi
 new file mode 100644
-index 000000000000..c1c7613bab11
+index 000000000..c1c7613ba
 --- /dev/null
 +++ b/arch/arm/boot/dts/rk3229-cpu-opp.dtsi
@@ -0,0 +1,50 @@
@@ -531,7 +531,7 @@ index 000000000000..c1c7613bab11
 +};
 diff --git a/arch/arm/boot/dts/rk322x-box.dtsi b/arch/arm/boot/dts/rk322x-box.dtsi
 new file mode 100644
-index 000000000000..29df40f4fa63
+index 000000000..44fb2f4ea
 --- /dev/null
 +++ b/arch/arm/boot/dts/rk322x-box.dtsi
@@ -0,0 +1,250 @@
@@ -787,7 +787,7 @@ index 000000000000..29df40f4fa63
 +};
 diff --git a/arch/arm/boot/dts/rk322x-dcdc.dtsi b/arch/arm/boot/dts/rk322x-dcdc.dtsi
 new file mode 100644
-index 000000000000..6076cb1d0d0b
+index 000000000..6076cb1d0
 --- /dev/null
 +++ b/arch/arm/boot/dts/rk322x-dcdc.dtsi
@@ -0,0 +1,164 @@
@@ -956,7 +956,7 @@ index 000000000000..6076cb1d0d0b
 +	};
 +};
 diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
-index eef2c44bdf69..f7a50b903a7d 100644
+index 5485a9918..c3ca67301 100644
 --- a/arch/arm/boot/dts/rk322x.dtsi
 +++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -5,6 +5,8 @@
@@ -968,7 +968,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 #include <dt-bindings/thermal/thermal.h>
 
 / {
-@@ -14,6 +16,7 @@
+@@ -14,6 +16,7 @@ / {
 	interrupt-parent = <&gic>;
 
 	aliases {
@@ -976,7 +976,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 		serial0 = &uart0;
 		serial1 = &uart1;
 		serial2 = &uart2;
-@@ -73,25 +76,25 @@
+@@ -73,25 +76,25 @@ cpu0_opp_table: opp_table0 {
 
 		opp-408000000 {
 			opp-hz = /bits/ 64 <408000000>;
@@ -1007,7 +1007,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 		};
 	};
 
-@@ -121,11 +124,52 @@
+@@ -121,11 +124,52 @@ arm-pmu {
 		interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
 	};
 
@@ -1060,7 +1060,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 	timer {
 		compatible = "arm,armv7-timer";
 		arm,cpu-registers-not-fw-configured;
-@@ -143,17 +187,13 @@
+@@ -143,15 +187,13 @@ xin24m: oscillator {
 		#clock-cells = <0>;
 	};
 
@@ -1073,21 +1073,23 @@ index eef2c44bdf69..f7a50b903a7d 100644
 		compatible = "rockchip,rk3228-i2s", "rockchip,rk3066-i2s";
 		reg = <0x100b0000 0x4000>;
 		interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
- 		#address-cells = <1>;
- 		#size-cells = <0>;
+		#address-cells = <1>;
+		#size-cells = <0>;
 +		#sound-dai-cells = <0>;
 		clock-names = "i2s_clk", "i2s_hclk";
 		clocks = <&cru SCLK_I2S1>, <&cru HCLK_I2S1_8CH>;
 		dmas = <&pdma 14>, <&pdma 15>;
-@@ -169,6 +209,7 @@
+@@ -165,6 +207,9 @@ i2s0: i2s0@100c0000 {
+ 		compatible = "rockchip,rk3228-i2s", "rockchip,rk3066-i2s";
+ 		reg = <0x100c0000 0x4000>;
 		interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
- 		#address-cells = <1>;
- 		#size-cells = <0>;
+		#address-cells = <1>;
+		#size-cells = <0>;
 +		#sound-dai-cells = <0>;
 		clock-names = "i2s_clk", "i2s_hclk";
 		clocks = <&cru SCLK_I2S0>, <&cru HCLK_I2S0_8CH>;
 		dmas = <&pdma 11>, <&pdma 12>;
-@@ -186,6 +227,7 @@
+@@ -182,6 +227,7 @@ spdif: spdif@100d0000 {
 		dma-names = "tx";
 		pinctrl-names = "default";
 		pinctrl-0 = <&spdif_tx>;
@@ -1095,7 +1097,17 @@ index eef2c44bdf69..f7a50b903a7d 100644
 		status = "disabled";
 	};
 
-@@ -213,6 +255,43 @@
+@@ -189,6 +235,9 @@ i2s2: i2s2@100e0000 {
+ 		compatible = "rockchip,rk3228-i2s", "rockchip,rk3066-i2s";
+ 		reg = <0x100e0000 0x4000>;
+ 		interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		#sound-dai-cells = <0>;
+ 		clock-names = "i2s_clk", "i2s_hclk";
+ 		clocks = <&cru SCLK_I2S2>, <&cru HCLK_I2S2_2CH>;
+ 		dmas = <&pdma 0>, <&pdma 1>;
+@@ -207,6 +256,43 @@ io_domains: io-domains {
 			status = "disabled";
 		};
 
@@ -1139,7 +1151,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 		u2phy0: usb2-phy@760 {
 			compatible = "rockchip,rk3228-usb2phy";
 			reg = <0x0760 0x0c>;
-@@ -263,6 +342,7 @@
+@@ -257,6 +343,7 @@ u2phy1_host: host-port {
 				status = "disabled";
 			};
 		};
@@ -1147,7 +1159,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 	};
 
 	uart0: serial@11010000 {
-@@ -301,7 +381,7 @@
+@@ -295,7 +382,7 @@ uart2: serial@11030000 {
 		clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>;
 		clock-names = "baudclk", "apb_pclk";
 		pinctrl-names = "default";
@@ -1156,7 +1168,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 		reg-shift = <2>;
 		reg-io-width = <4>;
 		status = "disabled";
-@@ -460,13 +540,13 @@
+@@ -454,13 +541,13 @@ cru: clock-controller@110e0000 {
 			<&cru PLL_CPLL>, <&cru ACLK_PERI>,
 			<&cru HCLK_PERI>, <&cru PCLK_PERI>,
 			<&cru ACLK_CPU>, <&cru HCLK_CPU>,
@@ -1173,7 +1185,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 	};
 
 	thermal-zones {
-@@ -511,6 +591,12 @@
+@@ -505,6 +592,12 @@ map1 {
 						<&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
 						<&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
 				};
@@ -1186,7 +1198,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 			};
 		};
 	};
-@@ -529,8 +615,9 @@
+@@ -523,8 +616,9 @@ tsadc: tsadc@11150000 {
 		pinctrl-0 = <&otp_gpio>;
 		pinctrl-1 = <&otp_out>;
 		pinctrl-2 = <&otp_gpio>;
@@ -1197,7 +1209,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 		status = "disabled";
 	};
 
-@@ -560,10 +647,33 @@
+@@ -554,10 +648,33 @@ gpu: gpu@20000000 {
 				  "ppmmu0",
 				  "pp1",
 				  "ppmmu1";
@@ -1232,7 +1244,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 	};
 
 	vpu_mmu: iommu@20020800 {
-@@ -573,8 +683,8 @@
+@@ -567,8 +684,8 @@ vpu_mmu: iommu@20020800 {
 		interrupt-names = "vpu_mmu";
 		clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
 		clock-names = "aclk", "iface";
@@ -1243,7 +1255,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 	};
 
 	vdec_mmu: iommu@20030480 {
-@@ -584,8 +694,8 @@
+@@ -578,8 +695,8 @@ vdec_mmu: iommu@20030480 {
 		interrupt-names = "vdec_mmu";
 		clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>;
 		clock-names = "aclk", "iface";
@@ -1254,7 +1266,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 	};
 
 	vop: vop@20050000 {
-@@ -639,7 +749,7 @@
+@@ -622,7 +739,7 @@ iep_mmu: iommu@20070800 {
 		interrupt-names = "iep_mmu";
 		clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>;
 		clock-names = "aclk", "iface";
@@ -1263,7 +1275,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 		status = "disabled";
 	};
 
-@@ -659,6 +769,7 @@
+@@ -642,6 +759,7 @@ hdmi: hdmi@200a0000 {
 		phys = <&hdmi_phy>;
 		phy-names = "hdmi";
 		rockchip,grf = <&grf>;
@@ -1271,7 +1283,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 		status = "disabled";
 
 		ports {
-@@ -680,9 +791,13 @@
+@@ -663,9 +781,13 @@ sdmmc: mmc@30000000 {
 		clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
 			 <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
@@ -1286,7 +1298,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 		status = "disabled";
 	};
 
-@@ -692,10 +807,14 @@
+@@ -675,10 +797,14 @@ sdio: mmc@30010000 {
 		interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,
 			 <&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;
@@ -1301,23 +1313,17 @@ index eef2c44bdf69..f7a50b903a7d 100644
 		status = "disabled";
 	};
 
-@@ -703,14 +822,13 @@
+@@ -686,8 +812,7 @@ emmc: mmc@30020000 {
 		compatible = "rockchip,rk3228-dw-mshc", "rockchip,rk3288-dw-mshc";
 		reg = <0x30020000 0x4000>;
 		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
 -		clock-frequency = <37500000>;
 -		max-frequency = <37500000>;
+		max-frequency = <150000000>;
 		clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
 			 <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
- 		bus-width = <8>;
- 		default-sample-phase = <158>;
- 		fifo-depth = <0x100>;
-+		max-frequency = <150000000>;
- 		pinctrl-names = "default";
- 		pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
- 		resets = <&cru SRST_EMMC>;
-@@ -718,6 +836,22 @@
+@@ -701,6 +826,22 @@ emmc: mmc@30020000 {
 		status = "disabled";
 	};
 
@@ -1340,7 +1346,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 	usb_otg: usb@30040000 {
 		compatible = "rockchip,rk3228-usb", "rockchip,rk3066-usb",
 			     "snps,dwc2";
-@@ -820,6 +954,26 @@
+@@ -796,6 +937,26 @@ gmac: ethernet@30200000 {
 		status = "disabled";
 	};
 
@@ -1367,7 +1373,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 	gic: interrupt-controller@32010000 {
 		compatible = "arm,gic-400";
 		interrupt-controller;
-@@ -908,6 +1062,11 @@
+@@ -884,6 +1045,11 @@ pcfg_pull_none_drv_12ma: pcfg-pull-none-drv-12ma {
 			drive-strength = <12>;
 		};
 
@@ -1379,7 +1385,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 		sdmmc {
 			sdmmc_clk: sdmmc-clk {
 				rockchip,pins = <1 RK_PC0 1 &pcfg_pull_none_drv_12ma>;
-@@ -923,6 +1082,10 @@
+@@ -899,6 +1065,10 @@ sdmmc_bus4: sdmmc-bus4 {
 						<1 RK_PC4 1 &pcfg_pull_none_drv_12ma>,
 						<1 RK_PC5 1 &pcfg_pull_none_drv_12ma>;
 			};
@@ -1390,7 +1396,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 		};
 
 		sdio {
-@@ -963,6 +1126,55 @@
+@@ -939,6 +1109,55 @@ emmc_bus8: emmc-bus8 {
 			};
 		};
 
@@ -1446,7 +1452,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 		gmac {
 			rgmii_pins: rgmii-pins {
 				rockchip,pins = <2 RK_PB6 1 &pcfg_pull_none>,
-@@ -1104,12 +1316,20 @@
+@@ -1080,12 +1299,20 @@ pwm1 {
 			pwm1_pin: pwm1-pin {
 				rockchip,pins = <0 RK_PD6 2 &pcfg_pull_none>;
 			};
@@ -1467,7 +1473,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 		};
 
 		pwm3 {
-@@ -1164,16 +1384,31 @@
+@@ -1140,16 +1367,31 @@ uart1_rts: uart1-rts {
 			};
 		};
 
@@ -1503,7 +1509,7 @@ index eef2c44bdf69..f7a50b903a7d 100644
 
 			uart2_cts: uart2-cts {
 				rockchip,pins = <0 RK_PD1 1 &pcfg_pull_none>;
-@@ -1183,5 +1418,23 @@
+@@ -1159,5 +1401,23 @@ uart2_rts: uart2-rts {
 				rockchip,pins = <0 RK_PD0 1 &pcfg_pull_none>;
 			};
 		};
@@ -1527,6 +1533,54 @@ index eef2c44bdf69..f7a50b903a7d 100644
 +
 	};
 };
-- 
-2.17.1
-
+diff --git a/arch/arm/boot/dts/rk322x.dtsi.rej b/arch/arm/boot/dts/rk322x.dtsi.rej
+new file mode 100644
+index 000000000..cc36be3e9
+--- /dev/null
+++ b/arch/arm/boot/dts/rk322x.dtsi.rej
+@@ -0,0 +1,45 @@
+--- arch/arm/boot/dts/rk322x.dtsi
++++ arch/arm/boot/dts/rk322x.dtsi
+@@ -187,17 +231,13 @@
+ 		#clock-cells = <0>;
+ 	};
+ 
+-	display_subsystem: display-subsystem {
+-		compatible = "rockchip,display-subsystem";
+-		ports = <&vop_out>;
+-	};
+-
+ 	i2s1: i2s1@100b0000 {
+ 		compatible = "rockchip,rk3228-i2s", "rockchip,rk3066-i2s";
+ 		reg = <0x100b0000 0x4000>;
+ 		interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
++		#sound-dai-cells = <0>;
+ 		clock-names = "i2s_clk", "i2s_hclk";
+ 		clocks = <&cru SCLK_I2S1>, <&cru HCLK_I2S1_8CH>;
+ 		dmas = <&pdma 14>, <&pdma 15>;
+@@ -213,6 +253,7 @@
+ 		interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
++		#sound-dai-cells = <0>;
+ 		clock-names = "i2s_clk", "i2s_hclk";
+ 		clocks = <&cru SCLK_I2S0>, <&cru HCLK_I2S0_8CH>;
+ 		dmas = <&pdma 11>, <&pdma 12>;
+@@ -825,14 +944,13 @@
+ 		compatible = "rockchip,rk3228-dw-mshc", "rockchip,rk3288-dw-mshc";
+ 		reg = <0x30020000 0x4000>;
+ 		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
+-		clock-frequency = <37500000>;
+-		max-frequency = <37500000>;
+ 		clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
+ 			 <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
+ 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
+ 		bus-width = <8>;
+ 		default-sample-phase = <158>;
+ 		fifo-depth = <0x100>;
++		max-frequency = <150000000>;
+ 		pinctrl-names = "default";
+ 		pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
+ 		resets = <&cru SRST_EMMC>;
@@ -64,6 +64,7 @@ index 33c1ce169203..e64369e01a21 100644
 extern const struct hantro_variant rk3328_vpu_variant;
 extern const struct hantro_variant rk3288_vpu_variant;
 +extern const struct hantro_variant rk322x_vpu_variant;
+ extern const struct hantro_variant imx8mq_vpu_variant;
 
 extern const struct hantro_postproc_regs hantro_g1_postproc_regs;
 
--- a/Show More
+++ b/Show More