From 33b3aabbd98bffc9d1f0aab81bd9e1a789eb6962 Mon Sep 17 00:00:00 2001
From: amazingfate <liujianfeng1994@gmail.com>
Date: Sat, 27 Apr 2024 23:30:16 +0800
Subject: [PATCH] armsom-sige7: sync edge devicetree with mainline

---
 .../dt/rk3588-armsom-sige7.dts                | 103 +++++++-----------
 1 file changed, 39 insertions(+), 64 deletions(-)

diff --git a/patch/kernel/rockchip-rk3588-edge/dt/rk3588-armsom-sige7.dts b/patch/kernel/rockchip-rk3588-edge/dt/rk3588-armsom-sige7.dts
index 38db1c2bd7..bee75afd5f 100644
--- a/patch/kernel/rockchip-rk3588-edge/dt/rk3588-armsom-sige7.dts
+++ b/patch/kernel/rockchip-rk3588-edge/dt/rk3588-armsom-sige7.dts
@@ -7,7 +7,6 @@
 #include <dt-bindings/soc/rockchip,vop2.h>
 #include "rk3588.dtsi"
 
-
 / {
 	model = "ArmSoM Sige7";
 	compatible = "armsom,sige7", "rockchip,rk3588";
@@ -15,7 +14,6 @@
 	aliases {
 		mmc0 = &sdhci;
 		mmc1 = &sdmmc;
-		mmc2 = &sdio;
 	};
 
 	chosen {
@@ -24,38 +22,36 @@
 
 	analog-sound {
 		compatible = "audio-graph-card";
-		label = "rk3588-es8316";
-
-		widgets = "Microphone", "Mic Jack",
-			  "Headphone", "Headphones";
-
-		routing = "MIC2", "Mic Jack",
-			  "Headphones", "HPOL",
-			  "Headphones", "HPOR";
-
 		dais = <&i2s0_8ch_p0>;
+		label = "rk3588-es8316";
 		hp-det-gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&hp_detect>;
+		routing = "MIC2", "Mic Jack",
+			  "Headphones", "HPOL",
+			  "Headphones", "HPOR";
+		widgets = "Microphone", "Mic Jack",
+			  "Headphone", "Headphones";
 	};
-		leds {
+
+	leds {
 		compatible = "gpio-leds";
 		pinctrl-names = "default";
 		pinctrl-0 = <&led_rgb_g>;
 
-		led_rgb_r {
+		led_green: led-0 {
+			color = <LED_COLOR_ID_GREEN>;
 			function = LED_FUNCTION_STATUS;
-			color = <LED_COLOR_ID_RED>;
-			gpios = <&gpio4 RK_PC5 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "default-off";
-		};
-
-		led_rgb_g {
-			function = LED_FUNCTION_STATUS;
-			color = <LED_COLOR_ID_BLUE>;
 			gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "heartbeat";
 		};
+
+		led_red: led-1 {
+			color = <LED_COLOR_ID_RED>;
+			function = LED_FUNCTION_STATUS;
+			gpios = <&gpio4 RK_PC5 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "none";
+		};
 	};
 
 	fan: pwm-fan {
@@ -118,7 +114,6 @@
 		regulator-max-microvolt = <1100000>;
 		vin-supply = <&vcc5v0_sys>;
 	};
-
 };
 
 &combphy0_ps {
@@ -174,17 +169,16 @@
 	status = "okay";
 };
 
-
-&hdptxphy_hdmi0 {
-	status = "okay";
-};
-
 &hdmi0_in {
 	hdmi0_in_vp0: endpoint {
 		remote-endpoint = <&vp0_out_hdmi0>;
 	};
 };
 
+&hdptxphy_hdmi0 {
+	status = "okay";
+};
+
 &i2c0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c0m2_xfer>;
@@ -231,12 +225,12 @@
 	hym8563: rtc@51 {
 		compatible = "haoyu,hym8563";
 		reg = <0x51>;
+		interrupt-parent = <&gpio0>;
+		interrupts = <RK_PB0 IRQ_TYPE_LEVEL_LOW>;
 		#clock-cells = <0>;
 		clock-output-names = "hym8563";
 		pinctrl-names = "default";
 		pinctrl-0 = <&hym8563_int>;
-		interrupt-parent = <&gpio0>;
-		interrupts = <RK_PB0 IRQ_TYPE_LEVEL_LOW>;
 		wakeup-source;
 	};
 };
@@ -247,10 +241,10 @@
 	es8316: audio-codec@11 {
 		compatible = "everest,es8316";
 		reg = <0x11>;
-		clocks = <&cru I2S0_8CH_MCLKOUT>;
-		clock-names = "mclk";
 		assigned-clocks = <&cru I2S0_8CH_MCLKOUT>;
 		assigned-clock-rates = <12288000>;
+		clocks = <&cru I2S0_8CH_MCLKOUT>;
+		clock-names = "mclk";
 		#sound-dai-cells = <0>;
 
 		port {
@@ -318,7 +312,6 @@
 };
 
 &pcie3x4 {
-	pinctrl-names = "default";
 	reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
 	vpcie3v3-supply = <&vcc3v3_pcie30>;
 	status = "okay";
@@ -353,7 +346,6 @@
 	};
 };
 
-
 &pwm1 {
 	status = "okay";
 };
@@ -373,13 +365,13 @@
 };
 
 &sdmmc {
-	max-frequency = <200000000>;
-	no-sdio;
-	no-mmc;
 	bus-width = <4>;
 	cap-mmc-highspeed;
 	cap-sd-highspeed;
 	disable-wp;
+	max-frequency = <200000000>;
+	no-sdio;
+	no-mmc;
 	sd-uhs-sdr104;
 	vmmc-supply = <&vcc_3v3_s3>;
 	vqmmc-supply = <&vccio_sd_s0>;
@@ -387,12 +379,12 @@
 };
 
 &spi2 {
-	status = "okay";
 	assigned-clocks = <&cru CLK_SPI2>;
 	assigned-clock-rates = <200000000>;
+	num-cs = <1>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&spi2m2_cs0 &spi2m2_pins>;
-	num-cs = <1>;
+	status = "okay";
 
 	pmic@0 {
 		compatible = "rockchip,rk806";
@@ -402,6 +394,9 @@
 		interrupt-parent = <&gpio0>;
 		interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
 
+		gpio-controller;
+		#gpio-cells = <2>;
+
 		pinctrl-names = "default";
 		pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>,
 			    <&rk806_dvs2_null>, <&rk806_dvs3_null>;
@@ -424,9 +419,6 @@
 		vcc14-supply = <&vcc_1v1_nldo_s3>;
 		vcca-supply = <&vcc5v0_sys>;
 
-		gpio-controller;
-		#gpio-cells = <2>;
-
 		rk806_dvs1_null: dvs1-null-pins {
 			pins = "gpio_pwrctrl1";
 			function = "pin_fun0";
@@ -712,11 +704,6 @@
 	};
 };
 
-&uart2 {
-	pinctrl-0 = <&uart2m0_xfer>;
-	status = "okay";
-};
-
 &u2phy0 {
 	status = "okay";
 };
@@ -726,22 +713,13 @@
 };
 
 &u2phy1 {
- 	status = "okay";
+	status = "okay";
 };
 
 &u2phy1_otg {
 	status = "okay";
 };
 
-&u2phy2 {
-	status = "okay";
-};
-
-&u2phy2_host {
-	phy-supply = <&vcc5v0_sys>;
-	status = "okay";
-};
-
 &u2phy3 {
 	status = "okay";
 };
@@ -751,18 +729,15 @@
 	status = "okay";
 };
 
+&uart2 {
+	pinctrl-0 = <&uart2m0_xfer>;
+	status = "okay";
+};
+
 &usbdp_phy1 {
 	status = "okay";
 };
 
-&usb_host0_ehci {
-	status = "okay";
-};
-
-&usb_host0_ohci {
-	status = "okay";
-};
-
 &usb_host1_ehci {
 	status = "okay";
 };