[PATCH v2 0/4] Fixes for dtbs_check warnings on Mediatek XHCI nodes

[PATCH v2 0/4] Fixes for dtbs_check warnings on Mediatek XHCI nodes

[Nícolas F. R. A. Prado]

The two first patches fix inconsistencies in the mtk-xhci dt-binding,
while the last two tweak the Mediatek devicetrees to fill in the missing
XHCI fixed clocks.

This series gets rid of a couple dtbs_check warnings on mt8192.dtsi and
another on mt8195.dtsi.

v1: https://lore.kernel.org/all/20220617222916.2435618-1-nfraprado@collabora.com

Changes in v2:
- Made all clocks required in the binding
- Instead of simply reordering the clocks on mt8192, added missing fixed
  clocks for all arm64 dts
- Added missing fixed clocks for all arm dts

Nícolas F. R. A. Prado (4):
  dt-bindings: usb: mtk-xhci: Allow wakeup interrupt-names to be
    optional
  dt-bindings: usb: mtk-xhci: Make all clocks required
  arm64: dts: mediatek: Set fixed-clock for missing XHCI clocks
  arm: dts: mediatek: Set fixed-clock for missing XHCI clocks

 .../bindings/usb/mediatek,mtk-xhci.yaml        |  5 ++---
 arch/arm/boot/dts/mt2701.dtsi                  | 14 ++++++++++----
 arch/arm/boot/dts/mt7623.dtsi                  | 14 ++++++++++----
 arch/arm/boot/dts/mt7629.dtsi                  |  6 ++++--
 arch/arm64/boot/dts/mediatek/mt2712e.dtsi      | 18 ++++++++++++++----
 arch/arm64/boot/dts/mediatek/mt7622.dtsi       |  5 +++--
 arch/arm64/boot/dts/mediatek/mt8173.dtsi       |  9 +++++++--
 arch/arm64/boot/dts/mediatek/mt8183.dtsi       |  8 ++++++--
 arch/arm64/boot/dts/mediatek/mt8192.dtsi       |  9 ++++++---
 arch/arm64/boot/dts/mediatek/mt8195.dtsi       | 18 ++++++++++++++----
 10 files changed, 76 insertions(+), 30 deletions(-)

-- 
2.36.1

[PATCH v2 1/4] dt-bindings: usb: mtk-xhci: Allow wakeup interrupt-names to be optional

[Nícolas F. R. A. Prado]

Add missing "minItems: 1" to the interrupt-names property to allow the
second interrupt-names, "wakeup", to be optional.

Fixes: fe8e488058c4 ("dt-bindings: usb: mtk-xhci: add wakeup interrupt")
Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: Chunfeng Yun <chunfeng.yun@mediatek.com>

---

(no changes since v1)

 Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
index 892718459d25..63cbc2b62d18 100644
--- a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
+++ b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
@@ -57,6 +57,7 @@ properties:
       - description: optional, wakeup interrupt used to support runtime PM
 
   interrupt-names:
+    minItems: 1
     items:
       - const: host
       - const: wakeup
-- 
2.36.1

[PATCH v2 2/4] dt-bindings: usb: mtk-xhci: Make all clocks required

[Nícolas F. R. A. Prado]

All of the clocks listed in the binding are always wired to the XHCI
controller hardware blocks on all SoCs. The reason some clocks were made
optional in the binding was to account for the fact that depending on
the SoC, some of the clocks might be fixed (ie not controlled by
software).

Given that the devicetree should represent the hardware, make all clocks
required in the binding. Subsequent patches will make the DTS changes to
specify fixed-clocks for the clocks that aren't controllable.

Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>

---

Changes in v2:
- Undid clock list changes that allowed middle clocks to be missing from
  v1 and made all clocks required instead
- Rewrote commit message and title

 Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
index 63cbc2b62d18..1444d18ef9bc 100644
--- a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
+++ b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
@@ -67,7 +67,6 @@ properties:
     maxItems: 1
 
   clocks:
-    minItems: 1
     items:
       - description: Controller clock used by normal mode
       - description: Reference clock used by low power mode etc
@@ -76,9 +75,8 @@ properties:
       - description: controller clock
 
   clock-names:
-    minItems: 1
     items:
-      - const: sys_ck  # required, the following ones are optional
+      - const: sys_ck
       - const: ref_ck
       - const: mcu_ck
       - const: dma_ck
-- 
2.36.1

Re: [PATCH v2 2/4] dt-bindings: usb: mtk-xhci: Make all clocks required

[Rob Herring]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 5404 bytes --]

On Thu, 23 Jun 2022 15:37:00 -0400, Nícolas F. R. A. Prado wrote:
> All of the clocks listed in the binding are always wired to the XHCI
> controller hardware blocks on all SoCs. The reason some clocks were made
> optional in the binding was to account for the fact that depending on
> the SoC, some of the clocks might be fixed (ie not controlled by
> software).
> 
> Given that the devicetree should represent the hardware, make all clocks
> required in the binding. Subsequent patches will make the DTS changes to
> specify fixed-clocks for the clocks that aren't controllable.
> 
> Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
> 
> ---
> 
> Changes in v2:
> - Undid clock list changes that allowed middle clocks to be missing from
>   v1 and made all clocks required instead
> - Rewrote commit message and title
> 
>  Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 

My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
on your patch (DT_CHECKER_FLAGS is new in v5.13):

