| Message ID | 20200213201953.15268-3-matthias.bgg@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm/arm64: mediatek: Fix mmsys device probing | expand |
On Thu, Feb 13, 2020 at 09:19:42PM +0100, matthias.bgg@kernel.org wrote: > From: Matthias Brugger <mbrugger@suse.com> > > The MediaTek DRM has a block called mmsys, which sets > the routing and enables the different blocks. > This patch adds one line for the mmsys bindings description and changes > the mmsys description to use the generic form of referring to a specific > Soc. > > Signed-off-by: Matthias Brugger <mbrugger@suse.com> > > --- > > Changes in v7: > - add hint to the mmsys binding document > - make mmsys description generic > - fix typo in commit message > > Changes in v6: None > Changes in v5: None > Changes in v4: None > Changes in v3: None > Changes in v2: None > > .../bindings/display/mediatek/mediatek,disp.txt | 3 +++ > .../bindings/display/mediatek/mediatek,mmsys.txt | 9 +-------- > 2 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt > index b91e709db7a4..8e453026ef78 100644 > --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt > +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt > @@ -24,6 +24,7 @@ connected to. > For a description of the display interface sink function blocks, see > Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt and > Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt. > +Documentation/devicetree/bindings/display/mediatek/mediatek,mmsys.txt. > > Required properties (all function blocks): > - compatible: "mediatek,<chip>-disp-<function>", one of > @@ -43,7 +44,9 @@ Required properties (all function blocks): > "mediatek,<chip>-dpi" - DPI controller, see mediatek,dpi.txt > "mediatek,<chip>-disp-mutex" - display mutex > "mediatek,<chip>-disp-od" - overdrive > + "mediatek,<chip>-mmsys", "syscon" - provide clocks and components management > the supported chips are mt2701, mt2712 and mt8173. > + > - reg: Physical base address and length of the function block register space > - interrupts: The interrupt signal from the function block (required, except for > merge and split function blocks). > diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,mmsys.txt b/Documentation/devicetree/bindings/display/mediatek/mediatek,mmsys.txt > index 301eefbe1618..7bbadee820e3 100644 > --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,mmsys.txt > +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,mmsys.txt > @@ -5,14 +5,7 @@ The Mediatek mmsys controller provides various clocks to the system. > > Required Properties: > > -- compatible: Should be one of: > - - "mediatek,mt2701-mmsys", "syscon" > - - "mediatek,mt2712-mmsys", "syscon" > - - "mediatek,mt6779-mmsys", "syscon" > - - "mediatek,mt6797-mmsys", "syscon" > - - "mediatek,mt7623-mmsys", "mediatek,mt2701-mmsys", "syscon" You've lost this information about the fallback... > - - "mediatek,mt8173-mmsys", "syscon" > - - "mediatek,mt8183-mmsys", "syscon" > +- compatible: "mediatek,<chip>-mmsys" You are just going to have to add these all back when this is converted to schema. Rob
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt index b91e709db7a4..8e453026ef78 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt @@ -24,6 +24,7 @@ connected to. For a description of the display interface sink function blocks, see Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt and Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt. +Documentation/devicetree/bindings/display/mediatek/mediatek,mmsys.txt. Required properties (all function blocks): - compatible: "mediatek,<chip>-disp-<function>", one of @@ -43,7 +44,9 @@ Required properties (all function blocks): "mediatek,<chip>-dpi" - DPI controller, see mediatek,dpi.txt "mediatek,<chip>-disp-mutex" - display mutex "mediatek,<chip>-disp-od" - overdrive + "mediatek,<chip>-mmsys", "syscon" - provide clocks and components management the supported chips are mt2701, mt2712 and mt8173. + - reg: Physical base address and length of the function block register space - interrupts: The interrupt signal from the function block (required, except for merge and split function blocks). diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,mmsys.txt b/Documentation/devicetree/bindings/display/mediatek/mediatek,mmsys.txt index 301eefbe1618..7bbadee820e3 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,mmsys.txt +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,mmsys.txt @@ -5,14 +5,7 @@ The Mediatek mmsys controller provides various clocks to the system. Required Properties: -- compatible: Should be one of: - - "mediatek,mt2701-mmsys", "syscon" - - "mediatek,mt2712-mmsys", "syscon" - - "mediatek,mt6779-mmsys", "syscon" - - "mediatek,mt6797-mmsys", "syscon" - - "mediatek,mt7623-mmsys", "mediatek,mt2701-mmsys", "syscon" - - "mediatek,mt8173-mmsys", "syscon" - - "mediatek,mt8183-mmsys", "syscon" +- compatible: "mediatek,<chip>-mmsys" - #clock-cells: Must be 1 The mmsys controller uses the common clk binding from