| Message ID | 20200920134905.4370-6-biju.das.jz@bp.renesas.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | Remodel HD3SS3220 device nodes | expand |
Hi Geert, The dependencies patches hit on 5.10-rc1 [1] [2][3]. This patch cleanly applies on renesas-devel. [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v5.10-rc1&id=588614be61b7cb46f697c3e141b2aef7f6b49347 [2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v5.10-rc1&id=a6806e32e7a41c20c6b288009cb6f30929668327 [3] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v5.10-rc1&id=1c6e8ee63adbaf02a1e5177610fe9b77bec93d8a Regards, Biju > -----Original Message----- > From: Biju Das <biju.das.jz@bp.renesas.com> > Sent: 20 September 2020 14:49 > To: Rob Herring <robh+dt@kernel.org> > Cc: Biju Das <biju.das.jz@bp.renesas.com>; Geert Uytterhoeven > <geert+renesas@glider.be>; Yoshihiro Shimoda > <yoshihiro.shimoda.uh@renesas.com>; Magnus Damm > <magnus.damm@gmail.com>; linux-renesas-soc@vger.kernel.org; > devicetree@vger.kernel.org; Chris Paterson > <Chris.Paterson2@renesas.com>; Biju Das <biju.das@bp.renesas.com>; > Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com> > Subject: [PATCH v4 5/6] arm64: dts: renesas: cat874: Move connector node > out of hd3ss3220 device > > Move connector node out of hd3ss3220 device in order to comply with usb > connector bindings. > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> > Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > --- > v3->v4: No change > v2->v3: No change > v1->v2: No change > --- > .../boot/dts/renesas/r8a774c0-cat874.dts | 67 ++++++++++++++----- > 1 file changed, 50 insertions(+), 17 deletions(-) > > diff --git a/arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts > b/arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts > index 26aee004a44e..ea87cb5a459c 100644 > --- a/arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts > +++ b/arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts > @@ -129,6 +129,29 @@ > #clock-cells = <0>; > clock-frequency = <74250000>; > }; > + > + connector { > + compatible = "usb-c-connector"; > + label = "USB-C"; > + data-role = "dual"; > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + port@0 { > + reg = <0>; > + hs_ep: endpoint { > + remote-endpoint = <&usb3_hs_ep>; > + }; > + }; > + port@1 { > + reg = <1>; > + ss_ep: endpoint { > + remote-endpoint = > <&hd3ss3220_in_ep>; > + }; > + }; > + }; > + }; > }; > > &audio_clk_a { > @@ -186,20 +209,19 @@ > interrupt-parent = <&gpio6>; > interrupts = <3 IRQ_TYPE_LEVEL_LOW>; > > - connector { > - compatible = "usb-c-connector"; > - label = "USB-C"; > - data-role = "dual"; > - > - ports { > - #address-cells = <1>; > - #size-cells = <0>; > - > - port@1 { > - reg = <1>; > - hd3ss3220_ep: endpoint { > - remote-endpoint = > <&usb3_role_switch>; > - }; > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + port@0 { > + reg = <0>; > + hd3ss3220_in_ep: endpoint { > + remote-endpoint = <&ss_ep>; > + }; > + }; > + port@1 { > + reg = <1>; > + hd3ss3220_out_ep: endpoint { > + remote-endpoint = > <&usb3_role_switch>; > }; > }; > }; > @@ -405,9 +427,20 @@ > status = "okay"; > usb-role-switch; > > - port { > - usb3_role_switch: endpoint { > - remote-endpoint = <&hd3ss3220_ep>; > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + port@0 { > + reg = <0>; > + usb3_hs_ep: endpoint { > + remote-endpoint = <&hs_ep>; > + }; > + }; > + port@1 { > + reg = <1>; > + usb3_role_switch: endpoint { > + remote-endpoint = <&hd3ss3220_out_ep>; > + }; > }; > }; > }; > -- > 2.17.1
On Sun, Sep 20, 2020 at 3:49 PM Biju Das <biju.das.jz@bp.renesas.com> wrote: > Move connector node out of hd3ss3220 device in order to comply with usb > connector bindings. > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> > Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> i.e. will queue in renesas-devel for v5.11. Gr{oetje,eeting}s, Geert
diff --git a/arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts b/arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts index 26aee004a44e..ea87cb5a459c 100644 --- a/arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts +++ b/arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts @@ -129,6 +129,29 @@ #clock-cells = <0>; clock-frequency = <74250000>; }; + + connector { + compatible = "usb-c-connector"; + label = "USB-C"; + data-role = "dual"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + port@0 { + reg = <0>; + hs_ep: endpoint { + remote-endpoint = <&usb3_hs_ep>; + }; + }; + port@1 { + reg = <1>; + ss_ep: endpoint { + remote-endpoint = <&hd3ss3220_in_ep>; + }; + }; + }; + }; }; &audio_clk_a { @@ -186,20 +209,19 @@ interrupt-parent = <&gpio6>; interrupts = <3 IRQ_TYPE_LEVEL_LOW>; - connector { - compatible = "usb-c-connector"; - label = "USB-C"; - data-role = "dual"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@1 { - reg = <1>; - hd3ss3220_ep: endpoint { - remote-endpoint = <&usb3_role_switch>; - }; + ports { + #address-cells = <1>; + #size-cells = <0>; + port@0 { + reg = <0>; + hd3ss3220_in_ep: endpoint { + remote-endpoint = <&ss_ep>; + }; + }; + port@1 { + reg = <1>; + hd3ss3220_out_ep: endpoint { + remote-endpoint = <&usb3_role_switch>; }; }; }; @@ -405,9 +427,20 @@ status = "okay"; usb-role-switch; - port { - usb3_role_switch: endpoint { - remote-endpoint = <&hd3ss3220_ep>; + ports { + #address-cells = <1>; + #size-cells = <0>; + port@0 { + reg = <0>; + usb3_hs_ep: endpoint { + remote-endpoint = <&hs_ep>; + }; + }; + port@1 { + reg = <1>; + usb3_role_switch: endpoint { + remote-endpoint = <&hd3ss3220_out_ep>; + }; }; }; };