| Message ID | 20191207224740.24536-2-matthias.bgg@kernel.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | arm/arm64: mediatek: Fix mmsys device probing | expand |
Hi, Matthias: On Sat, 2019-12-07 at 23:47 +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 enalbes the different blocks. > This patch adds one line for the mmsys bindings description. > > Signed-off-by: Matthias Brugger <mbrugger@suse.com> > --- > .../display/mediatek/mediatek,disp.txt | 28 ++++++++++--------- > 1 file changed, 15 insertions(+), 13 deletions(-) > > diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt > index 8469de510001..c71c8a4b73ff 100644 > --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt > +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt > @@ -27,20 +27,22 @@ Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt. > > Required properties (all function blocks): > - compatible: "mediatek,<chip>-disp-<function>", one of > - "mediatek,<chip>-disp-ovl" - overlay (4 layers, blending, csc) > - "mediatek,<chip>-disp-rdma" - read DMA / line buffer > - "mediatek,<chip>-disp-wdma" - write DMA > - "mediatek,<chip>-disp-color" - color processor > - "mediatek,<chip>-disp-aal" - adaptive ambient light controller > - "mediatek,<chip>-disp-gamma" - gamma correction > - "mediatek,<chip>-disp-merge" - merge streams from two RDMA sources > - "mediatek,<chip>-disp-split" - split stream to two encoders > - "mediatek,<chip>-disp-ufoe" - data compression engine > - "mediatek,<chip>-dsi" - DSI controller, see mediatek,dsi.txt > - "mediatek,<chip>-dpi" - DPI controller, see mediatek,dpi.txt > - "mediatek,<chip>-disp-mutex" - display mutex > - "mediatek,<chip>-disp-od" - overdrive > + "mediatek,<chip>-disp-ovl" - overlay (4 layers, blending, csc) This patch conflicts with 5.5-rc, please resend this patch base on 5.5-rc1. > + "mediatek,<chip>-disp-rdma" - read DMA / line buffer > + "mediatek,<chip>-disp-wdma" - write DMA > + "mediatek,<chip>-disp-color" - color processor > + "mediatek,<chip>-disp-aal" - adaptive ambient light controller > + "mediatek,<chip>-disp-gamma" - gamma correction > + "mediatek,<chip>-disp-merge" - merge streams from two RDMA sources > + "mediatek,<chip>-disp-split" - split stream to two encoders > + "mediatek,<chip>-disp-ufoe" - data compression engine > + "mediatek,<chip>-dsi" - DSI controller, see mediatek,dsi.txt > + "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. The original binding document for mmsys is in [1], I think we should not define it in duplicate. Maybe you could remove the original document. [1] https://www.kernel.org/doc/Documentation/devicetree/bindings/arm/mediatek/mediatek%2Cmmsys.txt Regards, CK > + > - 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).
Hi Matthias, On 9/12/19 6:12, CK Hu wrote: > Hi, Matthias: > > On Sat, 2019-12-07 at 23:47 +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 enalbes the different blocks. Typo s/enalbes/enables/ >> This patch adds one line for the mmsys bindings description. >> >> Signed-off-by: Matthias Brugger <mbrugger@suse.com> >> --- >> .../display/mediatek/mediatek,disp.txt | 28 ++++++++++--------- >> 1 file changed, 15 insertions(+), 13 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt >> index 8469de510001..c71c8a4b73ff 100644 >> --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt >> +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt >> @@ -27,20 +27,22 @@ Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt. >> >> Required properties (all function blocks): >> - compatible: "mediatek,<chip>-disp-<function>", one of >> - "mediatek,<chip>-disp-ovl" - overlay (4 layers, blending, csc) >> - "mediatek,<chip>-disp-rdma" - read DMA / line buffer >> - "mediatek,<chip>-disp-wdma" - write DMA >> - "mediatek,<chip>-disp-color" - color processor >> - "mediatek,<chip>-disp-aal" - adaptive ambient light controller >> - "mediatek,<chip>-disp-gamma" - gamma correction >> - "mediatek,<chip>-disp-merge" - merge streams from two RDMA sources >> - "mediatek,<chip>-disp-split" - split stream to two encoders >> - "mediatek,<chip>-disp-ufoe" - data compression engine >> - "mediatek,<chip>-dsi" - DSI controller, see mediatek,dsi.txt >> - "mediatek,<chip>-dpi" - DPI controller, see mediatek,dpi.txt >> - "mediatek,<chip>-disp-mutex" - display mutex >> - "mediatek,<chip>-disp-od" - overdrive >> + "mediatek,<chip>-disp-ovl" - overlay (4 layers, blending, csc) > > This patch conflicts with 5.5-rc, please resend this patch base on > 5.5-rc1. > >> + "mediatek,<chip>-disp-rdma" - read DMA / line buffer >> + "mediatek,<chip>-disp-wdma" - write DMA >> + "mediatek,<chip>-disp-color" - color processor >> + "mediatek,<chip>-disp-aal" - adaptive ambient light controller >> + "mediatek,<chip>-disp-gamma" - gamma correction >> + "mediatek,<chip>-disp-merge" - merge streams from two RDMA sources >> + "mediatek,<chip>-disp-split" - split stream to two encoders >> + "mediatek,<chip>-disp-ufoe" - data compression engine >> + "mediatek,<chip>-dsi" - DSI controller, see mediatek,dsi.txt >> + "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. > > The original binding document for mmsys is in [1], I think we should not > define it in duplicate. Maybe you could remove the original document. > > [1] > https://www.kernel.org/doc/Documentation/devicetree/bindings/arm/mediatek/mediatek%2Cmmsys.txt > > Regards, > CK > >> + >> - 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). >
On Sat, Dec 07, 2019 at 11:47:29PM +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 enalbes the different blocks. typo > This patch adds one line for the mmsys bindings description. > > Signed-off-by: Matthias Brugger <mbrugger@suse.com> > --- > .../display/mediatek/mediatek,disp.txt | 28 ++++++++++--------- > 1 file changed, 15 insertions(+), 13 deletions(-) Otherwise, Acked-by: Rob Herring <robh@kernel.org>
On 09/12/2019 06:12, CK Hu wrote: > Hi, Matthias: > > On Sat, 2019-12-07 at 23:47 +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 enalbes the different blocks. >> This patch adds one line for the mmsys bindings description. >> >> Signed-off-by: Matthias Brugger <mbrugger@suse.com> >> --- >> .../display/mediatek/mediatek,disp.txt | 28 ++++++++++--------- >> 1 file changed, 15 insertions(+), 13 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt >> index 8469de510001..c71c8a4b73ff 100644 >> --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt >> +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt >> @@ -27,20 +27,22 @@ Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt. >> >> Required properties (all function blocks): >> - compatible: "mediatek,<chip>-disp-<function>", one of >> - "mediatek,<chip>-disp-ovl" - overlay (4 layers, blending, csc) >> - "mediatek,<chip>-disp-rdma" - read DMA / line buffer >> - "mediatek,<chip>-disp-wdma" - write DMA >> - "mediatek,<chip>-disp-color" - color processor >> - "mediatek,<chip>-disp-aal" - adaptive ambient light controller >> - "mediatek,<chip>-disp-gamma" - gamma correction >> - "mediatek,<chip>-disp-merge" - merge streams from two RDMA sources >> - "mediatek,<chip>-disp-split" - split stream to two encoders >> - "mediatek,<chip>-disp-ufoe" - data compression engine >> - "mediatek,<chip>-dsi" - DSI controller, see mediatek,dsi.txt >> - "mediatek,<chip>-dpi" - DPI controller, see mediatek,dpi.txt >> - "mediatek,<chip>-disp-mutex" - display mutex >> - "mediatek,<chip>-disp-od" - overdrive >> + "mediatek,<chip>-disp-ovl" - overlay (4 layers, blending, csc) > > This patch conflicts with 5.5-rc, please resend this patch base on > 5.5-rc1. > >> + "mediatek,<chip>-disp-rdma" - read DMA / line buffer >> + "mediatek,<chip>-disp-wdma" - write DMA >> + "mediatek,<chip>-disp-color" - color processor >> + "mediatek,<chip>-disp-aal" - adaptive ambient light controller >> + "mediatek,<chip>-disp-gamma" - gamma correction >> + "mediatek,<chip>-disp-merge" - merge streams from two RDMA sources >> + "mediatek,<chip>-disp-split" - split stream to two encoders >> + "mediatek,<chip>-disp-ufoe" - data compression engine >> + "mediatek,<chip>-dsi" - DSI controller, see mediatek,dsi.txt >> + "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. > > The original binding document for mmsys is in [1], I think we should not > define it in duplicate. Maybe you could remove the original document. > > [1] > https://www.kernel.org/doc/Documentation/devicetree/bindings/arm/mediatek/mediatek%2Cmmsys.txt I think we should keep it, as it describes some requirements that are otherwise lost. I'll adapt the mmsys description and add a hint to it, like we do for dsi and dpi. Regards, Matthias > > Regards, > CK > >> + >> - 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). > > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek >
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt index 8469de510001..c71c8a4b73ff 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt @@ -27,20 +27,22 @@ Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt. Required properties (all function blocks): - compatible: "mediatek,<chip>-disp-<function>", one of - "mediatek,<chip>-disp-ovl" - overlay (4 layers, blending, csc) - "mediatek,<chip>-disp-rdma" - read DMA / line buffer - "mediatek,<chip>-disp-wdma" - write DMA - "mediatek,<chip>-disp-color" - color processor - "mediatek,<chip>-disp-aal" - adaptive ambient light controller - "mediatek,<chip>-disp-gamma" - gamma correction - "mediatek,<chip>-disp-merge" - merge streams from two RDMA sources - "mediatek,<chip>-disp-split" - split stream to two encoders - "mediatek,<chip>-disp-ufoe" - data compression engine - "mediatek,<chip>-dsi" - DSI controller, see mediatek,dsi.txt - "mediatek,<chip>-dpi" - DPI controller, see mediatek,dpi.txt - "mediatek,<chip>-disp-mutex" - display mutex - "mediatek,<chip>-disp-od" - overdrive + "mediatek,<chip>-disp-ovl" - overlay (4 layers, blending, csc) + "mediatek,<chip>-disp-rdma" - read DMA / line buffer + "mediatek,<chip>-disp-wdma" - write DMA + "mediatek,<chip>-disp-color" - color processor + "mediatek,<chip>-disp-aal" - adaptive ambient light controller + "mediatek,<chip>-disp-gamma" - gamma correction + "mediatek,<chip>-disp-merge" - merge streams from two RDMA sources + "mediatek,<chip>-disp-split" - split stream to two encoders + "mediatek,<chip>-disp-ufoe" - data compression engine + "mediatek,<chip>-dsi" - DSI controller, see mediatek,dsi.txt + "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).