From patchwork Tue Aug 21 14:33:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1355411 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 21D483FD40 for ; Tue, 21 Aug 2012 14:41:07 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T3pXB-00068n-DT; Tue, 21 Aug 2012 14:34:21 +0000 Received: from na3sys009aog127.obsmtp.com ([74.125.149.107]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1T3pX4-00064u-TT for linux-arm-kernel@lists.infradead.org; Tue, 21 Aug 2012 14:34:16 +0000 Received: from mail-ey0-f173.google.com ([209.85.215.173]) (using TLSv1) by na3sys009aob127.postini.com ([74.125.148.12]) with SMTP ID DSNKUDOcZPISjEaah8hCYq85sgLS1KpAfXxP@postini.com; Tue, 21 Aug 2012 07:34:14 PDT Received: by eaac13 with SMTP id c13so3394529eaa.18 for ; Tue, 21 Aug 2012 07:34:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=mSg2GWradqTd2BNF2mQtieHELvD3LHeJSumEjs3NPsA=; b=HelFPpVk5yrI0asYaN4KaSFI+65X7cUT9Yz1gGoMRQIUT4KZx4X2XirFV12u4tiAdV +AeSr0HeEurV5zcKTvR3XB0WoltxT2Jz+78S9KTvzY4jL4OUmJvrDQakJnygLjxXsYYX k/zD1GUIdQkz7j0uIXHRHb9MJL+cQiN1VyRNf9ZZ+W73Mlt0Y8Oeipy+2iMTzF85XxQA 4u7FE9Qh0Y9O2gd9Bx4J/2WB1IwkC+Wu46eTUExdHLHy9MZDsqpC9iIjx+qOONPUPb6P EkS5O+r4gaPY8NnBzTKeCLWhKC0/rk/VCseYpUaOGChS6GJbCbB+1KyqSc3kYzZXR65Z 92vQ== Received: by 10.14.184.133 with SMTP id s5mr13922458eem.31.1345559651577; Tue, 21 Aug 2012 07:34:11 -0700 (PDT) Received: from localhost.localdomain (176.39.21.109.rev.sfr.net. [109.21.39.176]) by mx.google.com with ESMTPS id k49sm4963259een.4.2012.08.21.07.34.08 (version=SSLv3 cipher=OTHER); Tue, 21 Aug 2012 07:34:10 -0700 (PDT) From: Peter Ujfalusi To: Mark Brown , Liam Girdwood , Tony Lindgren Subject: [PATCH] ASoC: omap-mcbsp: Device tree binding documentation update Date: Tue, 21 Aug 2012 17:33:56 +0300 Message-Id: <1345559636-23370-1-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.8.6 X-Gm-Message-State: ALoCoQlwf//lfICoRssr0yyHV47eCfwPFZK0QqMa1VEqrilatEMIzWzYx1WwcDzgSLHT25JWWH7m X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.107 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: alsa-devel@alsa-project.org, Benoit Cousson , devicetree-discuss@lists.ozlabs.org, Jarkko Nikula , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org To reflect the final devicetree node structure of McBSPs. Signed-off-by: Peter Ujfalusi --- Hello, the initial OMAP McBSP DT structure was not able to describe the IP (and it's versions) correctly. The main issue was the sidetone block of McBSP2/3 on OMAP3. With this change in the DT description the OS can get the needed information about the IP. The sidetone is still not supported when the Linux kernel is booted with DT since we still depend on hwmod to fill the resources. This patch depend on the McBSP DT support series going via audio tree. Regards, Peter .../devicetree/bindings/sound/omap-mcbsp.txt | 28 +++++++------------ 1 files changed, 10 insertions(+), 18 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/omap-mcbsp.txt b/Documentation/devicetree/bindings/sound/omap-mcbsp.txt index 447cb13..17cce44 100644 --- a/Documentation/devicetree/bindings/sound/omap-mcbsp.txt +++ b/Documentation/devicetree/bindings/sound/omap-mcbsp.txt @@ -8,38 +8,30 @@ Required properties: - reg: Register location and size, for OMAP4+ as an array: , ; +- reg-names: Array of strings associated with the address space - interrupts: Interrupt numbers for the McBSP port, as an array in case the McBSP IP have more interrupt lines: , , ; +- interrupt-names: Array of strings associated with the interrupt numbers - interrupt-parent: The parent interrupt controller - ti,buffer-size: Size of the FIFO on the port (OMAP2430 and newer SoC) - ti,hwmods: Name of the hwmod associated to the McBSP port -Sidetone support for OMAP3 McBSP2 and 3 ports: -- sidetone { }: Within this section the following parameters are required: -- reg: Register location and size for the ST block -- interrupts: The interrupt number for the ST block -- interrupt-parent: The parent interrupt controller for the ST block - Example: mcbsp2: mcbsp@49022000 { compatible = "ti,omap3-mcbsp"; - #address-cells = <1>; - #size-cells = <1>; - reg = <0x49022000 0xff>; - interrupts = <0 17 0x4>, /* OCP compliant interrup */ - <0 62 0x4>, /* TX interrup */ - <0 63 0x4>; /* RX interrup */ + reg = <0x49022000 0xff>, + <0x49028000 0xff>; + reg-names = "mpu", "sidetone"; + interrupts = <0 17 0x4>, /* OCP compliant interrupt */ + <0 62 0x4>, /* TX interrupt */ + <0 63 0x4>, /* RX interrupt */ + <0 4 0x4>; /* Sidetone */ + interrupt-names = "common", "tx", "rx", "sidetone"; interrupt-parent = <&intc>; ti,buffer-size = <1280>; ti,hwmods = "mcbsp2"; - - sidetone { - reg = <0x49028000 0xff>; - interrupts = <0 4 0x4>; - interrupt-parent = <&intc>; - }; };