From patchwork Mon Jan 29 04:31:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10189179 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 E39386020C for ; Mon, 29 Jan 2018 04:55:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D19C128768 for ; Mon, 29 Jan 2018 04:55:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C640D28786; Mon, 29 Jan 2018 04:55:00 +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=-1.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 749F928768 for ; Mon, 29 Jan 2018 04:54:59 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 61700267DD3; Mon, 29 Jan 2018 05:42:51 +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 53354267DD0; Mon, 29 Jan 2018 05:42:49 +0100 (CET) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id 44747267DD6 for ; Mon, 29 Jan 2018 05:31:23 +0100 (CET) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie1.idc.renesas.com with ESMTP; 29 Jan 2018 13:31:22 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id A4EFA5D022; Mon, 29 Jan 2018 13:31:22 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,429,1511794800"; d="scan'208";a="270916631" Received: from mail-sg2apc01lp0248.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.248]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 29 Jan 2018 13:31:22 +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=J+KQ8sk+C2pxbaMAMTqtjzNphUEYHV8KfT0RU9/Snfs=; b=mPP8d1yRiy1rSe60JVyMbkdRHkTfC2jO+JwUj7QhLVhm/VZyBr5fZ6Oo0LZwjYzAxq7SaL1n3q/1a9azcaxsXPl5i3XwOg6yh/s/HH6JuuhiUudpuXfbjrO82YRqwMfDOBidxzFqdW6koVTf35Z/y2SPpGx6n6hYip1WLfM9DL8= Received: from morimoto-PC.renesas.com (211.11.155.138) by KL1PR0601MB1877.apcprd06.prod.outlook.com (2603:1096:802:7::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.444.14; Mon, 29 Jan 2018 04:31:19 +0000 Message-ID: <87k1w1wam7.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: <87inbl5q6q.wl%kuninori.morimoto.gx@renesas.com> References: <87607l8k9i.wl%kuninori.morimoto.gx@renesas.com> <87inbl5q6q.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Mon, 29 Jan 2018 04:31:19 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: TY1PR01CA0120.jpnprd01.prod.outlook.com (2603:1096:401:d::38) To KL1PR0601MB1877.apcprd06.prod.outlook.com (2603:1096:802:7::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: e4508d66-d3b9-4345-bd55-08d566d1253d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:KL1PR0601MB1877; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1877; 3:SldG/qPrcUfGTrDj6l2ERohSviGSYM4DIpzTwXAUao02PANKIHLrKjYI2tRFW9Gh7r0TTFkbifN/z5ARflgE6kk9j5w+q2amzpKqa/vooFv1w/xEuAJSeL8mM0ou+eTyJUglt8m81Gfb8/kv1kahpcfvZa00h8TjEseAGdpCknneVrA/l+FNjfQCLiwU55e9BxMjlnUMEXeXcmrmKew5eX50DNZKeb+r8N2iwkXzi5LlDsf37iodmG3DJzMxrW+n; 25:upCO+M7uP6GdonILWvKVHcZ9xLKcbs9/jReU4ccsw7wtfS8WcbtVSTtOzr48woeAM4dZRq7eIUOexll/fDJqAXsKKf4bqSk1hQ6ObetZ2A2Qd6+9/QBIfN/PlB+hB/0a+rULrcA9mzAHJx54u/SqjGXSxYyBNXf7hHXyjKCYP+Sdh+QAaUQbRfTENOU9bKnLQ2asHAcpzOthqxvX1GNO/5d6W0E0TGBtHbrYwDfVGIwvD7paYQwlxBMWW6b5OiApswMQj2GmTe53AAdJsDzovKpl9kuVXaWyTimkRpfKrNWgEV3H8q6pJNrQKHznX6TCzDwPrKAhRdP/K1m5PqK12A==; 31:AcrO/GAQ0ad12utM/tKhI8lUNjgg5Lodp/guy14C2Ey2ivYIIyKE83n+ngJ6SrKsg30Ju9LzCkKEtbVVkW2Ev/TzMmj9/PtLWu2rBCxyY9rkSc3jFO+ZyVKmO0BqavdAMonOCymU97fEfP7Rs/dDQcJNEgsa+7k72h5sdLgdioY1GjJQ1fxICF3TWJ6fl7ELXRKwUIl7+wdX1LVkFhODfXWC0SWecMrKgptRnIm/tT4= X-MS-TrafficTypeDiagnostic: KL1PR0601MB1877: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1877; 20:96Wn5pUx74Y5CHX4/apRu3Jm/tTG3K8aeLrRjJFHOoYg5AB+VYsKqeN7a9O9Igs1f4r8DIAnzcFbZxXc499qMeQ2NOqkA7HN5SMKDCQtdj62V36ANFDhYwTjfVeeslTPQJXtFI5JKq0IOXf4zhM4EoVu2Myr3p4tBvXFSBpurZF4EdahZTh2skjUcLcEqVtgLSrlfpyAbDKAm9BBDU0I2DtO9ojERcoCC45ZWELCpSOn5Tkjb9sAqTAVppO0Kp/ZJ39c5M5+CYJcdDy6igdFhPCz8U4l11Cyc0Efy7bwLGTL/EdeDviXIBJgFLG22aZ7BF5CwJSfxtB5OPBwp9CfTg1m//Zlg2530lylb5X/IOg4H8/MqQTF8xmPRGcW+80iQpLzQrRhZS4hHv33/K4cX27UJyrZeFTPjMkMpPK9Jn9E3sqKzO46tZkYdaqLNzwEAJKttA2EWlF4nKQUWVggB+FSWM/VsmzW4zqIAq/YWV3EygDmykSiRR4zyCbhIH+0; 4:Md1htDkBHlzb6z8tfenAZE24Z/EOsYPCy1bCTkgUGb5yJ3QosJijW/w2SZquFDAuYKbf3vn5GdwigZx8I6NJT/GFg7i9qwLQZoUPYXifzgFfi5tvGVpVhk1iDlIxoVf2Zsvtwzr7Fpeh4HjLx1AOX41MkgVLiyh4ojOc0o0sHs4faCvBntoBselpWil59fpYgnkYcniJCanMsptbDKyWzKQgbzoEUV5KhsS8P43XQmAcg9hE84Hh75WD8OIXMYao9Q38zHGiXS7EeXgHyWxLeSbZH0LZwc+bFcucudlD19uwyj1Ny8JjxeaEp0Bh0O6F X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231101)(944501161)(93006095)(93001095)(6055026)(6041288)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(6072148)(201708071742011); SRVR:KL1PR0601MB1877; BCL:0; PCL:0; RULEID:; SRVR:KL1PR0601MB1877; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(39380400002)(396003)(376002)(346002)(366004)(199004)(189003)(2906002)(478600001)(25786009)(3846002)(6486002)(23726003)(105586002)(4326008)(6116002)(53936002)(36756003)(53416004)(97736004)(106356001)(7736002)(305945005)(66066001)(83506002)(68736007)(8676002)(26005)(47776003)(5660300001)(59450400001)(386003)(76176011)(6916009)(7696005)(69596002)(8936002)(86362001)(50466002)(81166006)(52116002)(16526019)(2950100002)(16586007)(81156014)(186003)(575784001)(58126008)(316002)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1877; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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; KL1PR0601MB1877; 23:FMcfOkERfrjOu5irX1BqAFPWXax7nrDwJXEl2gg?= =?us-ascii?Q?R3dLtY+kLhLuQ6WP3HpTEHn7a8LFd73WPnMOeq230yP1EGF1qq/ExxCJlC4o?= =?us-ascii?Q?RfOIXJ/FpTUOi34KbPX8PXlOcm41LansTebHO2l1ekaw4oIqPidD/ZrlEdKW?= =?us-ascii?Q?3VRTRh07ouNgxBpnlsNBb4Ylc4xNjnvhY7k/6V+q642bL7zwlZTr+EUEiO4x?= =?us-ascii?Q?NRwPyToz1VpkaFICmemhQPwgbXjHRdfoVYF4oLRBQxHhzYMQkDU7Zfymbm4B?= =?us-ascii?Q?1UEX7rdYpEfpWasVei1mISa+pPf6x09af2vdXFT87KImcZ3rr0Gh8g8yU8aA?= =?us-ascii?Q?3NVARx9+CekptHuoJqBB+UQncHSBvVXPnDOdy9002Gt910XzTC6p9MADQQns?= =?us-ascii?Q?kIKelWN3lTJ3RS5UEUJX8r+VMpoBdfcJTJ/FpmxUF1rOBs1uIDVUCQCp4Oqn?= =?us-ascii?Q?OeritinG3smuE0lx7NdF0UExETPiYxT9emyCjjgJfWB9qtbVIZQtox6bmqx9?= =?us-ascii?Q?YVdZq96N+nfZ2sbJh6ayJN742yF/kpp8Gvm24QjCX/QAZlDQoBPEAm0vx2T1?= =?us-ascii?Q?zT9fyeiaBAmZdmaWGPr/jRafsDd87zo4iv5mQecwhKnMsZQnR4oKZ2uqhIWo?= =?us-ascii?Q?ppwsW8Zy+xfOQLOSMWTLnA50N2iHO/Nr+3/+T6F5dyNY1J2lB97x229SHeeO?= =?us-ascii?Q?IBrGP9neElTfhj+xwYpF5RWS8tw/YCVg9uzDmEDc71edZNd1NELKLNAADCko?= =?us-ascii?Q?43CynhBeY5QaXAO2GUZS3OZso45CzGkJVZFRn3kmW2Wn8rQOTnRj4VQaJhBx?= =?us-ascii?Q?iv32haZGAVDO21uV9oczb16u2lqJv3gpYbGl69P/immTQblz6imPS+t80h4D?= =?us-ascii?Q?Bquq3QOfQklqsfV6lPjHI927jcbcRqBo+d94QI/iU4vxxJhDtytJ89wLpcGC?= =?us-ascii?Q?g+VkfXxwO5CVcZLE1xEL3aDJDJLXAhU6YTsYfXrGPDiSsAY8TNlRH2dojOuf?= =?us-ascii?Q?Ox354Kcyhw09IG1EC4roLwVN+pxfpE3TETojhtB5ZyhfqL36YMuoT/M1plEh?= =?us-ascii?Q?IG/06SqA65sjTotQNKSz+bpw0adO5B5Y/RHUWqPlWUcSxXONOnu/9xpN5dbz?= =?us-ascii?Q?fr0+pakVy5/P0XqjP66xeZe9EvVjxm/NeA3WSS2Y7kBpnJoZuviiouGlLnlT?= =?us-ascii?Q?ALEwxu+d4QU1sU694zeRckwpT1bFBFkE1ecQc?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1877; 6:8Pwc/F46v0JlMgSMSbkchYvTLn/ItZoTacFrhf/X3WIphlm/I2cUqr2ZgmftwWI8RT5P0J/D1wD4QV1zhaWqp2EQi78gnUELq4wHz4CeXQ3XpKvQPX70NXVHr6vZ3Sq7wgwzuqfB9LA5MYsbWOerxnc4HKJ6Lne+h8qCnseGG2QoJGv1K7e4vKevFGmvsbxEq1whRYG4vK4BSXu1yLdsmLpqO4zzT0ao1kCEFKspbrDnkQ7e4917K1fJP0bz2ebRIRoLIGfCPbGwrCp7pGH91MJd5iwI4MG/PFTfCexKFtpCnBWHh4RwgkmsKedjLAXIMLtsxlgvmLwqb1HZ4I41ofUN8yOChR/i4gkBbQLgJHc=; 5:aBlfidVFuRBiw9pno9TkTlIXS2LfXrPoQ/h0B15/eEeWNFlG4UqiRZExuB5wd2Qx4vbjVXoGN4v8WO9IpK/qVmOxxzfTV8/Dn3vTNkjIBRI4Vsr1oVtwgjSM5T04W4HVu21MCZyoyq2xgg7FX/Sdv6C0BjtmcNElG43sjUMbJ3E=; 24:l3QCeICgyw5ExgQcPqocUEK0iiKHzGkDZL3K0AcT0UyE1ZQfJnJaLGVO4xqeLVkpGOANc7BIJ9/mb2JkRqoU644osuZy+Y7hWjcUhZTmnkg=; 7:LKQ3b3M6r7ZQwpqoY/RV+JPRJKFryxdFM6hmTGWPC/6MJlFbiPvtE+i4xX43X0g4Cz6ZfarcJNoFCicnDPNQ5a/8JwrF//lLglT4AUJNqt3X4vVFHy0k2NNPCSw/ZNayJaTL3NPEp2d6e3JAZkkyp0cu9NbCJb8lf7KZuwnQ/pWQYDWcwBMr6DJULuPp5vwO5O1RwoCmiQsenKk6tHwcyfnPNkgxUK6A+UvvuLO2NQX+uX2mC34zXGc4+rjEQ2+/ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1877; 20:WBU8Joxcmpx/0hMdiedqtvYM3cPODqmflx5dMwZvaj7Qn1jTj7VgJxW5XRDLpY/Xqh1dyh5Rl9l/EaLh523Jxd1GSgzQlRc/k3rUVRamWjY387u4KGiRhS0AEWnZWjmtPZ5P7jfjOvAeFr4jkg01UCvASTKm4w00YLRt+J60lpk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 04:31:19.8200 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e4508d66-d3b9-4345-bd55-08d566d1253d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1877 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH v2 148/186] ASoC: nau8824: replace codec to component 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 Now we can replace Codec to Component. Let's do it. Note: xxx_codec_xxx() -> xxx_component_xxx() .idle_bias_off = 0 -> .idle_bias_on = 1 .ignore_pmdown_time = 0 -> .use_pmdown_time = 1 - -> .endianness = 1 - -> .non_legacy_dai_naming = 1 Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/nau8824.c | 113 +++++++++++++++++++++------------------------ sound/soc/codecs/nau8824.h | 2 +- 2 files changed, 54 insertions(+), 61 deletions(-) diff --git a/sound/soc/codecs/nau8824.c b/sound/soc/codecs/nau8824.c index 088e0ce..4d9148a 100644 --- a/sound/soc/codecs/nau8824.c +++ b/sound/soc/codecs/nau8824.c @@ -414,8 +414,8 @@ static bool nau8824_volatile_reg(struct device *dev, unsigned int reg) static int nau8824_output_dac_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { - struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); - struct nau8824 *nau8824 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); + struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component); switch (event) { case SND_SOC_DAPM_PRE_PMU: @@ -437,8 +437,8 @@ static int nau8824_output_dac_event(struct snd_soc_dapm_widget *w, static int nau8824_spk_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { - struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); - struct nau8824 *nau8824 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); + struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component); switch (event) { case SND_SOC_DAPM_PRE_PMU: @@ -461,8 +461,8 @@ static int nau8824_spk_event(struct snd_soc_dapm_widget *w, static int nau8824_pump_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { - struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); - struct nau8824 *nau8824 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); + struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component); switch (event) { case SND_SOC_DAPM_POST_PMU: @@ -487,8 +487,8 @@ static int nau8824_pump_event(struct snd_soc_dapm_widget *w, static int system_clock_control(struct snd_soc_dapm_widget *w, struct snd_kcontrol *k, int event) { - struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); - struct nau8824 *nau8824 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); + struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component); if (SND_SOC_DAPM_EVENT_OFF(event)) { /* Set clock source to disable or internal clock before the @@ -509,8 +509,8 @@ static int system_clock_control(struct snd_soc_dapm_widget *w, static int dmic_clock_control(struct snd_soc_dapm_widget *w, struct snd_kcontrol *k, int event) { - struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); - struct nau8824 *nau8824 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); + struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component); int src; /* The DMIC clock is gotten from system clock (256fs) divided by @@ -988,8 +988,8 @@ static int nau8824_clock_check(struct nau8824 *nau8824, static int nau8824_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - struct snd_soc_codec *codec = dai->codec; - struct nau8824 *nau8824 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = dai->component; + struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component); unsigned int val_len = 0, osr, ctrl_val, bclk_fs, bclk_div; nau8824_sema_acquire(nau8824, HZ); @@ -1072,8 +1072,8 @@ static int nau8824_hw_params(struct snd_pcm_substream *substream, static int nau8824_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) { - struct snd_soc_codec *codec = dai->codec; - struct nau8824 *nau8824 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = dai->component; + struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component); unsigned int ctrl1_val = 0, ctrl2_val = 0; nau8824_sema_acquire(nau8824, HZ); @@ -1149,8 +1149,8 @@ static int nau8824_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) static int nau8824_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width) { - struct snd_soc_codec *codec = dai->codec; - struct nau8824 *nau8824 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = dai->component; + struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component); unsigned int tslot_l = 0, ctrl_val = 0; if (slots > 4 || ((tx_mask & 0xf0) && (tx_mask & 0xf)) || @@ -1288,10 +1288,10 @@ static void nau8824_fll_apply(struct regmap *regmap, } /* freq_out must be 256*Fs in order to achieve the best performance */ -static int nau8824_set_pll(struct snd_soc_codec *codec, int pll_id, int source, +static int nau8824_set_pll(struct snd_soc_component *component, int pll_id, int source, unsigned int freq_in, unsigned int freq_out) { - struct nau8824 *nau8824 = snd_soc_codec_get_drvdata(codec); + struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component); struct nau8824_fll fll_param; int ret, fs; @@ -1374,10 +1374,10 @@ static int nau8824_config_sysclk(struct nau8824 *nau8824, return 0; } -static int nau8824_set_sysclk(struct snd_soc_codec *codec, +static int nau8824_set_sysclk(struct snd_soc_component *component, int clk_id, int source, unsigned int freq, int dir) { - struct nau8824 *nau8824 = snd_soc_codec_get_drvdata(codec); + struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component); return nau8824_config_sysclk(nau8824, clk_id, freq); } @@ -1403,10 +1403,10 @@ static void nau8824_resume_setup(struct nau8824 *nau8824) } } -static int nau8824_set_bias_level(struct snd_soc_codec *codec, +static int nau8824_set_bias_level(struct snd_soc_component *component, enum snd_soc_bias_level level) { - struct nau8824 *nau8824 = snd_soc_codec_get_drvdata(codec); + struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component); switch (level) { case SND_SOC_BIAS_ON: @@ -1416,7 +1416,7 @@ static int nau8824_set_bias_level(struct snd_soc_codec *codec, break; case SND_SOC_BIAS_STANDBY: - if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) { + if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) { /* Setup codec configuration after resume */ nau8824_resume_setup(nau8824); } @@ -1434,23 +1434,23 @@ static int nau8824_set_bias_level(struct snd_soc_codec *codec, return 0; } -static int nau8824_codec_probe(struct snd_soc_codec *codec) +static int nau8824_component_probe(struct snd_soc_component *component) { - struct nau8824 *nau8824 = snd_soc_codec_get_drvdata(codec); - struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); + struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component); + struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); nau8824->dapm = dapm; return 0; } -static int __maybe_unused nau8824_suspend(struct snd_soc_codec *codec) +static int __maybe_unused nau8824_suspend(struct snd_soc_component *component) { - struct nau8824 *nau8824 = snd_soc_codec_get_drvdata(codec); + struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component); if (nau8824->irq) { disable_irq(nau8824->irq); - snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_OFF); + snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF); } regcache_cache_only(nau8824->regmap, true); regcache_mark_dirty(nau8824->regmap); @@ -1458,9 +1458,9 @@ static int __maybe_unused nau8824_suspend(struct snd_soc_codec *codec) return 0; } -static int __maybe_unused nau8824_resume(struct snd_soc_codec *codec) +static int __maybe_unused nau8824_resume(struct snd_soc_component *component) { - struct nau8824 *nau8824 = snd_soc_codec_get_drvdata(codec); + struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component); regcache_cache_only(nau8824->regmap, false); regcache_sync(nau8824->regmap); @@ -1475,23 +1475,24 @@ static int __maybe_unused nau8824_resume(struct snd_soc_codec *codec) return 0; } -static const struct snd_soc_codec_driver nau8824_codec_driver = { - .probe = nau8824_codec_probe, - .set_sysclk = nau8824_set_sysclk, - .set_pll = nau8824_set_pll, - .set_bias_level = nau8824_set_bias_level, - .suspend = nau8824_suspend, - .resume = nau8824_resume, - .suspend_bias_off = true, - - .component_driver = { - .controls = nau8824_snd_controls, - .num_controls = ARRAY_SIZE(nau8824_snd_controls), - .dapm_widgets = nau8824_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(nau8824_dapm_widgets), - .dapm_routes = nau8824_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(nau8824_dapm_routes), - }, +static const struct snd_soc_component_driver nau8824_component_driver = { + .probe = nau8824_component_probe, + .set_sysclk = nau8824_set_sysclk, + .set_pll = nau8824_set_pll, + .set_bias_level = nau8824_set_bias_level, + .suspend = nau8824_suspend, + .resume = nau8824_resume, + .controls = nau8824_snd_controls, + .num_controls = ARRAY_SIZE(nau8824_snd_controls), + .dapm_widgets = nau8824_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(nau8824_dapm_widgets), + .dapm_routes = nau8824_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(nau8824_dapm_routes), + .suspend_bias_off = 1, + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static const struct snd_soc_dai_ops nau8824_dai_ops = { @@ -1547,10 +1548,10 @@ static int __maybe_unused nau8824_resume(struct snd_soc_codec *codec) * events will be routed to the given jack. Jack can be null to stop * reporting. */ -int nau8824_enable_jack_detect(struct snd_soc_codec *codec, +int nau8824_enable_jack_detect(struct snd_soc_component *component, struct snd_soc_jack *jack) { - struct nau8824 *nau8824 = snd_soc_codec_get_drvdata(codec); + struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component); int ret; nau8824->jack = jack; @@ -1838,15 +1839,8 @@ static int nau8824_i2c_probe(struct i2c_client *i2c, if (i2c->irq) nau8824_setup_irq(nau8824); - return snd_soc_register_codec(dev, - &nau8824_codec_driver, &nau8824_dai, 1); -} - - -static int nau8824_i2c_remove(struct i2c_client *client) -{ - snd_soc_unregister_codec(&client->dev); - return 0; + return devm_snd_soc_register_component(dev, + &nau8824_component_driver, &nau8824_dai, 1); } static const struct i2c_device_id nau8824_i2c_ids[] = { @@ -1878,7 +1872,6 @@ static int nau8824_i2c_remove(struct i2c_client *client) .acpi_match_table = ACPI_PTR(nau8824_acpi_match), }, .probe = nau8824_i2c_probe, - .remove = nau8824_i2c_remove, .id_table = nau8824_i2c_ids, }; module_i2c_driver(nau8824_i2c_driver); diff --git a/sound/soc/codecs/nau8824.h b/sound/soc/codecs/nau8824.h index 21eae24..6184a2b 100644 --- a/sound/soc/codecs/nau8824.h +++ b/sound/soc/codecs/nau8824.h @@ -471,7 +471,7 @@ struct nau8824_osr_attr { }; -int nau8824_enable_jack_detect(struct snd_soc_codec *codec, +int nau8824_enable_jack_detect(struct snd_soc_component *component, struct snd_soc_jack *jack); #endif /* _NAU8824_H */