Skip to content

Commit

Permalink
Revert "dt-bindings: usb: mtk-xhci: Make all clocks required"
Browse files Browse the repository at this point in the history
This reverts commit ebc4969. That
commit was supposed to make the binding better reflect the MediaTek XHCI
hardware block by requiring all clocks to be present. But doing that
also causes too much noise in the devicetrees, since it requires
updating old MediaTek DTs to add clock handles for the fixed clocks, and
going forward every new clock added to the binding would require even
more updates.

The commit also didn't update the example to match the changes, causing
additional warnings.

Instead let's keep the clocks optional so that old devicetrees can keep
omitting the fixed clocks, and we'll just add the clocks as required on
new DTs.

Fixes: ebc4969 ("dt-bindings: usb: mtk-xhci: Make all clocks required")
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Link: https://lore.kernel.org/r/20220708192605.43351-1-nfraprado@collabora.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Nícolas F. R. A. Prado authored and Greg Kroah-Hartman committed Jul 14, 2022
1 parent 421c8d9 commit aae7948
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ properties:
maxItems: 1

clocks:
minItems: 1
items:
- description: Controller clock used by normal mode
- description: Reference clock used by low power mode etc
Expand All @@ -76,8 +77,9 @@ properties:
- description: controller clock

clock-names:
minItems: 1
items:
- const: sys_ck
- const: sys_ck # required, the following ones are optional
- const: ref_ck
- const: mcu_ck
- const: dma_ck
Expand Down

0 comments on commit aae7948

Please sign in to comment.