On Mon, Feb 28, 2022 at 4:10 AM Johan Jonker <jbx6244@xxxxxxxxx> wrote:
>
>
>
> On 2/27/22 23:44, Peter Geis wrote:
> > On Sun, Feb 27, 2022 at 12:50 PM Johan Jonker <jbx6244@xxxxxxxxx> wrote:
> >>
> >>
> >>
> >> On 2/27/22 16:30, Peter Geis wrote:
> >>> Add the dwc3 device nodes to the rk356x device trees.
> >>> The rk3566 has one usb2 capable dwc3 otg controller and one usb3 capable
> >>> dwc3 host controller.
> >>> The rk3568 has one usb3 capable dwc3 otg controller and one usb3 capable
> >>> dwc3 host controller.
> >>>
> >>> Signed-off-by: Peter Geis <pgwipeout@xxxxxxxxx>
> >>> ---
> >>> arch/arm64/boot/dts/rockchip/rk3566.dtsi | 11 ++++++++
> >>> arch/arm64/boot/dts/rockchip/rk3568.dtsi | 9 ++++++
> >>> arch/arm64/boot/dts/rockchip/rk356x.dtsi | 35 +++++++++++++++++++++++-
> >>> 3 files changed, 54 insertions(+), 1 deletion(-)
> >>>
> >>> diff --git a/arch/arm64/boot/dts/rockchip/rk3566.dtsi b/arch/arm64/boot/dts/rockchip/rk3566.dtsi
> >>> index 3839eef5e4f7..0b957068ff89 100644
> >>> --- a/arch/arm64/boot/dts/rockchip/rk3566.dtsi
> >>> +++ b/arch/arm64/boot/dts/rockchip/rk3566.dtsi
> >>> @@ -6,6 +6,10 @@ / {
> >>> compatible = "rockchip,rk3566";
> >>> };
> >>>
> >>> +&pipegrf {
> >>> + compatible = "rockchip,rk3566-pipe-grf", "syscon";
> >>> +};
> >>> +
> >>> &power {
> >>> power-domain@RK3568_PD_PIPE {
> >>> reg = <RK3568_PD_PIPE>;
> >>> @@ -18,3 +22,10 @@ power-domain@RK3568_PD_PIPE {
> >>> #power-domain-cells = <0>;
> >>> };
> >>> };
> >>> +
> >>> +&usb_host0_xhci {
> >>> + phys = <&usb2phy0_otg>;
> >>> + phy-names = "usb2-phy";
> >>> + extcon = <&usb2phy0>;
> >>> + maximum-speed = "high-speed";
> >>> +};
> >>> diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
> >>> index 5b0f528d6818..8ba9334f9753 100644
> >>> --- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi
> >>> +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
> >>> @@ -99,6 +99,10 @@ opp-1992000000 {
> >>> };
> >>> };
> >>>
> >>> +&pipegrf {
> >>> + compatible = "rockchip,rk3568-pipe-grf", "syscon";
> >>> +};
> >>> +
> >>> &power {
> >>> power-domain@RK3568_PD_PIPE {
> >>> reg = <RK3568_PD_PIPE>;
> >>> @@ -114,3 +118,8 @@ power-domain@RK3568_PD_PIPE {
> >>> #power-domain-cells = <0>;
> >>> };
> >>> };
> >>> +
> >>> +&usb_host0_xhci {
> >>> + phys = <&usb2phy0_otg>, <&combphy0 PHY_TYPE_USB3>;
> >>> + phy-names = "usb2-phy", "usb3-phy";
> >>> +};
> >>> diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
> >>> index 7cdef800cb3c..072bb9080cd6 100644
> >>> --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
> >>> +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
> >>> @@ -230,6 +230,40 @@ scmi_shmem: sram@0 {
> >>> };
> >>> };
> >>>
> >>> + usb_host0_xhci: usb@fcc00000 {
> >>
> >>> + compatible = "snps,dwc3";
> >>
> >> compatible = "rockchip,rk3568-dwc3", "snps,dwc3";
> >>
> >> compatible strings must be SoC orientated.
> >> Add binding like you did before.
> >
> > Okay, should this go in the core yaml, since it's not really handled
> > by of-simple?
>
> Nothing to change in core.c, because the fall back string does the
> trick, so we don't have to change the driver for every new SoC.
> Change the node compatible here and add the binding.
> That's it. The rest comes later if needed.
It's the binding I'm referring to here.
snps,dwc3.yaml seems the logical place, but I want to make sure you
concur first.
>
> > Also, should I add in the compatible for rk3328 as well?
>
> No, same story the fall back string does the trick in core.c
Same thing here, since I'm in snps,dwc3.yaml anyways I can add the
rk3328 binding in and silence that error in one go.
>
>
> >
> >>
> >>> + reg = <0x0 0xfcc00000 0x0 0x400000>;
> >>> + interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
> >>> + clocks = <&cru CLK_USB3OTG0_REF>, <&cru CLK_USB3OTG0_SUSPEND>,
> >>> + <&cru ACLK_USB3OTG0>;
> >>> + clock-names = "ref_clk", "suspend_clk",
> >>> + "bus_clk";
> >>> + dr_mode = "host";
> >>> + phy_type = "utmi_wide";
> >>> + power-domains = <&power RK3568_PD_PIPE>;
> >>> + resets = <&cru SRST_USB3OTG0>;
> >>> + snps,dis_u2_susphy_quirk;
> >>> + status = "disabled";
> >>> + };
> >>> +
> >>> + usb_host1_xhci: usb@fd000000 {
> >>
> >>> + compatible = "snps,dwc3";
> >>
> >> compatible = "rockchip,rk3568-dwc3", "snps,dwc3";
> >>
> >>> + reg = <0x0 0xfd000000 0x0 0x400000>;
> >>> + interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
> >>> + clocks = <&cru CLK_USB3OTG1_REF>, <&cru CLK_USB3OTG1_SUSPEND>,
> >>> + <&cru ACLK_USB3OTG1>;
> >>> + clock-names = "ref_clk", "suspend_clk",
> >>> + "bus_clk";
> >>> + dr_mode = "host";
> >>> + phys = <&usb2phy0_host>, <&combphy1 PHY_TYPE_USB3>;
> >>> + phy-names = "usb2-phy", "usb3-phy";
> >>> + phy_type = "utmi_wide";
> >>> + power-domains = <&power RK3568_PD_PIPE>;
> >>> + resets = <&cru SRST_USB3OTG1>;
> >>> + snps,dis_u2_susphy_quirk;
> >>> + status = "disabled";
> >>> + };
> >>> +
> >>> gic: interrupt-controller@fd400000 {
> >>> compatible = "arm,gic-v3";
> >>> reg = <0x0 0xfd400000 0 0x10000>, /* GICD */
> >>> @@ -297,7 +331,6 @@ pmu_io_domains: io-domains {
> >>> };
> >>>
> >>> pipegrf: syscon@fdc50000 {
> >>> - compatible = "rockchip,rk3568-pipe-grf", "syscon";
> >>> reg = <0x0 0xfdc50000 0x0 0x1000>;
> >>> };
> >>>
