| Message ID | 1486609978-18482-2-git-send-email-baoyou.xie@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Stephen Boyd |
| Headers | show |
On Thu, Feb 09, 2017 at 11:12:57AM +0800, Baoyou Xie wrote: > - - compatible : Must be "zte,zx296702-i2s" > + - compatible : Must be one of: > + "zte,zx296718-i2s", "zte,zx296702-i2s" > + "zte,zx296702-i2s" You've added the new compatible twice here?
On Thu, Feb 09, 2017 at 04:46:45PM +0000, Mark Brown wrote: > On Thu, Feb 09, 2017 at 11:12:57AM +0800, Baoyou Xie wrote: > > > - - compatible : Must be "zte,zx296702-i2s" > > + - compatible : Must be one of: > > + "zte,zx296718-i2s", "zte,zx296702-i2s" > > + "zte,zx296702-i2s" > > You've added the new compatible twice here? It's indeed a bit confusing. Might be better if we add a couple of bullet like below. - compatible : Must be one of: - "zte,zx296718-i2s", "zte,zx296702-i2s"; - "zte,zx296702-i2s"; In this case, it's more easier for readers to understand that the first one is for I2S device on SoC ZX296718, while it's compatible with the I2S on ZX296702. Shawn -- To unsubscribe from this list: send the line "unsubscribe linux-clk" 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/sound/zte,zx-i2s.txt b/Documentation/devicetree/bindings/sound/zte,zx-i2s.txt index 7e5aa6f..292ad50 100644 --- a/Documentation/devicetree/bindings/sound/zte,zx-i2s.txt +++ b/Documentation/devicetree/bindings/sound/zte,zx-i2s.txt @@ -1,10 +1,12 @@ ZTE ZX296702 I2S controller Required properties: - - compatible : Must be "zte,zx296702-i2s" + - compatible : Must be one of: + "zte,zx296718-i2s", "zte,zx296702-i2s" + "zte,zx296702-i2s" - reg : Must contain I2S core's registers location and length - clocks : Pairs of phandle and specifier referencing the controller's clocks. - - clock-names: "tx" for the clock to the I2S interface. + - clock-names: "wclk" for the wclk, "pclk" for the pclk to the I2S interface. - dmas: Pairs of phandle and specifier for the DMA channel that is used by the core. The core expects two dma channels for transmit. - dma-names : Must be "tx" and "rx" @@ -16,12 +18,12 @@ please check: * dma/dma.txt Example: - i2s0: i2s0@0b005000 { + i2s0: i2s@b005000 { #sound-dai-cells = <0>; - compatible = "zte,zx296702-i2s"; + compatible = "zte,zx296718-i2s", "zte,zx296702-i2s"; reg = <0x0b005000 0x1000>; - clocks = <&lsp0clk ZX296702_I2S0_DIV>; - clock-names = "tx"; + clocks = <&audiocrm AUDIO_I2S0_WCLK>, <&audiocrm AUDIO_I2S0_PCLK>; + clock-names = "wclk", "pclk"; interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>; dmas = <&dma 5>, <&dma 6>; dma-names = "tx", "rx";
ZTE's zx2967 I2S controller driver introduces pclk, this patch documents this fact. Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org> --- Documentation/devicetree/bindings/sound/zte,zx-i2s.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)