| Message ID | 1370348890-6645-6-git-send-email-padma.v@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Padmavathi, On Tue, Jun 4, 2013 at 5:28 AM, Padmavathi Venna <padma.v@samsung.com> wrote: > This patch updates the samsung i2s documentation for pinmux and > clock entries. > > Signed-off-by: Padmavathi Venna <padma.v@samsung.com> > --- > .../devicetree/bindings/sound/samsung-i2s.txt | 40 ++++++------------- > 1 files changed, 13 insertions(+), 27 deletions(-) Whoops, just asked for this and now saw it. Thanks for posting! One note: don't use the "dts" tag for this commit. That should be only for things that are touching dts / dtsi files, not for updating docs. > diff --git a/Documentation/devicetree/bindings/sound/samsung-i2s.txt b/Documentation/devicetree/bindings/sound/samsung-i2s.txt > index 3070046..6f9d29f 100644 > --- a/Documentation/devicetree/bindings/sound/samsung-i2s.txt > +++ b/Documentation/devicetree/bindings/sound/samsung-i2s.txt > @@ -8,6 +8,10 @@ Required SoC Specific Properties: > - dmas: list of DMA controller phandle and DMA request line ordered pairs. > - dma-names: identifier string for each DMA request line in the dmas property. > These strings correspond 1:1 with the ordered pairs in dmas. > +- clocks: from common clock binding. Handle to iis clock and RCLK src clk. > +- clock-names: from common clock binding: Should be "iis","i2s_opclk0" and > + "i2s_opclk1". "iis" is the i2s bus clock and i2s_opclk selects the src of > + RCLK which is a mux inside i2s controller. From your other patch apparently opclk0 and/or opclk1 are not required. Two of your i2c nodes don't have either, though I suspect that you at least need opclk0. See my comments there. -Doug -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" 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/samsung-i2s.txt b/Documentation/devicetree/bindings/sound/samsung-i2s.txt index 3070046..6f9d29f 100644 --- a/Documentation/devicetree/bindings/sound/samsung-i2s.txt +++ b/Documentation/devicetree/bindings/sound/samsung-i2s.txt @@ -8,6 +8,10 @@ Required SoC Specific Properties: - dmas: list of DMA controller phandle and DMA request line ordered pairs. - dma-names: identifier string for each DMA request line in the dmas property. These strings correspond 1:1 with the ordered pairs in dmas. +- clocks: from common clock binding. Handle to iis clock and RCLK src clk. +- clock-names: from common clock binding: Should be "iis","i2s_opclk0" and + "i2s_opclk1". "iis" is the i2s bus clock and i2s_opclk selects the src of + RCLK which is a mux inside i2s controller. Optional SoC Specific Properties: @@ -20,44 +24,26 @@ Optional SoC Specific Properties: then this flag is enabled. - samsung,idma-addr: Internal DMA register base address of the audio sub system(used in secondary sound source). - -Required Board Specific Properties: - -- gpios: The gpio specifier for data out,data in, LRCLK, CDCLK and SCLK - interface lines. The format of the gpio specifier depends on the gpio - controller. - The syntax of samsung gpio specifier is - <[phandle of the gpio controller node] - [pin number within the gpio controller] - [mux function] - [flags and pull up/down] - [drive strength]> +- pinctrl-0: Should specify pin control groups used for this controller. +- pinctrl-names: Should contain only one value - "default". Example: -- SoC Specific Portion: - -i2s@03830000 { +i2s0: i2s@03830000 { compatible = "samsung,i2s-v5"; reg = <0x03830000 0x100>; dmas = <&pdma0 10 &pdma0 9 &pdma0 8>; dma-names = "tx", "rx", "tx-sec"; + clocks = <&clock_audss EXYNOS_I2S_BUS>, + <&clock_audss EXYNOS_I2S_BUS>, + <&clock_audss EXYNOS_SCLK_I2S>; + clock-names = "iis", "i2s_opclk0", "i2s_opclk1"; samsung,supports-6ch; samsung,supports-rstclr; samsung,supports-secdai; samsung,idma-addr = <0x03000000>; -}; - -- Board Specific Portion: - -i2s@03830000 { - gpios = <&gpz 0 2 0 0>, /* I2S_0_SCLK */ - <&gpz 1 2 0 0>, /* I2S_0_CDCLK */ - <&gpz 2 2 0 0>, /* I2S_0_LRCK */ - <&gpz 3 2 0 0>, /* I2S_0_SDI */ - <&gpz 4 2 0 0>, /* I2S_0_SDO[1] */ - <&gpz 5 2 0 0>, /* I2S_0_SDO[2] */ - <&gpz 6 2 0 0>; /* I2S_0_SDO[3] */ + pinctrl-names = "default"; + pinctrl-0 = <&i2s0_bus>; };
This patch updates the samsung i2s documentation for pinmux and clock entries. Signed-off-by: Padmavathi Venna <padma.v@samsung.com> --- .../devicetree/bindings/sound/samsung-i2s.txt | 40 ++++++------------- 1 files changed, 13 insertions(+), 27 deletions(-)