Message ID | 87fuxr4s06.wl%kuninori.morimoto.gx@renesas.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 72154e50728e8a08940332db20884b63dfa6590d |
Headers | show
Return-Path: <alsa-devel-bounces@alsa-project.org> 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9F3DFBEEE5 for <patchwork-alsa-devel@patchwork.kernel.org>; Thu, 21 Jan 2016 02:02:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CD404205DD for <patchwork-alsa-devel@patchwork.kernel.org>; Thu, 21 Jan 2016 02:02:58 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id AF515205DA for <patchwork-alsa-devel@patchwork.kernel.org>; Thu, 21 Jan 2016 02:02:57 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id DBCD2265E0C; Thu, 21 Jan 2016 03:02:51 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id EAF3D26148F; Thu, 21 Jan 2016 02:59:42 +0100 (CET) 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 CA9A0261492; Thu, 21 Jan 2016 02:59:41 +0100 (CET) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id 6BAA526148F for <alsa-devel@alsa-project.org>; Thu, 21 Jan 2016 02:57:40 +0100 (CET) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie3.idc.renesas.com with ESMTP; 21 Jan 2016 10:57:39 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 1C1FA4328A; Thu, 21 Jan 2016 10:57:39 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id F14F81806F; Thu, 21 Jan 2016 10:57:38 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id EC70C1800A; Thu, 21 Jan 2016 10:57:38 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac3.idc.renesas.com with ESMTP id LAF22563; Thu, 21 Jan 2016 10:57:38 +0900 X-IronPort-AV: E=Sophos;i="5.22,323,1449500400"; d="scan'";a="203941223" Received: from mail-hk2apc01lp0215.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.215]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 21 Jan 2016 10:57:38 +0900 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by HKXPR06MB1016.apcprd06.prod.outlook.com (10.161.181.156) with Microsoft SMTP Server (TLS) id 15.1.365.19; Thu, 21 Jan 2016 01:57:37 +0000 Message-ID: <87fuxr4s06.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown <broonie@kernel.org> In-Reply-To: <87r3hb4s53.wl%kuninori.morimoto.gx@renesas.com> References: <87r3hb4s53.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Thu, 21 Jan 2016 01:57:37 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: KAWPR01CA0005.jpnprd01.prod.outlook.com (25.161.24.15) To HKXPR06MB1016.apcprd06.prod.outlook.com (25.161.181.156) X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB1016; 2:N20VihiVhfeE7TSC6Sn+T6K9/7++wi+6Wk+fcZzlGNWSDXcjxxaCi3RW0t93lqyZz5Knzl1aFiULU4WL/MWkSkEIGYK4sTP87gEgj3lXzBDBGrPhl+r39WQ6CxQL1iI/MbO9HMcse8ahqJzpJJSyQg==; 3:PCMxoZplq3LsGrrbPTtWxtVzxKrmIDWMMThEPByKETLAc/EPxktMmMHPn+GDkZMatM8W9PY6DeEqnKtxY6Qd0amBUoAsQp3l4ac4iZiCr4AaInAqzqFFiQ4V+EymLqKH; 25:/0MPSYkCQD+jm0N/XbfTv+mGVaVFmgY+I8hG0Zr8HhSSUcfIoRE29pGWGei1Az7V4AyaxGPGdwNCpjcvvKugILwlk8LGJK416XUUEr4joT9LTmuJ40UZQDPBfnaLhi1szNJ0S0O6Km7u3U1dcl7puTptmEq7l536tzv3WKwhWLTPd+F8IAB5jfrSG5Ob0vDPzr4xVktL9bsOhtNv1cvqU3sFV0LQlGN419iWiAxE67xgiChAF9r2V/uZBUsuArFy X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HKXPR06MB1016; X-MS-Office365-Filtering-Correlation-Id: a261c3e3-40bc-4845-4135-08d322063cf4 X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB1016; 20:G92smkimjWgORI91MxXSl1blMXgpaEdffp88+EEL386DJCVi57beVxioOosGPYQkkku4GrSjjZ9b1dhvWlczkOuxAiXOinYGCm9O5bwm8+ZTBVuscmPKwhWeBSVYVqGg7itvA3dTS/nuTgF/NQkFK7fw/RmmF+bR0fWP1L6tblJlaR5oMQyvaClleEUzlO1gJHgkJ47B75aLIqcgdQtFGK6Thy+IsF2KcXOkJaylR84Zb/43t4fOotVcurSMGje5h+hK16BBcD53Hi4ukhscR+oBeLpOb3vdI6shdomxE5JLA+Jxa8H7/ExPKZuFcsjdZ0X7cSt6NslZIjIzhbHPq3+ee8QK6OWBoKhhdrfLAzlpA0xHHmKjvhdqE1Su4yD/mTZH7PlRHlnjqEvTNnkEE9MQ7TsJCcnxMc0EijaB6T7q9uvWYuDpsA/gTrD8ZJHyV9EAaWbGmYs8DbiUxCxZtulb4FcCK1dfv6LyqI2qCN6b7YLVKoFlwBIsRDjLHcRm; 4:0rASsWqePOvEJh8/Oovf4OGTCMAdCUTGOaNEqlhUMNqy/jhXhznR4idXa8A2Ov2hOBA52bqmzMQuNBuanBInQIpSMbOZfEOdGmHdsWfTMSIW+HdDFm7EiS+dKEqDgsv9UCdxiEjYG1co9LdTJDC7ViP5VeR3TJ57OU7zBZSJ90bhtTsjNgKaOYfgnBsknKGRBIlLp+nYkB9dTh5QefGGj9ITQQ1pEEXroiGky4wZ35LtAkgScPlwxMXUhn5LveZB6NN1VDrWQsDwthhmzC+DWGWOVTiLRtNUPOo7VTpirNEfeqDMvyzc9GVyQd3/T2/i4FcaXkqdZ8CnNo72eTstPcvOfKdDASMErNZdRRBBftDm57xpNk8QIC4OczXQMv73zwNwgv220cdHzhtu92vKuZiIlDAZ2ezBzy3VKixxDcrU63l7/6+RURWZqzusT6uz X-Microsoft-Antispam-PRVS: <HKXPR06MB10165BBADC9B923F88502A16D4C30@HKXPR06MB1016.apcprd06.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(85106069007906); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(10201501046)(3002001); SRVR:HKXPR06MB1016; BCL:0; PCL:0; RULEID:; SRVR:HKXPR06MB1016; X-Forefront-PRVS: 08286A0BE2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(189002)(199003)(87976001)(101416001)(19580405001)(2906002)(19580395003)(47776003)(33646002)(76176999)(50986999)(69596002)(54356999)(83506001)(66066001)(189998001)(5001960100002)(229853001)(4001350100001)(110136002)(86362001)(81156007)(40100003)(5004730100002)(97736004)(5008740100001)(122386002)(586003)(3846002)(23726003)(1096002)(6116002)(2950100001)(4326007)(77096005)(53416004)(105586002)(42186005)(106356001)(46406003)(92566002)(50466002)(36756003)(181643002); DIR:OUT; SFP:1102; SCL:1; SRVR:HKXPR06MB1016; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HKXPR06MB1016; 23:ygzD2Ln1d0GGeqTBaU73BkiT6FRd+SAsYpm26PaSe?= =?us-ascii?Q?O55p28BDTlw8HzRPi1M/fBYRL6xdlCCsPowKh7j0V7NreTtjo8BfT4U3cZKQ?= =?us-ascii?Q?gaI0Efe3KO4oePw3SNoMaVnt27CYONSGhC9fZcxhgatIgauF2G5Cenx5w+ej?= =?us-ascii?Q?BNPmx6IdlNI3/2GVCDDnmbXB5DYjgO8ew1YUwJp4SAM4T8XMUl+DiR9BO3Y/?= =?us-ascii?Q?RmyH1H3ltYjNLrPnh+Tsfgh/UzZYEAUTS4UAKu2aThFEx0USfL9VBfVKH7b9?= =?us-ascii?Q?hSYuQ/O6VjXdQmxLiG3g5j7OReFz+wKA689xzTVCCJZfOwRj1vkqHTwqDbin?= =?us-ascii?Q?tlmINWbzo865HsJuirZnf3FQrSn/wLRHZ0xgCA0w+Vnip7S3JGexMEuOAp0R?= =?us-ascii?Q?xgd0ZgrpeCUWX0XR9gqTI2+VyfjgLqTC633OzQttrzI5PK0+KRlj+MfSr6xt?= =?us-ascii?Q?eh77P5U65mIu5+Gdam+li/prFA4NspNXRHz0Xfp3eW8/Oa3aR460f1GPpA0b?= =?us-ascii?Q?AtwVRStsfoSOXzdnEdAbFq5eipARUCkh/S/4ffRpnmk6yEhZKxrjYCKbufsD?= =?us-ascii?Q?YzjE9y9/3OWWlyhBZSFl4aTxEj/amjsB/aQCdLLwn527OYoEhmg/T2lyn8I7?= =?us-ascii?Q?/kZk++wGdsYCXtmAxXqqG2ijgXKcW7NVZlLHKVCgBidOpppF5260KtNSjg5U?= =?us-ascii?Q?l/Rr3IR9h4gEYDhk84xeiumpwscFqpug01oJGCW674f34CNqg/FARzcFlgvX?= =?us-ascii?Q?lpidt0+v7Cjh8ilPqHZs95rs5Fyz9e3SUYVIkwvusG33ViRY9RFvLWPXUG0I?= =?us-ascii?Q?xu6Cktv9D2DzDyLI0c6xz+CacZoS8hYTEZf28BhHBfVgMWoxON39cDz+L0jY?= =?us-ascii?Q?MBxXXzB7V6aME/J1srfxfTwvmPwbTZziRD2FqjUWyaRBCITfc+xUrIjv/B8f?= =?us-ascii?Q?p/vf7s0RFoUrRbep7e7XvCHif9DP4b401XkLTlJ/diuAWk/CVNlbL/XuJBuu?= =?us-ascii?Q?qgBL1nKFmlGXc+7zFObexnppJAJrDj8XkViJ9jpjZVeuwVV/prPJ1QAMtmcN?= =?us-ascii?Q?yEKEJXdAbf4vE6MseEO7ws+Obe98NzRKDKuDyuV7UUOvTvOG3O1CATKEwHQx?= =?us-ascii?Q?hRAk7mWIDmimU2lDGAQFbxOsqE9qhfriaghr8Zbw5py0B9JU7o+bw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB1016; 5:TGaCHVAjl1QKX7Em5QUjQiFiU0qLXjQknRULXjLwyTbTl3QzCmzTTPeJbvi0zddUJ4OO44RaU7YZSCVAVYKDCNgOaqfFqZ6zJDwkOAA2VBTN+zPwbVfWTq8xmVnyIv6IBKaa0uN5Mj2bdFtfRc3XNA==; 24:8rL/wziTp+R6NlDrgTwD5FnLY9jFzexPLLJGqc4NQX4Sl4nOnuEAYY350I8zebKmRVmys9iYQq0iclm31O9UcZJPY9s6ETqeLWAY4qQwVZk=; 20:lhIW04Z4fQY/H1BfiQO+Nqbck1Qicc5wi9pDB929mMu7j4N6Y/ruJUquGqLSmMBru1Z6dR0f1KXiCfRbcHNUBIkhe9xZZzLHwUIn/HwWzEaVVutyJrQpmxD2vZEJ+iVHCLvPEU03nHFtof9UmVNMmYCFq+GSmFR/3JBqRdwHfLw= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2016 01:57:37.3410 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HKXPR06MB1016 Cc: Linux-ALSA <alsa-devel@alsa-project.org>, Simon <horms@verge.net.au>, Liam Girdwood <lgirdwood@gmail.com> Subject: [alsa-devel] [PATCH 08/15] ASoC: rsnd: select each SRC correctly for CMD data path 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" <alsa-devel.alsa-project.org> List-Unsubscribe: <http://mailman.alsa-project.org/mailman/options/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel/> List-Post: <mailto:alsa-devel@alsa-project.org> List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/sound/soc/sh/rcar/cmd.c b/sound/soc/sh/rcar/cmd.c index e77e493..4b2d50d 100644 --- a/sound/soc/sh/rcar/cmd.c +++ b/sound/soc/sh/rcar/cmd.c @@ -29,7 +29,6 @@ static int rsnd_cmd_init(struct rsnd_mod *mod, { struct rsnd_mod *dvc = rsnd_io_to_mod_dvc(io); struct rsnd_mod *mix = rsnd_io_to_mod_mix(io); - struct rsnd_mod *src = rsnd_io_to_mod_src(io); struct device *dev = rsnd_priv_to_dev(priv); u32 data; @@ -38,6 +37,7 @@ static int rsnd_cmd_init(struct rsnd_mod *mod, if (mix) { struct rsnd_dai *rdai; + struct rsnd_mod *src; struct rsnd_dai_stream *tio; int i; u32 path[] = { @@ -57,15 +57,19 @@ static int rsnd_cmd_init(struct rsnd_mod *mod, data = 0; for_each_rsnd_dai(rdai, priv, i) { tio = &rdai->playback; + src = rsnd_io_to_mod_src(tio); if (mix == rsnd_io_to_mod_mix(tio)) data |= path[rsnd_mod_id(src)]; tio = &rdai->capture; + src = rsnd_io_to_mod_src(tio); if (mix == rsnd_io_to_mod_mix(tio)) data |= path[rsnd_mod_id(src)]; } } else { + struct rsnd_mod *src = rsnd_io_to_mod_src(io); + u32 path[] = { [0] = 0x30000, [1] = 0x30001,