yamllint warnings/errors:

dtschema/dtc warnings/errors:
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtu3.example.dtb: usb@11271000: usb@11270000:clocks: [[4294967295, 94], [4294967295]] is too short
	From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtu3.yaml
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtu3.example.dtb: usb@11271000: usb@11270000:clock-names: ['sys_ck', 'ref_ck'] is too short
	From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtu3.yaml
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtu3.example.dtb: usb@11270000: clocks: [[4294967295, 94], [4294967295]] is too short
	From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtu3.example.dtb: usb@11270000: clock-names: ['sys_ck', 'ref_ck'] is too short
	From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtu3.example.dtb: usb@112c1000: usb@11270000:clocks: [[4294967295, 94], [4294967295]] is too short
	From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtu3.yaml
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtu3.example.dtb: usb@112c1000: usb@11270000:clock-names: ['sys_ck', 'ref_ck'] is too short
	From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtu3.yaml
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtu3.example.dtb: usb@11270000: clocks: [[4294967295, 94], [4294967295]] is too short
	From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtu3.example.dtb: usb@11270000: clock-names: ['sys_ck', 'ref_ck'] is too short
	From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtu3.example.dtb: usb@11201000: usb@11200000:clocks: [[4294967295]] is too short
	From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtu3.yaml
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtu3.example.dtb: usb@11201000: usb@11200000:clock-names: ['sys_ck'] is too short
	From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtu3.yaml
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtu3.example.dtb: usb@11200000: clocks: [[4294967295]] is too short
	From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtu3.example.dtb: usb@11200000: clock-names: ['sys_ck'] is too short
	From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.example.dtb: usb@11270000: clocks: [[4294967295, 94], [4294967295]] is too short
	From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.example.dtb: usb@11270000: clock-names: ['sys_ck', 'ref_ck'] is too short
	From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml

doc reference errors (make refcheckdocs):

See https://patchwork.ozlabs.org/patch/

This check can fail if there are any dependencies. The base for a patch
series is generally the most recent rc1.

If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure 'yamllint' is installed and dt-schema is up to
date:

pip3 install dtschema --upgrade

Please check and re-submit.

Re: [PATCH v2 2/4] dt-bindings: usb: mtk-xhci: Make all clocks required

[Chunfeng Yun]

Hi Nícolas,

On Thu, 2022-06-23 at 15:37 -0400, Nícolas F. R. A. Prado wrote:
> All of the clocks listed in the binding are always wired to the XHCI
> controller hardware blocks on all SoCs. The reason some clocks were
> made
> optional in the binding was to account for the fact that depending on
> the SoC, some of the clocks might be fixed (ie not controlled by
> software).
> 
> Given that the devicetree should represent the hardware, make all
> clocks
> required in the binding. Subsequent patches will make the DTS changes
> to
> specify fixed-clocks for the clocks that aren't controllable.
> 
> Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
> 
> ---
> 
> Changes in v2:
> - Undid clock list changes that allowed middle clocks to be missing
> from
>   v1 and made all clocks required instead
> - Rewrote commit message and title
> 
>  Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 4 +
> ---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/usb/mediatek,mtk-
> xhci.yaml b/Documentation/devicetree/bindings/usb/mediatek,mtk-
> xhci.yaml
> index 63cbc2b62d18..1444d18ef9bc 100644
> --- a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
> +++ b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
> @@ -67,7 +67,6 @@ properties:
>      maxItems: 1
>  
>    clocks:
> -    minItems: 1
>      items:
>        - description: Controller clock used by normal mode
>        - description: Reference clock used by low power mode etc
> @@ -76,9 +75,8 @@ properties:
>        - description: controller clock
>  
>    clock-names:
> -    minItems: 1
>      items:
> -      - const: sys_ck  # required, the following ones are optional
> +      - const: sys_ck
>        - const: ref_ck
>        - const: mcu_ck
>        - const: dma_ck

This patch causes more check warning, I prefer to leave dt-bindings
unchanged, but just fix mt8195's dts warning instead, thanks a lot

Re: [PATCH v2 2/4] dt-bindings: usb: mtk-xhci: Make all clocks required

[Nícolas F. R. A. Prado]

On Tue, Jun 28, 2022 at 08:57:45AM +0800, Chunfeng Yun wrote:
> Hi Nícolas,
> 
> On Thu, 2022-06-23 at 15:37 -0400, Nícolas F. R. A. Prado wrote:
> > All of the clocks listed in the binding are always wired to the XHCI
> > controller hardware blocks on all SoCs. The reason some clocks were
> > made
> > optional in the binding was to account for the fact that depending on
> > the SoC, some of the clocks might be fixed (ie not controlled by
> > software).
> > 
> > Given that the devicetree should represent the hardware, make all
> > clocks
> > required in the binding. Subsequent patches will make the DTS changes
> > to
> > specify fixed-clocks for the clocks that aren't controllable.
> > 
> > Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
> > 
> > ---
> > 
> > Changes in v2:
> > - Undid clock list changes that allowed middle clocks to be missing
> > from
> >   v1 and made all clocks required instead
> > - Rewrote commit message and title
> > 
> >  Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 4 +
> > ---
> >  1 file changed, 1 insertion(+), 3 deletions(-)
> > 
> > diff --git a/Documentation/devicetree/bindings/usb/mediatek,mtk-
> > xhci.yaml b/Documentation/devicetree/bindings/usb/mediatek,mtk-
> > xhci.yaml
> > index 63cbc2b62d18..1444d18ef9bc 100644
> > --- a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
> > +++ b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
> > @@ -67,7 +67,6 @@ properties:
> >      maxItems: 1
> >  
> >    clocks:
> > -    minItems: 1
> >      items:
> >        - description: Controller clock used by normal mode
> >        - description: Reference clock used by low power mode etc
> > @@ -76,9 +75,8 @@ properties:
> >        - description: controller clock
> >  
> >    clock-names:
> > -    minItems: 1
> >      items:
> > -      - const: sys_ck  # required, the following ones are optional
> > +      - const: sys_ck
> >        - const: ref_ck
> >        - const: mcu_ck
> >        - const: dma_ck
> 
> This patch causes more check warning, I prefer to leave dt-bindings
> unchanged, but just fix mt8195's dts warning instead, thanks a lot

