From patchwork Wed Jul 15 07:09:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 6793621 Return-Path: X-Original-To: patchwork-alsa-devel@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 3DA1F9F380 for ; Wed, 15 Jul 2015 07:13:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6BA9D205E2 for ; Wed, 15 Jul 2015 07:13:01 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 3296D204E0 for ; Wed, 15 Jul 2015 07:13:00 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 3C35B2658B7; Wed, 15 Jul 2015 09:12:59 +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.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 12654265894; Wed, 15 Jul 2015 09:11:13 +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 E1593265894; Wed, 15 Jul 2015 09:11:09 +0200 (CEST) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id 8F5252658A3 for ; Wed, 15 Jul 2015 09:09:51 +0200 (CEST) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie1.idc.renesas.com with ESMTP; 15 Jul 2015 16:09:49 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id EA25546206; Wed, 15 Jul 2015 16:09:49 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id E83B22806D; Wed, 15 Jul 2015 16:09:49 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id E3A5D2806F; Wed, 15 Jul 2015 16:09:49 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id SAC24090; Wed, 15 Jul 2015 16:09:49 +0900 X-IronPort-AV: E=Sophos;i="5.15,477,1432566000"; d="scan'";a="191575486" Received: from mail-pu1apc01lp0018.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.18]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 15 Jul 2015 16:09:49 +0900 Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; Received: from morimoto-PC.renesas.com (211.11.155.144) by HK2PR06MB0594.apcprd06.prod.outlook.com (10.161.187.145) with Microsoft SMTP Server (TLS) id 15.1.213.14; Wed, 15 Jul 2015 07:09:47 +0000 Message-ID: <87380px5kl.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown In-Reply-To: <87d1ztx5pb.wl%kuninori.morimoto.gx@renesas.com> References: <87d1ztx5pb.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Wed, 15 Jul 2015 07:09:47 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR06CA0037.apcprd06.prod.outlook.com (25.164.91.47) To HK2PR06MB0594.apcprd06.prod.outlook.com (25.161.187.145) X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0594; 2:2wODnQbibyJ/8vo1jQy9dyRnbfy3Dwe9400fB7q4ZIxapWDzm9ZLqbxJu7cIfZy0; 3:WDKM+QShqoK337nfX0nbfb6/2dO3gE4/jaE/rGxWK78B/taODG+oRvnM8CTliu7ni5p0e1hnmCh/38Z2jgDZIDpM9SsH9mwiupFyRQy2khJ+NWFdLmckIMZV7tbJbXYnFx6JNtizXF2DCVISqGM9YA==; 25:ZqQf+zwzAZPEWjKtDkDZ4bRYlEPv2XIJ+goEBSkbKUtdVLs/MGXcpLf/QBP5hv5YExOz4JRCrMdlIJcNn4ctFFuL0w1vd7K/yniUCj4kggHutWs34k2aDm63MjEvdGBky0gykOckicSJ+JreWVIp7vIkokuy9QBSHB3lI/AxPKBnH6/aQU63LNGbRTxhRL23diIw8ZmFAWI4q8Wly2nYWWVh4Cc3PvlGgHGzvyqHXKPfqqjhlSe30GwvXQHDNib7DJr3OECRHDvlzcOBZFhbaA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR06MB0594; X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0594; 20:XbwXZUmFtlM2B9j8MZTRXscqWKPi1hNWOckvZguwa/NRmdjw2VDW/Ng5UXKN6FpA+BaV1xo72+EWs4TYPGqEtZzOhRqawzu6YwFbsaRV3U7BXvH04XLpXR3W7SYTnO14EEgIkwbiMQMKqFLeKEIV2qTOHhV9IgMiYr+dMwMu19JPvpY810PCYtHqOvpoc1q4TMV/5VCU9rEVi8eQs41xp8MEliAnlRdFPjm2GlkUeXJpI1w+SO2pGHZjyicS7x9h551JPl1WIsHT6A1skc6SRHWx2rKlBDQpoiVi073sCOQrGftEOntrUN0m6Wwd0b0pZeT6DSdA4i+CT6Eocw78+6Rz8LZN2cbWdoK5YftZTjAEOMqSSNwHx44ZhKQLHMgHSs6iINyUfrlju5DBv+SmnSiEhaB0KyR98tHCHgxjfLj1JZnU4++qdV+wXiDIWK9pbh3UVonR1e+cROMMgK+YYPKsgoEWn5ym3P4LQrSeQNNo3FGyvGHImErK+5nt6Kna; 4:HTtbTvSSIIOr3d37yjmJ4tZsBYN+0Ut6aYWX6l++9oY3CONSVpfe6q1h7tmQgXmi7ZkWNYDt2FvAOwRXGJ/sRRPJ6UiV08NI3fX6JDxgrvsfso5FRIn2h5v6Kt27BZyM1IMBaTlOq9eeLvP99i/wfll4K4RyrMf2sM6o4VZUjAS5mq90uP+nBV66ak7BDDCRN7MKJgB/UHc7DUtKsaBwufSbdU5ryWaLObPZeuquWJasbbfI4+D6J9o92QpyNc53l928ExTGUTo9fi3n5HtFTXNtI5IAHWky0yFK/l7mlu8= HK2PR06MB0594: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:HK2PR06MB0594; BCL:0; PCL:0; RULEID:; SRVR:HK2PR06MB0594; X-Forefront-PRVS: 0638FD5066 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(19580405001)(5001960100002)(4001350100001)(87976001)(92566002)(19580395003)(53416004)(2950100001)(50466002)(575784001)(42186005)(86362001)(110136002)(107886002)(83506001)(50986999)(46406003)(76176999)(23726002)(54356999)(46102003)(77096005)(36756003)(62966003)(33646002)(229853001)(47776003)(40100003)(77156002)(189998001)(66066001)(122386002)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR06MB0594; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:; X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0594; 23:qaxdljxpQz62hOhGZrMSfneFSzLB0OsYB+5uHKEBAcfyQ1I3l452/XZLKkaiQpByW8DJZRBCaZp3jtPQIi3yRSh3yiBGCjSNKpy18WXWzAIjO/9fRCtfRHQJqoYrKVdRCBvIxhlGXbYEnDLJIRuBUcDGfRf+SBgo2sSNIk2MZh9aqA8yS3hhxGDe7fYiR/d4zTy2J91cOkxdWYy3sH+rbkQaGSKBUFHwhUw2/Qa+9ugFd875YymJA6pF/wZ0Y6YL+wC9qXDxrSc7bxEdkHiwaXlaAIFWpjuhBMk05SqQGN3OByUEkXd/k68giFP+Wzg9BKf8mGyr7qJdiLx7q9juqeffxlQeS63UX0MwLAsFt2o8I89ma/VA8fnelp1QToE4g0hH9GS55OxO0LA3GMpe5l5UCB4e3OErpLFXMNvcI7dvtvxcVqVwZv9T+kxAx6TPWswhfTvMJ1MbN0XfqesrTCkYnekWPPM+6KlySqklCKIDi1x1g+vMTFa7jKLjl5qXtpI3jA6Qi3Tn7rBai+CI4KWEy/LLtH0Rq6NK0qJNVrFcE2S9v3W27p+wo7UMlaSNBPadPTpmiRqsgUiHfvHeVC5hwVYa0T+0c4De6ed2MKw2GDWdj5AoBPN0Vd0e5hZlEIFALcSIFH8C0LTakZRl8JZZtYaj9UppumXtoVgNpodBMGPGJZUeILe0KV2c+q7f1aUqlVjrEjjJRwAwXvfgjt/iMXlVd2gnNN6rlK04zV9VxURS2BGB9vyfpN9cF3kbun1/8NKhhGZXoNHPwlGc7EhT4vFzOtHQSNWwrkgxQZTKviPlN4cadThEpIPuEhq2b8WDcCNAAcnDJ9qarPdOw3x9kyHBsFG+qh/tqmo2ntDxNueL/PSqw/GIxRO35ca+gfxKi5/t07xHkQmojMF2oeZtgx2ympK3f292Rtyf0yI= X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0594; 5:RehqKE0yypHW8hQz0eS8tLtMG3xg2GZzFAb5uVRp17r07Ofrsngb2DYO0km6+ZtgG92NRN5i+FHjlg66jXSCi+6I36mSoKvJpzfeAb98b8Z3SgZMhx0Z9Yefvm2MvMYr5BRZMz6HeIV5AMYecpdh7A==; 24:tftGvL0iwf5jY+RYvj/BGbBUfzP2eGgXQ1s19kBuHRI/lXdevaLbgdEnt86P+SXMbVK0K7Tz/RK5+8IN7xQWIcqE+hcDvpu4SkSAc63Otj4=; 20:seQJAJpNMfPY1FcWO60ja4BaqxpPAh3snkspB0b2PLcNUOmywq7mmOuI4aedA5KRny3EB+XBG27+JdofJtPtYfqr3mJQPUDzUl+HrqcZdtXQm/JH9sgBQuzUeSsZjPHqx4HXUK4CAAIaCZ9C4kyDnS4tfr10JL5OnZ2vLRPj0lU= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jul 2015 07:09:47.2747 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR06MB0594 Cc: Linux-ALSA , shiiba , Liam Girdwood , komatsu , kobayashi , Simon Subject: [alsa-devel] [PATCH 07/35] ASoC: rsnd: rename INT_ENABLE to SSI_INT_ENABLE 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 based on datasheet Signed-off-by: Kuninori Morimoto Tested-by: Keita Kobayashi --- sound/soc/sh/rcar/gen.c | 2 +- sound/soc/sh/rcar/rsnd.h | 2 +- sound/soc/sh/rcar/src.c | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c index 9dc1968..5d3592df 100644 --- a/sound/soc/sh/rcar/gen.c +++ b/sound/soc/sh/rcar/gen.c @@ -218,7 +218,7 @@ static int rsnd_gen2_probe(struct platform_device *pdev, RSND_GEN_M_REG(SSI_BUSIF_ADINR, 0x4, 0x80), RSND_GEN_M_REG(SSI_BUSIF_DALIGN,0x8, 0x80), RSND_GEN_M_REG(SSI_CTRL, 0x10, 0x80), - RSND_GEN_M_REG(INT_ENABLE, 0x18, 0x80), + RSND_GEN_M_REG(SSI_INT_ENABLE, 0x18, 0x80), }; struct rsnd_regmap_field_conf conf_scu[] = { RSND_GEN_M_REG(SRC_BUSIF_MODE, 0x0, 0x20), diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index f49b0cb..9ecd151 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -119,7 +119,7 @@ enum rsnd_reg { #define RSND_REG_SSI_CTRL RSND_REG_SHARE02 #define RSND_REG_SSI_BUSIF_MODE RSND_REG_SHARE03 #define RSND_REG_SSI_BUSIF_ADINR RSND_REG_SHARE04 -#define RSND_REG_INT_ENABLE RSND_REG_SHARE05 +#define RSND_REG_SSI_INT_ENABLE RSND_REG_SHARE05 #define RSND_REG_SRC_BSDSR RSND_REG_SHARE06 #define RSND_REG_SRC_BSISR RSND_REG_SHARE07 #define RSND_REG_DIV_EN RSND_REG_SHARE08 diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c index 3f6f4df..9e11f73 100644 --- a/sound/soc/sh/rcar/src.c +++ b/sound/soc/sh/rcar/src.c @@ -215,10 +215,9 @@ int rsnd_src_ssi_irq_enable(struct rsnd_mod *ssi_mod) return 0; /* enable SSI interrupt if Gen2 */ - if (rsnd_ssi_is_dma_mode(ssi_mod)) - rsnd_mod_write(ssi_mod, INT_ENABLE, 0x0e000000); - else - rsnd_mod_write(ssi_mod, INT_ENABLE, 0x0f000000); + rsnd_mod_write(ssi_mod, SSI_INT_ENABLE, + rsnd_ssi_is_dma_mode(ssi_mod) ? + 0x0e000000 : 0x0f000000); return 0; } @@ -231,7 +230,7 @@ int rsnd_src_ssi_irq_disable(struct rsnd_mod *ssi_mod) return 0; /* disable SSI interrupt if Gen2 */ - rsnd_mod_write(ssi_mod, INT_ENABLE, 0x00000000); + rsnd_mod_write(ssi_mod, SSI_INT_ENABLE, 0x00000000); return 0; }