From patchwork Thu Feb 18 08:18:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 8347191 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 733249F38B for ; Thu, 18 Feb 2016 08:18:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D10B020384 for ; Thu, 18 Feb 2016 08:18:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9F42F20386 for ; Thu, 18 Feb 2016 08:18:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1425114AbcBRISU (ORCPT ); Thu, 18 Feb 2016 03:18:20 -0500 Received: from relmlor4.renesas.com ([210.160.252.174]:60077 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1424633AbcBRIST (ORCPT ); Thu, 18 Feb 2016 03:18:19 -0500 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie3.idc.renesas.com with ESMTP; 18 Feb 2016 17:18:18 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 657A748E5D; Thu, 18 Feb 2016 17:18:18 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 579B8480A4; Thu, 18 Feb 2016 17:18:18 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 5167A480A3; Thu, 18 Feb 2016 17:18:18 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac4.idc.renesas.com with ESMTP id TAC24353; Thu, 18 Feb 2016 17:18:18 +0900 X-IronPort-AV: E=Sophos;i="5.22,464,1449500400"; d="scan'";a="204626272" Received: from mail-hk2apc01lp0208.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.208]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 18 Feb 2016 17:18:17 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=QJiM5OVStoFn+vupfkB2axLCc74wLa5SNzSefQDNe40=; b=bBvnBGwDpe+uSFybyso35w1BHnXv/+ZnNXe++n994SJFqHgjdMOXnCXQh/PsIgB0H7mb0mgKBEdCH97rxlHtCmdOYrjWryxL5sIAWmhNs+ILnoz4VC81JqlGh/nQwsMrLvEQWVlJHJkdvpbWcZ63U5+nwAPfbLKreku0BcMp67w= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; kernel.org; dmarc=none action=none header.from=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.409.15; Thu, 18 Feb 2016 08:18:16 +0000 Message-ID: <87fuwqtoz8.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 09/11] ASoC: rsnd: move rsnd_ssi_irq() position User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown CC: Linux-ALSA , Liam Girdwood , Simon , In-Reply-To: <87si0qtp8x.wl%kuninori.morimoto.gx@renesas.com> References: <87si0qtp8x.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Thu, 18 Feb 2016 08:18:16 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0013.jpnprd01.prod.outlook.com (25.161.131.151) To HKXPR06MB1016.apcprd06.prod.outlook.com (25.161.181.156) X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB1016; 2:A2TCddQvv1xqHX41Wv1TGDuNpgSer0UyrEmOWRKog6/bFvvhigFEMziZSuY2bGt/04V0cWqwfrLjdmdnjYcpXBLlLt8GSm08PtwEoxX/1Ze485dJjBX5oTf1MgaXwA59OFxkIZClDDKJoOAIxC+y4g==; 3:cLNEal4E4UzshZqB+VKv7X1Xkh9V5H71TJBcXBXMglHJpWmPB5u5Cv2l7BOuvnsw/BFdeFQfy6sw0UMsFK6rB2fLkgZpO0yFF7kvPsUHhw7C/kBc78G8zhFUPy8qTbew; 25:OCVqlzK1XLhu80Zt2ZvIdgIiA2VrlPwAsoqolVoGU8TijxYhWYXBJKHhcX1aJcH1eRjeV58ly6t7aidpAxiJn5ysQIR2h7w9NrCr5nMspdYHkYTzFF2TMxlQUUPruyJGYnoAxIuH4v6zxC57mxaDEK4IVbaBBi4tbOXoaV5XoqNSI/fdQ44pZEZcB3P0dZTsScAXiAT2q0pBdcxUaf4kZ5PKMocu5qV2aYxmEkhNL0ahq8UVLFzjR0cWp8JPn1h7b58DEwgapvSl0cAZFc4LjKUeTeVlkFW9sD5VPFKHepjUf4opWnU6ANLksaQX20dD X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HKXPR06MB1016; X-MS-Office365-Filtering-Correlation-Id: 0030b6e5-ee77-4ab0-fb7c-08d3383c0daf X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB1016; 20:a8RlSNo5DL2RlPz6NDnEXiubENhYiJNTSXE8jk1y5uH4HeJYSux0eGPeZknphYG5KtcJ/XltzJ/3Ak6kgUflEMK9jz3PyPtXSdrokm73QrczPvkEVZdJh3PKjRlv9zuKIkR3E5Mc9sPqZxM7xWxO+4PK3Kto2jzP+Nrcr5Of5ARuAK5G5XpN4DzSqbyHrJhC0GJFhpxClzrakKr9nUCdhPY0Hv1jPhCqgSw6bjQmtL4eXezjjYRi7j/x7p5dR04diXcQmJUBVuGic+gAA0CHKScXrNDhZFgsVqNMpazaesZcaTinrv65hjUaPMdVCR7pMnSLYjqpE/aFlkfRu4Qw1bzRWSGRqQB07kYSAhFqUmMCEXXuW3P4q2FHj5GZpfTZcaV0LbEN0G3tyt8LyCsy6sebGUmRhkTovJXJvj4qS8CMOV+u8iHBcgsLpohKUhkGLftxs04tW5QIfzxXvBKtVtVpjqnbZIc5aRkwbILvnIASU4e59D/WAIi0Q9LQs/tt; 4:FQ8AKTNUBqLqi17+cW3gFJLr63oWHlySYOSBo6VMYyuxaqInUilqHy9ya7aaLmuYbYLjiezFKE2DypTvui+Hn/N4gsZFQmFcDbmEKkhd2YDamHlwuuqFyeo6j6a7a1qFhTHC+xsqcHHwLGKq7WqLvu1+m6H5jZ153xT3RB53x8cyvnWQ6orJoPONvaRBmIPVabcL5OPg92HEJaVj5sgwjKMbmW7CVmSMV+9ZkGDndu/NAIgyZXxj6cNh6e6/ZzEZVAEH5ttDl6mL3vTfGMHnvdSKoZQREFF+MUnLzCcA9IfmMVv5JfMAJuo6ENBvXO+OSb0JPH4yEBqkhXIKcAWcAPQPdzWJ+X/5CODrQn1jRWOV5Z9xTb2PGOf9B5mOw21P X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001); SRVR:HKXPR06MB1016; BCL:0; PCL:0; RULEID:; SRVR:HKXPR06MB1016; X-Forefront-PRVS: 085634EFF4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(53416004)(47776003)(229853001)(110136002)(5001960100002)(42186005)(77096005)(50986999)(189998001)(76176999)(50466002)(19580395003)(4001350100001)(19580405001)(122386002)(46406003)(83506001)(3846002)(2950100001)(586003)(87976001)(23726003)(1096002)(86362001)(5004730100002)(575784001)(5008740100001)(92566002)(2906002)(36756003)(40100003)(33646002)(4326007); DIR:OUT; SFP:1102; SCL:1; SRVR:HKXPR06MB1016; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HKXPR06MB1016; 23:in1OVBwLVKUTloiIL+n9uSsCbxOyRenriT6XUc9+R?= =?us-ascii?Q?kn7c0FVWK6q7RVaDLXk9CBfr/UjAvmOtHySuKN6yDgTQXMcPmI61nvqHqCHN?= =?us-ascii?Q?MojSwBdcIlFjyfc9fMOPM93e+FQXdZokM35wBcNuhlrMUTKvwq/wUqraKjGT?= =?us-ascii?Q?66jLdWVPgTUC5kC3eW6xRDHzEmQ1qIl7iosh0W4hKAu5TTekKO2QiAmOaaXv?= =?us-ascii?Q?xTKuWToezysHo4D15mzwTbtS7iM5P+Xl7Xp+HkWBg96u/pJuf9NQnLjqucQq?= =?us-ascii?Q?SX1VeBT5cHcHrgLP2nuidQb3gFq82JwwPd4bgK9lkle0JigDzQoBsQnPoQWk?= =?us-ascii?Q?1sJ0YG34ZsWR0qmof/DRE10wevVXrQzWsZp8mbkel0bTEoc3zF/t1j9cm3I8?= =?us-ascii?Q?L1nN1KL+4TiPPq0Z1NRrCpV8hcCJIOICPv++xkULH4mBilTyAZlAdvuwvzYD?= =?us-ascii?Q?M4L1qvH1JMQKdHHskjl4wiERA5FNj4vJGqpmY9ZW9FUPqa+CSWNcMGzuZqQX?= =?us-ascii?Q?tuFCovdJgnrOuWXZi3PK7ikbR639CO1RZqkfq+KRbCoePYb0Yi7PRqxYbS+V?= =?us-ascii?Q?/yW8n6Ir5niuTO1l28aiMhKad/DCDpRtTucx6WlH4QL5hYO2ErK2JlNt76NW?= =?us-ascii?Q?+JH+qSBvqx/cCYcgWdxxT2GgqrtiFixK6WY6ZCZQ2GucvB/jYjjQ2PQXjCrw?= =?us-ascii?Q?dg0GTSQyTolYxqTPyTC0MhcYnkiiOL06/d34MlwNeAfMdp+dNXmpUdXngnaL?= =?us-ascii?Q?S45+tYyBMaQpQF5D6dvrwoYE4kpBweXpu92T8+YMJbn2wg45vASPHmAvJHs1?= =?us-ascii?Q?0GJ3RtEVhMJpsLI2gZoCmh5eU9CpDeuKEn6YQPUUsbzB6Mjve9DxW6Ouiet+?= =?us-ascii?Q?IfMGBHFUcMQuU0vE+oPOxPDH3ZlPFcEUOnBgkglqthPn8S8OpzswciJhpE0d?= =?us-ascii?Q?3ARxzpvYfsTr60IZ2IF42dmeG30+9/fstZ6zz5m2Q=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB1016; 5:Q3lfMshD8rYkojw9uCJnxcuOFW+mzK39SGyo0f4/5hI9/GeJDkfktA5JbDjNQEpBuoSgSZI1ZRxay9Vco7W0EHdeNKS2/SgoxjVFvB1167E7pngtskJB9g5EMFSWt/KHGFJ4ScY+3nRZ6mFEuxK4RQ==; 24:L6oZdc4C6Sh7P6DmfqPNSogvKq3/6Za/BiKtQUcWxe8FmH8Zchm+Z+kOrMZC3EQpdOVWGo9i4rtqsWVdyllrdqOB8/r3awXS1qxnrQfrI8c=; 20:iKRTQqmVQUCSr51RKla8WCiLzq/618YRfqvEx6NOi8fMl0xLpS3m79gMzBw99EuJxDdvaWYM0Jqkl3YZ+cZGywAser0citKwV0lGcAbQDrVSiA1pyUPOxdBDASqbVQNlrr8i3rellNX7gX1EnMu3jrVEZMH13VKMmRugm8Xx3M0= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2016 08:18:16.3827 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HKXPR06MB1016 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 From: Kuninori Morimoto prepare for runtime judging for SSI work Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/ssi.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index b5c6f0c..d46bc08 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -144,27 +144,6 @@ static void rsnd_ssi_status_check(struct rsnd_mod *mod, rsnd_mod_name(mod), rsnd_mod_id(mod)); } -static int rsnd_ssi_irq(struct rsnd_mod *mod, - struct rsnd_dai_stream *io, - struct rsnd_priv *priv, - int enable) -{ - u32 val = 0; - - if (rsnd_is_gen1(priv)) - return 0; - - if (rsnd_ssi_is_parent(mod, io)) - return 0; - - if (enable) - val = rsnd_ssi_is_dma_mode(mod) ? 0x0e000000 : 0x0f000000; - - rsnd_mod_write(mod, SSI_INT_ENABLE, val); - - return 0; -} - u32 rsnd_ssi_multi_slaves(struct rsnd_dai_stream *io) { struct rsnd_mod *mod; @@ -480,6 +459,27 @@ static int rsnd_ssi_stop(struct rsnd_mod *mod, return 0; } +static int rsnd_ssi_irq(struct rsnd_mod *mod, + struct rsnd_dai_stream *io, + struct rsnd_priv *priv, + int enable) +{ + u32 val = 0; + + if (rsnd_is_gen1(priv)) + return 0; + + if (rsnd_ssi_is_parent(mod, io)) + return 0; + + if (enable) + val = rsnd_ssi_is_dma_mode(mod) ? 0x0e000000 : 0x0f000000; + + rsnd_mod_write(mod, SSI_INT_ENABLE, val); + + return 0; +} + static void __rsnd_ssi_interrupt(struct rsnd_mod *mod, struct rsnd_dai_stream *io) {