Update Aiot-rk3588a device tree: remove unused includes, update LED GPIO, and add USB Type-C and regulator configurations

Author: ghhccghk

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

@@ -7,7 +7,6 @@
 /dts-v1/;
 
 #include "rk3588-evb7-lp4.dtsi"
-#include "rk3588-evb7-imx415.dtsi"
 #include "rk3588-linux.dtsi"
 
 / {
@@ -21,21 +20,11 @@
 	leds {
 		compatible = "gpio-leds";
 		work {
-			gpios = <&gpio4 RK_PB7 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "heartbeat";
 		};
 	};
-
-
-	mcuinf {
-		compatible = "smdtmcu,STM8S00K3";
-		status = "okay";
-		reg = <0x62>;
-		#pwm-cells = <2>;
-		/* MCU interrupt pin: GPIO0_B0 */
-		int-gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
-	};
-
+/*
 	adc-keys {
 		compatible = "adc-keys";
 		io-channels = <0x1d5 0x01>;
@@ -73,7 +62,7 @@
 			linux,code = <0x73>;
 			press-threshold-microvolt = <0x30d40>;
 		};
-	};
+	};*/
 
 	panel-edp0 {
 		compatible = "simple-panel";
@@ -114,19 +103,239 @@
 		regulator-name = "vcc3v3_lcd";
 		vin-supply = <&vcc_3v3_s0>;
 	};
+
+	vbus5v0_typec: vbus5v0-typec {
+		compatible = "regulator-fixed";
+		regulator-name = "vbus5v0_typec";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		enable-active-high;
+		gpio = <&gpio4 RK_PA1 GPIO_ACTIVE_HIGH>;
+		vin-supply = <&vcc5v0_host>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&typec5v_pwren>;
+	};
+
+	vcc5v0_peripherals:vcc5v0-peripherals {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc5v0_peripherals";
+		regulator-boot-on;
+		regulator-always-on;
+		regulator-min-microvolt = <0x4c4b40>;
+		regulator-max-microvolt = <0x4c4b40>;
+		enable-active-high;
+		gpio = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
+		vin-supply = <&vcc5v0_usb>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&vcc5v0_peripherals_en>;
+	};
+
+	vcc5v0_usb:vcc5v0-usb {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc5v0_usb";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <0x4c4b40>;
+		regulator-max-microvolt = <0x4c4b40>;
+		vin-supply = <&vcc5v0_usbdcin>;
+	};
+
+	vcc5v0_usbdcin:vcc5v0-usbdcin {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc5v0_usbdcin";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <0x4c4b40>;
+		regulator-max-microvolt = <0x4c4b40>;
+		vin-supply = <&vcc12v_dcin>;
+	};
+
+	vcc12v_dcin:vcc12v-dcin {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc12v_dcin";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <0xb71b00>;
+		regulator-max-microvolt = <0xb71b00>;
+	};
 };
 
 &pinctrl {
 	mcu {
-		mcum0-pins {
+		mcum0_pins:mcum0-pins {
 			rockchip,pins = <0x04 0x1c 0x05 0x1a3 0x04 0x1d 0x05 0x1a3>;
 		};
 
-		mcum1-pins {
+		mcum1_pins:mcum1-pins {
 			rockchip,pins = <0x03 0x1c 0x06 0x1a3 0x03 0x1d 0x06 0x1a3>;
 		};
 	};
 
+	usb-typec {
+		usbc0_int:usbc0-int {
+			rockchip,pins = <0x00 0x1b 0x00 0x1a8>;
+		};
+
+		typec5v_pwren:typec5v-pwren {
+			rockchip,pins = <0x04 0x01 0x00 0x1a3>;
+		};
+	};
+
+	usb {
+		vcc5v0_host_en:vcc5v0-host-en {
+			rockchip,pins = <0x04 0x08 0x00 0x1a3>;
+		};
+
+		vcc5v0_peripherals_en:vcc5v0-peripherals-en {
+			rockchip,pins = <0x03 0x1d 0x00 0x1a3>;
+		};
+	};
+
+};
+
+&i2c6 {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c6m0_xfer>;
+
+	nca9555: nca9555@20  {
+		reg = <0x20>;
+		compatible = "novosense,nca9555";
+		status = "okay";
+		gpio-controller;
+		#gpio-cells = <2>;
+		ngpios = <16>;
+		//可选：如果连接了 INT 引脚
+		//interrupt-parent = <&gpio1>;
+		//interrupts = <61 IRQ_TYPE_EDGE_FALLING>;
+	};
+
+	mcuinf: mcuinf@62 {
+		compatible = "smdtmcu,STM8S00K3";
+		status = "okay";
+		reg = <0x62>;
+		#pwm-cells = <2>;
+		/* MCU interrupt pin: GPIO0_B0 */
+		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>;
+		int-n-gpios = <&gpio0 RK_PD3 GPIO_ACTIVE_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&usbc0_int>;
+		vbus-supply = <&vbus5v0_typec>;
+		status = "okay";
+
+		ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port@0 {
+				reg = <0>;
+				usbc0_role_sw: endpoint@0 {
+					remote-endpoint = <&dwc3_0_role_switch>;
+				};
+			};
+		};
+
+		usb_con: connector {
+			compatible = "usb-c-connector";
+			label = "USB-C";
+			data-role = "dual";
+			power-role = "dual";
+			try-power-role = "sink";
+			op-sink-microwatt = <1000000>;
+			sink-pdos =
+				<PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
+			source-pdos =
+				<PDO_FIXED(5000, 2000, PDO_FIXED_USB_COMM)>;
+
+			altmodes {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				altmode@0 {
+					reg = <0>;
+					svid = <0xff01>;
+					vdo = <0xffffffff>;
+				};
+			};
+
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				port@0 {
+					reg = <0>;
+					usbc0_orien_sw: endpoint {
+						remote-endpoint = <&usbdp_phy0_orientation_switch>;
+					};
+				};
+
+				port@1 {
+					reg = <1>;
+					dp_altmode_mux: endpoint {
+						remote-endpoint = <&usbdp_phy0_dp_altmode_mux>;
+					};
+				};
+			};
+		};
+	};
+
+};
+
+&usbdrd_dwc3_0 {
+	dr_mode = "otg";
+	usb-role-switch;
+	status = "okay";
+
+	port {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		dwc3_0_role_switch: endpoint@0 {
+			reg = <0>;
+			remote-endpoint = <&usbc0_role_sw>;
+		};
+	};
+};
+
+&usbdp_phy0 {
+	orientation-switch;
+	rockchip,dp-lane-mux = <0 1 2 3 >;
+	svid = <0xff01>;
+	sbu1-dc-gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>;
+	sbu2-dc-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>;
+	status = "okay";
+
+	port {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		usbdp_phy0_orientation_switch: endpoint@0 {
+			reg = <0>;
+			remote-endpoint = <&usbc0_orien_sw>;
+		};
+
+		usbdp_phy0_dp_altmode_mux: endpoint@1 {
+			reg = <1>;
+			remote-endpoint = <&dp_altmode_mux>;
+		};
+	};
+};
+
+&usbdp_phy0_dp {
+	status = "okay";
+};
+
+&usbdp_phy0_u3 {
+	status = "okay";
+};
+
+&hym8563 {
+	status = "disabled";
 };
 
 &dp0 {