Merge pull request torvalds#266 from vamrs-feng/linux-5.10-gen-rkr4.1

Changes:
  * arm64: dts: radxa cm3 io: enable PCIe2x1

Signed-off-by: Stephen Chen <stephen@radxa.com>

arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts

@@ -89,6 +89,29 @@
 		cooling-levels = <0 64 128 192 255>;
 		pwms = <&pwm0 0 10000 0>;
 	};
+
+	vcc_ch482d1: vcc-ch482d1 {
+		compatible = "regulator-fixed";
+		gpio = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&ch482d_en1>;
+		regulator-name = "vcc_ch482d1";
+		regulator-always-on;
+		regulator-boot-on;
+		status = "okay";
+	};
+
+	vcc_ch482d2: vcc-ch482d2 {
+		compatible = "regulator-fixed";
+		gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&ch482d_en2>;
+		regulator-name = "vcc_ch482d2";
+		regulator-always-on;
+		regulator-boot-on;
+		status = "okay";
+	};
+
 };
 
 &gpio_leds {
@@ -183,6 +206,14 @@
 	status = "okay";
 };
 
+&pcie2x1 {
+	status = "okay";
+	reset-gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>;
+	vpcie3v3-supply = <&vcc3v3_sys>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pcie20m2_pins>;
+};
+
 &pwm0 {
 	pinctrl-0 = <&pwm0m1_pins>;
 	status = "okay";
@@ -261,6 +292,16 @@
 		};
 	};
 
+	ch482d {
+		ch482d_en1: ch482d-en1 {
+			rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
+		ch482d_en2: ch482d-en2 {
+			rockchip,pins = <3 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
 	gmac1 {
 		gmac1m0_miim: gmac1m0-miim {
 			rockchip,pins =