MT7623 has an musb controller that is compatible with the one from MT2701.
Signed-off-by: Sungbo Eo <[email protected]>
Tested-by: Frank Wunderlich <[email protected]>
---
v4:
* add tested by Frank
v3:
* remove unnecessary status=okay from u2port2
v2:
* rename usb3 label to usb0
* move usb0 & u2phy1 nodes to the right sorted place
* disable u2phy1 by default
* correct u2port2 node name to match its reg address
---
arch/arm/boot/dts/mt7623.dtsi | 33 +++++++++++++++++++++++++++++++++
arch/arm/boot/dts/mt7623a.dtsi | 4 ++++
2 files changed, 37 insertions(+)
diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi
index 3c11f7cfcc40..21c8a291b74e 100644
--- a/arch/arm/boot/dts/mt7623.dtsi
+++ b/arch/arm/boot/dts/mt7623.dtsi
@@ -585,6 +585,39 @@ spi2: spi@11017000 {
status = "disabled";
};
+ usb0: usb@11200000 {
+ compatible = "mediatek,mt7623-musb",
+ "mediatek,mtk-musb";
+ reg = <0 0x11200000 0 0x1000>;
+ interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
+ interrupt-names = "mc";
+ phys = <&u2port2 PHY_TYPE_USB2>;
+ dr_mode = "otg";
+ clocks = <&pericfg CLK_PERI_USB0>,
+ <&pericfg CLK_PERI_USB0_MCU>,
+ <&pericfg CLK_PERI_USB_SLV>;
+ clock-names = "main","mcu","univpll";
+ power-domains = <&scpsys MT2701_POWER_DOMAIN_IFR_MSC>;
+ status = "disabled";
+ };
+
+ u2phy1: t-phy@11210000 {
+ compatible = "mediatek,mt7623-tphy",
+ "mediatek,generic-tphy-v1";
+ reg = <0 0x11210000 0 0x0800>;
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges;
+ status = "disabled";
+
+ u2port2: usb-phy@11210800 {
+ reg = <0 0x11210800 0 0x0100>;
+ clocks = <&topckgen CLK_TOP_USB_PHY48M>;
+ clock-names = "ref";
+ #phy-cells = <1>;
+ };
+ };
+
audsys: clock-controller@11220000 {
compatible = "mediatek,mt7623-audsys",
"mediatek,mt2701-audsys",
diff --git a/arch/arm/boot/dts/mt7623a.dtsi b/arch/arm/boot/dts/mt7623a.dtsi
index 0735a1fb8ad9..d304b62d24b5 100644
--- a/arch/arm/boot/dts/mt7623a.dtsi
+++ b/arch/arm/boot/dts/mt7623a.dtsi
@@ -35,6 +35,10 @@ &scpsys {
clock-names = "ethif";
};
+&usb0 {
+ power-domains = <&scpsys MT7623A_POWER_DOMAIN_IFR_MSC>;
+};
+
&usb1 {
power-domains = <&scpsys MT7623A_POWER_DOMAIN_HIF>;
};
--
2.33.0
On Tue, 2021-08-31 at 00:59 +0900, Sungbo Eo wrote:
> MT7623 has an musb controller that is compatible with the one from
> MT2701.
>
> Signed-off-by: Sungbo Eo <[email protected]>
> Tested-by: Frank Wunderlich <[email protected]>
> ---
> v4:
> * add tested by Frank
>
> v3:
> * remove unnecessary status=okay from u2port2
>
> v2:
> * rename usb3 label to usb0
> * move usb0 & u2phy1 nodes to the right sorted place
> * disable u2phy1 by default
> * correct u2port2 node name to match its reg address
> ---
> arch/arm/boot/dts/mt7623.dtsi | 33
> +++++++++++++++++++++++++++++++++
> arch/arm/boot/dts/mt7623a.dtsi | 4 ++++
> 2 files changed, 37 insertions(+)
>
> diff --git a/arch/arm/boot/dts/mt7623.dtsi
> b/arch/arm/boot/dts/mt7623.dtsi
> index 3c11f7cfcc40..21c8a291b74e 100644
> --- a/arch/arm/boot/dts/mt7623.dtsi
> +++ b/arch/arm/boot/dts/mt7623.dtsi
> @@ -585,6 +585,39 @@ spi2: spi@11017000 {
> status = "disabled";
> };
>
> + usb0: usb@11200000 {
> + compatible = "mediatek,mt7623-musb",
> + "mediatek,mtk-musb";
> + reg = <0 0x11200000 0 0x1000>;
> + interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
> + interrupt-names = "mc";
> + phys = <&u2port2 PHY_TYPE_USB2>;
> + dr_mode = "otg";
> + clocks = <&pericfg CLK_PERI_USB0>,
> + <&pericfg CLK_PERI_USB0_MCU>,
> + <&pericfg CLK_PERI_USB_SLV>;
> + clock-names = "main","mcu","univpll";
> + power-domains = <&scpsys MT2701_POWER_DOMAIN_IFR_MSC>;
> + status = "disabled";
> + };
> +
> + u2phy1: t-phy@11210000 {
> + compatible = "mediatek,mt7623-tphy",
> + "mediatek,generic-tphy-v1";
> + reg = <0 0x11210000 0 0x0800>;
> + #address-cells = <2>;
> + #size-cells = <2>;
> + ranges;
> + status = "disabled";
> +
> + u2port2: usb-phy@11210800 {
> + reg = <0 0x11210800 0 0x0100>;
> + clocks = <&topckgen CLK_TOP_USB_PHY48M>;
> + clock-names = "ref";
> + #phy-cells = <1>;
> + };
> + };
> +
> audsys: clock-controller@11220000 {
> compatible = "mediatek,mt7623-audsys",
> "mediatek,mt2701-audsys",
> diff --git a/arch/arm/boot/dts/mt7623a.dtsi
> b/arch/arm/boot/dts/mt7623a.dtsi
> index 0735a1fb8ad9..d304b62d24b5 100644
> --- a/arch/arm/boot/dts/mt7623a.dtsi
> +++ b/arch/arm/boot/dts/mt7623a.dtsi
> @@ -35,6 +35,10 @@ &scpsys {
> clock-names = "ethif";
> };
>
> +&usb0 {
> + power-domains = <&scpsys MT7623A_POWER_DOMAIN_IFR_MSC>;
> +};
> +
> &usb1 {
> power-domains = <&scpsys MT7623A_POWER_DOMAIN_HIF>;
> };
Is the dt-binding patch applied?
It's better to put it into this series due to the new
compatible "mediatek,mt7623-musb" is used for the first time.
Reviewed-by: Chunfeng Yun <[email protected]>
Thanks a lot
Am 31. August 2021 08:27:18 MESZ schrieb "Chunfeng Yun (云春峰)" <[email protected]>:
>Is the dt-binding patch applied?
>It's better to put it into this series due to the new
>compatible "mediatek,mt7623-musb" is used for the first time.
>
>Reviewed-by: Chunfeng Yun <[email protected]>
Hi,
I don't see [1] (ack from rob) in [2]/[3]
@sungbo: please leave dt-bindings patch in series.
You need no new version only for adding tags (acked,tested or reviewed).
Only for code-changes,but then add tags from previous versions.
Imho it is better to take my musb patch [4]
into the series as well to make depency cleaner
[1] https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/
[2] https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git/log/?h=for-next
[3] https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git/log/?h=for-next
[4] https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/
regards Frank
On 2021-08-31 17:59, Frank Wunderlich wrote:
> Am 31. August 2021 08:27:18 MESZ schrieb "Chunfeng Yun (云春峰)" <[email protected]>:
>
>> Is the dt-binding patch applied?
>> It's better to put it into this series due to the new
>> compatible "mediatek,mt7623-musb" is used for the first time.
>>
>> Reviewed-by: Chunfeng Yun <[email protected]>
>
> Hi,
>
> I don't see [1] (ack from rob) in [2]/[3]
You can find it here.
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git/log/?h=usb-next
>
> @sungbo: please leave dt-bindings patch in series.
I'll keep it for a while, then.
> You need no new version only for adding tags (acked,tested or reviewed).
> Only for code-changes,but then add tags from previous versions.
Got it. Thanks for the tip. :)
>
> Imho it is better to take my musb patch [4]
> into the series as well to make depency cleaner
Okay, I'll take it in the next version.
Thanks.
>
> [1] https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/
> [2] https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git/log/?h=for-next
> [3] https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git/log/?h=for-next
> [4] https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/
> regards Frank
>
> Gesendet: Dienstag, 31. August 2021 um 13:02 Uhr
> Von: "Sungbo Eo" <[email protected]>
> On 2021-08-31 17:59, Frank Wunderlich wrote:
> > Am 31. August 2021 08:27:18 MESZ schrieb "Chunfeng Yun (云春峰)" <[email protected]>:
> > I don't see [1] (ack from rob) in [2]/[3]
>
> You can find it here.
> https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git/log/?h=usb-next
>
> >
> > @sungbo: please leave dt-bindings patch in series.
>
> I'll keep it for a while, then.
ok, then it is not needed again...have not searched in usb-tree.
> > You need no new version only for adding tags (acked,tested or reviewed).
> > Only for code-changes,but then add tags from previous versions.
>
> Got it. Thanks for the tip. :)
>
> > Imho it is better to take my musb patch [4]
> > into the series as well to make depency cleaner
>
> Okay, I'll take it in the next version.
okay, if dt-bindings is already in usb-tree wait what maintainers (matthias/rob) says about adding my patch to a new version of your series or if this is clear now :)
> > [1] https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/
> > [2] https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git/log/?h=for-next
> > [3] https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git/log/?h=for-next
> > [4] https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/
> > regards Frank
> >
>
Hi,
just a gentle ping for this patch (second part is already merged to usb-tree) and my followup for bpi-r2
https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/
regards Frank
> Gesendet: Montag, 30. August 2021 um 17:59 Uhr
> Von: "Sungbo Eo" <[email protected]>
> An: [email protected]
> Cc: "Rob Herring" <[email protected]>, "Matthias Brugger" <[email protected]>, "Bin Liu" <[email protected]>, "Greg Kroah-Hartman" <[email protected]>, "Frank Wunderlich" <[email protected]>, [email protected], [email protected], [email protected], [email protected], "Sungbo Eo" <[email protected]>
> Betreff: [PATCH v4 1/2] arm: dts: mt7623: add musb device nodes
>
> MT7623 has an musb controller that is compatible with the one from MT2701.
>
> Signed-off-by: Sungbo Eo <[email protected]>
> Tested-by: Frank Wunderlich <[email protected]>
> ---
> v4:
> * add tested by Frank
>
> v3:
> * remove unnecessary status=okay from u2port2
>
> v2:
> * rename usb3 label to usb0
> * move usb0 & u2phy1 nodes to the right sorted place
> * disable u2phy1 by default
> * correct u2port2 node name to match its reg address
> ---
> arch/arm/boot/dts/mt7623.dtsi | 33 +++++++++++++++++++++++++++++++++
> arch/arm/boot/dts/mt7623a.dtsi | 4 ++++
> 2 files changed, 37 insertions(+)
>
> diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi
> index 3c11f7cfcc40..21c8a291b74e 100644
> --- a/arch/arm/boot/dts/mt7623.dtsi
> +++ b/arch/arm/boot/dts/mt7623.dtsi
> @@ -585,6 +585,39 @@ spi2: spi@11017000 {
> status = "disabled";
> };
>
> + usb0: usb@11200000 {
> + compatible = "mediatek,mt7623-musb",
> + "mediatek,mtk-musb";
> + reg = <0 0x11200000 0 0x1000>;
> + interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
> + interrupt-names = "mc";
> + phys = <&u2port2 PHY_TYPE_USB2>;
> + dr_mode = "otg";
> + clocks = <&pericfg CLK_PERI_USB0>,
> + <&pericfg CLK_PERI_USB0_MCU>,
> + <&pericfg CLK_PERI_USB_SLV>;
> + clock-names = "main","mcu","univpll";
> + power-domains = <&scpsys MT2701_POWER_DOMAIN_IFR_MSC>;
> + status = "disabled";
> + };
> +
> + u2phy1: t-phy@11210000 {
> + compatible = "mediatek,mt7623-tphy",
> + "mediatek,generic-tphy-v1";
> + reg = <0 0x11210000 0 0x0800>;
> + #address-cells = <2>;
> + #size-cells = <2>;
> + ranges;
> + status = "disabled";
> +
> + u2port2: usb-phy@11210800 {
> + reg = <0 0x11210800 0 0x0100>;
> + clocks = <&topckgen CLK_TOP_USB_PHY48M>;
> + clock-names = "ref";
> + #phy-cells = <1>;
> + };
> + };
> +
> audsys: clock-controller@11220000 {
> compatible = "mediatek,mt7623-audsys",
> "mediatek,mt2701-audsys",
> diff --git a/arch/arm/boot/dts/mt7623a.dtsi b/arch/arm/boot/dts/mt7623a.dtsi
> index 0735a1fb8ad9..d304b62d24b5 100644
> --- a/arch/arm/boot/dts/mt7623a.dtsi
> +++ b/arch/arm/boot/dts/mt7623a.dtsi
> @@ -35,6 +35,10 @@ &scpsys {
> clock-names = "ethif";
> };
>
> +&usb0 {
> + power-domains = <&scpsys MT7623A_POWER_DOMAIN_IFR_MSC>;
> +};
> +
> &usb1 {
> power-domains = <&scpsys MT7623A_POWER_DOMAIN_HIF>;
> };
> --
> 2.33.0
>
>
> _______________________________________________
> Linux-mediatek mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
>
On 30/08/2021 17:59, Sungbo Eo wrote:
> MT7623 has an musb controller that is compatible with the one from MT2701.
>
> Signed-off-by: Sungbo Eo <[email protected]>
> Tested-by: Frank Wunderlich <[email protected]>
Applied to v5.15-next/dts32
Thanks
> ---
> v4:
> * add tested by Frank
>
> v3:
> * remove unnecessary status=okay from u2port2
>
> v2:
> * rename usb3 label to usb0
> * move usb0 & u2phy1 nodes to the right sorted place
> * disable u2phy1 by default
> * correct u2port2 node name to match its reg address
> ---
> arch/arm/boot/dts/mt7623.dtsi | 33 +++++++++++++++++++++++++++++++++
> arch/arm/boot/dts/mt7623a.dtsi | 4 ++++
> 2 files changed, 37 insertions(+)
>
> diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi
> index 3c11f7cfcc40..21c8a291b74e 100644
> --- a/arch/arm/boot/dts/mt7623.dtsi
> +++ b/arch/arm/boot/dts/mt7623.dtsi
> @@ -585,6 +585,39 @@ spi2: spi@11017000 {
> status = "disabled";
> };
>
> + usb0: usb@11200000 {
> + compatible = "mediatek,mt7623-musb",
> + "mediatek,mtk-musb";
> + reg = <0 0x11200000 0 0x1000>;
> + interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
> + interrupt-names = "mc";
> + phys = <&u2port2 PHY_TYPE_USB2>;
> + dr_mode = "otg";
> + clocks = <&pericfg CLK_PERI_USB0>,
> + <&pericfg CLK_PERI_USB0_MCU>,
> + <&pericfg CLK_PERI_USB_SLV>;
> + clock-names = "main","mcu","univpll";
> + power-domains = <&scpsys MT2701_POWER_DOMAIN_IFR_MSC>;
> + status = "disabled";
> + };
> +
> + u2phy1: t-phy@11210000 {
> + compatible = "mediatek,mt7623-tphy",
> + "mediatek,generic-tphy-v1";
> + reg = <0 0x11210000 0 0x0800>;
> + #address-cells = <2>;
> + #size-cells = <2>;
> + ranges;
> + status = "disabled";
> +
> + u2port2: usb-phy@11210800 {
> + reg = <0 0x11210800 0 0x0100>;
> + clocks = <&topckgen CLK_TOP_USB_PHY48M>;
> + clock-names = "ref";
> + #phy-cells = <1>;
> + };
> + };
> +
> audsys: clock-controller@11220000 {
> compatible = "mediatek,mt7623-audsys",
> "mediatek,mt2701-audsys",
> diff --git a/arch/arm/boot/dts/mt7623a.dtsi b/arch/arm/boot/dts/mt7623a.dtsi
> index 0735a1fb8ad9..d304b62d24b5 100644
> --- a/arch/arm/boot/dts/mt7623a.dtsi
> +++ b/arch/arm/boot/dts/mt7623a.dtsi
> @@ -35,6 +35,10 @@ &scpsys {
> clock-names = "ethif";
> };
>
> +&usb0 {
> + power-domains = <&scpsys MT7623A_POWER_DOMAIN_IFR_MSC>;
> +};
> +
> &usb1 {
> power-domains = <&scpsys MT7623A_POWER_DOMAIN_HIF>;
> };
>