From patchwork Fri Sep 29 00:09:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9976925 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9E07060365 for ; Fri, 29 Sep 2017 00:09:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F65529784 for ; Fri, 29 Sep 2017 00:09:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 806EB2977E; Fri, 29 Sep 2017 00:09:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E88C72977E for ; Fri, 29 Sep 2017 00:09:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751241AbdI2AJn (ORCPT ); Thu, 28 Sep 2017 20:09:43 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:45415 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751046AbdI2AJm (ORCPT ); Thu, 28 Sep 2017 20:09:42 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie2.idc.renesas.com with ESMTP; 29 Sep 2017 09:09:40 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id C6FDE3EAE6; Fri, 29 Sep 2017 09:09:40 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.42,451,1500908400"; d="scan'208";a="258027359" Received: from mail-sg2apc01lp0246.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.246]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 29 Sep 2017 09:09:39 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Hr7u6+xd3jK1eTw3gBGnTfT8s00Qlq5aC4+U91uMGfI=; b=QGORkQodUJbi13v/vT3E+o0h0SqakLCGaqKmKNIrlLVA91jji9CeeYy5R/197/+KhnwqAIRsyNT3dVN5f8ReEIaLV388pOsfr3RBLfwVyRpVhJeA9NXRVxYTE2PMLTfwEyNmXgs9mmIW3QfpL/B2WlJ4wIf7jCo/1y/jMUN2wyU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.138) by PS1PR0601MB1882.apcprd06.prod.outlook.com (2603:1096:803:8::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Fri, 29 Sep 2017 00:09:35 +0000 Message-ID: <87r2uqgyog.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 2/6] ASoC: rsnd: use generic rsnd_flags_xxx() macro on ADG User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown Cc: Linux-ALSA , Simon , linux-renesas-soc@vger.kernel.org, Hiroyuki Yokoyama In-Reply-To: <87tvzmgyqv.wl%kuninori.morimoto.gx@renesas.com> References: <87tvzmgyqv.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 29 Sep 2017 00:09:35 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: KL1PR0601CA0004.apcprd06.prod.outlook.com (2603:1096:802:1::14) To PS1PR0601MB1882.apcprd06.prod.outlook.com (2603:1096:803:8::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3a6ff1d5-699a-43f6-ceb0-08d506ce5f26 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:PS1PR0601MB1882; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1882; 3:waXqa+9TNZqM5nHXWCFNaqXq1KDDB7sxcpzBAtGvDv2UY11cb++9zSVhPeOvvnS68SS2OJUPCGGkDEJGgCKkoOPB66R7mFjTPzYG8ehFkk0r2gbidoLzpyKazLkH6+FcoCVJugMr93RMf07yvAe8tAjr2TzI/3JGN6tp0Na3tY6hJN/NFb610DoLructviDuQITDEr7RDctbT6a6jLGKYbzJ5JLXXUlfL0ZYWCiziCNGZNKU4R3lwvsOowonGnKP; 25:rFQkf+zYNA71ePTSNtqZggKBj1CX1DWvSH9euBQoFMUZ8TCoHFekxB2B2sVD8SsQ+387RrUN+xG98iTUSod8GsfgrVU2BIfSq9e+1zFnKik4IxWuoCaW+b5j87XXjIQxt05ObX5+VIT1z8Wecs4BlxGm479GjFq22FWbOaVuEKeDsFmkZxXUIBG5mqRbJbt5f8PsVBDbEp1BhzR7wOkUD2VxO4lmRp91zfaYcKgAaw0w3Mpdwi6M1ucDTMZyoHY1sR0btpcERTNU1K6qZcxwsGedsAwUV4s2kOciDvYrEPs5+ihMbZnITlSW+zlej27lwbTwnVm7c+/wuZ3iHizg9w==; 31:CrkNCSV5be5MGrvazhuP/r6a9XArzLJjG+2J2k5epH/rE+lSjL/VkqPEr/Hsqn1uLKT6O9JUQa76bXLuwwpkMTEFPQeyTYXuQ18poZA8amR7RrfUjpDOOymNB4UEqig0Z2cdNObN+urxUji8+yfasoNNnE8SRxNOAda0wMo5Li0WPDVdXGV366f4VHl6LMbooQDHWqnmg4EJXEFM0T+gj4q+9IIprxK71a7noyZb+A4= X-MS-TrafficTypeDiagnostic: PS1PR0601MB1882: X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1882; 20:6V6oF/cmFPlrpdwvBZwOAfDYBLEY/HJltNn5ZFdDumLbyZYLwm/wUa6PQH5pOuWblkYPMZG9stz3XKks4qk5ITftPLDG6pOazTGJtq9MDuEEbFsAUNta+RNzy4dj8gJ/0Wgcq4E6P9NZ473FvgNpGSbP3WQzepBGG8Vpq/cS3sRWNQpnGJcE8BaSncmPZmrRfPsKmR/qu37FQO2A1Elb8/5oyieQBpi6x3cU2E1Sao6rRkTSSGlyPxvhynylChV1dFYw/VURb3JCLwKrhhny/Acc11Z277A36rf2VUoMkxhdMB+6mTBiVFWJsec13rYL0IkC8gOAptc40B0UT/fUL06659wMiUKYVxS5GTw07v8waw07wTx36YybkV/ScID1WGE5RKczqHYnjkHnR3b1VSN0PGUhUjcZvTUxHSMr2anoYAvUD9x9h70rLEsf9YwWWVKjew8gvfUeFslBJ/Tmb0O+xwww8wjdMb6XCHOdzgc0Bd43YrIea3XQ8ijMAiDb; 4:MWuiX6cM3mCO9WAn52tpFsog0DxZw3kYWXmdr0mkW1cswHDeO9a/lA1NCo4jIhbSbjpaP4InAiBtRJuzVWNkMPHrEemqUBzTASvJ09b+vtoDG0Lh4pfg4vOft5kg0/KKUe2638xqNe5OWblwsYHj/jRdpO08nP0k2tO8FnSbXqy2wJp+9pYctJTDsT3wp9tkezcRhTYkdMBIZsQ3e/zvEuzR/ONwurRUfZ0jWoJj27PqjT3zvTEcfMZa8LCYJWXf X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(100000703101)(100105400095)(3002001)(6055026)(6041248)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123555025)(20161123562025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:PS1PR0601MB1882; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:PS1PR0601MB1882; X-Forefront-PRVS: 0445A82F82 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(39860400002)(376002)(346002)(189002)(199003)(86362001)(8676002)(2906002)(6116002)(69596002)(81156014)(189998001)(3846002)(8936002)(81166006)(5660300001)(23726003)(25786009)(83506001)(305945005)(6486002)(478600001)(7736002)(36756003)(50466002)(50986999)(76176999)(58126008)(54356999)(16586007)(68736007)(47776003)(101416001)(66066001)(97736004)(107886003)(6916009)(33646002)(2950100002)(316002)(54906003)(53416004)(53936002)(105586002)(106356001)(16526017)(4326008)(41533002)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1882; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1882; 23:KaOnZtwSpXUGZvsVYo50Cbp+Vbj2CdEZF8J2ugs?= =?us-ascii?Q?AUfriIWiBFwUjxguBgiaSe9o3kELtwTE0kyGkQsFg5xbY3JtfUFdzOciYk6u?= =?us-ascii?Q?hHqQUMURO4pu4gJzAJZagaPchstK3OLuan4Y2CyO3OX/QmeOJ9DpA+vgueGw?= =?us-ascii?Q?l0NJzZ0ITdAp+ideTCa4+8nt8YJYEtdurODQ/6nILoa4xLx74z3i2KkOYl30?= =?us-ascii?Q?cBe6q1w75gCHvyEA63KpwokgctcONWNqCiphTP5wWF++IpvwOWo1VOdN1mB6?= =?us-ascii?Q?bRf2eNSUM//gdqf+pV6k417MlSb5wdC+Go1sHp/PWbQmrjyGbNMxt9EEupP3?= =?us-ascii?Q?M31ZPL//UVzY9k6VLz4G4oTxFjb8AJOvn8QHq50Zs+l9s9QZDByUNdGYvCCe?= =?us-ascii?Q?4rwegWO/CjOX1lv9DDIdQsiIsNFFYh0iRo79BAp0h1IjKgAFBXImmaKuuUL7?= =?us-ascii?Q?ZTHq4EAQwqSAHyAuq9+TTjiebq5mzGkHh8noXjIRGcdfDP6NpNIfGS9GyL8X?= =?us-ascii?Q?NL4gObKG9IFNIEwUMlkvcjiKEthsZjXjEkoT6pCxkzreImfb2N42ALXGvvNo?= =?us-ascii?Q?7+P4GqinZ938P7+a7uN89mWeBR+9dGZ9Zhvh1RkqkdcKY9cwrciW6gGJmoGb?= =?us-ascii?Q?ecUIwLzq/hr4C/xMeQNdMcBP07JB+gzcHMHL7zVoWcZOv5aeJZlRt1gkBoUA?= =?us-ascii?Q?wpIIYXvPzCWRbIs3Wdd5Q4+h5P21uBL0FU+K5a0lYEDrI3t0I0eJmtnqCTXZ?= =?us-ascii?Q?fNppVpFn1lUox5RghPmczPQ0TXI57UXeWJPg/aVy64MPKEkQKQTfi1TIJrSj?= =?us-ascii?Q?5hT23kaZcFqLP5u6EX+lXYshtPm/kWRCLwn6ALGcEt111UAVZjDr/xYQUNWJ?= =?us-ascii?Q?xRhiacG1ibzzXTwFANm5gWLyqcpUWCTNtDtzF335wO+rgJyMUfc3INqiWRv+?= =?us-ascii?Q?p7fFpmW1ACqzHHcrz8ut9SfxGLzRAv72q1Sxbu5mA5PoQP0BQWo/sWNP7J8z?= =?us-ascii?Q?sNfEAS77L4hp15dalvjsK8AYDbzSA4BvnqWOWhrLJ2gUT5S+9nQPX0ULLDv3?= =?us-ascii?Q?qsdu6niB3zbet7sp6A0owi8TdRp7lOws0c+Vdqa5MaPRftcHa0FoljXUcc/l?= =?us-ascii?Q?TJoFODSMt/TmL3S3TRJllyD+ubNKxNyacfCErzZ2MhVEceRYhqSWgEyOGuYv?= =?us-ascii?Q?L3G2UaiyxmtZfHhpggaSv23Zz8q4eIh4GjcMA?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1882; 6:HbJedlMzrdMNW154oDLJ3XnSRfaApNSFV3y1r6ng/pbTBQYTMq1qCFM44rpK5bG8VKBbHtzg0qE3lxYNmMpVvMp+mQomXcCD7BKlvK5eVBWRq4rbGQEBCMPSG4I7jCs3kmTPwiwD/JTzHTFbkkw+Ji7jS4rS7uG8nhYvtKJNOb4DmPCYsB4mR3Xk5Ee2cYpJORWGb91nUyATCf1F9xHeMjR8jwpbaUlty1/O47nufCX3gai9IBGIL+c+qCy63ZGMSmijQhu4izomWIHF0ltPyZAmZkZsLY1frkZ17j2vPZwlb2abu6CP+omvxbmafMLmfXnlpCrM2ubhEFZnzXS71A==; 5:DQYlmmGfUsTVQOuC+nwEJ48bKHf+rMQ8GOy/2mF0MwZtyDzRRteAccmie50w6NmhA8/tSrp8bxVVZFgyoDBVC2qG2hJsDblp3NyOYYjis6hPSAbV+IoBlAJV92m2SuEqrzog2W/KiuckZWwU9DFhVA==; 24:RNcJMG6w7vOrLngg6C6DXQbC8I8X4NcYcbFHvwt0jztpoOLOj70PdixesZfQMQ9aVB26/CEXszF0XRFNUJodp7ms6hNRd64+xXdix0F5Hsc=; 7:X2WA1cFeItxq7dZHDqSQTtfK1UNvaUv35bKJ/O9/TetG56BMdaiubDmleC/la0jfZPq+UcXzBoIa0/Q6fbNCTqPQZQiF7FncPxoISmyALn7Pmug9aS1JuXoEL9M3O8tvnXC0zukBlLtZscc+fiTLfIPr7pgdMbwBtbrx7ATmRVuB3NAVpNw6d3Ggiyc3LXjCtvaqJt0OJ3Ofu1pngK1QGmReXVc28/T9VGqo4eJsDWs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1882; 20:4E+mPvVwEKTPEoocRg3JEoSEvOvDRKPgoa7pLychX9edzOUikny2hx7LYfFmljcZgpaqgrnJB5vhPBWTFXf1u62Fphq1vFAnOnz6l+DBgKd1+cDIMEeRJaQEDZrW7SZ1aLG3+YdWEJGIeS63HeozEJ/Km0ANXPtAbXoIvINYr04= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2017 00:09:35.8764 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1882 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto Now rsnd driver has rsnd_flgas_xxx() macro. Let's use it Signed-off-by: Kuninori Morimoto Tested-by: Hiroyuki Yokoyama --- sound/soc/sh/rcar/adg.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index e11ce50..19213077 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -44,7 +44,6 @@ struct rsnd_adg { #define LRCLK_ASYNC (1 << 0) #define AUDIO_OUT_48 (1 << 1) -#define adg_mode_flags(adg) (adg->flags) #define for_each_rsnd_clk(pos, adg, i) \ for (i = 0; \ @@ -366,8 +365,8 @@ int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *ssi_mod, unsigned int rate) rsnd_adg_set_ssi_clk(ssi_mod, data); - if (adg_mode_flags(adg) & LRCLK_ASYNC) { - if (adg_mode_flags(adg) & AUDIO_OUT_48) + if (rsnd_flags_has(adg, LRCLK_ASYNC)) { + if (rsnd_flags_has(adg, AUDIO_OUT_48)) ckr = 0x80000000; } else { if (0 == (rate % 8000)) @@ -479,10 +478,10 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, } if (req_rate[0] % 48000 == 0) - adg->flags |= AUDIO_OUT_48; + rsnd_flags_set(adg, AUDIO_OUT_48); if (of_get_property(np, "clkout-lr-asynchronous", NULL)) - adg->flags |= LRCLK_ASYNC; + rsnd_flags_set(adg, LRCLK_ASYNC); /* * This driver is assuming that AUDIO_CLKA/AUDIO_CLKB/AUDIO_CLKC @@ -512,7 +511,7 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, adg->rbga_rate_for_441khz = rate / div; ckr |= brg_table[i] << 20; if (req_441kHz_rate && - !(adg_mode_flags(adg) & AUDIO_OUT_48)) + !rsnd_flags_has(adg, AUDIO_OUT_48)) parent_clk_name = __clk_get_name(clk); } } @@ -528,7 +527,7 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, adg->rbgb_rate_for_48khz = rate / div; ckr |= brg_table[i] << 16; if (req_48kHz_rate && - (adg_mode_flags(adg) & AUDIO_OUT_48)) + rsnd_flags_has(adg, AUDIO_OUT_48)) parent_clk_name = __clk_get_name(clk); } }