[PATCH 13/16] rockchip: rk3588-rock-5b: Drop usb-typec node from u-boot.dtsi
Kever Yang
kever.yang at rock-chips.com
Tue May 7 05:34:47 CEST 2024
On 2024/5/5 03:43, Jonas Karlman wrote:
> The usb-typec related nodes and props added in the board u-boot.dtsi
> file has not yet landed in upstream Linux kernel DT, and they are not
> needed for U-Boot to use the USB Type-C port in peripheral mode.
>
> Remove superfluous usb-typec related nodes and props and replace them
> with a simple dr_mode and maximum-speed prop to cleanup the board
> u-boot.dtsi file.
>
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>
Thanks,
- Kever
> ---
> arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 106 +-----------------------
> 1 file changed, 2 insertions(+), 104 deletions(-)
>
> diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
> index d6020ca790f6..69914f4ce183 100644
> --- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
> +++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
> @@ -4,32 +4,12 @@
> */
>
> #include "rk3588-u-boot.dtsi"
> -#include <dt-bindings/usb/pd.h>
> -
> -/ {
> - vcc12v_dcin: vcc12v-dcin-regulator {
> - compatible = "regulator-fixed";
> - regulator-name = "vcc12v_dcin";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <12000000>;
> - regulator-max-microvolt = <12000000>;
> - };
> -};
>
> &fspim2_pins {
> bootph-pre-ram;
> bootph-some-ram;
> };
>
> -&pinctrl {
> - usb {
> - usbc0_int: usbc0-int {
> - rockchip,pins = <3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> - };
> -};
> -
> &sdhci {
> cap-mmc-highspeed;
> mmc-hs200-1_8v;
> @@ -76,26 +56,7 @@
> };
>
> &usbdp_phy0 {
> - orientation-switch;
> - mode-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_typec_ss: endpoint at 0 {
> - reg = <0>;
> - remote-endpoint = <&usbc0_ss>;
> - };
> -
> - usbdp_phy0_typec_sbu: endpoint at 1 {
> - reg = <1>;
> - remote-endpoint = <&usbc0_sbu>;
> - };
> - };
> };
>
> &usbdp_phy0_u3 {
> @@ -103,74 +64,11 @@
> };
>
> &usb_host0_xhci {
> - usb-role-switch;
> + dr_mode = "peripheral";
> + maximum-speed = "high-speed";
> status = "okay";
> -
> - port {
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - usb_host0_xhci_drd_sw: endpoint {
> - remote-endpoint = <&usbc0_hs>;
> - };
> - };
> };
>
> &usb_host1_xhci {
> status = "okay";
> };
> -
> -&i2c4 {
> - pinctrl-names = "default";
> - pinctrl-0 = <&i2c4m1_xfer>;
> - status = "okay";
> -
> - usbc0: usb-typec at 22 {
> - compatible = "fcs,fusb302";
> - reg = <0x22>;
> - interrupt-parent = <&gpio3>;
> - interrupts = <RK_PB4 IRQ_TYPE_LEVEL_LOW>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&usbc0_int>;
> - vbus-supply = <&vcc12v_dcin>;
> - status = "okay";
> -
> - usb_con: connector {
> - compatible = "usb-c-connector";
> - label = "USB-C";
> - data-role = "dual";
> - power-role = "sink";
> - try-power-role = "sink";
> - op-sink-microwatt = <1000000>;
> - sink-pdos =
> - <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>,
> - <PDO_VAR(5000, 20000, 5000)>;
> -
> - ports {
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - port at 0 {
> - reg = <0>;
> - usbc0_hs: endpoint {
> - remote-endpoint = <&usb_host0_xhci_drd_sw>;
> - };
> - };
> -
> - port at 1 {
> - reg = <1>;
> - usbc0_ss: endpoint {
> - remote-endpoint = <&usbdp_phy0_typec_ss>;
> - };
> - };
> -
> - port at 2 {
> - reg = <2>;
> - usbc0_sbu: endpoint {
> - remote-endpoint = <&usbdp_phy0_typec_sbu>;
> - };
> - };
> - };
> - };
> - };
> -};
More information about the U-Boot
mailing list