From aae7948d564c614c26eb896eb8be57879146240c Mon Sep 17 00:00:00 2001
From: =?utf8?q?N=C3=ADcolas=20F=2E=20R=2E=20A=2E=20Prado?=
<nfraprado@collabora.com>
Date: Fri, 8 Jul 2022 15:26:05 -0400
Subject: [PATCH] Revert "dt-bindings: usb: mtk-xhci: Make all clocks required"
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
This reverts commit ebc4969ae125e65fdb563f66f4bfa7aec95f7eb4. 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: ebc4969ae125 ("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>
---
Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
index 04cbbca0e94ee..b0e58b15b9ae7 100644
--- a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
+++ b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
@@ -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
@@ -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
--
2.30.2