Hi Chunfeng,

the warnings reported by Rob's bot only happen if patches 3 and 4 aren't applied
to adapt the devicetrees. They are ABI breaking changes, but I understood this
as the desired solution from the discussion we had with Krzysztof on v1 [1].

I was expecting some feedback from Krzysztof or Matthias if this was an issue,
but it looks like Greg already merged the patch. I'll wait a bit for some
feedback and if this really was a misunderstanding I can send a revert patch.

Thanks,
Nícolas

[1] https://lore.kernel.org/all/20220622132219.36rvznhip2egujec@notapiano/

Re: [PATCH v2 2/4] dt-bindings: usb: mtk-xhci: Make all clocks required

[Rob Herring]

On Wed, Jun 29, 2022 at 02:55:46PM -0400, Nícolas F. R. A. Prado wrote:
> On Tue, Jun 28, 2022 at 08:57:45AM +0800, Chunfeng Yun wrote:
> > Hi Nícolas,
> > 
> > On Thu, 2022-06-23 at 15:37 -0400, Nícolas F. R. A. Prado wrote:
> > > All of the clocks listed in the binding are always wired to the XHCI
> > > controller hardware blocks on all SoCs. The reason some clocks were
> > > made
> > > optional in the binding was to account for the fact that depending on
> > > the SoC, some of the clocks might be fixed (ie not controlled by
> > > software).
> > > 
> > > Given that the devicetree should represent the hardware, make all
> > > clocks
> > > required in the binding. Subsequent patches will make the DTS changes
> > > to
> > > specify fixed-clocks for the clocks that aren't controllable.
> > > 
> > > Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
> > > 
> > > ---
> > > 
> > > Changes in v2:
> > > - Undid clock list changes that allowed middle clocks to be missing
> > > from
> > >   v1 and made all clocks required instead
> > > - Rewrote commit message and title
> > > 
> > >  Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 4 +
> > > ---
> > >  1 file changed, 1 insertion(+), 3 deletions(-)
> > > 
> > > diff --git a/Documentation/devicetree/bindings/usb/mediatek,mtk-
> > > xhci.yaml b/Documentation/devicetree/bindings/usb/mediatek,mtk-
> > > xhci.yaml
> > > index 63cbc2b62d18..1444d18ef9bc 100644
> > > --- a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
> > > +++ b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
> > > @@ -67,7 +67,6 @@ properties:
> > >      maxItems: 1
> > >  
> > >    clocks:
> > > -    minItems: 1
> > >      items:
> > >        - description: Controller clock used by normal mode
> > >        - description: Reference clock used by low power mode etc
> > > @@ -76,9 +75,8 @@ properties:
> > >        - description: controller clock
> > >  
> > >    clock-names:
> > > -    minItems: 1
> > >      items:
> > > -      - const: sys_ck  # required, the following ones are optional
> > > +      - const: sys_ck
> > >        - const: ref_ck
> > >        - const: mcu_ck
> > >        - const: dma_ck
> > 
> > This patch causes more check warning, I prefer to leave dt-bindings
> > unchanged, but just fix mt8195's dts warning instead, thanks a lot
> 
> Hi Chunfeng,
> 
> the warnings reported by Rob's bot only happen if patches 3 and 4 aren't applied
> to adapt the devicetrees. They are ABI breaking changes, but I understood this
> as the desired solution from the discussion we had with Krzysztof on v1 [1].

The warnings have nothing to do with patches 3 and 4 as those are for 
dts files. It's examples in bindings that are the problem.

Rob

Re: [PATCH v2 2/4] dt-bindings: usb: mtk-xhci: Make all clocks required

[Chunfeng Yun]

