lkml.org 
[lkml]   [2021]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 3/8] arm64: dts: rockchip: restyle rk3399 usbdrd3_0 node
    Date
    For rk3399 dwc3 usb the wrapper node for only clocks makes no sense,
    so restyle the rk3399 usbdrd3_0 node before more new SoC types are
    added with the same IP.

    Signed-off-by: Johan Jonker <jbx6244@gmail.com>
    ---
    Changed V3:
    remove aclk_usb3_rksoc_axi_perf
    remove aclk_usb3
    ---
    arch/arm64/boot/dts/rockchip/rk3399-ficus.dts | 2 +-
    arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 6 +---
    arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 6 +---
    arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts | 6 +---
    .../boot/dts/rockchip/rk3399-khadas-edge.dtsi | 6 +---
    arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts | 6 +---
    arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 4 ---
    arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 6 +---
    .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 4 ---
    .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 4 ---
    arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 4 ---
    arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 6 +---
    arch/arm64/boot/dts/rockchip/rk3399-rock960.dts | 2 +-
    arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 4 ---
    arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 6 +---
    arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 6 +---
    arch/arm64/boot/dts/rockchip/rk3399.dtsi | 37 ++++++++--------------
    .../boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 4 ---
    18 files changed, 24 insertions(+), 95 deletions(-)

    diff --git a/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts b/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts
    index 1ce85a581..95110d065 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts
    +++ b/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts
    @@ -153,7 +153,7 @@
    status = "okay";
    };

    -&usbdrd_dwc3_0 {
    +&usbdrd3_0 {
    dr_mode = "host";
    };

    diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
    index 6db18808b..4017b0e8c 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
    +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
    @@ -773,12 +773,8 @@
    };

    &usbdrd3_0 {
    - status = "okay";
    -};
    -
    -&usbdrd_dwc3_0 {
    - status = "okay";
    dr_mode = "otg";
    + status = "okay";
    };

    &usbdrd3_1 {
    diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
    index 32dcaf210..e42783cb7 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
    +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
    @@ -618,13 +618,9 @@ ap_i2c_audio: &i2c8 {
    };

    &usbdrd3_0 {
    - status = "okay";
    + dr_mode = "host";
    extcon = <&usbc_extcon0>;
    -};
    -
    -&usbdrd_dwc3_0 {
    status = "okay";
    - dr_mode = "host";
    };

    &vopb {
    diff --git a/arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts b/arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts
    index 341d074ed..daf14f732 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts
    +++ b/arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts
    @@ -731,12 +731,8 @@
    };

    &usbdrd3_0 {
    - status = "okay";
    -};
    -
    -&usbdrd_dwc3_0 {
    - status = "okay";
    dr_mode = "host";
    + status = "okay";
    };

    &usbdrd3_1 {
    diff --git a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi
    index 635afdd99..d028285fb 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi
    +++ b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi
    @@ -797,12 +797,8 @@
    };

    &usbdrd3_0 {
    - status = "okay";
    -};
    -
    -&usbdrd_dwc3_0 {
    - status = "okay";
    dr_mode = "otg";
    + status = "okay";
    };

    &usbdrd3_1 {
    diff --git a/arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts b/arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts
    index 1fa80ac15..1c0b48a71 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts
    +++ b/arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts
    @@ -611,12 +611,8 @@
    };

    &usbdrd3_0 {
    - status = "okay";
    -};
    -
    -&usbdrd_dwc3_0 {
    - status = "okay";
    dr_mode = "otg";
    + status = "okay";
    };

    &usbdrd3_1 {
    diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
    index 76a8b40a9..90a6ea1d7 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
    +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
    @@ -715,10 +715,6 @@
    status = "okay";
    };

    -&usbdrd_dwc3_0 {
    - status = "okay";
    -};
    -
    &usbdrd_dwc3_1 {
    dr_mode = "host";
    status = "okay";
    diff --git a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
    index ad7c4d008..7b633622c 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
    +++ b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
    @@ -854,12 +854,8 @@
    };

    &usbdrd3_0 {
    - status = "okay";
    -};
    -
    -&usbdrd_dwc3_0 {
    - status = "okay";
    dr_mode = "host";
    + status = "okay";
    };

    &usbdrd3_1 {
    diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
    index 219b7507a..f00e11075 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
    +++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
    @@ -1086,10 +1086,6 @@
    };

    &usbdrd3_0 {
    - status = "okay";
    -};
    -
    -&usbdrd_dwc3_0 {
    dr_mode = "host";
    status = "okay";
    };
    diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
    index a8d363568..35780506c 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
    +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
    @@ -223,10 +223,6 @@
    };

    &usbdrd3_0 {
    - status = "okay";
    -};
    -
    -&usbdrd_dwc3_0 {
    dr_mode = "otg";
    status = "okay";
    };
    diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
    index 20309076d..4d30c1b32 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
    +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
    @@ -792,10 +792,6 @@
    status = "okay";
    };

    -&usbdrd_dwc3_0 {
    - status = "okay";
    -};
    -
    &usbdrd3_1 {
    status = "okay";
    };
    diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
    index fb7599f07..69c067dd1 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
    +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
    @@ -668,12 +668,8 @@
    };

    &usbdrd3_0 {
    - status = "okay";
    -};
    -
    -&usbdrd_dwc3_0 {
    - status = "okay";
    dr_mode = "host";
    + status = "okay";
    };

    &usbdrd3_1 {
    diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts
    index b20774081..20c3ef9fc 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts
    +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts
    @@ -164,7 +164,7 @@
    };
    };

    -&usbdrd_dwc3_0 {
    +&usbdrd3_0 {
    dr_mode = "otg";
    };

    diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
    index 5e3ac589b..3920dcbd1 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
    +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
    @@ -635,10 +635,6 @@
    status = "okay";
    };

    -&usbdrd_dwc3_0 {
    - status = "okay";
    -};
    -
    &usbdrd3_1 {
    status = "okay";
    };
    diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
    index 580972459..564b56810 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
    +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
    @@ -817,12 +817,8 @@
    };

    &usbdrd3_0 {
    - status = "okay";
    -};
    -
    -&usbdrd_dwc3_0 {
    - status = "okay";
    dr_mode = "host";
    + status = "okay";
    };

    &usbdrd3_1 {
    diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
    index 701a567d7..2e76f178e 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
    +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
    @@ -614,12 +614,8 @@
    };

    &usbdrd3_0 {
    - status = "okay";
    -};
    -
    -&usbdrd_dwc3_0 {
    - status = "okay";
    dr_mode = "host";
    + status = "okay";
    };

    &usbdrd3_1 {
    diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
    index b125cac89..cfde6cc64 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
    +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
    @@ -394,37 +394,26 @@
    };

    usbdrd3_0: usb@fe800000 {
    - compatible = "rockchip,rk3399-dwc3";
    - #address-cells = <2>;
    - #size-cells = <2>;
    - ranges;
    + compatible = "rockchip,rk3399-dwc3", "snps,dwc3";
    + reg = <0x0 0xfe800000 0x0 0x100000>;
    + interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH 0>;
    clocks = <&cru SCLK_USB3OTG0_REF>, <&cru SCLK_USB3OTG0_SUSPEND>,
    <&cru ACLK_USB3OTG0>, <&cru ACLK_USB3_GRF>;
    clock-names = "ref_clk", "suspend_clk",
    "bus_clk", "grf_clk";
    + dr_mode = "otg";
    + phys = <&u2phy0_otg>, <&tcphy0_usb3>;
    + phy-names = "usb2-phy", "usb3-phy";
    + phy_type = "utmi_wide";
    + power-domains = <&power RK3399_PD_USB3>;
    resets = <&cru SRST_A_USB3_OTG0>;
    reset-names = "usb3-otg";
    + snps,dis-del-phy-power-chg-quirk;
    + snps,dis_enblslpm_quirk;
    + snps,dis-tx-ipgap-linecheck-quirk;
    + snps,dis-u2-freeclk-exists-quirk;
    + snps,dis_u2_susphy_quirk;
    status = "disabled";
    -
    - usbdrd_dwc3_0: usb@fe800000 {
    - compatible = "snps,dwc3";
    - reg = <0x0 0xfe800000 0x0 0x100000>;
    - interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH 0>;
    - clocks = <&cru SCLK_USB3OTG0_REF>, <&cru ACLK_USB3OTG0>,
    - <&cru SCLK_USB3OTG0_SUSPEND>;
    - clock-names = "ref", "bus_early", "suspend";
    - dr_mode = "otg";
    - phys = <&u2phy0_otg>, <&tcphy0_usb3>;
    - phy-names = "usb2-phy", "usb3-phy";
    - phy_type = "utmi_wide";
    - snps,dis_enblslpm_quirk;
    - snps,dis-u2-freeclk-exists-quirk;
    - snps,dis_u2_susphy_quirk;
    - snps,dis-del-phy-power-chg-quirk;
    - snps,dis-tx-ipgap-linecheck-quirk;
    - power-domains = <&power RK3399_PD_USB3>;
    - status = "disabled";
    - };
    };

    usbdrd3_1: usb@fe900000 {
    diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
    index 7257494d2..810fb7880 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
    +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
    @@ -454,10 +454,6 @@
    status = "okay";
    };

    -&usbdrd_dwc3_0 {
    - status = "okay";
    -};
    -
    &vbus_host {
    enable-active-high;
    gpio = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>; /* USB1_EN_OC# */
    --
    2.11.0
    \
     
     \ /
      Last update: 2021-02-06 01:31    [W:4.658 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site