From 48d52ef954551456b63170443d1bcfeb6f2ef841 Mon Sep 17 00:00:00 2001 From: amazingfate Date: Fri, 28 Feb 2025 14:00:13 +0800 Subject: [PATCH] Revert "OrangePi5Plus: DTS: Enable front USB-A 3.0 and USB-C ports" This reverts commit c52b05713a864081bd9f0f9dee96d3743ac6964e. --- .../mainline/rk3588-orangepi-5-plus-fixup.dts | 140 ------------------ .../OrangePi5Plus/DeviceTree/Mainline.inf | 2 +- 2 files changed, 1 insertion(+), 141 deletions(-) delete mode 100644 devicetree/mainline/rk3588-orangepi-5-plus-fixup.dts diff --git a/devicetree/mainline/rk3588-orangepi-5-plus-fixup.dts b/devicetree/mainline/rk3588-orangepi-5-plus-fixup.dts deleted file mode 100644 index 39589608..00000000 --- a/devicetree/mainline/rk3588-orangepi-5-plus-fixup.dts +++ /dev/null @@ -1,140 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) - -#include "rk3588-orangepi-5-plus.dts" - -/ { - vbus5v0_typec: regulator-vbus5v0-typec { - compatible = "regulator-fixed"; - regulator-name = "vbus5v0_typec"; - regulator-boot-on; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&typec5v_pwren>; - vin-supply = <&vcc5v0_sys>; - }; -}; - -&i2c6 { - fusb302: typec-portc@22 { - compatible = "fcs,fusb302"; - reg = <0x22>; - interrupt-parent = <&gpio0>; - interrupts = ; - pinctrl-names = "default"; - pinctrl-0 = <&usbc0_int>; - vbus-supply = <&vbus5v0_typec>; - - usb_con: connector { - compatible = "usb-c-connector"; - data-role = "dual"; - label = "USB-C"; - power-role = "source"; - source-pdos = ; - - 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>; - - usbc0_role_sw: endpoint { - remote-endpoint = <&dwc3_0_role_switch>; - }; - }; - - port@2 { - reg = <2>; - - dp_altmode_mux: endpoint { - remote-endpoint = <&usbdp_phy0_dp_altmode_mux>; - }; - }; - }; - }; - }; -}; - -&pinctrl { - usb-typec { - usbc0_int: usbc0-int { - rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>; - }; - - typec5v_pwren: typec5v-pwren { - rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; -}; - -&u2phy0 { - status = "okay"; -}; - -&u2phy0_otg { - status = "okay"; -}; - -&u2phy1 { - status = "okay"; -}; - -&u2phy1_otg { - phy-supply = <&vcc5v0_usb20>; - status = "okay"; -}; - -&usbdp_phy0 { - mode-switch; - orientation-switch; - 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_phy1 { - phy-supply = <&vcc5v0_usb20>; - status = "okay"; -}; - -&usb_host0_xhci { - usb-role-switch; - status = "okay"; - - port { - dwc3_0_role_switch: endpoint { - remote-endpoint = <&usbc0_role_sw>; - }; - }; -}; - -&usb_host1_xhci { - dr_mode = "host"; - status = "okay"; -}; diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/DeviceTree/Mainline.inf b/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/DeviceTree/Mainline.inf index 7d5b6eec..6d373527 100644 --- a/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/DeviceTree/Mainline.inf +++ b/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/DeviceTree/Mainline.inf @@ -14,7 +14,7 @@ VERSION_STRING = 1.0 [Sources] - devicetree/mainline/rk3588-orangepi-5-plus-fixup.dts + devicetree/mainline/upstream/src/arm64/rockchip/rk3588-orangepi-5-plus.dts [Packages] MdePkg/MdePkg.dec