diff options
author | Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | 2023-06-13 00:20:40 +0300 |
---|---|---|
committer | Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | 2023-06-13 00:23:33 +0300 |
commit | 03c601927b673a243c9595e1ecc9e8adfdd02438 (patch) | |
tree | 9ef1868a308ed0a30deae355bfb298d7b11d6d73 /Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml | |
parent | 1b90e8f8879c64d4f77dd1f25134397ac075b7bd (diff) | |
parent | ba57b9b11f78530146f02b776854b2b6b6d344a4 (diff) | |
download | linux-03c601927b673a243c9595e1ecc9e8adfdd02438.tar.xz |
Merge branch 'drm-next' of git://anongit.freedesktop.org/drm/drm into msm-next-lumag-base
Merge the drm-next tree to pick up the DRM DSC helpers (merged via
drm-intel-next tree). MSM DSC v1.2 patches depend on these helpers.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Diffstat (limited to 'Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml')
-rw-r--r-- | Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml index c119caa9ad16..e9644e333d78 100644 --- a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml +++ b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml @@ -11,7 +11,7 @@ maintainers: - Chunfeng Yun <chunfeng.yun@mediatek.com> allOf: - - $ref: "usb-xhci.yaml" + - $ref: usb-xhci.yaml description: | There are two scenarios: @@ -77,6 +77,7 @@ properties: - description: Mcu bus clock for register access - description: DMA bus clock for data transfer - description: controller clock + - description: frame count clock clock-names: minItems: 1 @@ -86,14 +87,7 @@ properties: - const: mcu_ck - const: dma_ck - const: xhci_ck - - assigned-clocks: - minItems: 1 - maxItems: 5 - - assigned-clock-parents: - minItems: 1 - maxItems: 5 + - const: frmcnt_ck phys: description: |