On Fri, 2022-07-01 at 15:37 -0600, Rob Herring wrote:
> On Wed, Jun 29, 2022 at 02:55:46PM -0400, Nícolas F. R. A. Prado
> wrote:
> > On Tue, Jun 28, 2022 at 08:57:45AM +0800, Chunfeng Yun wrote:
> > > Hi Nícolas,
> > > 
> > > On Thu, 2022-06-23 at 15:37 -0400, Nícolas F. R. A. Prado wrote:
> > > > All of the clocks listed in the binding are always wired to the
> > > > XHCI
> > > > controller hardware blocks on all SoCs. The reason some clocks
> > > > were
> > > > made
> > > > optional in the binding was to account for the fact that
> > > > depending on
> > > > the SoC, some of the clocks might be fixed (ie not controlled
> > > > by
> > > > software).
> > > > 
> > > > Given that the devicetree should represent the hardware, make
> > > > all
> > > > clocks
> > > > required in the binding. Subsequent patches will make the DTS
> > > > changes
> > > > to
> > > > specify fixed-clocks for the clocks that aren't controllable.
> > > > 
> > > > Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
> > > > 
> > > > ---
> > > > 
> > > > Changes in v2:
> > > > - Undid clock list changes that allowed middle clocks to be
> > > > missing
> > > > from
> > > >   v1 and made all clocks required instead
> > > > - Rewrote commit message and title
> > > > 
> > > >  Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml |
> > > > 4 +
> > > > ---
> > > >  1 file changed, 1 insertion(+), 3 deletions(-)
> > > > 
> > > > diff --git
> > > > a/Documentation/devicetree/bindings/usb/mediatek,mtk-
> > > > xhci.yaml b/Documentation/devicetree/bindings/usb/mediatek,mtk-
> > > > xhci.yaml
> > > > index 63cbc2b62d18..1444d18ef9bc 100644
> > > > --- a/Documentation/devicetree/bindings/usb/mediatek,mtk-
> > > > xhci.yaml
> > > > +++ b/Documentation/devicetree/bindings/usb/mediatek,mtk-
> > > > xhci.yaml
> > > > @@ -67,7 +67,6 @@ properties:
> > > >      maxItems: 1
> > > >  
> > > >    clocks:
> > > > -    minItems: 1
> > > >      items:
> > > >        - description: Controller clock used by normal mode
> > > >        - description: Reference clock used by low power mode
> > > > etc
> > > > @@ -76,9 +75,8 @@ properties:
> > > >        - description: controller clock
> > > >  
> > > >    clock-names:
> > > > -    minItems: 1
> > > >      items:
> > > > -      - const: sys_ck  # required, the following ones are
> > > > optional
> > > > +      - const: sys_ck
> > > >        - const: ref_ck
> > > >        - const: mcu_ck
> > > >        - const: dma_ck
> > > 
> > > This patch causes more check warning, I prefer to leave dt-
> > > bindings
> > > unchanged, but just fix mt8195's dts warning instead, thanks a
> > > lot
> > 
> > Hi Chunfeng,
> > 
> > the warnings reported by Rob's bot only happen if patches 3 and 4
> > aren't applied
> > to adapt the devicetrees. They are ABI breaking changes, but I
> > understood this
> > as the desired solution from the discussion we had with Krzysztof
> > on v1 [1].
> 
> The warnings have nothing to do with patches 3 and 4 as those are
> for 
> dts files. It's examples in bindings that are the problem.
Yes, I mean almost all existing dts supporting mtk-xhci will also cause
similar warnings, as changes in patches 3, 4;

It seems less flexible to make all clock required, not only changes all
existing ones but also need more changes if additional clock is added.

> 
> Rob

Re: [PATCH v2 2/4] dt-bindings: usb: mtk-xhci: Make all clocks required

[Nícolas F. R. A. Prado]

On Sat, Jul 02, 2022 at 04:24:12PM +0800, Chunfeng Yun wrote:
> On Fri, 2022-07-01 at 15:37 -0600, Rob Herring wrote:
> > On Wed, Jun 29, 2022 at 02:55:46PM -0400, Nícolas F. R. A. Prado
> > wrote:
> > > On Tue, Jun 28, 2022 at 08:57:45AM +0800, Chunfeng Yun wrote:
> > > > Hi Nícolas,
> > > > 
> > > > On Thu, 2022-06-23 at 15:37 -0400, Nícolas F. R. A. Prado wrote:
> > > > > All of the clocks listed in the binding are always wired to the
> > > > > XHCI
> > > > > controller hardware blocks on all SoCs. The reason some clocks
> > > > > were
> > > > > made
> > > > > optional in the binding was to account for the fact that
> > > > > depending on
> > > > > the SoC, some of the clocks might be fixed (ie not controlled
> > > > > by
> > > > > software).
> > > > > 
> > > > > Given that the devicetree should represent the hardware, make
> > > > > all
> > > > > clocks
> > > > > required in the binding. Subsequent patches will make the DTS
> > > > > changes
> > > > > to
> > > > > specify fixed-clocks for the clocks that aren't controllable.
> > > > > 
> > > > > Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
> > > > > 
> > > > > ---
> > > > > 
> > > > > Changes in v2:
> > > > > - Undid clock list changes that allowed middle clocks to be
> > > > > missing
> > > > > from
> > > > >   v1 and made all clocks required instead
> > > > > - Rewrote commit message and title
> > > > > 
> > > > >  Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml |
> > > > > 4 +
> > > > > ---
> > > > >  1 file changed, 1 insertion(+), 3 deletions(-)
> > > > > 
> > > > > diff --git
> > > > > a/Documentation/devicetree/bindings/usb/mediatek,mtk-
> > > > > xhci.yaml b/Documentation/devicetree/bindings/usb/mediatek,mtk-
> > > > > xhci.yaml
> > > > > index 63cbc2b62d18..1444d18ef9bc 100644
> > > > > --- a/Documentation/devicetree/bindings/usb/mediatek,mtk-
> > > > > xhci.yaml
> > > > > +++ b/Documentation/devicetree/bindings/usb/mediatek,mtk-
> > > > > xhci.yaml
> > > > > @@ -67,7 +67,6 @@ properties:
> > > > >      maxItems: 1
> > > > >  
> > > > >    clocks:
> > > > > -    minItems: 1
> > > > >      items:
> > > > >        - description: Controller clock used by normal mode
> > > > >        - description: Reference clock used by low power mode
> > > > > etc
> > > > > @@ -76,9 +75,8 @@ properties:
> > > > >        - description: controller clock
> > > > >  
> > > > >    clock-names:
> > > > > -    minItems: 1
> > > > >      items:
> > > > > -      - const: sys_ck  # required, the following ones are
> > > > > optional
> > > > > +      - const: sys_ck
> > > > >        - const: ref_ck
> > > > >        - const: mcu_ck
> > > > >        - const: dma_ck
> > > > 
> > > > This patch causes more check warning, I prefer to leave dt-
> > > > bindings
> > > > unchanged, but just fix mt8195's dts warning instead, thanks a
> > > > lot
> > > 
> > > Hi Chunfeng,
> > > 
> > > the warnings reported by Rob's bot only happen if patches 3 and 4
> > > aren't applied
> > > to adapt the devicetrees. They are ABI breaking changes, but I
> > > understood this
> > > as the desired solution from the discussion we had with Krzysztof
> > > on v1 [1].
> > 
> > The warnings have nothing to do with patches 3 and 4 as those are
> > for 
> > dts files. It's examples in bindings that are the problem.

