diff --git a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts b/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts index 9b1303ce29b30..a072069cc84e1 100755 --- a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts @@ -102,13 +102,15 @@ work_led: work { label = "red"; gpios = <&gpio4 RK_PC5 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "heartbeat"; + linux,default-trigger = "default-off"; + default-state = "off"; }; active_led: active { label = "green"; gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "none"; + linux,default-trigger = "default-off"; + default-state = "on"; }; }; @@ -196,15 +198,6 @@ pinctrl-0 = <&vcc5v0_host_en>; }; - sdio_pwrseq: sdio-pwrseq { - compatible = "mmc-pwrseq-simple"; - clocks = <&hym8563>; - clock-names = "ext_clock"; - pinctrl-names = "default"; - pinctrl-0 = <&wifi_enable_h>; - reset-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_LOW>; - }; - wireless_bluetooth: wireless-bluetooth { compatible = "bluetooth-platdata"; clocks = <&hym8563>; @@ -219,16 +212,15 @@ wireless_wlan: wireless-wlan { compatible = "wlan-platdata"; - wifi_chip_type = "ap6275s"; + wifi_chip_type = "ap6275p"; pinctrl-names = "default"; - pinctrl-0 = <&wifi_host_wake_irq>; + pinctrl-0 = <&wifi_host_wake_irq>,<&wifi_poweren_gpio>; WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; + WIFI,poweren_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; -//============================================================= - &av1d_mmu { status = "okay"; }; @@ -490,10 +482,6 @@ status = "okay"; }; -&usbdp_phy0 { - status = "okay"; -}; - &usbdp_phy0_dp { status = "okay"; }; @@ -507,7 +495,7 @@ }; &usbdp_phy1_dp { - status = "okay"; + status = "disabled"; }; &usbdp_phy1_u3 { @@ -518,11 +506,6 @@ status = "okay"; }; -&usbdrd_dwc3_0 { - dr_mode = "otg"; - status = "okay"; -}; - &usbhost3_0 { status = "okay"; }; @@ -580,8 +563,6 @@ rockchip,primary-plane = ; }; -//============================================================= - &dp0 { status = "okay"; }; @@ -683,6 +664,47 @@ }; }; +&i2c3 { + status = "okay"; + usbc1: fusb302@22 { + compatible = "fcs,fusb302"; + reg = <0x22>; + interrupt-parent = <&gpio3>; + interrupts = ; + int-n-gpios = <&gpio3 RK_PC4 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&usbc1_int>; + //vbus-supply = <&vcc12v_dcin>; + vbus-supply = <&vcc5v0_usbdcin>; + status = "okay"; + usb_con1: connector { + compatible = "usb-c-connector"; + label = "USB-C"; + data-role = "dual"; + power-role = "dual"; + try-power-role = "sink"; + op-sink-microwatt = <1000000>; + sink-pdos = + ; + source-pdos = + ; + + altmodes { + #address-cells = <1>; + #size-cells = <0>; + + altmode@0 { + reg = <0>; + svid = <0xff01>; + vdo = <0xffffffff>; + }; + }; + }; + }; +}; + &i2c4 { status = "okay"; pinctrl-names = "default"; @@ -837,12 +859,21 @@ status = "okay"; }; +&combphy2_psu { + status = "okay"; +}; + &pcie2x1l0 { reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; rockchip,init-delay-ms = <100>; status = "okay"; }; +&pcie2x1l1 { + reset-gpios = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + &pcie2x1l2 { reset-gpios = <&gpio3 RK_PB0 GPIO_ACTIVE_HIGH>; rockchip,init-delay-ms = <100>; @@ -858,6 +889,8 @@ &pcie3x4 { reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>; vpcie3v3-supply = <&vcc3v3_pcie30>; + pinctrl-names = "default"; + pinctrl-0 = <&pcie30x4_clkreqn_m1>; status = "okay"; }; @@ -923,11 +956,21 @@ rockchip,pins = <3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>; }; + usbc1_int: usbc1-int { + rockchip,pins = <3 RK_PC4 RK_FUNC_GPIO &pcfg_pull_up>; + }; + typec5v_pwren: typec5v-pwren { rockchip,pins = <2 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; }; }; + pcie30x4 { + pcie30x4_clkreqn_m1: pcie30x4-clkreqn-m1 { + rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>; + }; + }; + wireless-bluetooth { uart6_gpios: uart6-gpios { rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; @@ -938,6 +981,9 @@ wifi_host_wake_irq: wifi-host-wake-irq { rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>; }; + wifi_poweren_gpio: wifi-poweren-gpio { + rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_up>; + }; }; }; @@ -981,23 +1027,6 @@ status = "okay"; }; -&sdio { - max-frequency = <150000000>; - supports-sdio; - bus-width = <4>; - disable-wp; - cap-sd-highspeed; - cap-sdio-irq; - keep-power-in-suspend; - mmc-pwrseq = <&sdio_pwrseq>; - non-removable; - num-slots = <1>; - pinctrl-names = "default"; - pinctrl-0 = <&sdiom0_pins>; - sd-uhs-sdr104; - status = "okay"; -}; - &sdmmc { max-frequency = <200000000>; no-sdio; @@ -1027,9 +1056,11 @@ &u2phy0_otg { rockchip,typec-vbus-det; + status = "okay"; }; &usbdp_phy0 { + status = "okay"; orientation-switch; svid = <0xff01>; sbu1-dc-gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>; @@ -1050,12 +1081,9 @@ }; }; -&usbdp_phy1 { - rockchip,dp-lane-mux = <0 1 2 3>; -}; - &usbdrd_dwc3_0 { - dr_mode = "otg"; + status = "okay"; + dr_mode = "otg"; usb-role-switch; port { #address-cells = <1>; @@ -1065,16 +1093,4 @@ remote-endpoint = <&usbc0_role_sw>; }; }; -}; - -&usbdp_phy0_dp { - status = "okay"; -}; - -&usbhost3_0 { - status = "disabled"; -}; - -&usbhost_dwc3_0 { - status = "disabled"; }; \ No newline at end of file