| Message ID | 1463053795-55455-2-git-send-email-yt.shen@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 2016-05-12 at 19:49 +0800, yt.shen@mediatek.com wrote: > From: YT Shen <yt.shen@mediatek.com> > > Add device tree binding documentation for the display subsystem in > Mediatek SoC MT2701 > > Signed-off-by: YT Shen <yt.shen@mediatek.com> > --- > .../bindings/display/mediatek/mediatek,disp.txt | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt > index db6e77e..53b3cc3 100644 > --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt > +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt > @@ -40,6 +40,7 @@ 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>-disp-bls" - backlight > - 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, This one is in conflict with "Support Mediatek Soc MT2701 disp pwm" series Weiqing sent last week, which add disp-bls support to display pwm driver. Joe.C
Hi Yingjoe, On Thu, 2016-05-12 at 22:59 +0800, Yingjoe Chen wrote: > On Thu, 2016-05-12 at 19:49 +0800, yt.shen@mediatek.com wrote: > > From: YT Shen <yt.shen@mediatek.com> > > > > Add device tree binding documentation for the display subsystem in > > Mediatek SoC MT2701 > > > > Signed-off-by: YT Shen <yt.shen@mediatek.com> > > --- > > .../bindings/display/mediatek/mediatek,disp.txt | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt > > index db6e77e..53b3cc3 100644 > > --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt > > +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt > > @@ -40,6 +40,7 @@ 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>-disp-bls" - backlight > > - 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, > > This one is in conflict with "Support Mediatek Soc MT2701 disp pwm" > series Weiqing sent last week, which add disp-bls support to display pwm > driver. > > Joe.C Thanks, I will remove this part and update it in the next version. Regards, yt.shen
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt index db6e77e..53b3cc3 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt @@ -40,6 +40,7 @@ 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>-disp-bls" - backlight - 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).