| Message ID | 20221117162728.20608-8-linux@fw-web.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add BananaPi R3 | expand |
On Thu, 2022-11-17 at 17:27 +0100, Frank Wunderlich wrote: > From: Sam Shih <sam.shih@mediatek.com> > > This patch adds USB support for MT7986. > > Signed-off-by: Sam Shih <sam.shih@mediatek.com> > Signed-off-by: Frank Wunderlich <frank-w@public-files.de> > --- > changes compared to sams original version: > - reorder xhci-clocks based on yaml binding > > v5: > - update ranges/reg of usb-phy > - not added RB from AngeloGioacchino for v4 because of these changes > --- > arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 28 ++++++++++ > arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 55 > ++++++++++++++++++++ > arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 28 ++++++++++ > 3 files changed, 111 insertions(+) > > diff --git a/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts > b/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts > index 006878e3f2b2..2b5d7ea31b4d 100644 > --- a/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts > +++ b/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts > @@ -23,6 +23,24 @@ memory@40000000 { > device_type = "memory"; > reg = <0 0x40000000 0 0x40000000>; > }; > + > + reg_3p3v: regulator-3p3v { > + compatible = "regulator-fixed"; > + regulator-name = "fixed-3.3V"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-boot-on; > + regulator-always-on; > + }; > + > + reg_5v: regulator-5v { > + compatible = "regulator-fixed"; > + regulator-name = "fixed-5V"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + regulator-boot-on; > + regulator-always-on; > + }; > }; Usually if we use a gpio to control a switch to turn on/off power, we model it as a fixed regulator, but here no gpio provided in reg_3p3v and reg_5v, if no gpio used, no need these two fixed regulators too. > > &crypto { > @@ -140,6 +158,12 @@ &spi1 { > status = "okay"; > }; > > +&ssusb { > + vusb33-supply = <®_3p3v>; > + vbus-supply = <®_5v>; These two supply can be removed if no swith to control them, they are optional. > + status = "okay"; > +}; > + > &switch { > ports { > #address-cells = <1>; > @@ -201,6 +225,10 @@ &uart2 { > status = "okay"; > }; > > +&usb_phy { > + status = "okay"; > +}; > + > &wifi { > status = "okay"; > pinctrl-names = "default", "dbdc"; > diff --git a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi > b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi > index 29da9b8ed753..c69b8bff7f4a 100644 > --- a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi > +++ b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi > @@ -281,6 +281,61 @@ spi1: spi@1100b000 { > status = "disabled"; > }; > > + ssusb: usb@11200000 { > + compatible = "mediatek,mt7986-xhci", > + "mediatek,mtk-xhci"; > + reg = <0 0x11200000 0 0x2e00>, > + <0 0x11203e00 0 0x0100>; > + reg-names = "mac", "ippc"; > + interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&infracfg CLK_INFRA_IUSB_SYS_CK>, > + <&infracfg CLK_INFRA_IUSB_CK>, > + <&infracfg CLK_INFRA_IUSB_133_CK>, > + <&infracfg CLK_INFRA_IUSB_66M_CK>, > + <&topckgen CLK_TOP_U2U3_XHCI_SEL>; > + clock-names = "sys_ck", > + "ref_ck", > + "mcu_ck", > + "dma_ck", > + "xhci_ck"; > + phys = <&u2port0 PHY_TYPE_USB2>, > + <&u3port0 PHY_TYPE_USB3>, > + <&u2port1 PHY_TYPE_USB2>; > + status = "disabled"; > + }; > + > + usb_phy: t-phy@11e10000 { > + compatible = "mediatek,mt7986-tphy", > + "mediatek,generic-tphy-v2"; > + #address-cells = <1>; > + #size-cells = <1>; > + ranges = <0 0 0x11e10000 0x1700>; > + status = "disabled"; > + > + u2port0: usb-phy@0 { > + reg = <0x0 0x700>; > + clocks = <&topckgen > CLK_TOP_DA_U2_REFSEL>, > + <&topckgen > CLK_TOP_DA_U2_CK_1P_SEL>; > + clock-names = "ref", "da_ref"; > + #phy-cells = <1>; > + }; > + > + u3port0: usb-phy@700 { > + reg = <0x700 0x900>; > + clocks = <&topckgen > CLK_TOP_USB3_PHY_SEL>; > + clock-names = "ref"; > + #phy-cells = <1>; > + }; > + > + u2port1: usb-phy@1000 { > + reg = <0x1000 0x700>; > + clocks = <&topckgen > CLK_TOP_DA_U2_REFSEL>, > + <&topckgen > CLK_TOP_DA_U2_CK_1P_SEL>; > + clock-names = "ref", "da_ref"; > + #phy-cells = <1>; > + }; > + }; > + > ethsys: syscon@15000000 { > #address-cells = <1>; > #size-cells = <1>; > diff --git a/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts > b/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts > index 2c7f1d4fb352..a98025112b5a 100644 > --- a/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts > +++ b/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts > @@ -23,6 +23,24 @@ memory@40000000 { > device_type = "memory"; > reg = <0 0x40000000 0 0x40000000>; > }; > + > + reg_3p3v: regulator-3p3v { > + compatible = "regulator-fixed"; > + regulator-name = "fixed-3.3V"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-boot-on; > + regulator-always-on; > + }; > + > + reg_5v: regulator-5v { > + compatible = "regulator-fixed"; > + regulator-name = "fixed-5V"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + regulator-boot-on; > + regulator-always-on; ditto > + }; > }; > > &crypto { > @@ -167,10 +185,20 @@ &spi1 { > status = "okay"; > }; > > +&ssusb { > + vusb33-supply = <®_3p3v>; > + vbus-supply = <®_5v>; ditto > + status = "okay"; > +}; > + > &uart0 { > status = "okay"; > }; > > +&usb_phy { > + status = "okay"; > +}; > + > &wifi { > status = "okay"; > pinctrl-names = "default", "dbdc";
Hi > Gesendet: Freitag, 18. November 2022 um 07:43 Uhr > Von: "Chunfeng Yun (云春峰)" <Chunfeng.Yun@mediatek.com> > On Thu, 2022-11-17 at 17:27 +0100, Frank Wunderlich wrote: > > From: Sam Shih <sam.shih@mediatek.com> > > > > This patch adds USB support for MT7986. > > > > Signed-off-by: Sam Shih <sam.shih@mediatek.com> > > Signed-off-by: Frank Wunderlich <frank-w@public-files.de> > > --- > > changes compared to sams original version: > > - reorder xhci-clocks based on yaml binding > > > > v5: > > - update ranges/reg of usb-phy > > - not added RB from AngeloGioacchino for v4 because of these changes > > diff --git a/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts > > b/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts > > index 006878e3f2b2..2b5d7ea31b4d 100644 > > --- a/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts > > +++ b/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts > > @@ -23,6 +23,24 @@ memory@40000000 { > > device_type = "memory"; > > reg = <0 0x40000000 0 0x40000000>; > > }; > > + > > + reg_3p3v: regulator-3p3v { > > + compatible = "regulator-fixed"; > > + regulator-name = "fixed-3.3V"; > > + regulator-min-microvolt = <3300000>; > > + regulator-max-microvolt = <3300000>; > > + regulator-boot-on; > > + regulator-always-on; > > + }; > > + > > + reg_5v: regulator-5v { > > + compatible = "regulator-fixed"; > > + regulator-name = "fixed-5V"; > > + regulator-min-microvolt = <5000000>; > > + regulator-max-microvolt = <5000000>; > > + regulator-boot-on; > > + regulator-always-on; > > + }; > > }; > Usually if we use a gpio to control a switch to turn on/off power, we > model it as a fixed regulator, but here no gpio provided in reg_3p3v > and reg_5v, if no gpio used, no need these two fixed regulators too. i can drop 5v regulator, but 3v3 is used by emmc, so i would move that to the mmc-patch > > > > &crypto { > > @@ -140,6 +158,12 @@ &spi1 { > > status = "okay"; > > }; > > > > +&ssusb { > > + vusb33-supply = <®_3p3v>; > > + vbus-supply = <®_5v>; > These two supply can be removed if no swith to control them, they are > optional. ok, i drop the references. anything else ok? prepared patch here (now yet squashed): https://github.com/frank-w/BPI-R2-4.14/commits/6.1-r3dts regards Frank
diff --git a/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts b/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts index 006878e3f2b2..2b5d7ea31b4d 100644 --- a/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts +++ b/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts @@ -23,6 +23,24 @@ memory@40000000 { device_type = "memory"; reg = <0 0x40000000 0 0x40000000>; }; + + reg_3p3v: regulator-3p3v { + compatible = "regulator-fixed"; + regulator-name = "fixed-3.3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; + + reg_5v: regulator-5v { + compatible = "regulator-fixed"; + regulator-name = "fixed-5V"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; + regulator-always-on; + }; }; &crypto { @@ -140,6 +158,12 @@ &spi1 { status = "okay"; }; +&ssusb { + vusb33-supply = <®_3p3v>; + vbus-supply = <®_5v>; + status = "okay"; +}; + &switch { ports { #address-cells = <1>; @@ -201,6 +225,10 @@ &uart2 { status = "okay"; }; +&usb_phy { + status = "okay"; +}; + &wifi { status = "okay"; pinctrl-names = "default", "dbdc"; diff --git a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi index 29da9b8ed753..c69b8bff7f4a 100644 --- a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi @@ -281,6 +281,61 @@ spi1: spi@1100b000 { status = "disabled"; }; + ssusb: usb@11200000 { + compatible = "mediatek,mt7986-xhci", + "mediatek,mtk-xhci"; + reg = <0 0x11200000 0 0x2e00>, + <0 0x11203e00 0 0x0100>; + reg-names = "mac", "ippc"; + interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&infracfg CLK_INFRA_IUSB_SYS_CK>, + <&infracfg CLK_INFRA_IUSB_CK>, + <&infracfg CLK_INFRA_IUSB_133_CK>, + <&infracfg CLK_INFRA_IUSB_66M_CK>, + <&topckgen CLK_TOP_U2U3_XHCI_SEL>; + clock-names = "sys_ck", + "ref_ck", + "mcu_ck", + "dma_ck", + "xhci_ck"; + phys = <&u2port0 PHY_TYPE_USB2>, + <&u3port0 PHY_TYPE_USB3>, + <&u2port1 PHY_TYPE_USB2>; + status = "disabled"; + }; + + usb_phy: t-phy@11e10000 { + compatible = "mediatek,mt7986-tphy", + "mediatek,generic-tphy-v2"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0 0x11e10000 0x1700>; + status = "disabled"; + + u2port0: usb-phy@0 { + reg = <0x0 0x700>; + clocks = <&topckgen CLK_TOP_DA_U2_REFSEL>, + <&topckgen CLK_TOP_DA_U2_CK_1P_SEL>; + clock-names = "ref", "da_ref"; + #phy-cells = <1>; + }; + + u3port0: usb-phy@700 { + reg = <0x700 0x900>; + clocks = <&topckgen CLK_TOP_USB3_PHY_SEL>; + clock-names = "ref"; + #phy-cells = <1>; + }; + + u2port1: usb-phy@1000 { + reg = <0x1000 0x700>; + clocks = <&topckgen CLK_TOP_DA_U2_REFSEL>, + <&topckgen CLK_TOP_DA_U2_CK_1P_SEL>; + clock-names = "ref", "da_ref"; + #phy-cells = <1>; + }; + }; + ethsys: syscon@15000000 { #address-cells = <1>; #size-cells = <1>; diff --git a/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts b/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts index 2c7f1d4fb352..a98025112b5a 100644 --- a/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts +++ b/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts @@ -23,6 +23,24 @@ memory@40000000 { device_type = "memory"; reg = <0 0x40000000 0 0x40000000>; }; + + reg_3p3v: regulator-3p3v { + compatible = "regulator-fixed"; + regulator-name = "fixed-3.3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; + + reg_5v: regulator-5v { + compatible = "regulator-fixed"; + regulator-name = "fixed-5V"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; + regulator-always-on; + }; }; &crypto { @@ -167,10 +185,20 @@ &spi1 { status = "okay"; }; +&ssusb { + vusb33-supply = <®_3p3v>; + vbus-supply = <®_5v>; + status = "okay"; +}; + &uart0 { status = "okay"; }; +&usb_phy { + status = "okay"; +}; + &wifi { status = "okay"; pinctrl-names = "default", "dbdc";