From patchwork Wed Feb 10 02:46:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 8268281 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 034CF9F4DD for ; Wed, 10 Feb 2016 02:49:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1FE8E202B8 for ; Wed, 10 Feb 2016 02:49:56 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id E514D2026C for ; Wed, 10 Feb 2016 02:49:54 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 20AEF26574E; Wed, 10 Feb 2016 03:49:54 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.8 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 38A1C2616F3; Wed, 10 Feb 2016 03:47:48 +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 334132616F3; Wed, 10 Feb 2016 03:47:47 +0100 (CET) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id 0018826533D for ; Wed, 10 Feb 2016 03:46:44 +0100 (CET) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie3.idc.renesas.com with ESMTP; 10 Feb 2016 11:46:43 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id ABFCA4429D; Wed, 10 Feb 2016 11:46:43 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 94AE41806F; Wed, 10 Feb 2016 11:46:43 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 8B8401800A; Wed, 10 Feb 2016 11:46:43 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac3.idc.renesas.com with ESMTP id MAL28234; Wed, 10 Feb 2016 11:46:43 +0900 X-IronPort-AV: E=Sophos;i="5.22,424,1449500400"; d="scan'";a="205332128" Received: from mail-hk2apc01lp0216.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.216]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 10 Feb 2016 11:46:42 +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=8nuR1k7YlLTaYNKfYhBjZocRfkJm8EjtmZ3GnKbxNc0=; b=CFcOo9+jljk5ThKGRYIIZWCKc9zu/6cbj3lu/6dSkjmAUrZP1VZkBCUuWxIpQfNR5FLT13bP7N1Dw2HSgru/TuKNLfvwYhszS54N3foJTUCTXvyHy25wNfKPjQb3SFiSUzhFaDtR92VfXQsefILZZfC2pXcqV+Oy/5rCwUi3c/A= 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 SIXPR06MB1024.apcprd06.prod.outlook.com (10.160.242.28) with Microsoft SMTP Server (TLS) id 15.1.403.16; Wed, 10 Feb 2016 02:46:41 +0000 Message-ID: <87r3gls2u8.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown , Greg KH In-Reply-To: <871t8lthka.wl%kuninori.morimoto.gx@renesas.com> References: <871t8lthka.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Wed, 10 Feb 2016 02:46:41 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0034.jpnprd01.prod.outlook.com (25.164.162.144) To SIXPR06MB1024.apcprd06.prod.outlook.com (25.160.242.28) X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB1024; 2:783KcB7D1YUtknciO13NaQxc/InwLw5Hnx4yNjeMsT+dnAkzZbPYsMtMbija0YEKUZeFpOQ+Z6AhhthoWNzofzXVuwdN5rSSglq3o9z5twtt9NOHUIoEnPwEAuuFfvRlLNBCvzruJIWZaXc9f4/XhQ==; 3:Q8E+LaTlP378sr1UAI6aKJ1etfCA3DpDSFMvmxYaqQGBASbSS1Jr8CxVDCpOicL8GhkNQvFg3ILpDWScXGf0YBVHDQr9jco5e+mzEoyhPAqqooQ1U2s99NEeRKexJcUr; 25:iVu4GG5/gb6ehMZKiEM0H3fnk9/S5kJhezpVl1iogIW8ytHGyNX4CsPX6sJ+xg0ilYfRKR78lwWR1hA+JUQBQfQw8KxJNNXFeorqWA94rLF5kBUW0q95eFwNGNrvdfKSQyI3AWqZswGONXe5OAd1svACQ+FN8tzbNxxmzQBZ2kmwM9mWPahNNTXi7hH2uCrIf4Ql4a42B1/RWmHHUYq7HsAlxZuMpBxYfIuvh2xoSf7Y6S68qa3/PTKqhgPf8tBc0JZ4xwXdThwIJAj/QeRQh1vYybbrFoZqe+0Wuek/j2Hoh7tYpDHtkJHPIcHaaUjx X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SIXPR06MB1024; X-MS-Office365-Filtering-Correlation-Id: 243684b8-694e-449f-641a-08d331c4683c X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB1024; 20:d9v+yA86sDpZHuUA+2TBl/+dmRngUv2ITtT7yJ8dDy8wOMTpGZ8lsfYPO4cVrqp2RirZJXPFybA1OZxAWqTs88pHtv99MM/50y3+NEXOHzIJIQoYGa9OaNT3GVG1Pi9ijx1tff/GcD26TXK5hX+vlAVdwfyryjfQfga3EMSUdyg6IDVoP8yvDTVmsQuYo+m32c9wXqjxSZGnPDiJ13Lc8qI29ub88pmHXyVadB8blSZoIM9gnISgN1ZixxtWo1fkGcqFB4EGA8/vd+Ugm2TMGJOr5JiiD3pmrmBij0Oy7XqQNVajDQzrGZ0gdDPbMacNQwvz6z7XjQRcjRsvyv0giKHCCF9SlzMNlPvKCrkOgGzYVZtFa1Ww0tGRoKn36hSN/HcaIBbTKjYO6PooDa/oDMO1NoVJUK1N183ZDO6FIgTQstuIZgd9cPndg/OZFdk3fxoDwysDh/DlE0PCet1Q5tHKuLejNJYBM+9zt0LwiKRwWh+jCMck2BTM959qmYD5; 4:hixsGGJvDMlUpNQn5gzhfr/yUwvev2qzw8rktl7JBNKU1IlseP2ddEEUBvzjiQMmR9u05HRQGdO9ewKPDbI3pVizLPvdQWWEwR09Ca4OqS9F+I8tdBwZ81l3wDSFLLRGflOThS/9Ay5qWyF9CJZ3UA4+vM5pDQOGHHKgYWpBDLu0ShQZOEiF3R6kegJS9JzWvRs75hcwC9KRAhbHex5FiYmTgbiOKH85hXMrRYcZWotT9u/wpjKBKVfg7OUwKpifDohZGhnPtrLXRS6KYbCTNx5VFW/SQ7L8lv2KnDnuTF2FjCfWqKvNPYn3cAwwuIhaIOzqSfriOeQG73vGlIJ4P3tv1j+fVoIezFPCGC9+smyOqlSc5V2OckLYOxgABSmg 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:SIXPR06MB1024; BCL:0; PCL:0; RULEID:; SRVR:SIXPR06MB1024; X-Forefront-PRVS: 0848C1A6AA X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(86362001)(46406003)(40100003)(92566002)(76176999)(189998001)(54356999)(50986999)(122386002)(36756003)(87976001)(50466002)(2950100001)(4001350100001)(5001770100001)(5001960100002)(5004730100002)(229853001)(77096005)(33646002)(83506001)(19580405001)(19580395003)(47776003)(4326007)(1096002)(586003)(2906002)(5008740100001)(23726003)(6116002)(3846002)(42186005)(66066001)(53416004); DIR:OUT; SFP:1102; SCL:1; SRVR:SIXPR06MB1024; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SIXPR06MB1024; 23:TeVO9kRT909Uqa++KgJp/irX4h+mkufQqmS9+92od?= =?us-ascii?Q?gAW9OvBOFcQNdLtpwYKvzUxg29ccUNrqfxGS9YIkqK3oTBqKJQu6nGf5SnIg?= =?us-ascii?Q?l/soRgXJIslHFz6AcTwGtucuu5Vvh1RqDnLPHBqNdvSWc5DnNCRLTFaJOaRL?= =?us-ascii?Q?2Tjs/UkLnekVN3d53wce2Gowu5MCTXAGXvKX4572wUFPtt1baZnXNsuPuW+A?= =?us-ascii?Q?/xIRZ8dRpHTlhad9cjTDCtkA/saVgOKSNdo1UpPgFbn1TZwc2CKBcxAwotdX?= =?us-ascii?Q?2GUp4hVoMj9l39snYj7QGKmA1gG2Lq1zl6cMgmCMVqDidcCGkHKNIgt40iVX?= =?us-ascii?Q?n2ZbAggWSxkZLeh5oagG9XAWllExsFr893doQXLcQ6twnOz0L650QaO1s3Tz?= =?us-ascii?Q?YjdX9jwmn1hnV/ddKzVIvMokGrUYlNqVsVNBPQ8bbisDImynjgyBSuXPyF2z?= =?us-ascii?Q?A0SITLjOD2NXl/4JmaYW9+p1LCUpOuxlXqbNJjRbqNUCVedk0LpgdvrY79Qk?= =?us-ascii?Q?wMftz8Jan75tcdK4oQb7umbiYC5GhbLxMd6xQMGjp2Ck//0mXbAsjEBiZNkB?= =?us-ascii?Q?tio+fXkeGBn7sPXw+3+a0fJYfw4HO59E2JeJnn6vCh1DwZ1vhqS97BtD1Ezj?= =?us-ascii?Q?+KjKwp4YPcNaGLiFB/J4ZYw02tP1P4DpzH5YieC9CKCpEeVLL6FYppEkwTWX?= =?us-ascii?Q?DwXUydjgsBo4JXKCV+LNV/QBDmaWT1IM7dcCTp1H5BXMW0gEr329bvofK0Vd?= =?us-ascii?Q?AApDz+TzTrWy8+nwEF8Z3FYJKES+KWB7mv3ThX2VdsDKiZSlnnAzI7TEGd41?= =?us-ascii?Q?v3uTjOn5ujknt00uHqejRpGNtXs0b9vhQnNpLnzAzcQ6bgKEVh6aMSYhNZuT?= =?us-ascii?Q?CCN3Mupw2QsMBueHpdXN4CI+RibDX8mvuTqwmy0fex0e6buzSb2NrX/g98i3?= =?us-ascii?Q?QoRJoq+Bjc5e9CH2BMAIHqAEivw65ul9McEqWPB611XEEwwkHSmli4ceXqqy?= =?us-ascii?Q?vc=3D?= X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB1024; 5:ImucMWMjezicKjDwTbFnRfZR7/3OuMyfPO+vUHwNw9g/u6pzSW0KRpgYdDx5oKI/Qu+w+dHrrWUsVIoCrUcGqv1CdDlhkOfg6k35IdP1nnXZV+bkFw7VkVdcKIAqd5AgtUwXS6upZkgvGqo9aGFBCA==; 24:lNKUYedhR9tqxu1oPqb1HRuODgWS8w9kMxKnpXWJZGCbOGC4uQKt+69Gg7Rk1EBY6snhys+E5OIXHL1/iRupVOYkpud2lnQ6diPO2pWmeAs=; 20:o7zY295wAbbQplAqplZYnXTbsSjVhSh15GRL9dnQWuXrSqUgAXIAM9jbMNiwXJ/DpzpJnaIW/ovpqVdrb7U0mqAUc08azNfEj0RHDhl2OeIzyrzSquVMAl2Xo8DpYi50yN4F9HHWTNoDKGa8nxzyiwsxuMvKv+zAkh1DRKHuoBc= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2016 02:46:41.6667 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SIXPR06MB1024 Cc: Linux-ALSA , Linux-Kernel Subject: [alsa-devel] [PATCH 7/7][RFC] ASoC: rsnd: rsnd_write() / rsnd_bset() uses regmap _force_ function 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 Some R-Car sound requests picky register access which needs *force* register write. To reduce complexity, this patch uses regmap force function for all register access. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/gen.c | 21 ++------------------- sound/soc/sh/rcar/rsnd.h | 2 -- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c index ea24247..a936c4b 100644 --- a/sound/soc/sh/rcar/gen.c +++ b/sound/soc/sh/rcar/gen.c @@ -104,23 +104,6 @@ void rsnd_write(struct rsnd_priv *priv, if (!rsnd_is_accessible_reg(priv, gen, reg)) return; - regmap_fields_write(gen->regs[reg], rsnd_mod_id(mod), data); - - dev_dbg(dev, "w %s[%d] - %-18s (%4d) : %08x\n", - rsnd_mod_name(mod), rsnd_mod_id(mod), - rsnd_reg_name(gen, reg), reg, data); -} - -void rsnd_force_write(struct rsnd_priv *priv, - struct rsnd_mod *mod, - enum rsnd_reg reg, u32 data) -{ - struct device *dev = rsnd_priv_to_dev(priv); - struct rsnd_gen *gen = rsnd_priv_to_gen(priv); - - if (!rsnd_is_accessible_reg(priv, gen, reg)) - return; - regmap_fields_force_write(gen->regs[reg], rsnd_mod_id(mod), data); dev_dbg(dev, "w %s[%d] - %-18s (%4d) : %08x\n", @@ -137,8 +120,8 @@ void rsnd_bset(struct rsnd_priv *priv, struct rsnd_mod *mod, if (!rsnd_is_accessible_reg(priv, gen, reg)) return; - regmap_fields_update_bits(gen->regs[reg], rsnd_mod_id(mod), - mask, data); + regmap_fields_force_update_bits(gen->regs[reg], + rsnd_mod_id(mod), mask, data); dev_dbg(dev, "b %s[%d] - %-18s (%4d) : %08x/%08x\n", rsnd_mod_name(mod), rsnd_mod_id(mod), diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 317dd79..b536a12 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -147,8 +147,6 @@ struct rsnd_dai_stream; rsnd_read(rsnd_mod_to_priv(m), m, RSND_REG_##r) #define rsnd_mod_write(m, r, d) \ rsnd_write(rsnd_mod_to_priv(m), m, RSND_REG_##r, d) -#define rsnd_mod_force_write(m, r, d) \ - rsnd_force_write(rsnd_mod_to_priv(m), m, RSND_REG_##r, d) #define rsnd_mod_bset(m, r, s, d) \ rsnd_bset(rsnd_mod_to_priv(m), m, RSND_REG_##r, s, d)