| Message ID | 20170124003853.16418-2-eric@anholt.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Need to cc DT list if you want it in my queue. On Mon, Jan 23, 2017 at 6:38 PM, Eric Anholt <eric@anholt.net> wrote: > These are part of the vc4 display pipeline. > > Signed-off-by: Eric Anholt <eric@anholt.net> > --- > .../devicetree/bindings/display/brcm,bcm-vc4.txt | 35 ++++++++++++++++++++++ > 1 file changed, 35 insertions(+) > > diff --git a/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt b/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt > index e2768703ac2b..34c7fddcea39 100644 > --- a/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt > +++ b/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt > @@ -56,6 +56,18 @@ Required properties for V3D: > - interrupts: The interrupt number > See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt > > +Required properties for DSI: > +- compatible: Should be "brcm,bcm2835-dsi0" or "brcm,bcm2835-dsi1" Are the blocks different? > +- reg: Physical base address and length of the DSI block's registers > +- interrupts: The interrupt number > + See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt > +- clocks: a) phy: The DSI PLL clock feeding the DSI analog PHY > + b) escape: The DSI ESC clock from CPRMAN > + c) pixel: The DSI pixel clock from CPRMAN > +- clock-output-names: > + The 3 clocks output from the DSI analog PHY: dsi[01]_byte, > + dsi[01]_ddr2, and dsi[01]_ddr > + > [1] Documentation/devicetree/bindings/media/video-interfaces.txt > > Example: > @@ -99,6 +111,29 @@ dpi: dpi@7e208000 { > }; > }; > > +dsi1: dsi@7e700000 { > + compatible = "brcm,bcm2835-dsi1"; > + reg = <0x7e700000 0x8c>; > + interrupts = <2 12>; > + #address-cells = <1>; > + #size-cells = <0>; > + #clock-cells = <1>; > + > + clocks = <&clocks BCM2835_PLLD_DSI1>, > + <&clocks BCM2835_CLOCK_DSI1E>, > + <&clocks BCM2835_CLOCK_DSI1P>; > + clock-names = "phy", "escape", "pixel"; > + > + clock-output-names = "dsi1_byte", "dsi1_ddr2", "dsi1_ddr"; > + > + pitouchscreen: panel@0 { > + compatible = "raspberrypi,touchscreen"; > + reg = <0>; > + > + <...> > + }; > +}; > + > vec: vec@7e806000 { > compatible = "brcm,bcm2835-vec"; > reg = <0x7e806000 0x1000>; > -- > 2.11.0 >
Rob Herring <robh+dt@kernel.org> writes: > Need to cc DT list if you want it in my queue. > > On Mon, Jan 23, 2017 at 6:38 PM, Eric Anholt <eric@anholt.net> wrote: >> These are part of the vc4 display pipeline. >> >> Signed-off-by: Eric Anholt <eric@anholt.net> >> --- >> .../devicetree/bindings/display/brcm,bcm-vc4.txt | 35 ++++++++++++++++++++++ >> 1 file changed, 35 insertions(+) >> >> diff --git a/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt b/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt >> index e2768703ac2b..34c7fddcea39 100644 >> --- a/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt >> +++ b/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt >> @@ -56,6 +56,18 @@ Required properties for V3D: >> - interrupts: The interrupt number >> See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt >> >> +Required properties for DSI: >> +- compatible: Should be "brcm,bcm2835-dsi0" or "brcm,bcm2835-dsi1" > > Are the blocks different? They are from the same lineage, but very different (old dsi0 is 1 lane, dsi1 is 4 lanes). You can see how much the registers move around and change in the dsi->port conditional blocks in the driver code.
On Fri, Jan 27, 2017 at 8:41 PM, Eric Anholt <eric@anholt.net> wrote: > Rob Herring <robh+dt@kernel.org> writes: > >> Need to cc DT list if you want it in my queue. >> >> On Mon, Jan 23, 2017 at 6:38 PM, Eric Anholt <eric@anholt.net> wrote: >>> These are part of the vc4 display pipeline. >>> >>> Signed-off-by: Eric Anholt <eric@anholt.net> >>> --- >>> .../devicetree/bindings/display/brcm,bcm-vc4.txt | 35 ++++++++++++++++++++++ >>> 1 file changed, 35 insertions(+) >>> >>> diff --git a/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt b/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt >>> index e2768703ac2b..34c7fddcea39 100644 >>> --- a/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt >>> +++ b/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt >>> @@ -56,6 +56,18 @@ Required properties for V3D: >>> - interrupts: The interrupt number >>> See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt >>> >>> +Required properties for DSI: >>> +- compatible: Should be "brcm,bcm2835-dsi0" or "brcm,bcm2835-dsi1" >> >> Are the blocks different? > > They are from the same lineage, but very different (old dsi0 is 1 lane, > dsi1 is 4 lanes). You can see how much the registers move around and > change in the dsi->port conditional blocks in the driver code. Okay, can you add a note here with this detail. With that, Acked-by: Rob Herring <robh@kernel.org>
diff --git a/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt b/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt index e2768703ac2b..34c7fddcea39 100644 --- a/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt +++ b/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt @@ -56,6 +56,18 @@ Required properties for V3D: - interrupts: The interrupt number See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt +Required properties for DSI: +- compatible: Should be "brcm,bcm2835-dsi0" or "brcm,bcm2835-dsi1" +- reg: Physical base address and length of the DSI block's registers +- interrupts: The interrupt number + See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt +- clocks: a) phy: The DSI PLL clock feeding the DSI analog PHY + b) escape: The DSI ESC clock from CPRMAN + c) pixel: The DSI pixel clock from CPRMAN +- clock-output-names: + The 3 clocks output from the DSI analog PHY: dsi[01]_byte, + dsi[01]_ddr2, and dsi[01]_ddr + [1] Documentation/devicetree/bindings/media/video-interfaces.txt Example: @@ -99,6 +111,29 @@ dpi: dpi@7e208000 { }; }; +dsi1: dsi@7e700000 { + compatible = "brcm,bcm2835-dsi1"; + reg = <0x7e700000 0x8c>; + interrupts = <2 12>; + #address-cells = <1>; + #size-cells = <0>; + #clock-cells = <1>; + + clocks = <&clocks BCM2835_PLLD_DSI1>, + <&clocks BCM2835_CLOCK_DSI1E>, + <&clocks BCM2835_CLOCK_DSI1P>; + clock-names = "phy", "escape", "pixel"; + + clock-output-names = "dsi1_byte", "dsi1_ddr2", "dsi1_ddr"; + + pitouchscreen: panel@0 { + compatible = "raspberrypi,touchscreen"; + reg = <0>; + + <...> + }; +}; + vec: vec@7e806000 { compatible = "brcm,bcm2835-vec"; reg = <0x7e806000 0x1000>;
These are part of the vc4 display pipeline. Signed-off-by: Eric Anholt <eric@anholt.net> --- .../devicetree/bindings/display/brcm,bcm-vc4.txt | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+)