From patchwork Wed Jun 12 08:07:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Padmavathi Venna X-Patchwork-Id: 2708301 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C11FEC1459 for ; Wed, 12 Jun 2013 08:04:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 90580201D6 for ; Wed, 12 Jun 2013 08:04:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 57A01201D2 for ; Wed, 12 Jun 2013 08:04:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752567Ab3FLIEQ (ORCPT ); Wed, 12 Jun 2013 04:04:16 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:9519 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753022Ab3FLIEM (ORCPT ); Wed, 12 Jun 2013 04:04:12 -0400 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MO9004T0T2QGKL0@mailout1.samsung.com> for linux-samsung-soc@vger.kernel.org; Wed, 12 Jun 2013 17:04:09 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.125]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 5F.54.29708.97B28B15; Wed, 12 Jun 2013 17:04:09 +0900 (KST) X-AuditID: cbfee690-b7f6f6d00000740c-0b-51b82b7937ba Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 7D.28.21068.97B28B15; Wed, 12 Jun 2013 17:04:09 +0900 (KST) Received: from padma-linuxpc.sisodomain.com ([107.108.83.35]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MO900FK3T2G1NN0@mmp2.samsung.com>; Wed, 12 Jun 2013 17:04:09 +0900 (KST) From: Padmavathi Venna To: linux-samsung-soc@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, alsa-devel@alsa-project.org, padma.v@samsung.com, padma.kvr@gmail.com Cc: sbkim73@samsung.com, broonie@kernel.org, kgene.kim@samsung.com, mturquette@linaro.org Subject: [PATCH V6 5/6] ARM: dts: Update Samsung I2S documentation Date: Wed, 12 Jun 2013 13:37:42 +0530 Message-id: <1371024463-303-6-git-send-email-padma.v@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1371024463-303-1-git-send-email-padma.v@samsung.com> References: <1371024463-303-1-git-send-email-padma.v@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIIsWRmVeSWpSXmKPExsWyRsSkVrdSe0egwfGH0hZXLh5ispj68Amb xYHZD1ktehdcZbPY9Pgaq8WM8/uYLJ5OuMhm0b5sDqvF75vf2SwurvjC5MDlseFzE5vHzll3 2T02repk87hzbQ+bx+Yl9R7nZyxk9OjbsorR4/MmuQCOKC6blNSczLLUIn27BK6MT0slC45L VGx52MLSwHhfuIuRk0NCwERizeQtrBC2mMSFe+vZuhi5OIQEljJKrJz2lxGmqL/hKztEYjqj xPvLZ1ghnB4miY2TVwM5HBxsAjoSLWddQBpEBHYzSvRetACxmQWiJe49+cwEYgsLOElMXLmV DaScRUBVomNVOEiYV8BR4vyL02wQuxQkjk39CnYQJ1D5npNzWEBsIaCaB/dmgq2VEDjGLvGt 6TQ7SIJFQEDi2+RDLCAzJQRkJTYdYIaYIylxcMUNlgmMwgsYGVYxiqYWJBcUJ6UXmegVJ+YW l+al6yXn525iBEbH6X/PJuxgvHfA+hBjMtC4icxSosn5wOjKK4k3NDYzsjA1MTU2Mrc0I01Y SZxXvcU6UEggPbEkNTs1tSC1KL6oNCe1+BAjEwenVAOjavFhw8iU/ykqKds//d8xXXmi5QRx S87FzSmRlc/2b/OS485b1Pt4Yeyi218n9C3fdeigUezjQ7+bN5ixc3A94ei4Ibk9tt+14dCN Uz0HLb+e6FttoNnzNniVTc6WZ5PcPuVmury++ExN5OGncqHqPo2GpV/T9Gec/HlEUt8i+3xB eMzzSr5SJZbijERDLeai4kQAzeG6m6QCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHIsWRmVeSWpSXmKPExsVy+t9jQd1K7R2BBj+ahC2uXDzEZDH14RM2 iwOzH7Ja9C64ymax6fE1VosZ5/cxWTydcJHNon3ZHFaL3ze/s1lcXPGFyYHLY8PnJjaPnbPu sntsWtXJ5nHn2h42j81L6j3Oz1jI6NG3ZRWjx+dNcgEcUQ2MNhmpiSmpRQqpecn5KZl56bZK 3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlARyoplCXmlAKFAhKLi5X07TBNCA1x07WA aYzQ9Q0JgusxMkADCWsYMz4tlSw4LlGx5WELSwPjfeEuRk4OCQETif6Gr+wQtpjEhXvr2boY uTiEBKYzSry/fIYVwulhktg4eTWQw8HBJqAj0XLWBaRBRGA3o0TvRQsQm1kgWuLek89MILaw gJPExJVb2UDKWQRUJTpWhYOEeQUcJc6/OM0GsUtB4tjUr6wgNidQ+Z6Tc1hAbCGgmgf3ZrJO YORdwMiwilE0tSC5oDgpPddIrzgxt7g0L10vOT93EyM49p5J72Bc1WBxiFGAg1GJh/eA2fZA IdbEsuLK3EOMEhzMSiK8f4R3BArxpiRWVqUW5ccXleakFh9iTAY6aiKzlGhyPjAt5JXEGxqb mJsam1qaWJiYWZImrCTOe7DVOlBIID2xJDU7NbUgtQhmCxMHp1QDI5fwDTMfL7b1zk+Ouxsu 4j9uZ2bU2l8b+qWRU6vuuOKGy6ensx6sDIu/8/oZp8eZ33vvX9g0tf//5M/3kgq49HkmxDnz xyj0nnq0o+jSL+3NxpKFBq0PnN0O9aga6mZvb2982pwT53j0rdfiO0YixzSfnnt6rLH49/OK 4+s7ebXEmhV2+osbKbEUZyQaajEXFScCAD+mBH0BAwAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch updates the samsung i2s documentation for pinmux and clock entries. Signed-off-by: Padmavathi Venna --- .../devicetree/bindings/sound/samsung-i2s.txt | 46 ++++++++----------- 1 files changed, 19 insertions(+), 27 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/samsung-i2s.txt b/Documentation/devicetree/bindings/sound/samsung-i2s.txt index 3070046..025e66b 100644 --- a/Documentation/devicetree/bindings/sound/samsung-i2s.txt +++ b/Documentation/devicetree/bindings/sound/samsung-i2s.txt @@ -8,6 +8,16 @@ 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: Handle to iis clock and RCLK source clk. +- clock-names: + i2s0 uses some base clks from CMU and some are from audio subsystem internal + clock controller. The clock names for i2s0 should be "iis", "i2s_opclk0" and + "i2s_opclk1" as shown in the example below. + i2s1 and i2s2 uses clocks from CMU. The clock names for i2s1 and i2s2 should + be "iis" and "i2s_opclk0". + "iis" is the i2s bus clock and i2s_opclk0, i2s_opclk1 are sources of the root + clk. i2s0 has internal mux to select the source of root clk and i2s1 and i2s2 + doesn't have any such mux. Optional SoC Specific Properties: @@ -20,44 +30,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>; };