Sorry, you're right, I misread the errors.

> Yes, I mean almost all existing dts supporting mtk-xhci will also cause
> similar warnings, as changes in patches 3, 4;
> 
> It seems less flexible to make all clock required, not only changes all
> existing ones but also need more changes if additional clock is added.

Yes, that's a valid concern. I must have misunderstood the discussion in v1
then.

So, I'm going to send a revert for this change and send a new patch adding fixed
clocks on the dts for just mt8192 and mt8195 to fix the dtbs_check warnings.
Does that sound good?

Thanks,
Nícolas

Re: [PATCH v2 2/4] dt-bindings: usb: mtk-xhci: Make all clocks required

[Chunfeng Yun]

On Tue, 2022-07-05 at 16:36 -0400, Nícolas F. R. A. Prado wrote:
> On Sat, Jul 02, 2022 at 04:24:12PM +0800, Chunfeng Yun wrote:
> > On Fri, 2022-07-01 at 15:37 -0600, Rob Herring wrote:
> > > On Wed, Jun 29, 2022 at 02:55:46PM -0400, Nícolas F. R. A. Prado
> > > wrote:
> > > > On Tue, Jun 28, 2022 at 08:57:45AM +0800, Chunfeng Yun wrote:
> > > > > Hi Nícolas,
> > > > > 
> > > > > On Thu, 2022-06-23 at 15:37 -0400, Nícolas F. R. A. Prado
> > > > > wrote:
> > > > > > All of the clocks listed in the binding are always wired to
> > > > > > the
> > > > > > XHCI
> > > > > > controller hardware blocks on all SoCs. The reason some
> > > > > > clocks
> > > > > > were
> > > > > > made
> > > > > > optional in the binding was to account for the fact that
> > > > > > depending on
> > > > > > the SoC, some of the clocks might be fixed (ie not
> > > > > > controlled
> > > > > > by
> > > > > > software).
> > > > > > 
> > > > > > Given that the devicetree should represent the hardware,
> > > > > > make
> > > > > > all
> > > > > > clocks
> > > > > > required in the binding. Subsequent patches will make the
> > > > > > DTS
> > > > > > changes
> > > > > > to
> > > > > > specify fixed-clocks for the clocks that aren't
> > > > > > controllable.
> > > > > > 
> > > > > > Signed-off-by: Nícolas F. R. A. Prado <
> > > > > > nfraprado@collabora.com>
> > > > > > 
> > > > > > ---
> > > > > > 
> > > > > > Changes in v2:
> > > > > > - Undid clock list changes that allowed middle clocks to be
> > > > > > missing
> > > > > > from
> > > > > >   v1 and made all clocks required instead
> > > > > > - Rewrote commit message and title
> > > > > > 
> > > > > >  Documentation/devicetree/bindings/usb/mediatek,mtk-
> > > > > > xhci.yaml |
> > > > > > 4 +
> > > > > > ---
> > > > > >  1 file changed, 1 insertion(+), 3 deletions(-)
> > > > > > 
> > > > > > diff --git
> > > > > > a/Documentation/devicetree/bindings/usb/mediatek,mtk-
> > > > > > xhci.yaml
> > > > > > b/Documentation/devicetree/bindings/usb/mediatek,mtk-
> > > > > > xhci.yaml
> > > > > > index 63cbc2b62d18..1444d18ef9bc 100644
> > > > > > --- a/Documentation/devicetree/bindings/usb/mediatek,mtk-
> > > > > > xhci.yaml
> > > > > > +++ b/Documentation/devicetree/bindings/usb/mediatek,mtk-
> > > > > > xhci.yaml
> > > > > > @@ -67,7 +67,6 @@ properties:
> > > > > >      maxItems: 1
> > > > > >  
> > > > > >    clocks:
> > > > > > -    minItems: 1
> > > > > >      items:
> > > > > >        - description: Controller clock used by normal mode
> > > > > >        - description: Reference clock used by low power
> > > > > > mode
> > > > > > etc
> > > > > > @@ -76,9 +75,8 @@ properties:
> > > > > >        - description: controller clock
> > > > > >  
> > > > > >    clock-names:
> > > > > > -    minItems: 1
> > > > > >      items:
> > > > > > -      - const: sys_ck  # required, the following ones are
> > > > > > optional
> > > > > > +      - const: sys_ck
> > > > > >        - const: ref_ck
> > > > > >        - const: mcu_ck
> > > > > >        - const: dma_ck
> > > > > 
> > > > > This patch causes more check warning, I prefer to leave dt-
> > > > > bindings
> > > > > unchanged, but just fix mt8195's dts warning instead, thanks
> > > > > a
> > > > > lot
> > > > 
> > > > Hi Chunfeng,
> > > > 
> > > > the warnings reported by Rob's bot only happen if patches 3 and
> > > > 4
> > > > aren't applied
> > > > to adapt the devicetrees. They are ABI breaking changes, but I
> > > > understood this
> > > > as the desired solution from the discussion we had with
> > > > Krzysztof
> > > > on v1 [1].
> > > 
> > > The warnings have nothing to do with patches 3 and 4 as those are
> > > for 
> > > dts files. It's examples in bindings that are the problem.
> 
> Sorry, you're right, I misread the errors.
> 
> > Yes, I mean almost all existing dts supporting mtk-xhci will also
> > cause
> > similar warnings, as changes in patches 3, 4;
> > 
> > It seems less flexible to make all clock required, not only changes
> > all
> > existing ones but also need more changes if additional clock is
> > added.
> 
> Yes, that's a valid concern. I must have misunderstood the discussion
> in v1
> then.
> 
> So, I'm going to send a revert for this change and send a new patch
> adding fixed
> clocks on the dts for just mt8192 and mt8195 to fix the dtbs_check
> warnings.
> Does that sound good?
Yes, sound good, thanks a lot

