From patchwork Fri Jan 12 01:12:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10159145 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 A0DFF601A1 for ; Fri, 12 Jan 2018 01:14:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E02428047 for ; Fri, 12 Jan 2018 01:14:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 80E672870F; Fri, 12 Jan 2018 01:14:15 +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 6932D28047 for ; Fri, 12 Jan 2018 01:14:14 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 93EA2267AAD; Fri, 12 Jan 2018 02:14:02 +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 A202C267AAA; Fri, 12 Jan 2018 02:13:58 +0100 (CET) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id CBC372679DF for ; Fri, 12 Jan 2018 02:12:24 +0100 (CET) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 12 Jan 2018 10:12:22 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 904356C3EB; Fri, 12 Jan 2018 10:12:22 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,346,1511794800"; d="scan'208";a="268006185" Received: from mail-hk2apc01lp0211.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.211]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 12 Jan 2018 10:12: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=9Tj/Ro0ZgPEdsnV+FK46A/2NxuaW90CK3VE+BrSVwVM=; b=Gn2o/jGoSijvy4v8FfIa+SjXHJohJYcw/VVxDU+SR/8dMFvM6wOcPK3FhpyVk1iDuR5w93XXoIRDCyyIZXVR5C7Mnzeswd8tna1S6n4r0XfElp8ttT1Xy++4FAj7hfPutVAAVOErjPez+9ViBzvnSiIKkSqGghtlzYNKBxwsfVg= 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 HK2PR0601MB1874.apcprd06.prod.outlook.com (2603:1096:202:a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Fri, 12 Jan 2018 01:12:20 +0000 Message-ID: <87o9lzdgpa.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: <87bmhzevk9.wl%kuninori.morimoto.gx@renesas.com> References: <87bmhzevk9.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 12 Jan 2018 01:12:20 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: KAXPR01CA0033.jpnprd01.prod.outlook.com (2603:1096:402:1a::19) To HK2PR0601MB1874.apcprd06.prod.outlook.com (2603:1096:202:a::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dbd2063b-abd7-4eee-45b9-08d5595987a9 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020074)(4652020)(5600026)(4604075)(48565401081)(2017052603307)(7153060)(7193020); SRVR:HK2PR0601MB1874; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 3:6AvXf0W/8EM64cLIDfXIYQJV1gBWZxj7q2lFsVcbloObMQ3PrGQNQRgRZRfAzd+foG+icLLgiSVKVsi28rnK9TgDnOLLcTl1PnwKqm3se/sqK76lfRIa7y/zqv3U/cEtOFypkMPF7/TvMZrprp/YWcMRXTmU8xilNktfOeNZA79y12NzbSdrGOKJe5D69ZPOZctss7NVoyBcqcgT2nY42khzTYqjHlOsVfUI+itvILo6uHjpvsdSDFY0lS4uZpty; 25:CdZ0A9kEjCOtFe0xyDG9eW73LAUj3te4NuBXrY7nEG6BhCLMvlWNcGnMQzquXFtZ2ZHJfb4jTsfuzFmF6Tkb8Xitmai7wDKGjcQL9iYDf/jooF6OipSVfzEWEO0wjuuFYzAY9kjvNXUedtDY6J6pXSIbdwVuYudPSvFNlol2Tr2Gw02A9v9/cgfxIOaP9myJhYE7uU2QjmJZ6tr7mSAkWMRz+hF5vb6Gn9Tv2qLVrvuHZ7Bs5zYtCufHjLvwlMrlaXu9LRmELGHvDTvKdaJ20WVBjir007FfhI6Z2VuoZi+TOj09Sa4xok3TltnfI0XwzsItI3rCFAkhbwliCgCpwA==; 31:bfLQdbCdLacQ+tZW9c3hBKP0wnnLYXu+dQMcVKUdvbfPnIZ9p8T7nBWxqxNZQBDd4BPGNyl98q7yz+G5XOELnAXZfpbD9rrQzG6SSe7rG8wMqjHu/vqRp6RHUDB868IBT4n+2+U4KXw8HaastqC/KNJpbDSgZmQXcGikklB/F0jsKnoOlvS66ww43+EFTnOgXoFCwTc70VmdqopBFarFM1htKwU1bWdDC0Ivqmf3Q+Y= X-MS-TrafficTypeDiagnostic: HK2PR0601MB1874: X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 20:S9ibtkjTmQBtT9/04SyB9iIkc+HQRPHDfVUUEiZErxZnpWXatF/9u235uTJPNNAMp6OEGxOzQ0r3GaP+7vHER4ojWzzTzG+zG5aEXyPd/NhPiPrmhdCfo8+U9fZXZf35W59/ftBUeJXecq+Q1+Zn5EtWlY2af7khzrCwsRPKtcdp4yqqsZwh7aiqwiRVphlDjQZDILBxGybnk5DhCqP9N5nvBf0nvegkI1uf/FgNOvwWrJSUZC8ZQj8nNg9dXla7YQKunyaPoCmYHUM8EIKizk5zptB68UcxerNZIMIzMjnxqadOOWFuMDQ5CVSPT7+eLUiSOi+XFzYGpQPHGZU2Z5rV1lb6mVQrrjuHtmsKjOaK9LyHenqvvKn3rT+ceefqiSaN5HsUb3HuPzTLmOpBpGCBnxdB/vQ0+tT05nu3EbmgYlHph8I8VOO3Q4NqUvP2xwLZ0XlN9q7IGx/nsRUVkU4xHm5U/Hvxs40YBzgCxI6Sd05+0bsAcLZjac+6DDa1; 4:wTXsdxEKWI4tADx+n4Jezs4Dtqrekdd2buhAls0fUVJBPUrBJr+ji1rjiAdQbR6gbDxKF5PErOjXkpICxBG8qWVhYYTTrnMkm2XUHhGCuM25qvoF4s0Z32xXgkodQudbDem2QzRoe5M/M+1qMulPRDiOwvXH6zU8z7D9C1EP8vX4jSu1WJ+ModypWYbXuWDSMqN3Od4pyn4r5br/njoXN94i/CZWPO3oNurrFl4ZLtIYLW7qPajA2TBN9Bokfrk4YD7sxJSFIalYAbPs/gPaT7IVW7Scq7qzUga94/HXhDqY+dDHHu5qT1M1MQ6eSGLt X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231023)(944501137)(10201501046)(6055026)(6041268)(20161123562045)(20161123564045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:HK2PR0601MB1874; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:HK2PR0601MB1874; X-Forefront-PRVS: 0550778858 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(376002)(366004)(396003)(39860400002)(39380400002)(199004)(189003)(7736002)(3846002)(7696005)(105586002)(97736004)(52116002)(16526018)(16586007)(106356001)(83506002)(54906003)(8676002)(316002)(53416004)(76176011)(58126008)(81156014)(5660300001)(386003)(2906002)(305945005)(6486002)(81166006)(8936002)(36756003)(68736007)(59450400001)(6916009)(478600001)(2950100002)(4326008)(25786009)(50466002)(23726003)(47776003)(69596002)(6116002)(53936002)(66066001)(86362001)(21314002)(16060500001)(309714004); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1874; 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; HK2PR0601MB1874; 23:d/rVcWrf85ZPOTwImbTVxJhIm18g2OhJ0DuwUNV?= =?us-ascii?Q?OK9FZqJVOxEmX9p45SBGCzKr3Zn9L8k9ePHMZtoYY7bJDa+aINZS7tnPDnyQ?= =?us-ascii?Q?g+gVaRXLPiGbr5/JeudwvlLyazrd2aiUFNrd6cfjMSe4YAGOEZZQF2agpWSB?= =?us-ascii?Q?O0DfdPOzMjAbzVhf9TIKTXqd4sYGrEeuxwU4s33qY0ylDSM1rkw5PkYHc79m?= =?us-ascii?Q?1OwuFVZ2KrY1/u7N95zyQRxQBzVQItWpwrOZTswV1WGNQdfCNzP70GquOoP/?= =?us-ascii?Q?n4jhEDDMlRUJgdxQkpPJHYas3XwELNi+UqFE+Dt7w5F6BvztcIcqqjGYU2ZB?= =?us-ascii?Q?Vo5VI21vCdCAA/DEDXmcXS3aQiwJBX96BnwD21Xt7OzzOaAKKVKtz0ifp8bF?= =?us-ascii?Q?zVsFoH2V8NN/s3J9ZKJ4dgJZste1Ycjcn/Llr1jGiZgHhFe9YkGjAKjbLOLJ?= =?us-ascii?Q?y6Zmkf57kwJAg61lqWx28Ll7JejiyWp41k6pDPFRzQPuliAW1XQbSNo3GJwB?= =?us-ascii?Q?LlP2usnbUvnynYy475cRssEP2A9Wi7Az9GcdKm3ZPen2929d4urp8bGVRMka?= =?us-ascii?Q?rK+JN5mUG7uqkL5YTeBkZg70ca5Q/LYQcgI4AN+qndgg8304MXTWS3Jxev1C?= =?us-ascii?Q?BARRLhunJJAwlg5fvUghxx3m4yzO+6OQXZj0VFfNbxH42nKaILX782jIJL/q?= =?us-ascii?Q?cctkvfqmEJJ9Z3ZW46MKBJg793p/l/zMQmEhPktQJagnv2sXwUEQweU9ttWd?= =?us-ascii?Q?nFdbqjHkw0E9Yjc6fb7rxXE0mt9ff//sVshnBs+MNNaAP6uQeyXdXYm/iO9D?= =?us-ascii?Q?LaLHW6KLmBKbii6oPuE+ZKnCszeGVA/qDTHPPkSxW9RFvMgLn+7lVV8j3FIo?= =?us-ascii?Q?N4p1FDYPT1kgwZjzTGf1a5bx78+bK/88GR/Uk13NH9azmL/ICxc3vuUNjqdv?= =?us-ascii?Q?c/FwZ8VfvMCgkQ9V/FnjXQzWD6ThTVWUN4kh8tpQwox9nBmys9+go/OuVx9s?= =?us-ascii?Q?CakQiRhwrUcD8FMgnS4zr1MpAKjq94oVrO/8i9udhQf1smChooB17oeRoP3d?= =?us-ascii?Q?XZ+ew12u0781kUw44S9FVKPRzG0T7nWW53Yo0v88HnJPNtaNEK0Z3pqaobwf?= =?us-ascii?Q?WqnfiCEAbjRIT9a+mpqn8mId7Fdb8JUHalc93Vi0J8MZof3Uwkw5rW5xAf9G?= =?us-ascii?Q?IRgnvtqU3ZNFo9jxnHrX03HYeEJO122IILxsz?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 6:v8mYwRWLRcrO51/4QRiDh072mEIJG/p22zPW3+LU8i9LuHclVHqaL1/toFNc1A3L3udeOX02Rw09LijjTRvRg0Jt9e6nX9NUjoNoGkleMKXdT/n03pNb5GFj2oYvCoMKrI/8UjSXvWto6AhK//5zYcQIMBq8VfMdts9eM1bGQnIN8vaih3F+39pYhNXDyQ6RGjQPsMeeni8XlbcJ1qKBBkmLZzutDUCGFogp2YZZ010r5A5La0CgkL3rv9jizp2vzj38rHF/g2ycLiN/3vGqnpuhso4ckka6cTkC2CN/zKIzgeqcETlnGUEAXDD2BVnDttG1S/tnqd+HFYJF1FG2J6BX7zYEAjK2y6Ylf0xNDUU=; 5:CJHMdjbRD9PibB5CTGXP2Rkhr2yZ1ggZjWOMd3Bnz/haUJn5BFt6dVTOG8zyHrXmRrY/9UHSIhrr42KAsLjU+HU2/f4Wn5d9YCmX6loA8M9XgG3vEjMAb91rYxRkG2Ug9rLS7fZLQaaTv2e/s6mH28QRGOs79XTxke2A6fD8G8Y=; 24:CUBtUs9UQHsEknYjZpvKp6O679awoI5m/51O7MZOg2myErrKU4v0f4NVtRaRsIJNOI9gybM2g5ntIrmE2D92OdKnlm3AEUZSs6a/0BvdCEo=; 7:WTd5fGt02tD0O+btbMT3iOyA0RFzqrZTMZ7Iijhqrt7IjweKTKi53qBB2cY9Ba+ylVujnzEmc9rISWmQX7BuPtYK5HkF2502ehpTMNASA9GxirP2ztW8l9f1D2V7cXg4tk15mpZgG9Wd//of2lQg5dpCUSSs65Z12XtTQQhCdHq/hs6EPwFeAEsTpTCraupCw41mU7V0IVYOqCQhmO4Po8GWC/+JrzbKMVsc5aitQYPcB+PNdKlqYl/9vz2vmy7Q SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 20:FdCArOoNAsZPAvvrfedb3CWZ4NaFaCfQVOq4BS4U5i/TJ0j3lSIjh1myOhuF3PqST8y5zyj+EAnr5IU/sNWTtvh8e6td6cWWNlfiYYcVzm5RvaLTEeBM/ichZv79MTjw7wk+4gxbZWjQWt2iZIoyypjVnGv4nNIg8mwKcTFEGdg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2018 01:12:20.1397 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dbd2063b-abd7-4eee-45b9-08d5595987a9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1874 Cc: Linux-ALSA , Simon Subject: [alsa-devel] [PATCH 016/187] ASoC: wm8776: 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 -> .pmdown_time = 1 - -> .endianness = 1 - -> .non_legacy_dai_naming = 1 Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/wm8776.c | 105 ++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 59 deletions(-) diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c index ae30480..02f8164 100644 --- a/sound/soc/codecs/wm8776.c +++ b/sound/soc/codecs/wm8776.c @@ -78,9 +78,9 @@ static bool wm8776_volatile(struct device *dev, unsigned int reg) } } -static int wm8776_reset(struct snd_soc_codec *codec) +static int wm8776_reset(struct snd_soc_component *component) { - return snd_soc_write(codec, WM8776_RESET, 0); + return snd_soc_component_write(component, WM8776_RESET, 0); } static const DECLARE_TLV_DB_SCALE(hp_tlv, -12100, 100, 1); @@ -166,7 +166,7 @@ static int wm8776_reset(struct snd_soc_codec *codec) static int wm8776_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) { - struct snd_soc_codec *codec = dai->codec; + struct snd_soc_component *component = dai->component; int reg, iface, master; switch (dai->driver->id) { @@ -224,8 +224,8 @@ static int wm8776_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) } /* Finally, write out the values */ - snd_soc_update_bits(codec, reg, 0xf, iface); - snd_soc_update_bits(codec, WM8776_MSTRCTRL, 0x180, master); + snd_soc_component_update_bits(component, reg, 0xf, iface); + snd_soc_component_update_bits(component, WM8776_MSTRCTRL, 0x180, master); return 0; } @@ -243,8 +243,8 @@ static int wm8776_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 wm8776_priv *wm8776 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = dai->component; + struct wm8776_priv *wm8776 = snd_soc_component_get_drvdata(component); int iface_reg, iface; int ratio_shift, master; int i; @@ -279,13 +279,13 @@ static int wm8776_hw_params(struct snd_pcm_substream *substream, iface = 0x30; break; default: - dev_err(codec->dev, "Unsupported sample size: %i\n", + dev_err(component->dev, "Unsupported sample size: %i\n", params_width(params)); return -EINVAL; } /* Only need to set MCLK/LRCLK ratio if we're master */ - if (snd_soc_read(codec, WM8776_MSTRCTRL) & master) { + if (snd_soc_component_read32(component, WM8776_MSTRCTRL) & master) { for (i = 0; i < ARRAY_SIZE(mclk_ratios); i++) { if (wm8776->sysclk[dai->driver->id] / params_rate(params) == mclk_ratios[i]) @@ -293,37 +293,37 @@ static int wm8776_hw_params(struct snd_pcm_substream *substream, } if (i == ARRAY_SIZE(mclk_ratios)) { - dev_err(codec->dev, + dev_err(component->dev, "Unable to configure MCLK ratio %d/%d\n", wm8776->sysclk[dai->driver->id], params_rate(params)); return -EINVAL; } - dev_dbg(codec->dev, "MCLK is %dfs\n", mclk_ratios[i]); + dev_dbg(component->dev, "MCLK is %dfs\n", mclk_ratios[i]); - snd_soc_update_bits(codec, WM8776_MSTRCTRL, + snd_soc_component_update_bits(component, WM8776_MSTRCTRL, 0x7 << ratio_shift, i << ratio_shift); } else { - dev_dbg(codec->dev, "DAI in slave mode\n"); + dev_dbg(component->dev, "DAI in slave mode\n"); } - snd_soc_update_bits(codec, iface_reg, 0x30, iface); + snd_soc_component_update_bits(component, iface_reg, 0x30, iface); return 0; } static int wm8776_mute(struct snd_soc_dai *dai, int mute) { - struct snd_soc_codec *codec = dai->codec; + struct snd_soc_component *component = dai->component; - return snd_soc_write(codec, WM8776_DACMUTE, !!mute); + return snd_soc_component_write(component, WM8776_DACMUTE, !!mute); } static int wm8776_set_sysclk(struct snd_soc_dai *dai, int clk_id, unsigned int freq, int dir) { - struct snd_soc_codec *codec = dai->codec; - struct wm8776_priv *wm8776 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = dai->component; + struct wm8776_priv *wm8776 = snd_soc_component_get_drvdata(component); if (WARN_ON(dai->driver->id >= ARRAY_SIZE(wm8776->sysclk))) return -EINVAL; @@ -333,10 +333,10 @@ static int wm8776_set_sysclk(struct snd_soc_dai *dai, return 0; } -static int wm8776_set_bias_level(struct snd_soc_codec *codec, +static int wm8776_set_bias_level(struct snd_soc_component *component, enum snd_soc_bias_level level) { - struct wm8776_priv *wm8776 = snd_soc_codec_get_drvdata(codec); + struct wm8776_priv *wm8776 = snd_soc_component_get_drvdata(component); switch (level) { case SND_SOC_BIAS_ON: @@ -344,16 +344,16 @@ static int wm8776_set_bias_level(struct snd_soc_codec *codec, case SND_SOC_BIAS_PREPARE: 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) { regcache_sync(wm8776->regmap); /* Disable the global powerdown; DAPM does the rest */ - snd_soc_update_bits(codec, WM8776_PWRDOWN, 1, 0); + snd_soc_component_update_bits(component, WM8776_PWRDOWN, 1, 0); } break; case SND_SOC_BIAS_OFF: - snd_soc_update_bits(codec, WM8776_PWRDOWN, 1, 1); + snd_soc_component_update_bits(component, WM8776_PWRDOWN, 1, 1); break; } @@ -407,37 +407,38 @@ static int wm8776_set_bias_level(struct snd_soc_codec *codec, }, }; -static int wm8776_probe(struct snd_soc_codec *codec) +static int wm8776_probe(struct snd_soc_component *component) { int ret = 0; - ret = wm8776_reset(codec); + ret = wm8776_reset(component); if (ret < 0) { - dev_err(codec->dev, "Failed to issue reset: %d\n", ret); + dev_err(component->dev, "Failed to issue reset: %d\n", ret); return ret; } /* Latch the update bits; right channel only since we always * update both. */ - snd_soc_update_bits(codec, WM8776_HPRVOL, 0x100, 0x100); - snd_soc_update_bits(codec, WM8776_DACRVOL, 0x100, 0x100); + snd_soc_component_update_bits(component, WM8776_HPRVOL, 0x100, 0x100); + snd_soc_component_update_bits(component, WM8776_DACRVOL, 0x100, 0x100); return ret; } -static const struct snd_soc_codec_driver soc_codec_dev_wm8776 = { - .probe = wm8776_probe, - .set_bias_level = wm8776_set_bias_level, - .suspend_bias_off = true, - - .component_driver = { - .controls = wm8776_snd_controls, - .num_controls = ARRAY_SIZE(wm8776_snd_controls), - .dapm_widgets = wm8776_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8776_dapm_widgets), - .dapm_routes = routes, - .num_dapm_routes = ARRAY_SIZE(routes), - }, +static const struct snd_soc_component_driver soc_component_dev_wm8776 = { + .probe = wm8776_probe, + .set_bias_level = wm8776_set_bias_level, + .controls = wm8776_snd_controls, + .num_controls = ARRAY_SIZE(wm8776_snd_controls), + .dapm_widgets = wm8776_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8776_dapm_widgets), + .dapm_routes = routes, + .num_dapm_routes = ARRAY_SIZE(routes), + .suspend_bias_off = 1, + .idle_bias_on = 1, + .pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static const struct of_device_id wm8776_of_match[] = { @@ -475,25 +476,18 @@ static int wm8776_spi_probe(struct spi_device *spi) spi_set_drvdata(spi, wm8776); - ret = snd_soc_register_codec(&spi->dev, - &soc_codec_dev_wm8776, wm8776_dai, ARRAY_SIZE(wm8776_dai)); + ret = devm_snd_soc_register_component(&spi->dev, + &soc_component_dev_wm8776, wm8776_dai, ARRAY_SIZE(wm8776_dai)); return ret; } -static int wm8776_spi_remove(struct spi_device *spi) -{ - snd_soc_unregister_codec(&spi->dev); - return 0; -} - static struct spi_driver wm8776_spi_driver = { .driver = { .name = "wm8776", .of_match_table = wm8776_of_match, }, .probe = wm8776_spi_probe, - .remove = wm8776_spi_remove, }; #endif /* CONFIG_SPI_MASTER */ @@ -515,18 +509,12 @@ static int wm8776_i2c_probe(struct i2c_client *i2c, i2c_set_clientdata(i2c, wm8776); - ret = snd_soc_register_codec(&i2c->dev, - &soc_codec_dev_wm8776, wm8776_dai, ARRAY_SIZE(wm8776_dai)); + ret = devm_snd_soc_register_component(&i2c->dev, + &soc_component_dev_wm8776, wm8776_dai, ARRAY_SIZE(wm8776_dai)); return ret; } -static int wm8776_i2c_remove(struct i2c_client *client) -{ - snd_soc_unregister_codec(&client->dev); - return 0; -} - static const struct i2c_device_id wm8776_i2c_id[] = { { "wm8775", WM8775 }, { "wm8776", WM8776 }, @@ -540,7 +528,6 @@ static int wm8776_i2c_remove(struct i2c_client *client) .of_match_table = wm8776_of_match, }, .probe = wm8776_i2c_probe, - .remove = wm8776_i2c_remove, .id_table = wm8776_i2c_id, }; #endif