From nobody Mon Apr 13 02:38:10 2026 Received: from mail-oo1-f98.google.com (mail-oo1-f98.google.com [209.85.161.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 174BD1CEADB for ; Sat, 11 Apr 2026 02:47:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.98 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775875672; cv=none; b=q7NSUW/YU0MkSCmsQBtaXM21bDOeVXH2a5va48fv3diHtbZFIdKdNpfh21ykVs4LAuPN1Gzl5b71NHmPVvAo13DrtqQMVs4UgnKZfL28vSp/fW+fXi7jO6T/e540pR7qhwEpJlY2OK2UAuFmRHhZeHh4vkjgFa0eaV0RT7MBDRA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775875672; c=relaxed/simple; bh=vQUxmko/Jd/65zUwvghbSPz6GGysPc//QGxB+93y4RM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gpXHTzen4hf2R01zKFWK+wH3mhNmH5CjbaF6/O6lj9e2WVnMjSMQQGCI+Zn+PubW6/GGCjsIrk9C6sHHzxOXx1nJR7JC6hRY3e6MWRR7N/kwnkcY3cn14p8rMpwOg1jpbdo23myJffjsr/YNCkMBJyxfjlb16HClasOcSRKYhNM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ausil.us; spf=pass smtp.mailfrom=ausil.us; dkim=pass (2048-bit key) header.d=ausil.us header.i=@ausil.us header.b=jt1U4aiu; arc=none smtp.client-ip=209.85.161.98 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ausil.us Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ausil.us Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ausil.us header.i=@ausil.us header.b="jt1U4aiu" Received: by mail-oo1-f98.google.com with SMTP id 006d021491bc7-662efd1bdd4so1436610eaf.0 for ; Fri, 10 Apr 2026 19:47:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ausil.us; s=google; t=1775875670; x=1776480470; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KWb3wq+tLz2SXSLe84zxMiTa2uE6dgIP0LkrcchIYxY=; b=jt1U4aiuZ4e7Cup7dg3m6Dzfowyw4Zu/JnxWk8PmMujYzhHbDRMJx5wkTRoQuN5lcI EtM4+tjYEbf0p+rCPeyWDFPLGyFWXW5lo28MzarjfsUObz/NtbG9eWw6ESK61R9Ytl4D 64cb3biaLF/lIW72okMMTD2vvkrkvnKEHoewRd1QB32n/CepE0QhGWxcQ4y/vIFgYz7c fSmw0V+Oo0HlDQdYOeGdC38XGgmFIzagWfSlHrvemmMQh5Yg4q6Ptcyppbs9q3xT1bfc SlxAQTYOW9R4fP2ni/nfauqDyJrR8hosIa9Aa4p0XcAVDdMeUYiiCG7KNcs7+gycdJQs 5qSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775875670; x=1776480470; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=KWb3wq+tLz2SXSLe84zxMiTa2uE6dgIP0LkrcchIYxY=; b=PBTQRieQtw/dkx3n9nYmAAkpNIF2EUiPp5C8Yc0BrBxWJ5dYihRt91jyOkmoGLEshC 84hHevTvyT7Y3pC0r8Wb3KYTqZJXpDe0WheBTB1QOb4Xv5Y1J5wxm7y1LR9ePLSKYViZ 9nnR8wzisM6ScN+2GPhZ+xATwWYh/a8OD3kedkv4DAgrv+bZ0t5hmH2ucVmquvZ/oNmo dcZ+Kj8oKZGwKhh8reee9K1VDVeEYSlU2wUMPC6Y8KrT0CyH+s2IM0UmuQ6Dfu4WaoP/ DwWyMpSaa4hxNdXNgVeTcxe+MfIALNzk1KPkjViu6Dobh1NTVHhzOIfWvaVXxrJzD1E/ 4eFg== X-Forwarded-Encrypted: i=1; AJvYcCV8mohWUeG535hZgzIrcvhQBJXFbmmPEtCrDjQ3hdpRk8qGQxJsIeVqL7yDFLoHf9jFsOm3BLTHi1WjtBU=@vger.kernel.org X-Gm-Message-State: AOJu0Ywkrh0ur1I/5WCLcjJIa4P3DV1UGxV0CQFvZHxwLXTXSKD4zun4 0bs4mdENBjBK0FiqqrsoOulYurz16wUIKNhK2M5k0jNLK0BGgaT5kDQ5C9UCtRbXk/lq/1NOIJh D+gk7cGwXdL8RaWaniZvQlPfVoqc+jmGGRdDj X-Gm-Gg: AeBDies41FaEe8mvxQXA3uacZ92I1ZyALm7NNMQ2km6AuMYl4sk3pdwSn0OoXU+OXOv 7lUsEZ3ehAcbZdCFmuoNmSR8sqdplg3onloqyVo0vCN42+EO/20H5fPvID74/B66ZRES+lpe6sa 1wiOfqelAUjGVNRpqkP2Vskf9v+WxM1AmHKA8PrPWMDECdWNPMt/nOPjJazjZ6p8EduDtieBVFb iT+V6a+lwfA8IDAVzBKEiHjPv45z8IP/4Q/ZW14/iahTNb9mbg/syWgeQtBjbbUEr5qeKEOqqKK H4+WpPanpkn5NAIdV15cjXymHt7PWXiNt4DHrl6CVZQJoZLKEUSNaZKvY0gV+m2T1OrCjLN4i74 1+WVKAubXNnAsErV11cjmvR0qEBsMCQcT4m+Xi8GOphJw X-Received: by 2002:a05:6820:7513:b0:682:47e0:5d4e with SMTP id 006d021491bc7-68a68d5f842mr3068714eaf.14.1775875670052; Fri, 10 Apr 2026 19:47:50 -0700 (PDT) Received: from ryac.ausil.us (207-179-239-100.mtco.net. [207.179.239.100]) by smtp-relay.gmail.com with ESMTPS id 586e51a60fabf-423ddd32ab3sm599086fac.16.2026.04.10.19.47.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Apr 2026 19:47:50 -0700 (PDT) X-Relaying-Domain: ausil.us From: dennis@ausil.us To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner Cc: FUKAUMI Naoki , Hsun Lai , Jonas Karlman , Chaoyi Chen , John Clark , Michael Opdenacker , Quentin Schulz , Andrew Lunn , Chukun Pan , Alexey Charkov , Peter Robinson , Dennis Gilmore , Michael Riesch , Mykola Kvach , Jimmy Hon , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 2/3] arm64: dts: rockchip: refactor items from Orange Pi 5/b to prep for Pro Date: Fri, 10 Apr 2026 21:47:42 -0500 Message-ID: <20260411024743.195385-3-dennis@ausil.us> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260411024743.195385-1-dennis@ausil.us> References: <20260411024743.195385-1-dennis@ausil.us> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Dennis Gilmore The Orange Pi 5 Pro uses the same SoC and base as the Orange Pi 5 and Orange Pi 5B but has had sound, USB, and leds wired up differently. The boards also use gmac for ethernet where the Pro has a PCIe attached NIC. I have not changed the definitions from what was in rk3588s-orangepi-5.dtsi Signed-off-by: Dennis Gilmore Reviewed-By: Jimmy Hon Tested-By: Jimmy Hon --- .../dts/rockchip/rk3588s-orangepi-5-5b.dtsi | 192 +++++++++++++++++ .../boot/dts/rockchip/rk3588s-orangepi-5.dts | 6 +- .../boot/dts/rockchip/rk3588s-orangepi-5.dtsi | 198 +----------------- .../boot/dts/rockchip/rk3588s-orangepi-5b.dts | 2 +- 4 files changed, 209 insertions(+), 189 deletions(-) create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-5b.dtsi diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-5b.dtsi b/arch= /arm64/boot/dts/rockchip/rk3588s-orangepi-5-5b.dtsi new file mode 100644 index 000000000000..b04dd667605d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-5b.dtsi @@ -0,0 +1,192 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Device tree definitions shared by the Orange Pi 5 and Orange Pi 5B + * but not the Orange Pi 5 Pro. + */ + +#include +#include "rk3588s-orangepi-5.dtsi" + +/ { + aliases { + ethernet0 =3D &gmac1; + }; + + analog-sound { + compatible =3D "simple-audio-card"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&hp_detect>; + simple-audio-card,name =3D "rockchip,es8388"; + simple-audio-card,bitclock-master =3D <&masterdai>; + simple-audio-card,format =3D "i2s"; + simple-audio-card,frame-master =3D <&masterdai>; + simple-audio-card,hp-det-gpios =3D <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>; + simple-audio-card,mclk-fs =3D <256>; + simple-audio-card,routing =3D + "Headphones", "LOUT1", + "Headphones", "ROUT1", + "LINPUT1", "Microphone Jack", + "RINPUT1", "Microphone Jack", + "LINPUT2", "Onboard Microphone", + "RINPUT2", "Onboard Microphone"; + simple-audio-card,widgets =3D + "Microphone", "Microphone Jack", + "Microphone", "Onboard Microphone", + "Headphone", "Headphones"; + + simple-audio-card,cpu { + sound-dai =3D <&i2s1_8ch>; + }; + + masterdai: simple-audio-card,codec { + sound-dai =3D <&es8388>; + system-clock-frequency =3D <12288000>; + }; + }; + + pwm-leds { + compatible =3D "pwm-leds"; + + led { + color =3D ; + function =3D LED_FUNCTION_STATUS; + linux,default-trigger =3D "heartbeat"; + max-brightness =3D <255>; + pwms =3D <&pwm0 0 25000 0>; + }; + }; +}; + +&gmac1 { + clock_in_out =3D "output"; + phy-handle =3D <&rgmii_phy1>; + phy-mode =3D "rgmii-rxid"; + pinctrl-0 =3D <&gmac1_miim + &gmac1_tx_bus2 + &gmac1_rx_bus2 + &gmac1_rgmii_clk + &gmac1_rgmii_bus>; + pinctrl-names =3D "default"; + tx_delay =3D <0x42>; + status =3D "okay"; +}; + +&i2c6 { + es8388: audio-codec@10 { + compatible =3D "everest,es8388", "everest,es8328"; + reg =3D <0x10>; + clocks =3D <&cru I2S1_8CH_MCLKOUT>; + AVDD-supply =3D <&vcc_3v3_s0>; + DVDD-supply =3D <&vcc_1v8_s0>; + HPVDD-supply =3D <&vcc_3v3_s0>; + PVDD-supply =3D <&vcc_3v3_s0>; + assigned-clocks =3D <&cru I2S1_8CH_MCLKOUT>; + assigned-clock-rates =3D <12288000>; + #sound-dai-cells =3D <0>; + }; + + usbc0: usb-typec@22 { + compatible =3D "fcs,fusb302"; + reg =3D <0x22>; + interrupt-parent =3D <&gpio0>; + interrupts =3D ; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&usbc0_int>; + vbus-supply =3D <&vbus_typec>; + status =3D "okay"; + + usb_con: connector { + compatible =3D "usb-c-connector"; + label =3D "USB-C"; + data-role =3D "dual"; + op-sink-microwatt =3D <1000000>; + power-role =3D "dual"; + sink-pdos =3D + ; + source-pdos =3D + ; + try-power-role =3D "source"; + + ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + port@0 { + reg =3D <0>; + usbc0_hs: endpoint { + remote-endpoint =3D <&usb_host0_xhci_drd_sw>; + }; + }; + + port@1 { + reg =3D <1>; + usbc0_ss: endpoint { + remote-endpoint =3D <&usbdp_phy0_typec_ss>; + }; + }; + + port@2 { + reg =3D <2>; + usbc0_sbu: endpoint { + remote-endpoint =3D <&usbdp_phy0_typec_sbu>; + }; + }; + }; + }; + }; +}; + +&i2s1_8ch { + rockchip,i2s-tx-route =3D <3 2 1 0>; + rockchip,i2s-rx-route =3D <1 3 2 0>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2s1m0_sclk + &i2s1m0_mclk + &i2s1m0_lrck + &i2s1m0_sdi1 + &i2s1m0_sdo3>; + status =3D "okay"; +}; + +&pwm0 { + pinctrl-0 =3D <&pwm0m2_pins>; + pinctrl-names =3D "default"; + status =3D "okay"; +}; + +&usb_host0_xhci { + dr_mode =3D "otg"; + usb-role-switch; + + port { + usb_host0_xhci_drd_sw: endpoint { + remote-endpoint =3D <&usbc0_hs>; + }; + }; +}; + +&usb_host2_xhci { + status =3D "okay"; +}; + +&usbdp_phy0 { + mode-switch; + orientation-switch; + sbu1-dc-gpios =3D <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; + sbu2-dc-gpios =3D <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>; + + port { + #address-cells =3D <1>; + #size-cells =3D <0>; + + usbdp_phy0_typec_ss: endpoint@0 { + reg =3D <0>; + remote-endpoint =3D <&usbc0_ss>; + }; + + usbdp_phy0_typec_sbu: endpoint@1 { + reg =3D <1>; + remote-endpoint =3D <&usbc0_sbu>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm= 64/boot/dts/rockchip/rk3588s-orangepi-5.dts index 83b9b6645a1e..d76bdf1b5e90 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts @@ -2,12 +2,16 @@ =20 /dts-v1/; =20 -#include "rk3588s-orangepi-5.dtsi" +#include "rk3588s-orangepi-5-5b.dtsi" =20 / { model =3D "Xunlong Orange Pi 5"; compatible =3D "xunlong,orangepi-5", "rockchip,rk3588s"; =20 + aliases { + mmc0 =3D &sdmmc; + }; + vcc3v3_pcie20: regulator-vcc3v3-pcie20 { compatible =3D "regulator-fixed"; enable-active-high; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi b/arch/ar= m64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi index dafad29f9854..5c154cc6c62a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi @@ -3,19 +3,13 @@ /dts-v1/; =20 #include -#include #include +#include #include #include -#include #include "rk3588s.dtsi" =20 / { - aliases { - ethernet0 =3D &gmac1; - mmc0 =3D &sdmmc; - }; - chosen { stdout-path =3D "serial2:1500000n8"; }; @@ -34,38 +28,6 @@ button-recovery { }; }; =20 - analog-sound { - compatible =3D "simple-audio-card"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&hp_detect>; - simple-audio-card,name =3D "rockchip,es8388"; - simple-audio-card,bitclock-master =3D <&masterdai>; - simple-audio-card,format =3D "i2s"; - simple-audio-card,frame-master =3D <&masterdai>; - simple-audio-card,hp-det-gpios =3D <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>; - simple-audio-card,mclk-fs =3D <256>; - simple-audio-card,routing =3D - "Headphones", "LOUT1", - "Headphones", "ROUT1", - "LINPUT1", "Microphone Jack", - "RINPUT1", "Microphone Jack", - "LINPUT2", "Onboard Microphone", - "RINPUT2", "Onboard Microphone"; - simple-audio-card,widgets =3D - "Microphone", "Microphone Jack", - "Microphone", "Onboard Microphone", - "Headphone", "Headphones"; - - simple-audio-card,cpu { - sound-dai =3D <&i2s1_8ch>; - }; - - masterdai: simple-audio-card,codec { - sound-dai =3D <&es8388>; - system-clock-frequency =3D <12288000>; - }; - }; - hdmi0-con { compatible =3D "hdmi-connector"; type =3D "a"; @@ -77,18 +39,6 @@ hdmi0_con_in: endpoint { }; }; =20 - pwm-leds { - compatible =3D "pwm-leds"; - - led { - color =3D ; - function =3D LED_FUNCTION_STATUS; - linux,default-trigger =3D "heartbeat"; - max-brightness =3D <255>; - pwms =3D <&pwm0 0 25000 0>; - }; - }; - vbus_typec: regulator-vbus-typec { compatible =3D "regulator-fixed"; enable-active-high; @@ -101,15 +51,6 @@ vbus_typec: regulator-vbus-typec { vin-supply =3D <&vcc5v0_sys>; }; =20 - vcc5v0_sys: regulator-vcc5v0-sys { - compatible =3D "regulator-fixed"; - regulator-name =3D "vcc5v0_sys"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt =3D <5000000>; - regulator-max-microvolt =3D <5000000>; - }; - vcc_3v3_sd_s0: regulator-vcc-3v3-sd-s0 { compatible =3D "regulator-fixed"; gpios =3D <&gpio4 RK_PB5 GPIO_ACTIVE_LOW>; @@ -119,6 +60,15 @@ vcc_3v3_sd_s0: regulator-vcc-3v3-sd-s0 { regulator-max-microvolt =3D <3300000>; vin-supply =3D <&vcc_3v3_s3>; }; + + vcc5v0_sys: regulator-vcc5v0-sys { + compatible =3D "regulator-fixed"; + regulator-name =3D "vcc5v0_sys"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt =3D <5000000>; + regulator-max-microvolt =3D <5000000>; + }; }; =20 &combphy0_ps { @@ -161,20 +111,6 @@ &cpu_l3 { cpu-supply =3D <&vdd_cpu_lit_s0>; }; =20 -&gmac1 { - clock_in_out =3D "output"; - phy-handle =3D <&rgmii_phy1>; - phy-mode =3D "rgmii-rxid"; - pinctrl-0 =3D <&gmac1_miim - &gmac1_tx_bus2 - &gmac1_rx_bus2 - &gmac1_rgmii_clk - &gmac1_rgmii_bus>; - pinctrl-names =3D "default"; - tx_delay =3D <0x42>; - status =3D "okay"; -}; - &gpu { mali-supply =3D <&vdd_gpu_s0>; status =3D "okay"; @@ -270,69 +206,6 @@ &i2c6 { pinctrl-0 =3D <&i2c6m3_xfer>; status =3D "okay"; =20 - es8388: audio-codec@10 { - compatible =3D "everest,es8388", "everest,es8328"; - reg =3D <0x10>; - clocks =3D <&cru I2S1_8CH_MCLKOUT>; - AVDD-supply =3D <&vcc_3v3_s0>; - DVDD-supply =3D <&vcc_1v8_s0>; - HPVDD-supply =3D <&vcc_3v3_s0>; - PVDD-supply =3D <&vcc_3v3_s0>; - assigned-clocks =3D <&cru I2S1_8CH_MCLKOUT>; - assigned-clock-rates =3D <12288000>; - #sound-dai-cells =3D <0>; - }; - - usbc0: usb-typec@22 { - compatible =3D "fcs,fusb302"; - reg =3D <0x22>; - interrupt-parent =3D <&gpio0>; - interrupts =3D ; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&usbc0_int>; - vbus-supply =3D <&vbus_typec>; - status =3D "okay"; - - usb_con: connector { - compatible =3D "usb-c-connector"; - label =3D "USB-C"; - data-role =3D "dual"; - op-sink-microwatt =3D <1000000>; - power-role =3D "dual"; - sink-pdos =3D - ; - source-pdos =3D - ; - try-power-role =3D "source"; - - ports { - #address-cells =3D <1>; - #size-cells =3D <0>; - - port@0 { - reg =3D <0>; - usbc0_hs: endpoint { - remote-endpoint =3D <&usb_host0_xhci_drd_sw>; - }; - }; - - port@1 { - reg =3D <1>; - usbc0_ss: endpoint { - remote-endpoint =3D <&usbdp_phy0_typec_ss>; - }; - }; - - port@2 { - reg =3D <2>; - usbc0_sbu: endpoint { - remote-endpoint =3D <&usbdp_phy0_typec_sbu>; - }; - }; - }; - }; - }; - hym8563: rtc@51 { compatible =3D "haoyu,hym8563"; reg =3D <0x51>; @@ -346,18 +219,6 @@ hym8563: rtc@51 { }; }; =20 -&i2s1_8ch { - rockchip,i2s-tx-route =3D <3 2 1 0>; - rockchip,i2s-rx-route =3D <1 3 2 0>; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&i2s1m0_sclk - &i2s1m0_mclk - &i2s1m0_lrck - &i2s1m0_sdi1 - &i2s1m0_sdo3>; - status =3D "okay"; -}; - &i2s5_8ch { status =3D "okay"; }; @@ -404,12 +265,6 @@ typec5v_pwren: typec5v-pwren { }; }; =20 -&pwm0 { - pinctrl-0 =3D <&pwm0m2_pins>; - pinctrl-names =3D "default"; - status =3D "okay"; -}; - &rknn_core_0 { npu-supply =3D <&vdd_npu_s0>; sram-supply =3D <&vdd_npu_s0>; @@ -841,26 +696,7 @@ &uart2 { }; =20 &usbdp_phy0 { - mode-switch; - orientation-switch; - sbu1-dc-gpios =3D <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; - sbu2-dc-gpios =3D <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>; status =3D "okay"; - - port { - #address-cells =3D <1>; - #size-cells =3D <0>; - - usbdp_phy0_typec_ss: endpoint@0 { - reg =3D <0>; - remote-endpoint =3D <&usbc0_ss>; - }; - - usbdp_phy0_typec_sbu: endpoint@1 { - reg =3D <1>; - remote-endpoint =3D <&usbc0_sbu>; - }; - }; }; =20 &usb_host0_ehci { @@ -872,15 +708,7 @@ &usb_host0_ohci { }; =20 &usb_host0_xhci { - dr_mode =3D "otg"; - usb-role-switch; status =3D "okay"; - - port { - usb_host0_xhci_drd_sw: endpoint { - remote-endpoint =3D <&usbc0_hs>; - }; - }; }; =20 &usb_host1_ehci { @@ -891,7 +719,7 @@ &usb_host1_ohci { status =3D "okay"; }; =20 -&usb_host2_xhci { +&vop { status =3D "okay"; }; =20 @@ -899,10 +727,6 @@ &vop_mmu { status =3D "okay"; }; =20 -&vop { - status =3D "okay"; -}; - &vp0 { vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { reg =3D ; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts b/arch/ar= m64/boot/dts/rockchip/rk3588s-orangepi-5b.dts index d21ec320d295..8af174777809 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts @@ -2,7 +2,7 @@ =20 /dts-v1/; =20 -#include "rk3588s-orangepi-5.dtsi" +#include "rk3588s-orangepi-5-5b.dtsi" =20 / { model =3D "Xunlong Orange Pi 5B"; --=20 2.53.0