Merge remote-tracking branch 'asus/rk3288_linux_release_v2.4.0_20210520' into HEAD

Change-Id: I12a4ddca7529cfabc2622a1c0a115bb4229539e6

Author: Stone-Wu-asus

arch/arm/Kconfig

@@ -1494,7 +1494,6 @@ config ARCH_NR_GPIO
 	default 416 if ARCH_SUNXI
 	default 392 if ARCH_U8500
 	default 352 if ARCH_VT8500
-	default 288 if ARCH_ROCKCHIP
 	default 264 if MACH_H4700
 	default 0
 	help

arch/arm/boot/dts/Makefile

@@ -547,6 +547,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 	rk3288-evb-android-rk818-lvds.dtb \
 	rk3288-evb-android-rk818-mipi.dtb \
 	rk3288-evb-android-rk818-mipi-edp.dtb \
+	rk3288-evb-rk628-hdmi2csi-avb.dtb \
+	rk3288-evb-rk628-hdmi2dsi-avb.dtb \
 	rk3288-evb-rk628-hdmi2gvi-avb.dtb \
 	rk3288-evb-rk628-rgb2dsi-avb.dtb \
 	rk3288-evb-rk628-rgb2gvi-avb.dtb \

arch/arm/boot/dts/rk312x.dtsi

@@ -56,6 +56,7 @@
 	#size-cells = <1>;
 
 	aliases {
+		ethernet0 = &gmac;
 		serial0 = &uart0;
 		serial1 = &uart1;
 		serial2 = &uart2;

arch/arm/boot/dts/rk322x.dtsi

@@ -55,6 +55,7 @@
 	interrupt-parent = <&gic>;
 
 	aliases {
+		ethernet0 = &gmac;
 		serial0 = &uart0;
 		serial1 = &uart1;
 		serial2 = &uart2;

arch/arm/boot/dts/rk3288-evb-rk628-hdmi2csi-avb.dts

@@ -0,0 +1,152 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+// Copyright (c) 2020 Fuzhou Rockchip Electronics Co., Ltd
+
+/dts-v1/;
+#include "rk3288-evb-rk628.dtsi"
+
+/ {
+	model = "Rockchip RK3288 EVB RK628 Board";
+	compatible = "rockchip,rk3288-evb-rk628", "rockchip,rk3288";
+
+	chosen {
+		bootargs = "rootwait earlycon=uart8250,mmio32,0xff690000 vmalloc=496M swiotlb=1 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init kpti=0 androidboot.selinux=permissive";
+	};
+
+	hdmiin-sound {
+		compatible = "rockchip,rockchip-rt5651-rk628-sound";
+		rockchip,cpu = <&i2s>;
+		rockchip,codec = <&rt5651>;
+		status = "okay";
+	};
+};
+
+&firmware_android {
+	compatible = "android,firmware";
+	boot_devices = "ff0f0000.dwmmc";
+
+	vbmeta {
+		compatible = "android,vbmeta";
+		parts = "vbmeta,boot,system,vendor,dtbo";
+	};
+
+	fstab {
+		compatible = "android,fstab";
+
+		vendor {
+			compatible = "android,vendor";
+			dev = "/dev/block/by-name/vendor";
+			type = "ext4";
+			mnt_flags = "ro,barrier=1,inode_readahead_blks=8";
+			fsmgr_flags = "wait,avb";
+		};
+	};
+};
+
+&video_phy {
+	status = "okay";
+};
+
+&hdmi {
+	status = "okay";
+};
+
+&hdmi_in_vopb {
+	status = "disabled";
+};
+
+&hdmi_in_vopl {
+	status = "okay";
+};
+
+&route_hdmi {
+	connect = <&vopl_out_hdmi>;
+	status = "disabled";
+};
+
+&rk628 {
+	reg = <0x51>;
+	interrupt-parent = <&gpio7>;
+	interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;
+	enable-gpios = <&gpio5 RK_PC3 GPIO_ACTIVE_HIGH>;
+	reset-gpios = <&gpio7 RK_PB4 GPIO_ACTIVE_LOW>;
+	status = "okay";
+};
+
+&rk628_combrxphy {
+	status = "okay";
+};
+
+&rk628_combtxphy {
+	status = "okay";
+};
+
+&rk628_csi {
+	status = "okay";
+	/*
+	 * If the hpd output level is inverted on the circuit,
+	 * the following configuration needs to be enabled.
+	 */
+	/* hpd-output-inverted; */
+	plugin-det-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
+	power-gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;
+	rockchip,camera-module-index = <0>;
+	rockchip,camera-module-facing = "back";
+	rockchip,camera-module-name = "RK628-CSI";
+	rockchip,camera-module-lens-name = "NC";
+
+	port {
+		hdmiin_out0: endpoint {
+			remote-endpoint = <&mipi_in>;
+			data-lanes = <1 2 3 4>;
+		};
+	};
+};
+
+&mipi_phy_rx0 {
+	status = "okay";
+
+	ports {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		port@0 {
+			reg = <0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			mipi_in: endpoint@1 {
+				reg = <1>;
+				remote-endpoint = <&hdmiin_out0>;
+				data-lanes = <1 2 3 4>;
+			};
+		};
+
+		port@1 {
+			reg = <1>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			dphy_rx_out: endpoint@0 {
+				reg = <0>;
+				remote-endpoint = <&isp_mipi_in>;
+			};
+		};
+	};
+};
+
+&rkisp1 {
+	status = "okay";
+	port {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		isp_mipi_in: endpoint@0 {
+			reg = <0>;
+			remote-endpoint = <&dphy_rx_out>;
+		};
+	};
+};
+
+&isp_mmu {
+	status = "okay";
+};