From patchwork Wed Jul 15 07:09:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 6793611 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EEF04C05AC for ; Wed, 15 Jul 2015 07:12:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2246C204EB for ; Wed, 15 Jul 2015 07:12:06 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id DD75620519 for ; Wed, 15 Jul 2015 07:12:04 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 1321C265963; Wed, 15 Jul 2015 09:12:03 +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 A1CE5265824; Wed, 15 Jul 2015 09:10:23 +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 4CD40265824; Wed, 15 Jul 2015 09:10:22 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 9F75126585C for ; Wed, 15 Jul 2015 09:09:31 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 15 Jul 2015 16:09:30 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 2617E50A23; Wed, 15 Jul 2015 16:09:30 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 221BD8002D; Wed, 15 Jul 2015 16:09:30 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 2188680030; Wed, 15 Jul 2015 16:09:30 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac1.idc.renesas.com with ESMTP id SAG16147; Wed, 15 Jul 2015 16:09:30 +0900 X-IronPort-AV: E=Sophos;i="5.15,477,1432566000"; d="scan'";a="191575429" 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:29 +0900 Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; Received: from morimoto-PC.renesas.com (211.11.155.144) by SIXPR06MB0605.apcprd06.prod.outlook.com (10.160.237.147) with Microsoft SMTP Server (TLS) id 15.1.219.17; Wed, 15 Jul 2015 07:09:27 +0000 Message-ID: <874ml5x5l5.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:27 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0040.jpnprd01.prod.outlook.com (25.164.162.150) To SIXPR06MB0605.apcprd06.prod.outlook.com (25.160.237.147) X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0605; 2:ZIitrrMkxrFUF4HyD0RWml5J61+NQEZRnXV8HTddweLZQ83PRk269tw3/TuWgjPS; 3:fOB5BxXj2wrEFItmbajKGaJoACR3LbZAl7SZ2gcJEjF4AGcoYqd9fSKRcSGxVoffSfDZkmWmq/Fo8RiOdctjgDnwoEwDpBRjtEPx277JHc+tTx884l49xVI/6tTf+ctw6O5ndFB46FD//JZlwjdGsg==; 25:qv9n5cuOrHXYHt75qYOjKWHShaRkqkpiZNq6ZxLjOaFWYqeRYhdvunlXDG1bnApVWZY9o1hlj4DYNImH66Ozml6ZOxMgWUafOfFmGb3bT182ELfO5fYdU5VktSdroTaAPU7WRkYWy278I2nq4NDPTSB71+XsqFNSqDIP3kL7if7VEWlllhyI0OaeMJIWnZSI+EjDe8g4KnQz+5WNntbq9abMaxSCi+rG2ZCkKN3CXu9ml0ZjgHHfGd+MF8A0414J X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SIXPR06MB0605; X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0605; 20:zydaxI4dtIE5YA4xWrm+4buHQGlIWGiOEILLtWRu8VVL9L1gpH9tsst7wsb03F4YDkZRzV8kpc2LE6tFMjWoMCLBtZJXaMqTWoVFHoVEkdDZ4pawjkbtuHlOZutI0gAP0D+RowhVmfiufFsEzkiVulZJhSZaK36z4tMwD3HS9VZ8E0BqfV8hRLf04vdKY4/EgoeXyoSGaX47sV0OfdO8+dArvVmdxvKkN4sX5yoZLbngsUH2hqoNIx4t/JzAmLQfwGxRqYidambJG9Z8MOPwo1kyOSzF6TlMp4lLYy8WgIHphu3SzLHZ4i57nhM2d7TuBj4QmfXIMbqqpnYVrAYDLKAUMuEuic7KuLKUygTD0THrARVI6xMGf59Na31ogM45jVuXJPhcvO/oq2mq/HQWEvyr1ci2Rrc4soniMTP3Bu200JkQHfTZeVPxheJ6fNVPzeIeKaUDcKnTbBQlP/REdBh16IQof0HlbvrMg2ITJYyg+4X44A4qgYJN+jCF1fgo; 4:lVPeHyZtilFln5eAnwFSG1lEfCizhXlvsYI5PLkFIdN+r5RgJjQib02u57JJluTOm9ZWlJMBYqGnL3Si1gDS/sDbuvL9e6HX4l2hwfC1DRhWkK+5wD40R0LlGGhYzJ08CArP3MRB9xuse0fMX6+5EjY9APAKUjlgU9zilUAE2cN+1LbR/gKi5MmuI96JBDWe4CZOWXZWbtmPBb3TtxDaNq1LFH/H37g1gHl8zl6DKvbGmlNGy1I4+1zUHnTAXm+WgkT+RP6Z/MXlSfa9FIR6N0EM4BjZMK6kiM5E5FYmP1g= SIXPR06MB0605: 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:SIXPR06MB0605; BCL:0; PCL:0; RULEID:; SRVR:SIXPR06MB0605; X-Forefront-PRVS: 0638FD5066 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(62966003)(229853001)(46102003)(40100003)(92566002)(122386002)(87976001)(23726002)(86362001)(575784001)(77156002)(83506001)(46406003)(66066001)(5001960100002)(189998001)(107886002)(110136002)(47776003)(76176999)(54356999)(19580395003)(19580405001)(50986999)(2950100001)(33646002)(42186005)(4001350100001)(53416004)(50466002)(36756003)(77096005)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:SIXPR06MB0605; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:; X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0605; 23:yVt9DMVAPLmy96FCCcYoXqY0ZCqeNs501F05KWMeTvnXU7PqisgRkz3t8/fdZJBTUxwWUGn75Q2erDqRSoXu/s4fRVIPgjdSVCfO7U5mjV38jc0XT7v5hG0ZvOCdFDq8uxBYqObnzD2/x747iJaWw+8DaRhLJsZqB2dC6Ctl6RtS1Zvgpjgjnlg4q2KjXH5GOqQt12M6MmcMknOeEL1LCjYBMc1jfQXXtDKSHgSsEOw4qME/QMGLiHf/fc9ar5jgLY9Yu0BEKJzHb3QmyctzNVQ86AMt3sNkE4jHvkpWWsrdhMI5rEcyctquI8UawQs6Xc9L75toqW7bn7ytAX06dVHqUo4geAKlRJjNo7Syg669tVCE/SASST6OrR5ajT1R+UwV+XHQ+D04UPQ5LYx1ggW8rXSSp+FnMjMcMFNxlZ7BRo/wnDRcaWaP1GjvJPIgs/+/oFQ26y5QP4EGLiqaQVWL2/tjFk8c0L+QYbk1bEnHa6WbHdkraSg/bBluyFqLYg1US33lHL175e5HgkCGrpsj+PTWnwSfoOacclNXuMKLogthuMuhEJ3XDm95gIlRX5hT8/Zz0gInTFwDxIRBveWA0hCZTGif5WeROKpSjdpzuFriOaSIjeu4N1cTg6nUR8DIGwr6mbOanzb0V9B3EQ+Jzqp/ZbzRV3n9W0cEmTyT+aH4BBHi49GZULR8GN9NtLvorAWFb8lEgN+2dRIDo3XgG3zSOqahJ500XtCcF6d0fwYh1hIK9MHvCnGLG/AUwxMs/e9pt9oaMiSFLpZd9vMrRTt1R/cYKXAX++wKCHoBvevFM0s1xQn+Th7Wm8PAVuFjdIew16fA2szIVvvJEYJvYFTHYC/kD0xNIPvH7xNadTTbgjRCpi2tLCxkuCyHiXc33D7pPuTmDtYIjl+WDjrpUpJqF+fXKvVBJAUKIGM= X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB0605; 5:i7EyiIC0VjTDPAd1Ox5yjPFpDKkUuXai0oQDXDTOZAVdEvL/1JIhycR2MJoDqUJbM8GDIPduuy67CGJ9BpoPAjrygevvCBIF6mAXDNlUvXnwnNicXTB0b+/1B+MXpHB8nmqKs7tl3iOKRBPQIkarXQ==; 24:9BKQ7XJeEBNcd/0SIwSGlQxOS6iU8/s1r+HRXySIOOAN+nsHB0E6nS0Pz/E8QRyKseaHzphKjH3xgvkDAXsKPP6l8VP4Uj1lP6COpcSuLg8=; 20:KwZbS1yg6DfnrFfCn1aNDPppOQIWg9/lZ5swUZlkKkveDAvg/NBnEemqKsmAiaa/hlr+8Ani3ocjqCIHovjfoskAaE2uwB7GI+8TBnM0lZ3e0E5FgEerTphB6lFsmv+UzYnPSIVrARCxIbuamOYGCRUFuFOIL5YuBygCcz3duS0= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jul 2015 07:09:27.1426 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SIXPR06MB0605 Cc: Linux-ALSA , shiiba , Liam Girdwood , komatsu , kobayashi , Simon Subject: [alsa-devel] [PATCH 06/35] ASoC: rsnd: rename BUSIF_DALIGN to SSI_BUSIF_DALIGN 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 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c index 48f704b..9dc1968 100644 --- a/sound/soc/sh/rcar/gen.c +++ b/sound/soc/sh/rcar/gen.c @@ -216,7 +216,7 @@ static int rsnd_gen2_probe(struct platform_device *pdev, /* FIXME: it needs SSI_MODE2/3 in the future */ RSND_GEN_M_REG(SSI_BUSIF_MODE, 0x0, 0x80), RSND_GEN_M_REG(SSI_BUSIF_ADINR, 0x4, 0x80), - RSND_GEN_M_REG(BUSIF_DALIGN, 0x8, 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), }; diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index f729646..f49b0cb 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -136,7 +136,7 @@ enum rsnd_reg { #define RSND_REG_AUDIO_CLK_SEL2 RSND_REG_SHARE19 #define RSND_REG_CMD_CTRL RSND_REG_SHARE20 #define RSND_REG_CMDOUT_TIMSEL RSND_REG_SHARE21 -#define RSND_REG_BUSIF_DALIGN RSND_REG_SHARE22 +#define RSND_REG_SSI_BUSIF_DALIGN RSND_REG_SHARE22 #define RSND_REG_DVC_VRCTR RSND_REG_SHARE23 #define RSND_REG_DVC_VRPDR RSND_REG_SHARE24 #define RSND_REG_DVC_VRDBR RSND_REG_SHARE25 diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c index 37927ca..3f6f4df 100644 --- a/sound/soc/sh/rcar/src.c +++ b/sound/soc/sh/rcar/src.c @@ -189,7 +189,7 @@ int rsnd_src_ssiu_start(struct rsnd_mod *ssi_mod, val |= 0x76543210 & ~mask; break; } - rsnd_mod_write(ssi_mod, BUSIF_DALIGN, val); + rsnd_mod_write(ssi_mod, SSI_BUSIF_DALIGN, val); }