From patchwork Fri May 30 10:10:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 4269541 Return-Path: X-Original-To: patchwork-alsa-devel@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 32125BEEA7 for ; Fri, 30 May 2014 10:10:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5EC6D2037B for ; Fri, 30 May 2014 10:10:38 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 372D620200 for ; Fri, 30 May 2014 10:10:37 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 0D0D7264EE5; Fri, 30 May 2014 12:10:35 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id C074D2619E7; Fri, 30 May 2014 12:10:25 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 9A59E2619FB; Fri, 30 May 2014 12:10:23 +0200 (CEST) Received: from mail-pd0-f171.google.com (mail-pd0-f171.google.com [209.85.192.171]) by alsa0.perex.cz (Postfix) with ESMTP id 4C5C32619D7 for ; Fri, 30 May 2014 12:10:15 +0200 (CEST) Received: by mail-pd0-f171.google.com with SMTP id y13so800591pdi.2 for ; Fri, 30 May 2014 03:10:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:message-id:from:subject:user-agent:to:cc:mime-version :content-type; bh=vAWaBs6K0NFGQxv4IgCngxPiQD+faZd5+D2VVpcmsWU=; b=zTVakXra8Id0AZrMqu4+jL4sF7itzG6LJ+fyVhj2aD/MaNug7T3sfnTuSrpAqdjb1P bJpyvo4GGUmygHxctMlrYyZLQ+pY3HDORt8Rj1/9CN9e/QOPrNKecBsoCVJOvU26vTep 8sq9OiVPXRzeE2L/YZxEzru01A6oYUEXSy2TMdNd9BKExVAWBQE2fXrEznuKaHxDFvb6 4X+4IJQYu2wtP+WDMjVKteUOibZ6G06ZZI9CupAKorPRu3TnrMkiM1vH0SWwjs/2/kp/ zhzhjYp7scdGrMruPlEbB/8u4siGCafDhWz92dp7PnMG8wt/5LaHXULkudMC2WtSeeRV NggQ== X-Received: by 10.68.134.101 with SMTP id pj5mr17326213pbb.62.1401444614132; Fri, 30 May 2014 03:10:14 -0700 (PDT) Received: from remon.gmail.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id nh8sm5605187pbc.25.2014.05.30.03.10.12 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 30 May 2014 03:10:13 -0700 (PDT) Date: Fri, 30 May 2014 03:10:13 -0700 (PDT) Message-ID: <87sinrpofv.wl%kuninori.morimoto.gx@gmail.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 To: Mark Brown MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Cc: Linux-ALSA , Simon , Liam Girdwood , Kuninori Morimoto Subject: [alsa-devel] [PATCH] ASoC: rsnd: fixup SSI interrupts style of DeviceTree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto Current SSI interrupts has been set to each port. But it is too ugly style. SSI interrupts will be listed under rcar_sound,ssi node by this patch Signed-off-by: Kuninori Morimoto --- >> Mark There is still no DT user for this driver at this point. No conflict happens on platform. .../devicetree/bindings/sound/renesas,rsnd.txt | 50 ++++++++------------ sound/soc/sh/rcar/ssi.c | 2 +- 2 files changed, 21 insertions(+), 31 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt index 8346cab..1fba56b 100644 --- a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt @@ -53,36 +53,26 @@ rcar_sound: rcar_sound@0xffd90000 { }; rcar_sound,ssi { - ssi0: ssi@0 { - interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>; - }; - ssi1: ssi@1 { - interrupts = <0 371 IRQ_TYPE_LEVEL_HIGH>; - }; - ssi2: ssi@2 { - interrupts = <0 372 IRQ_TYPE_LEVEL_HIGH>; - }; - ssi3: ssi@3 { - interrupts = <0 373 IRQ_TYPE_LEVEL_HIGH>; - }; - ssi4: ssi@4 { - interrupts = <0 374 IRQ_TYPE_LEVEL_HIGH>; - }; - ssi5: ssi@5 { - interrupts = <0 375 IRQ_TYPE_LEVEL_HIGH>; - }; - ssi6: ssi@6 { - interrupts = <0 376 IRQ_TYPE_LEVEL_HIGH>; - }; - ssi7: ssi@7 { - interrupts = <0 377 IRQ_TYPE_LEVEL_HIGH>; - }; - ssi8: ssi@8 { - interrupts = <0 378 IRQ_TYPE_LEVEL_HIGH>; - }; - ssi9: ssi@9 { - interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>; - }; + interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>, + <0 371 IRQ_TYPE_LEVEL_HIGH>, + <0 372 IRQ_TYPE_LEVEL_HIGH>, + <0 373 IRQ_TYPE_LEVEL_HIGH>, + <0 374 IRQ_TYPE_LEVEL_HIGH>, + <0 375 IRQ_TYPE_LEVEL_HIGH>, + <0 376 IRQ_TYPE_LEVEL_HIGH>, + <0 377 IRQ_TYPE_LEVEL_HIGH>, + <0 378 IRQ_TYPE_LEVEL_HIGH>, + <0 379 IRQ_TYPE_LEVEL_HIGH>; + ssi0: ssi@0 { }; + ssi1: ssi@1 { }; + ssi2: ssi@2 { }; + ssi3: ssi@3 { }; + ssi4: ssi@4 { }; + ssi5: ssi@5 { }; + ssi6: ssi@6 { }; + ssi7: ssi@7 { }; + ssi8: ssi@8 { }; + ssi9: ssi@9 { }; }; rcar_sound,dai { diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 2df723d..b311bc6 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -588,7 +588,7 @@ static void rsnd_of_parse_ssi(struct platform_device *pdev, /* * irq */ - ssi_info->pio_irq = irq_of_parse_and_map(np, 0); + ssi_info->pio_irq = irq_of_parse_and_map(node, i); /* * DMA