[PATCH] arm64: dts: mediatek: mt8195: Add MTU3 nodes and correctly describe USB
Chen-Yu Tsai
wenst at chromium.org
Tue Jan 30 23:14:02 PST 2024
On Tue, Jan 30, 2024 at 7:32 PM AngeloGioacchino Del Regno
<angelogioacchino.delregno at collabora.com> wrote:
>
> Il 15/01/24 09:43, AngeloGioacchino Del Regno ha scritto:
> > The MT8195 SoC has four USB controllers: only one is a direct path to
> > a XHCI controller, while the other three (0, 2 and 3) are behind the
> > MTU3 DRD controller instead!
> >
> > Add the missing MTU3 nodes, default disabled, for controllers 0, 2 and
> > 3 and move the related XHCI nodes to be children of their MTU3 DRD to
> > correctly describe the SoC.
> >
> > In order to retain USB functionality on all of the MT8195 and MT8395
> > boards, also move the vusb33 supply and enable the relevant MTU3 nodes
> > with special attention to the MT8195 Cherry Chromebook, where it was
> > necessary to set the dr_mode of all MTU3 controllers to host to avoid
> > interfering with the EC performing DRD on its own.
> >
> > Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno at collabora.com>
>
> Hello Chen-Yu,
>
> even though I've carefully tested that on my MT8195 Chromebook, can you please
> check this one?
Tested-by: Chen-Yu Tsai <wenst at chromium.org>
> Four eyes are better than two. :-)
>
> P.S.: Sorry, I forgot to Cc you in the first submission....
No worries. I probably missed it as I was busy working on other devices.
> > ---
> >
> > Depends on [1]
> >
> > This patch was tested on a MT8395 board and on the MT8195 Cherry
> > Tomato Chromebook.
> >
> > [1]: https://lore.kernel.org/all/20240112133222.240038-1-angelogioacchino.delregno@collabora.com
> >
> > .../boot/dts/mediatek/mt8195-cherry.dtsi | 26 +++-
> > arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 18 ++-
> > arch/arm64/boot/dts/mediatek/mt8195-evb.dts | 12 ++
> > arch/arm64/boot/dts/mediatek/mt8195.dtsi | 125 +++++++++++-------
> > .../dts/mediatek/mt8395-genio-1200-evk.dts | 17 ++-
> > 5 files changed, 140 insertions(+), 58 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi
> > index a136bea99d9c..e563a2dc4cce 100644
> > --- a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi
> > +++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi
> > @@ -1293,11 +1293,32 @@ &uart0 {
> > status = "okay";
> > };
> >
> > +/*
> > + * For the USB Type-C ports the role and alternate modes switching is
> > + * done by the EC so we set dr_mode to host to avoid interfering.
> > + */
Actually the USB roles can't be changed. The external ports all connect
to a USB hub. And the internal devices are either the Bluetooth device
or the USB cameras in the lid. So they all only work in host mode.
BTW, I think xhci1 can be disabled. There's nothing connected to it.
And the SS lines are used for PCIe instead.
ChenYu
> > +&ssusb0 {
> > + dr_mode = "host";
> > + vusb33-supply = <&mt6359_vusb_ldo_reg>;
> > + status = "okay";
> > +};
> > +
> > +&ssusb2 {
> > + dr_mode = "host";
> > + vusb33-supply = <&mt6359_vusb_ldo_reg>;
> > + status = "okay";
> > +};
> > +
> > +&ssusb3 {
> > + dr_mode = "host";
> > + vusb33-supply = <&mt6359_vusb_ldo_reg>;
> > + status = "okay";
> > +};
> > +
> > &xhci0 {
> > status = "okay";
> >
> > rx-fifo-depth = <3072>;
> > - vusb33-supply = <&mt6359_vusb_ldo_reg>;
> > vbus-supply = <&usb_vbus>;
> > };
> >
> > @@ -1311,8 +1332,6 @@ &xhci1 {
> >
> > &xhci2 {
> > status = "okay";
> > -
> > - vusb33-supply = <&mt6359_vusb_ldo_reg>;
> > vbus-supply = <&usb_vbus>;
> > };
> >
> > @@ -1321,7 +1340,6 @@ &xhci3 {
> >
> > /* MT7921's USB Bluetooth has issues with USB2 LPM */
> > usb2-lpm-disable;
> > - vusb33-supply = <&mt6359_vusb_ldo_reg>;
> > vbus-supply = <&usb_vbus>;
> > };
> >
> > diff --git a/arch/arm64/boot/dts/mediatek/mt8195-demo.dts b/arch/arm64/boot/dts/mediatek/mt8195-demo.dts
> > index 69c7f3954ae5..9872743f743f 100644
> > --- a/arch/arm64/boot/dts/mediatek/mt8195-demo.dts
> > +++ b/arch/arm64/boot/dts/mediatek/mt8195-demo.dts
> > @@ -528,8 +528,22 @@ &u3phy3 {
> > status = "okay";
> > };
> >
> > -&xhci0 {
> > +&ssusb0 {
> > + vusb33-supply = <&mt6359_vusb_ldo_reg>;
> > + status = "okay";
> > +};
> > +
> > +&ssusb2 {
> > vusb33-supply = <&mt6359_vusb_ldo_reg>;
> > + status = "okay";
> > +};
> > +
> > +&ssusb3 {
> > + vusb33-supply = <&mt6359_vusb_ldo_reg>;
> > + status = "okay";
> > +};
> > +
> > +&xhci0 {
> > vbus-supply = <&otg_vbus_regulator>;
> > status = "okay";
> > };
> > @@ -540,11 +554,9 @@ &xhci1 {
> > };
> >
> > &xhci2 {
> > - vusb33-supply = <&mt6359_vusb_ldo_reg>;
> > status = "okay";
> > };
> >
> > &xhci3 {
> > - vusb33-supply = <&mt6359_vusb_ldo_reg>;
> > status = "okay";
> > };
> > diff --git a/arch/arm64/boot/dts/mediatek/mt8195-evb.dts b/arch/arm64/boot/dts/mediatek/mt8195-evb.dts
> > index 690dc7717f2c..341b6e074139 100644
> > --- a/arch/arm64/boot/dts/mediatek/mt8195-evb.dts
> > +++ b/arch/arm64/boot/dts/mediatek/mt8195-evb.dts
> > @@ -160,6 +160,18 @@ &uart0 {
> > status = "okay";
> > };
> >
> > +&ssusb0 {
> > + status = "okay";
> > +};
> > +
> > +&ssusb2 {
> > + status = "okay";
> > +};
> > +
> > +&ssusb3 {
> > + status = "okay";
> > +};
> > +
> > &xhci0 {
> > status = "okay";
> > };
> > diff --git a/arch/arm64/boot/dts/mediatek/mt8195.dtsi b/arch/arm64/boot/dts/mediatek/mt8195.dtsi
> > index 152cc0b191bb..45f278efd946 100644
> > --- a/arch/arm64/boot/dts/mediatek/mt8195.dtsi
> > +++ b/arch/arm64/boot/dts/mediatek/mt8195.dtsi
> > @@ -1349,29 +1349,40 @@ queue3 {
> > };
> > };
> >
> > - xhci0: usb at 11200000 {
> > - compatible = "mediatek,mt8195-xhci",
> > - "mediatek,mtk-xhci";
> > - reg = <0 0x11200000 0 0x1000>,
> > - <0 0x11203e00 0 0x0100>;
> > + ssusb0: usb at 11201000 {
> > + compatible = "mediatek,mt8195-mtu3", "mediatek,mtu3";
> > + reg = <0 0x11201000 0 0x2dff>, <0 0x11203e00 0 0x0100>;
> > reg-names = "mac", "ippc";
> > - interrupts = <GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH 0>;
> > - phys = <&u2port0 PHY_TYPE_USB2>,
> > - <&u3port0 PHY_TYPE_USB3>;
> > - assigned-clocks = <&topckgen CLK_TOP_USB_TOP>,
> > - <&topckgen CLK_TOP_SSUSB_XHCI>;
> > - assigned-clock-parents = <&topckgen CLK_TOP_UNIVPLL_D5_D4>,
> > - <&topckgen CLK_TOP_UNIVPLL_D5_D4>;
> > + ranges = <0 0 0 0x11200000 0 0x3f00>;
> > + #address-cells = <2>;
> > + #size-cells = <2>;
> > + interrupts = <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH 0>;
> > clocks = <&infracfg_ao CLK_INFRA_AO_SSUSB>,
> > <&topckgen CLK_TOP_SSUSB_REF>,
> > - <&apmixedsys CLK_APMIXED_USB1PLL>,
> > - <&clk26m>,
> > <&infracfg_ao CLK_INFRA_AO_SSUSB_XHCI>;
> > - clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck",
> > - "xhci_ck";
> > - mediatek,syscon-wakeup = <&pericfg 0x400 103>;
> > + clock-names = "sys_ck", "ref_ck", "mcu_ck";
> > + phys = <&u2port0 PHY_TYPE_USB2>, <&u3port0 PHY_TYPE_USB3>;
> > wakeup-source;
> > + mediatek,syscon-wakeup = <&pericfg 0x400 103>;
> > status = "disabled";
> > +
> > + xhci0: usb at 0 {
> > + compatible = "mediatek,mt8195-xhci", "mediatek,mtk-xhci";
> > + reg = <0 0 0 0x1000>;
> > + reg-names = "mac";
> > + interrupts = <GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH 0>;
> > + assigned-clocks = <&topckgen CLK_TOP_USB_TOP>,
> > + <&topckgen CLK_TOP_SSUSB_XHCI>;
> > + assigned-clock-parents = <&topckgen CLK_TOP_UNIVPLL_D5_D4>,
> > + <&topckgen CLK_TOP_UNIVPLL_D5_D4>;
> > + clocks = <&infracfg_ao CLK_INFRA_AO_SSUSB>,
> > + <&topckgen CLK_TOP_SSUSB_REF>,
> > + <&apmixedsys CLK_APMIXED_USB1PLL>,
> > + <&clk26m>,
> > + <&infracfg_ao CLK_INFRA_AO_SSUSB_XHCI>;
> > + clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck", "xhci_ck";
> > + status = "disabled";
> > + };
> > };
> >
> > mmc0: mmc at 11230000 {
> > @@ -1452,52 +1463,68 @@ xhci1: usb at 11290000 {
> > status = "disabled";
> > };
> >
> > - xhci2: usb at 112a0000 {
> > - compatible = "mediatek,mt8195-xhci",
> > - "mediatek,mtk-xhci";
> > - reg = <0 0x112a0000 0 0x1000>,
> > - <0 0x112a3e00 0 0x0100>;
> > + ssusb2: usb at 112a1000 {
> > + compatible = "mediatek,mt8195-mtu3", "mediatek,mtu3";
> > + reg = <0 0x112a1000 0 0x2dff>, <0 0x112a3e00 0 0x0100>;
> > reg-names = "mac", "ippc";
> > - interrupts = <GIC_SPI 533 IRQ_TYPE_LEVEL_HIGH 0>;
> > - phys = <&u2port2 PHY_TYPE_USB2>;
> > - assigned-clocks = <&topckgen CLK_TOP_USB_TOP_2P>,
> > - <&topckgen CLK_TOP_SSUSB_XHCI_2P>;
> > - assigned-clock-parents = <&topckgen CLK_TOP_UNIVPLL_D5_D4>,
> > - <&topckgen CLK_TOP_UNIVPLL_D5_D4>;
> > + ranges = <0 0 0 0x112a0000 0 0x3f00>;
> > + #address-cells = <2>;
> > + #size-cells = <2>;
> > + interrupts = <GIC_SPI 532 IRQ_TYPE_LEVEL_HIGH 0>;
> > + assigned-clocks = <&topckgen CLK_TOP_USB_TOP_2P>;
> > + assigned-clock-parents = <&topckgen CLK_TOP_UNIVPLL_D5_D4>;
> > clocks = <&pericfg_ao CLK_PERI_AO_SSUSB_2P_BUS>,
> > <&topckgen CLK_TOP_SSUSB_P2_REF>,
> > - <&clk26m>,
> > - <&clk26m>,
> > <&pericfg_ao CLK_PERI_AO_SSUSB_2P_XHCI>;
> > - clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck",
> > - "xhci_ck";
> > - mediatek,syscon-wakeup = <&pericfg 0x400 105>;
> > + clock-names = "sys_ck", "ref_ck", "mcu_ck";
> > + phys = <&u2port2 PHY_TYPE_USB2>;
> > wakeup-source;
> > + mediatek,syscon-wakeup = <&pericfg 0x400 105>;
> > status = "disabled";
> > +
> > + xhci2: usb at 0 {
> > + compatible = "mediatek,mt8195-xhci", "mediatek,mtk-xhci";
> > + reg = <0 0 0 0x1000>;
> > + reg-names = "mac";
> > + interrupts = <GIC_SPI 533 IRQ_TYPE_LEVEL_HIGH 0>;
> > + assigned-clocks = <&topckgen CLK_TOP_SSUSB_XHCI_2P>;
> > + assigned-clock-parents = <&topckgen CLK_TOP_UNIVPLL_D5_D4>;
> > + clocks = <&pericfg_ao CLK_PERI_AO_SSUSB_2P_XHCI>;
> > + clock-names = "sys_ck";
> > + status = "disabled";
> > + };
> > };
> >
> > - xhci3: usb at 112b0000 {
> > - compatible = "mediatek,mt8195-xhci",
> > - "mediatek,mtk-xhci";
> > - reg = <0 0x112b0000 0 0x1000>,
> > - <0 0x112b3e00 0 0x0100>;
> > + ssusb3: usb at 112b1000 {
> > + compatible = "mediatek,mt8195-mtu3", "mediatek,mtu3";
> > + reg = <0 0x112b1000 0 0x2dff>, <0 0x112b3e00 0 0x0100>;
> > reg-names = "mac", "ippc";
> > - interrupts = <GIC_SPI 536 IRQ_TYPE_LEVEL_HIGH 0>;
> > - phys = <&u2port3 PHY_TYPE_USB2>;
> > - assigned-clocks = <&topckgen CLK_TOP_USB_TOP_3P>,
> > - <&topckgen CLK_TOP_SSUSB_XHCI_3P>;
> > - assigned-clock-parents = <&topckgen CLK_TOP_UNIVPLL_D5_D4>,
> > - <&topckgen CLK_TOP_UNIVPLL_D5_D4>;
> > + ranges = <0 0 0 0x112b0000 0 0x3f00>;
> > + #address-cells = <2>;
> > + #size-cells = <2>;
> > + interrupts = <GIC_SPI 535 IRQ_TYPE_LEVEL_HIGH 0>;
> > + assigned-clocks = <&topckgen CLK_TOP_USB_TOP_3P>;
> > + assigned-clock-parents = <&topckgen CLK_TOP_UNIVPLL_D5_D4>;
> > clocks = <&pericfg_ao CLK_PERI_AO_SSUSB_3P_BUS>,
> > <&topckgen CLK_TOP_SSUSB_P3_REF>,
> > - <&clk26m>,
> > - <&clk26m>,
> > <&pericfg_ao CLK_PERI_AO_SSUSB_3P_XHCI>;
> > - clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck",
> > - "xhci_ck";
> > - mediatek,syscon-wakeup = <&pericfg 0x400 106>;
> > + clock-names = "sys_ck", "ref_ck", "mcu_ck";
> > + phys = <&u2port3 PHY_TYPE_USB2>;
> > wakeup-source;
> > + mediatek,syscon-wakeup = <&pericfg 0x400 106>;
> > status = "disabled";
> > +
> > + xhci3: usb at 0 {
> > + compatible = "mediatek,mt8195-xhci", "mediatek,mtk-xhci";
> > + reg = <0 0 0 0x1000>;
> > + reg-names = "mac";
> > + interrupts = <GIC_SPI 536 IRQ_TYPE_LEVEL_HIGH 0>;
> > + assigned-clocks = <&topckgen CLK_TOP_SSUSB_XHCI_3P>;
> > + assigned-clock-parents = <&topckgen CLK_TOP_UNIVPLL_D5_D4>;
> > + clocks = <&pericfg_ao CLK_PERI_AO_SSUSB_3P_XHCI>;
> > + clock-names = "sys_ck";
> > + status = "disabled";
> > + };
> > };
> >
> > pcie0: pcie at 112f0000 {
> > diff --git a/arch/arm64/boot/dts/mediatek/mt8395-genio-1200-evk.dts b/arch/arm64/boot/dts/mediatek/mt8395-genio-1200-evk.dts
> > index 7fc515a07c65..1558649f633c 100644
> > --- a/arch/arm64/boot/dts/mediatek/mt8395-genio-1200-evk.dts
> > +++ b/arch/arm64/boot/dts/mediatek/mt8395-genio-1200-evk.dts
> > @@ -880,6 +880,21 @@ &ufsphy {
> > status = "disabled";
> > };
> >
> > +&ssusb0 {
> > + vusb33-supply = <&mt6359_vusb_ldo_reg>;
> > + status = "okay";
> > +};
> > +
> > +&ssusb2 {
> > + vusb33-supply = <&mt6359_vusb_ldo_reg>;
> > + status = "okay";
> > +};
> > +
> > +&ssusb3 {
> > + vusb33-supply = <&mt6359_vusb_ldo_reg>;
> > + status = "okay";
> > +};
> > +
> > &xhci0 {
> > status = "okay";
> > };
> > @@ -890,11 +905,9 @@ &xhci1 {
> > };
> >
> > &xhci2 {
> > - vusb33-supply = <&mt6359_vusb_ldo_reg>;
> > status = "okay";
> > };
> >
> > &xhci3 {
> > - vusb33-supply = <&mt6359_vusb_ldo_reg>;
> > status = "okay";
> > };
>
>
More information about the linux-arm-kernel
mailing list