diff --git a/rk3588/.dr4-rk3588.dtb.dts.tmp b/rk3588/.dr4-rk3588.dtb.dts.tmp index 97bcab9..5821cb2 100644 --- a/rk3588/.dr4-rk3588.dtb.dts.tmp +++ b/rk3588/.dr4-rk3588.dtb.dts.tmp @@ -14600,11 +14600,29 @@ &usbhost3_0 { - status = "disabled"; + status = "okay"; }; &usbhost_dwc3_0 { - status = "disabled"; + status = "okay"; +}; + +&usbdrd_dwc3_0 { + extcon=<&u2phy0>; + status="okay"; +}; + +&u2phy0 { + status = "okay"; +}; + +&usbdrd_dwc3_1 { + extcon=<&u2phy1>; + status="okay"; +}; + +&u2phy1 { + status = "okay"; }; # 13 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 @@ -14810,24 +14828,10 @@ }; }; - - -&uart0 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&uart0m0_xfer>; - fifo-depth =<4096>; - rx-fifo-depth =<2048>; - tx-fifo-depth =<2048>; - dma-names = "tx", "rx"; - - -}; - &uart1 { status = "okay"; pinctrl-names = "default"; - pinctrl-0 = <&uart1m2_xfer>; + pinctrl-0 = <&uart1m1_xfer>; fifo-depth =<4096>; rx-fifo-depth =<2048>; tx-fifo-depth =<2048>; @@ -14866,21 +14870,10 @@ }; -&uart6 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&uart6m2_xfer>; - fifo-depth =<4096>; - rx-fifo-depth =<2048>; - tx-fifo-depth =<2048>; - dma-names = "tx", "rx"; - -}; - &uart7 { status = "okay"; pinctrl-names = "default"; - pinctrl-0 = <&uart7m1_xfer>; + pinctrl-0 = <&uart7m0_xfer>; fifo-depth =<4096>; rx-fifo-depth =<2048>; tx-fifo-depth =<2048>; @@ -14897,27 +14890,6 @@ dma-names = "tx", "rx"; }; -&uart9 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&uart9m2_xfer>; - fifo-depth =<4096>; - rx-fifo-depth =<2048>; - tx-fifo-depth =<2048>; - dma-names = "tx", "rx"; -}; - - - -&can0 { - assigned-clocks = <&cru 112>; - assigned-clock-rates = <200000000>; - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&can0m0_pins>; - -}; - &can1 { assigned-clocks = <&cru 114>; assigned-clock-rates = <200000000>; @@ -14926,14 +14898,6 @@ pinctrl-0 = <&can1m1_pins>; }; -&can2 { - assigned-clocks = <&cru 116>; - assigned-clock-rates = <200000000>; - status = "disabled"; - pinctrl-names = "default"; - pinctrl-0 = <&can2m1_pins>; -}; - &spi3 { status = "okay"; pinctrl-0 = <&spi3m1_pins &spi3m1_cs1>; @@ -14968,7 +14932,7 @@ }; &sdmmc { - status = "okay"; + status = "disabled"; }; &fiq_debugger { diff --git a/rk3588/dr4-rk3588.dtb b/rk3588/dr4-rk3588.dtb index 5011dba..e712232 100644 Binary files a/rk3588/dr4-rk3588.dtb and b/rk3588/dr4-rk3588.dtb differ diff --git a/rk3588/dr4-rk3588.dts b/rk3588/dr4-rk3588.dts index d0c091b..7e2673e 100755 --- a/rk3588/dr4-rk3588.dts +++ b/rk3588/dr4-rk3588.dts @@ -161,24 +161,10 @@ }; }; - - -&uart0 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&uart0m0_xfer>; - fifo-depth =<4096>; - rx-fifo-depth =<2048>; - tx-fifo-depth =<2048>; - dma-names = "tx", "rx"; - - -}; - &uart1 { status = "okay"; pinctrl-names = "default"; - pinctrl-0 = <&uart1m2_xfer>; + pinctrl-0 = <&uart1m1_xfer>; fifo-depth =<4096>; rx-fifo-depth =<2048>; tx-fifo-depth =<2048>; @@ -217,21 +203,10 @@ }; -&uart6 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&uart6m2_xfer>; - fifo-depth =<4096>; - rx-fifo-depth =<2048>; - tx-fifo-depth =<2048>; - dma-names = "tx", "rx"; - -}; - &uart7 { status = "okay"; pinctrl-names = "default"; - pinctrl-0 = <&uart7m1_xfer>; + pinctrl-0 = <&uart7m0_xfer>; fifo-depth =<4096>; rx-fifo-depth =<2048>; tx-fifo-depth =<2048>; @@ -248,27 +223,6 @@ dma-names = "tx", "rx"; }; -&uart9 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&uart9m2_xfer>; - fifo-depth =<4096>; - rx-fifo-depth =<2048>; - tx-fifo-depth =<2048>; - dma-names = "tx", "rx"; -}; - - - -&can0 { - assigned-clocks = <&cru CLK_CAN0>; - assigned-clock-rates = <200000000>; - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&can0m0_pins>; - -}; - &can1 { assigned-clocks = <&cru CLK_CAN1>; assigned-clock-rates = <200000000>; @@ -277,14 +231,6 @@ pinctrl-0 = <&can1m1_pins>; }; -&can2 { - assigned-clocks = <&cru CLK_CAN2>; - assigned-clock-rates = <200000000>; - status = "disabled"; - pinctrl-names = "default"; - pinctrl-0 = <&can2m1_pins>; -}; - &spi3 { status = "okay"; pinctrl-0 = <&spi3m1_pins &spi3m1_cs1>; @@ -319,7 +265,7 @@ }; &sdmmc { - status = "okay"; + status = "disabled"; }; &fiq_debugger { diff --git a/rk3588/rp-usb-host.dtsi b/rk3588/rp-usb-host.dtsi index 5603215..b777111 100755 --- a/rk3588/rp-usb-host.dtsi +++ b/rk3588/rp-usb-host.dtsi @@ -39,10 +39,27 @@ &usbhost3_0 { - status = "disabled"; + status = "okay"; }; &usbhost_dwc3_0 { - status = "disabled"; + status = "okay"; }; +&usbdrd_dwc3_0 { + extcon=<&u2phy0>; + status="okay"; +}; + +&u2phy0 { + status = "okay"; +}; + +&usbdrd_dwc3_1 { + extcon=<&u2phy1>; + status="okay"; +}; + +&u2phy1 { + status = "okay"; +};