> 
> Thanks,
> Nícolas

[PATCH v2 3/4] arm64: dts: mediatek: Set fixed-clock for missing XHCI clocks

[Nícolas F. R. A. Prado]

The XHCI controller hardware always has all clocks wired, however
depending on the SoC, some of them might be fixed (ie not controllable).
These fixed clocks were previously omitted from the devicetree entirely.

In order to better describe the hardware on the devicetree, and to have
a fixed order of clocks for all SoCs, add the missing non-controllable
clocks as phandles to a fixed-clock node.

By keeping a fixed clock order, this gets rid of dtbs_check warnings on
mt8192 and mt8195.

Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>

---

Changes in v2:
- Instead of simply reordering the clocks on mt8192, added missing fixed
  clocks for all arm64 dts
- Rewrote commit message and title

 arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 18 ++++++++++++++----
 arch/arm64/boot/dts/mediatek/mt7622.dtsi  |  5 +++--
 arch/arm64/boot/dts/mediatek/mt8173.dtsi  |  9 +++++++--
 arch/arm64/boot/dts/mediatek/mt8183.dtsi  |  8 ++++++--
 arch/arm64/boot/dts/mediatek/mt8192.dtsi  |  9 ++++++---
 arch/arm64/boot/dts/mediatek/mt8195.dtsi  | 18 ++++++++++++++----
 6 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/arch/arm64/boot/dts/mediatek/mt2712e.dtsi b/arch/arm64/boot/dts/mediatek/mt2712e.dtsi
index 623eb3beabf2..941d6a19075c 100644
--- a/arch/arm64/boot/dts/mediatek/mt2712e.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt2712e.dtsi
@@ -816,8 +816,13 @@ usb_host0: usb@11270000 {
 			reg-names = "mac";
 			interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_LOW>;
 			power-domains = <&scpsys MT2712_POWER_DOMAIN_USB>;
-			clocks = <&topckgen CLK_TOP_USB30_SEL>, <&clk26m>;
-			clock-names = "sys_ck", "ref_ck";
+			clocks = <&topckgen CLK_TOP_USB30_SEL>,
+				 <&clk26m>,
+				 <&clk26m>,
+				 <&clk26m>,
+				 <&clk26m>;
+			clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck",
+				      "xhci_ck";
 			status = "disabled";
 		};
 	};
@@ -880,8 +885,13 @@ usb_host1: usb@112c0000 {
 			reg-names = "mac";
 			interrupts = <GIC_SPI 249 IRQ_TYPE_LEVEL_LOW>;
 			power-domains = <&scpsys MT2712_POWER_DOMAIN_USB2>;
-			clocks = <&topckgen CLK_TOP_USB30_SEL>, <&clk26m>;
-			clock-names = "sys_ck", "ref_ck";
+			clocks = <&topckgen CLK_TOP_USB30_SEL>,
+				 <&clk26m>,
+				 <&clk26m>,
+				 <&clk26m>,
+				 <&clk26m>;
+			clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck",
+				      "xhci_ck";
 			status = "disabled";
 		};
 	};
