| Message ID | 1474727185-24180-2-git-send-email-shawn.guo@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
On Sat, Sep 24, 2016 at 10:26:24PM +0800, Shawn Guo wrote: > It adds initial bindings doc for ZTE VOU display controller. HDMI is > the only supported output device right now. > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > --- > .../devicetree/bindings/display/zte,vou.txt | 86 ++++++++++++++++++++++ > 1 file changed, 86 insertions(+) > create mode 100644 Documentation/devicetree/bindings/display/zte,vou.txt > > diff --git a/Documentation/devicetree/bindings/display/zte,vou.txt b/Documentation/devicetree/bindings/display/zte,vou.txt > new file mode 100644 > index 000000000000..d03ba4c4810c > --- /dev/null > +++ b/Documentation/devicetree/bindings/display/zte,vou.txt > @@ -0,0 +1,86 @@ > +ZTE VOU Display Controller > + > +This is a display controller found on ZTE ZX296718 SoC. It includes multiple > +Graphic Layer (GL) and Video Layer (VL), two Mixers/Channels, and a few blocks > +handling scaling, color space conversion etc. VOU also integrates the support > +for typical output devices, like HDMI, TV Encoder, VGA, and RGB LCD. > + > +* Master VOU node > + > +It must be the parent node of all the sub-device nodes. > + > +Required properties: > + - compatible: should be "zte,zx296718-vou" > + - #address-cells: should be <1> > + - #size-cells: should be <1> > + - reg: Physical base address and length of the whole VOU IO region > + - ranges: to allow probing of sub-devices > + > +* VOU DPC device > + > +Required properties: > + - compatible: should be "zte,zx296718-dpc" > + - reg: Physical base address and length of DPC register regions, one for each > + entry in 'reg-names' > + - reg-names: The names of register regions. The following regions are required: > + "osd" > + "timing_ctrl" > + "dtrc" > + "vou_ctrl" > + "otfppu" > + - interrupts: VOU DPC interrupt number to CPU > + - clocks: A list of phandle + clock-specifier pairs, one for each entry > + in 'clock-names' > + - clock-names: A list of clock names. The following clocks are required: > + "aclk" > + "ppu_wclk" > + "main_wclk" > + "aux_wclk" > + > +* HDMI output device > + > +Required properties: > + - compatible: should be "zte,zx296718-hdmi" > + - reg: Physical base address and length of the HDMI device IO region > + - interrupts : HDMI interrupt number to CPU > + - clocks: A list of phandle + clock-specifier pairs, one for each entry > + in 'clock-names' > + - clock-names: A list of clock names. The following clocks are required: > + "osc_cec" > + "osc_clk" > + "xclk" > + > +Example: > + > +vou: vou@1440000 { > + compatible = "zte,zx296718-vou"; > + #address-cells = <1>; > + #size-cells = <1>; > + reg = <0x1440000 0x10000>; > + ranges; You still have overlapping addresses. Explicitly list the sub ranges in reg here used by the VOU driver if the driver usage doesn't overlap. If there is overlap (2 drivers accessing the same range), then you need some APIs between the components (or possibly regmap). Also, don't do an empty ranges here. Fill it in so the child nodes are just offsets of 0x1440000 > + > + dpc: dpc@1440000 { > + compatible = "zte,zx296718-dpc"; > + reg = <0x1440000 0x1000>, <0x1441000 0x1000>, > + <0x1445000 0x1000>, <0x1446000 0x1000>, > + <0x144a000 0x1000>; > + reg-names = "osd", "timing_ctrl", > + "dtrc", "vou_ctrl", > + "otfppu"; > + interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&topcrm VOU_ACLK>, <&topcrm VOU_PPU_WCLK>, > + <&topcrm VOU_MAIN_WCLK>, <&topcrm VOU_AUX_WCLK>; > + clock-names = "aclk", "ppu_wclk", > + "main_wclk", "aux_wclk"; > + }; > + > + hdmi: hdmi@144c000 { > + compatible = "zte,zx296718-hdmi"; > + reg = <0x144c000 0x4000>; > + interrupts = <GIC_SPI 82 IRQ_TYPE_EDGE_RISING>; > + clocks = <&topcrm HDMI_OSC_CEC>, > + <&topcrm HDMI_OSC_CLK>, > + <&topcrm HDMI_XCLK>; > + clock-names = "osc_cec", "osc_clk", "xclk"; > + }; > +}; > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sun, Oct 09, 2016 at 03:49:10PM +0800, Shawn Guo wrote: > On Mon, Oct 03, 2016 at 12:44:29PM -0500, Rob Herring wrote: > > > +Example: > > > + > > > +vou: vou@1440000 { > > > + compatible = "zte,zx296718-vou"; > > > + #address-cells = <1>; > > > + #size-cells = <1>; > > > + reg = <0x1440000 0x10000>; > > > + ranges; > > > > You still have overlapping addresses. Explicitly list the sub ranges in > > reg here used by the VOU driver if the driver usage doesn't overlap. If > > there is overlap (2 drivers accessing the same range), then you need > > some APIs between the components (or possibly regmap). > > The driver matching "zte,zx296718-vou" doesn't map or access the any > 'reg' address. The 'reg' property here is more like a hint telling > that the VOU block covers the address space of all child devices. > > I will simply drop the 'reg' property here. > > > Also, don't do an empty ranges here. Fill it in so the child nodes are > > just offsets of 0x1440000 > > Okay. I thought that empty 'ranges' is fine as long as parent and child > address spaces are identical (1:1 mapping). It is fine, but it's just better policy to limit the scope of things. > So with your suggestion, I made the changes below. Let me know if this > is still not what you are asking for. Looks fine. With that, Acked-by: Rob Herring <robh@kernel.org> > > Shawn > > -----8<----------------- > > diff --git a/Documentation/devicetree/bindings/display/zte,vou.txt b/Documentation/devicetree/bindings/display/zte,vou.txt > index d03ba4c4810c..6bb4ab2517ef 100644 > --- a/Documentation/devicetree/bindings/display/zte,vou.txt > +++ b/Documentation/devicetree/bindings/display/zte,vou.txt > @@ -56,14 +56,13 @@ vou: vou@1440000 { > compatible = "zte,zx296718-vou"; > #address-cells = <1>; > #size-cells = <1>; > - reg = <0x1440000 0x10000>; > - ranges; > + ranges = <0 0x1440000 0x10000>; > > - dpc: dpc@1440000 { > + dpc: dpc@0 { > compatible = "zte,zx296718-dpc"; > - reg = <0x1440000 0x1000>, <0x1441000 0x1000>, > - <0x1445000 0x1000>, <0x1446000 0x1000>, > - <0x144a000 0x1000>; > + reg = <0x0000 0x1000>, <0x1000 0x1000>, > + <0x5000 0x1000>, <0x6000 0x1000>, > + <0xa000 0x1000>; > reg-names = "osd", "timing_ctrl", > "dtrc", "vou_ctrl", > "otfppu"; > @@ -74,9 +73,9 @@ vou: vou@1440000 { > "main_wclk", "aux_wclk"; > }; > > - hdmi: hdmi@144c000 { > + hdmi: hdmi@c000 { > compatible = "zte,zx296718-hdmi"; > - reg = <0x144c000 0x4000>; > + reg = <0xc000 0x4000>; > interrupts = <GIC_SPI 82 IRQ_TYPE_EDGE_RISING>; > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/display/zte,vou.txt b/Documentation/devicetree/bindings/display/zte,vou.txt new file mode 100644 index 000000000000..d03ba4c4810c --- /dev/null +++ b/Documentation/devicetree/bindings/display/zte,vou.txt @@ -0,0 +1,86 @@ +ZTE VOU Display Controller + +This is a display controller found on ZTE ZX296718 SoC. It includes multiple +Graphic Layer (GL) and Video Layer (VL), two Mixers/Channels, and a few blocks +handling scaling, color space conversion etc. VOU also integrates the support +for typical output devices, like HDMI, TV Encoder, VGA, and RGB LCD. + +* Master VOU node + +It must be the parent node of all the sub-device nodes. + +Required properties: + - compatible: should be "zte,zx296718-vou" + - #address-cells: should be <1> + - #size-cells: should be <1> + - reg: Physical base address and length of the whole VOU IO region + - ranges: to allow probing of sub-devices + +* VOU DPC device + +Required properties: + - compatible: should be "zte,zx296718-dpc" + - reg: Physical base address and length of DPC register regions, one for each + entry in 'reg-names' + - reg-names: The names of register regions. The following regions are required: + "osd" + "timing_ctrl" + "dtrc" + "vou_ctrl" + "otfppu" + - interrupts: VOU DPC interrupt number to CPU + - clocks: A list of phandle + clock-specifier pairs, one for each entry + in 'clock-names' + - clock-names: A list of clock names. The following clocks are required: + "aclk" + "ppu_wclk" + "main_wclk" + "aux_wclk" + +* HDMI output device + +Required properties: + - compatible: should be "zte,zx296718-hdmi" + - reg: Physical base address and length of the HDMI device IO region + - interrupts : HDMI interrupt number to CPU + - clocks: A list of phandle + clock-specifier pairs, one for each entry + in 'clock-names' + - clock-names: A list of clock names. The following clocks are required: + "osc_cec" + "osc_clk" + "xclk" + +Example: + +vou: vou@1440000 { + compatible = "zte,zx296718-vou"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x1440000 0x10000>; + ranges; + + dpc: dpc@1440000 { + compatible = "zte,zx296718-dpc"; + reg = <0x1440000 0x1000>, <0x1441000 0x1000>, + <0x1445000 0x1000>, <0x1446000 0x1000>, + <0x144a000 0x1000>; + reg-names = "osd", "timing_ctrl", + "dtrc", "vou_ctrl", + "otfppu"; + interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&topcrm VOU_ACLK>, <&topcrm VOU_PPU_WCLK>, + <&topcrm VOU_MAIN_WCLK>, <&topcrm VOU_AUX_WCLK>; + clock-names = "aclk", "ppu_wclk", + "main_wclk", "aux_wclk"; + }; + + hdmi: hdmi@144c000 { + compatible = "zte,zx296718-hdmi"; + reg = <0x144c000 0x4000>; + interrupts = <GIC_SPI 82 IRQ_TYPE_EDGE_RISING>; + clocks = <&topcrm HDMI_OSC_CEC>, + <&topcrm HDMI_OSC_CLK>, + <&topcrm HDMI_XCLK>; + clock-names = "osc_cec", "osc_clk", "xclk"; + }; +};
It adds initial bindings doc for ZTE VOU display controller. HDMI is the only supported output device right now. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> --- .../devicetree/bindings/display/zte,vou.txt | 86 ++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/zte,vou.txt -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html