From patchwork Tue Mar 25 04:30:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 3885201 Return-Path: X-Original-To: patchwork-linux-sh@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 0DCFCBF540 for ; Tue, 25 Mar 2014 04:30:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3611F2026C for ; Tue, 25 Mar 2014 04:30:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5E0752020E for ; Tue, 25 Mar 2014 04:30:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751457AbaCYEag (ORCPT ); Tue, 25 Mar 2014 00:30:36 -0400 Received: from mail-pb0-f54.google.com ([209.85.160.54]:52054 "EHLO mail-pb0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751065AbaCYEaf (ORCPT ); Tue, 25 Mar 2014 00:30:35 -0400 Received: by mail-pb0-f54.google.com with SMTP id ma3so6441593pbc.27 for ; Mon, 24 Mar 2014 21:30:35 -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:from:to:cc:in-reply-to :references:mime-version:content-type; bh=cL2BH+oqudwD46011TYkPX0N9y2b555FArCLjQHLwPg=; b=Dbh1tFrSSVMpQnf7eWO2TfzxJ40b9LCO68BXOjJ85uNFSNSE9fyQ2EFHB8wcxBw1cv HpIadb9L5zz9DL/3d6eIQ34DcnwR0Jasd/0SiIEUMiVJdtWikmirNWiqHO1t0Mm+7COS 8m68xzMUOb5vy72tv7Ppe1TmIKB6StTfRLFvDXRqRlbfwBs9Smsq0p0XI+WeYAwx/YCy 2KH4P1wIWWueHh9EIx+I4x01lXJ139MGtISK6QCHRWhGYzjp1vzG1qVpBMcE2vfz7+/e c9cWJE7qiz40NLBQ41gwA39K0yO1MaZ1wXA05DzDb/NgcYYYiaxHNU6ptFasCOfi188O Gc0w== X-Received: by 10.68.250.3 with SMTP id yy3mr75835821pbc.56.1395721835256; Mon, 24 Mar 2014 21:30:35 -0700 (PDT) Received: from morimoto-dell.gmail.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id h6sm38654702pbl.75.2014.03.24.21.30.33 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 24 Mar 2014 21:30:34 -0700 (PDT) Date: Mon, 24 Mar 2014 21:30:34 -0700 (PDT) Message-ID: <87a9cedhnb.wl%kuninori.morimoto.gx@gmail.com> From: Kuninori Morimoto Subject: [PATCH 6/6] ARM: shmobile: lager: switch to use dai info for R-Car sound User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 From: Kuninori Morimoto To: Simon Cc: Magnus , linux-sh@vger.kernel.org, Kuninori Morimoto In-Reply-To: <87ior2dhp9.wl%kuninori.morimoto.gx@gmail.com> References: <87ior2dhp9.wl%kuninori.morimoto.gx@gmail.com> MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 From: Kuninori Morimoto Now, R-Car sound driver supports dai info settings. switch to use it Signed-off-by: Kuninori Morimoto --- arch/arm/mach-shmobile/board-lager.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c index 18c7e03..05c263b 100644 --- a/arch/arm/mach-shmobile/board-lager.c +++ b/arch/arm/mach-shmobile/board-lager.c @@ -567,20 +567,27 @@ static struct resource rsnd_resources[] __initdata = { }; static struct rsnd_ssi_platform_info rsnd_ssi[] = { - RSND_SSI_SET(0, 0, gic_spi(370), RSND_SSI_PLAY), - RSND_SSI_SET(0, 0, gic_spi(371), RSND_SSI_CLK_PIN_SHARE), + RSND_SSI(0, gic_spi(370), 0), + RSND_SSI(0, gic_spi(371), RSND_SSI_CLK_PIN_SHARE), }; -static struct rsnd_scu_platform_info rsnd_scu[2] = { +static struct rsnd_src_platform_info rsnd_src[2] = { /* no member at this point */ }; +static struct rsnd_dai_platform_info rsnd_dai = { + .playback = { .ssi = &rsnd_ssi[0], }, + .capture = { .ssi = &rsnd_ssi[1], }, +}; + static struct rcar_snd_info rsnd_info = { .flags = RSND_GEN2, .ssi_info = rsnd_ssi, .ssi_info_nr = ARRAY_SIZE(rsnd_ssi), - .scu_info = rsnd_scu, - .scu_info_nr = ARRAY_SIZE(rsnd_scu), + .src_info = rsnd_src, + .src_info_nr = ARRAY_SIZE(rsnd_src), + .dai_info = &rsnd_dai, + .dai_info_nr = 1, }; static struct asoc_simple_card_info rsnd_card_info = {