diff --git a/arch/arm64/boot/dts/mediatek/mt7622.dtsi b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
index 146e18b5b1f4..04ba0773dda3 100644
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
@@ -752,8 +752,9 @@ ssusb: usb@1a0c0000 {
 		clocks = <&ssusbsys CLK_SSUSB_SYS_EN>,
 			 <&ssusbsys CLK_SSUSB_REF_EN>,
 			 <&ssusbsys CLK_SSUSB_MCU_EN>,
-			 <&ssusbsys CLK_SSUSB_DMA_EN>;
-		clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck";
+			 <&ssusbsys CLK_SSUSB_DMA_EN>,
+			 <&clk25m>;
+		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>;
diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
index d1f3dc5dec35..3b64651f7a43 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
@@ -943,8 +943,13 @@ usb_host: usb@11270000 {
 				reg-names = "mac";
 				interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_LOW>;
 				power-domains = <&spm MT8173_POWER_DOMAIN_USB>;
-				clocks = <&topckgen CLK_TOP_USB30_SEL>, <&clk26m>;
-				clock-names = "sys_ck", "ref_ck";
+				clocks = <&topckgen CLK_TOP_USB30_SEL>,
+					 <&clk26m>,
+					 <&clk26m>,
+					 <&clk26m>,
+					 <&clk26m>;
+				clock-names = "sys_ck", "ref_ck", "mcu_ck",
+					      "dma_ck", "xhci_ck";
 				status = "disabled";
 			};
 		};
diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
index e92a0b8c1ee2..fe114f70f677 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
@@ -1471,8 +1471,12 @@ usb_host: usb@11200000 {
 				reg-names = "mac";
 				interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_LOW>;
 				clocks = <&infracfg CLK_INFRA_UNIPRO_SCK>,
-					 <&infracfg CLK_INFRA_USB>;
-				clock-names = "sys_ck", "ref_ck";
+					 <&infracfg CLK_INFRA_USB>,
+					 <&clk26m>,
+					 <&clk26m>,
+					 <&clk26m>;
+				clock-names = "sys_ck", "ref_ck", "mcu_ck",
+					      "dma_ck", "xhci_ck";
 				status = "disabled";
 			};
 		};
