Update Aiot-rk3588a device tree: refine GPIO and I2C configurations

Author: ghhccghk

patch/kernel/rk35xx-vendor-6.1/dt/rk3588-aiot-rk3588a.dts

@@ -20,12 +20,8 @@
 	gpio_leds: gpio-leds {
 		compatible = "gpio-leds";
 		led_work_heartbeat: work_heartbeat {
-			gpios = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "heartbeat";
-		};
-		led_work_default_on: work_default_on  {
 			gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "default-on";
 		};
 	};
 
@@ -64,7 +60,7 @@
 
 		uboot_key: key-uboot {
 			label = "uboot key";
-			linux,code = <KEY_VOLUMEUP>;   /* U-Boot 一般也用 VUP */
+			linux,code = <KEY_VOLUMEUP>;
 			press-threshold-microvolt = <0x30d40>;
 		};
 	};
@@ -106,6 +102,7 @@
 	vcc3v3_lcd: vcc3v3-lcd {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc3v3_lcd";
+		gpio = <&gpio1 RK_PB3 GPIO_ACTIVE_HIGH>;
 		vin-supply = <&vcc_3v3_s0>;
 	};
 
@@ -164,66 +161,81 @@
 		regulator-max-microvolt = <0xb71b00>;
 	};
 };
+
 &pinctrl {
 	mcu {
-		mcum0_pins:mcum0-pins {
-			rockchip,pins = <0x04 0x1c 0x05 0x1a3 0x04 0x1d 0x05 0x1a3>;
+		mcum0_pins: mcum0-pins {
+			rockchip,pins =
+				<4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,
+				<4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
-		mcum1_pins:mcum1-pins {
-			rockchip,pins = <0x03 0x1c 0x06 0x1a3 0x03 0x1d 0x06 0x1a3>;
+		mcum1_pins: mcum1-pins {
+			rockchip,pins =
+				<3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,
+				<3 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	usb-typec {
-		usbc0_int:usbc0-int {
-			rockchip,pins = <0x00 0x1b 0x00 0x1a8>;
+		usbc0_int: usbc0-int {
+			rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 
-		typec5v_pwren:typec5v-pwren {
-			rockchip,pins = <0x04 0x01 0x00 0x1a3>;
+		typec5v_pwren: typec5v-pwren {
+			rockchip,pins =
+				<4 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
 	usb {
-		vcc5v0_host_en:vcc5v0-host-en {
-			rockchip,pins = <0x04 0x08 0x00 0x1a3>;
+		vcc5v0_peripherals_en: vcc5v0-peripherals-en {
+			rockchip,pins =
+				<3 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
+	};
+};
 
-		vcc5v0_peripherals_en:vcc5v0-peripherals-en {
-			rockchip,pins = <0x03 0x1d 0x00 0x1a3>;
-		};
+&i2c5 {
+	status = "okay";
+	gt1x: gt1x@14 {
+		compatible = "goodix,gt1x";
+		reg = <0x14>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&touch_gpio>;
+		status = "disabled";
+		goodix,rst-gpio = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
+		goodix,irq-gpio = <&gpio3 RK_PC0 IRQ_TYPE_LEVEL_LOW>;
+		power-supply = <&vcc3v3_lcd_n>;
 	};
 };
 
+
 &i2c6 {
 	status = "okay";
-	pinctrl-names = "default";
-	pinctrl-0 = <&i2c6m0_xfer>;
 
 	nca9555: nca9555@20  {
 		reg = <0x20>;
-		compatible = "novosense,nca9555","nxp,pca9555";
+		compatible = "nxp,pca9555";
 		status = "okay";
 		gpio-controller;
 		#gpio-cells = <2>;
-		//可选：如果连接了 INT 引脚
 	};
 
 	mcuinf: mcuinf@62 {
 		compatible = "smdtmcu,STM8S00K3";
-		status = "disabled";
+		status = "okay";
 		reg = <0x62>;
 		#pwm-cells = <2>;
 		/* MCU interrupt pin: GPIO0_B0 */
-		// int-gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
+		int-gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
 	};
 
 	usbc0: fusb302@22 {
 		compatible = "fcs,fusb302";
 		reg = <0x22>;
 		interrupt-parent = <&gpio0>;
-		interrupts = <RK_PD3 IRQ_TYPE_LEVEL_LOW>;
+		interrupts = <RK_PD3 IRQ_TYPE_EDGE_FALLING>;
 		int-n-gpios = <&gpio0 RK_PD3 GPIO_ACTIVE_LOW>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&usbc0_int>;
@@ -288,6 +300,8 @@
 
 };
 
+
+
 &usbdrd_dwc3_0 {
 	dr_mode = "otg";
 	usb-role-switch;
@@ -334,9 +348,6 @@
 	status = "okay";
 };
 
-&hym8563 {
-	status = "disabled";
-};
 
 &dp0 {
 	status = "disabled";