diff --git a/arch/arm64/boot/dts/mediatek/mt8192.dtsi b/arch/arm64/boot/dts/mediatek/mt8192.dtsi
index 733aec2e7f77..fd2ab1f2a1bb 100644
--- a/arch/arm64/boot/dts/mediatek/mt8192.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8192.dtsi
@@ -723,9 +723,12 @@ xhci: usb@11200000 {
 			assigned-clock-parents = <&topckgen CLK_TOP_UNIVPLL_D5_D4>,
 						 <&topckgen CLK_TOP_UNIVPLL_D5_D4>;
 			clocks = <&infracfg CLK_INFRA_SSUSB>,
-				 <&infracfg CLK_INFRA_SSUSB_XHCI>,
-				 <&apmixedsys CLK_APMIXED_USBPLL>;
-			clock-names = "sys_ck", "xhci_ck", "ref_ck";
+				 <&apmixedsys CLK_APMIXED_USBPLL>,
+				 <&clk26m>,
+				 <&clk26m>,
+				 <&infracfg CLK_INFRA_SSUSB_XHCI>;
+			clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck",
+				      "xhci_ck";
 			wakeup-source;
 			mediatek,syscon-wakeup = <&pericfg 0x420 102>;
 			status = "disabled";
diff --git a/arch/arm64/boot/dts/mediatek/mt8195.dtsi b/arch/arm64/boot/dts/mediatek/mt8195.dtsi
index 3ad14e0e0956..8e9783953795 100644
--- a/arch/arm64/boot/dts/mediatek/mt8195.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8195.dtsi
@@ -571,8 +571,10 @@ xhci0: usb@11200000 {
 			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", "xhci_ck";
+			clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck",
+				      "xhci_ck";
 			mediatek,syscon-wakeup = <&pericfg 0x400 103>;
 			wakeup-source;
 			status = "disabled";
@@ -636,8 +638,10 @@ xhci1: usb@11290000 {
 			clocks = <&pericfg_ao CLK_PERI_AO_SSUSB_1P_BUS>,
 				 <&topckgen CLK_TOP_SSUSB_P1_REF>,
 				 <&apmixedsys CLK_APMIXED_USB1PLL>,
+				 <&clk26m>,
 				 <&pericfg_ao CLK_PERI_AO_SSUSB_1P_XHCI>;
-			clock-names = "sys_ck", "ref_ck", "mcu_ck","xhci_ck";
+			clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck",
+				      "xhci_ck";
 			mediatek,syscon-wakeup = <&pericfg 0x400 104>;
 			wakeup-source;
 			status = "disabled";
@@ -657,8 +661,11 @@ xhci2: usb@112a0000 {
 						 <&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", "xhci_ck";
+			clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck",
+				      "xhci_ck";
 			mediatek,syscon-wakeup = <&pericfg 0x400 105>;
 			wakeup-source;
 			status = "disabled";
@@ -678,8 +685,11 @@ xhci3: usb@112b0000 {
 						 <&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", "xhci_ck";
+			clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck",
+				      "xhci_ck";
 			mediatek,syscon-wakeup = <&pericfg 0x400 106>;
 			wakeup-source;
 			status = "disabled";
-- 
2.36.1

[PATCH v2 4/4] arm: dts: mediatek: Set fixed-clock for missing XHCI clocks

[Nícolas F. R. A. Prado]

The XHCI controller hardware always has all clocks wired, however
depending on the SoC, some of them might be fixed (ie not controllable).
These fixed clocks were previously omitted from the devicetree entirely.

In order to better describe the hardware on the devicetree, and to have
a fixed order of clocks for all SoCs, add the missing non-controllable
clocks as phandles to a fixed-clock node.

Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>

---

Changes in v2:
- Added this commit

 arch/arm/boot/dts/mt2701.dtsi | 14 ++++++++++----
 arch/arm/boot/dts/mt7623.dtsi | 14 ++++++++++----
 arch/arm/boot/dts/mt7629.dtsi |  6 ++++--
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi
index b8eba3ba153c..1c1b9b5a1d7a 100644
--- a/arch/arm/boot/dts/mt2701.dtsi
+++ b/arch/arm/boot/dts/mt2701.dtsi
@@ -611,8 +611,11 @@ usb0: usb@1a1c0000 {
 		reg-names = "mac", "ippc";
 		interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_LOW>;
 		clocks = <&hifsys CLK_HIFSYS_USB0PHY>,
-			 <&topckgen CLK_TOP_ETHIF_SEL>;
-		clock-names = "sys_ck", "ref_ck";
+			 <&topckgen CLK_TOP_ETHIF_SEL>,
+			 <&clk26m>,
+			 <&clk26m>,
+			 <&clk26m>;
+		clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck", "xhci_ck";
 		power-domains = <&scpsys MT2701_POWER_DOMAIN_HIF>;
 		phys = <&u2port0 PHY_TYPE_USB2>, <&u3port0 PHY_TYPE_USB3>;
 		status = "disabled";
@@ -651,8 +654,11 @@ usb1: usb@1a240000 {
 		reg-names = "mac", "ippc";
 		interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_LOW>;
 		clocks = <&hifsys CLK_HIFSYS_USB1PHY>,
-			 <&topckgen CLK_TOP_ETHIF_SEL>;
-		clock-names = "sys_ck", "ref_ck";
+			 <&topckgen CLK_TOP_ETHIF_SEL>,
+			 <&clk26m>,
+			 <&clk26m>,
+			 <&clk26m>;
+		clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck", "xhci_ck";
 		power-domains = <&scpsys MT2701_POWER_DOMAIN_HIF>;
 		phys = <&u2port1 PHY_TYPE_USB2>, <&u3port1 PHY_TYPE_USB3>;
 		status = "disabled";
diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi
index 25d31e40a553..b640e6f4ad2e 100644
--- a/arch/arm/boot/dts/mt7623.dtsi
+++ b/arch/arm/boot/dts/mt7623.dtsi
@@ -864,8 +864,11 @@ usb1: usb@1a1c0000 {
 		reg-names = "mac", "ippc";
 		interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_LOW>;
 		clocks = <&hifsys CLK_HIFSYS_USB0PHY>,
-			 <&topckgen CLK_TOP_ETHIF_SEL>;
-		clock-names = "sys_ck", "ref_ck";
+			 <&topckgen CLK_TOP_ETHIF_SEL>,
+			 <&clk26m>,
+			 <&clk26m>,
+			 <&clk26m>;
+		clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck", "xhci_ck";
 		power-domains = <&scpsys MT2701_POWER_DOMAIN_HIF>;
 		phys = <&u2port0 PHY_TYPE_USB2>, <&u3port0 PHY_TYPE_USB3>;
 		status = "disabled";
@@ -905,8 +908,11 @@ usb2: usb@1a240000 {
 		reg-names = "mac", "ippc";
 		interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_LOW>;
 		clocks = <&hifsys CLK_HIFSYS_USB1PHY>,
-			 <&topckgen CLK_TOP_ETHIF_SEL>;
-		clock-names = "sys_ck", "ref_ck";
+			 <&topckgen CLK_TOP_ETHIF_SEL>,
+			 <&clk26m>,
+			 <&clk26m>,
+			 <&clk26m>;
+		clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck", "xhci_ck";
 		power-domains = <&scpsys MT2701_POWER_DOMAIN_HIF>;
 		phys = <&u2port1 PHY_TYPE_USB2>, <&u3port1 PHY_TYPE_USB3>;
 		status = "disabled";
diff --git a/arch/arm/boot/dts/mt7629.dtsi b/arch/arm/boot/dts/mt7629.dtsi
index 46fc236e1b89..810d1c867b43 100644
--- a/arch/arm/boot/dts/mt7629.dtsi
+++ b/arch/arm/boot/dts/mt7629.dtsi
@@ -315,8 +315,10 @@ ssusb: usb@1a0c0000 {
 			clocks = <&ssusbsys CLK_SSUSB_SYS_EN>,
 				 <&ssusbsys CLK_SSUSB_REF_EN>,
 				 <&ssusbsys CLK_SSUSB_MCU_EN>,
-				 <&ssusbsys CLK_SSUSB_DMA_EN>;
-			clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck";
+				 <&ssusbsys CLK_SSUSB_DMA_EN>,
+				 <&clk20m>;
+			clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck",
+				      "xhci_ck";
 			assigned-clocks = <&topckgen CLK_TOP_AXI_SEL>,
 					  <&topckgen CLK_TOP_SATA_SEL>,
 					  <&topckgen CLK_TOP_HIF_SEL>;
-- 
2.36.1