From patchwork Fri Jan 12 01:29:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10159299 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 F3498602D8 for ; Fri, 12 Jan 2018 01:38:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E17B928769 for ; Fri, 12 Jan 2018 01:38:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D5629287DE; Fri, 12 Jan 2018 01:38:47 +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 895EE287C9 for ; Fri, 12 Jan 2018 01:38:46 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 24113267FEF; Fri, 12 Jan 2018 02:38:44 +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 E658B267D97; Fri, 12 Jan 2018 02:38:42 +0100 (CET) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id 754AE267D9A for ; Fri, 12 Jan 2018 02:29:16 +0100 (CET) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie1.idc.renesas.com with ESMTP; 12 Jan 2018 10:29:15 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id E31136D35A; Fri, 12 Jan 2018 10:29:14 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,346,1511794800"; d="scan'208";a="269309138" Received: from mail-hk2apc01lp0214.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.214]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 12 Jan 2018 10:29:14 +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=PnaBUTvkP/tN5fQGa6E7240wUlaQv4zA8sO9UPdYAJE=; b=h/mSZZxQmlwAt1PKaYP+pXrshdl7HJqve38wrPaG5nhEmPI31Bcy6664VndwncDHInJVw6W87TgV9tPTvSuD18xC5wDYu5/KifxrwgGhZtOccf0YOdcuqUxR86/ChGlEnclYw39UdTw94/cDwwkYACNISxWLMLa7kPgMizbTDZc= 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 SG2PR0601MB1885.apcprd06.prod.outlook.com (2603:1096:3:9::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:29:12 +0000 Message-ID: <87fu7bamsa.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:29:12 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: KAXPR01CA0020.jpnprd01.prod.outlook.com (2603:1096:402:19::30) To SG2PR0601MB1885.apcprd06.prod.outlook.com (2603:1096:3:9::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 1936929f-4bea-456d-6e60-08d5595be2ea X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020074)(4652020)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:SG2PR0601MB1885; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1885; 3:GoUgsvO4+tR67nWJcbYqLeQBdT+0UgrnDGm1r0SuFnw0R1Jj8T/NjAr6tnz+R5E5x3iCBJYJYPtlbGVPVkSBEPvIDvImsmrG6Vu8cKMK/bLNNrt9YvPdGCUZn1xQVXhD/hH7PwN+iFTOeHsd1+BOyv3639ZJYrHZ0Il0h98gVtKyQqLm/uYqlj+xaey/8xPCimr59VEpmOaGojeJQXC8S49veYqw7Bs+4iCjC70pKKaBcGseB9NxRiSp4p/niTGo; 25:4ummE3AIycN+KlYgfYNNbWo3RyVZUB4cMr8uMFvohfw+9ABx/GSZVtMeIY+iCpJJwS9LANJWUESDPgHgUE1kAPIqRwhekfgEL2SaObk18tP4yPkVD6JbK2JCHWF8A4BGkTnDu1fhj9HwFhXxyNUVtcyhPU6wMHuuq7NSgjdQWEzO0dMCkBi8Ovu0hyoZtBUL+u/bBl6pFsMB366n3uAQczrO4OMHwl3qdWBAfUAtrv1nlbrAjUBVjKBfjZGlZQYphBa1DyBkiXag5tD11pIeTKEBA70CgcpBUtrmIcddWw9lc+5ZSUaqjVhwcFD3rs5FTUxGUhn+EmaATgyrhSc40A==; 31:vTgu3iATling5u4OqD/CUqxZYaYwB8b5VW5Ux4TXeJvcJL+lHH24Pp/XEbRZJ6z/5ewB7bJUrvPhLgu8IG8Cqs6QXhqC6d8AlvCLleZo99WhnDFyFHe0cnN09dHk8iGAaE/4ml2se7wywrKB+zIdjMePI38QLuPCJ+IXZMgjPPKHLJZByHSmonxzaQZ/sEYeb63yClKicjgqn7Ewjq7B8sMhMmNqiW6Ml8XVUEXvmYY= X-MS-TrafficTypeDiagnostic: SG2PR0601MB1885: X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1885; 20:BkGds+ETh+INZLDAOAf/gHmTFP5TXs9Xun1NuuSP/2RLLaJeKwRF1S/TNX+Qiqtm4G6VO8WDIV0JsrXfOYNPhp8qn4qW9bOFq9Y5tqU1QrFtFSkj9x64K/SXCf25PYo3ccK+0sjp2nQq1zo/IKxe2ABb7XYT325EASTn1rnSMM57WjCYUwBcsKQCKE+rhyc+eHCLW7QP+oTkDyap57GNEjXG/7wPlGQtMRwlXBnqqbD+qp0X2NVCH8httg+6/vbkODnjKCFjOYlHLXbqoC8l6HMIbafpUQgxZmJSnp2cG3xgArtZB94Y9YuR5+13FexBj8QYse/cmc06MycF2SzfSrV9LVRWDeZRl67/571i9jdeku8UrTu5DB931n+9QIdgGtJZU+CGSz6HFLQw/bxKZ1fQXj4B5QmuKNlxDasS0AVshkv1puZoA5oQs88qMNlxTUonT2IaKzwsbyOp9/PL3iVCGjIe3esS9RS56uolX7gRSFgf7xgOK84Qg0hpbGiC; 4:fu65QIdnG6zMnQqp43MlUYZy7gIi5MsEP+xq3MOipl2p8p/d5DcJxVC0MIrwCAgXySvCLuQ6f6FZVsxiOyamtSu097Y+P4UAfEjZRqlUDP2jqqZ2naDiurQ3mUUzMFpmfUvMRcyjlGDQCGv/JlXFylrWMV8B1eTBE16OzrkNaJDIBDg7jqC8L9hAMDqwCPoh+/mUESvPiDj3UWveggoojiCgiGLtxtuBmtFKOEtWnP9boi2O9/h8xAZ+D5vhJ8XGGQdE7mFewPeHqDqdqDiEYpWwzs50z6DDoht9T6p8Yb42eYbJBqKbyTvkH0OKZPOk X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(3231023)(944501138)(93006095)(93001095)(10201501046)(6055026)(6041268)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(6072148)(201708071742011); SRVR:SG2PR0601MB1885; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:SG2PR0601MB1885; X-Forefront-PRVS: 0550778858 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(366004)(346002)(376002)(396003)(39380400002)(189003)(199004)(23726003)(59450400001)(83506002)(54906003)(52116002)(7736002)(76176011)(7696005)(66066001)(81166006)(53416004)(25786009)(316002)(8936002)(16526018)(305945005)(6486002)(53936002)(386003)(47776003)(58126008)(2906002)(16586007)(36756003)(69596002)(4326008)(68736007)(97736004)(2950100002)(6916009)(105586002)(575784001)(86362001)(478600001)(81156014)(50466002)(3846002)(106356001)(6116002)(8676002)(5660300001)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1885; 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; SG2PR0601MB1885; 23:5JliLEJ1oN77uuG2OpYUI7VFM6cL5UNz3WCAJOH?= =?us-ascii?Q?S5MmwWVOVSJFJ5PxLaXDBZ+8mj3BIIMbpFJgtqeElGPUy/828r6R4uQfvXr7?= =?us-ascii?Q?5KI2RtlQql8LimAdVAEpQes/R5es30vMOKd28JPMMXfJG2lmEiu2C3ATsF3u?= =?us-ascii?Q?yIOzKizGJt0BbzU6ZyCoAyzMTMoa+moddjcozQ0TdsuVGTC5Hx6qeblRjztl?= =?us-ascii?Q?E6Tks6VAK2BYDfPMEFtdTQuTtwPZS6rlDlp98eTADAqagTRmRtjDtUVzRZKz?= =?us-ascii?Q?qLNqXiqvJpJfHWw9HzqHGTh/kzuolhShqIYjOJ95HzDaUtTTrtRgKEobUHyX?= =?us-ascii?Q?z3OPs+pveNNO8blJwcmLYxxyhHknZ+G9j383Ad9glH7QElG1ElbqQCrJN5uF?= =?us-ascii?Q?anTdhPGqBpbsN2vtgjnAr1O1oZiGl9VfMkUJIAYI7swd5ZfM6ciXzlaPwtBL?= =?us-ascii?Q?zM7xHpNdtGxFvC6+ky0f25q7urOigP4sVOyQ/mYV0lc7okB2CSDeUN8opXKE?= =?us-ascii?Q?wbSiYzpuZmxuzz//lYDRmIb/9CfKhFaYxa6yXXCaP5c+yEpJaI03c0bHXu/7?= =?us-ascii?Q?R8NDeT56QpDLcUdn68nTEHtaJcsoi5abTJ6y3Rb6JR/anHcCCxSuwrCmBZiq?= =?us-ascii?Q?4ycc30WOhOuT+2bQsTb1E3fHie3I9jAtgJTy8kuKSkiue51TOJVw0G8AVkCg?= =?us-ascii?Q?yrfG9+lPINmpR4O3e/mXVqSNZa2qliGk7tgsA3CLqiUNCTc/gw6ElqmUan/M?= =?us-ascii?Q?3+OPAn0ylNz6c9gkG6UcGleMAbj8lwXPUgPKgHRV3G/hETIXfe+kzwmbNq40?= =?us-ascii?Q?AYn0KS7XZY7sgBDIECjHFsZoAlkZsyAV1X4HWahslchkrvYTAPWeapjOnNpo?= =?us-ascii?Q?nZueMlJ1niO84JOQJYle28ZnRi++CutXVBgYFqr6Loi9yuAk8f6AHyyUSgRK?= =?us-ascii?Q?9QZ0V6Se5hBd8dMQST7Unn5KvSck8N8tDy5TtAan3QdkXVmy/kMLTSC/vYU0?= =?us-ascii?Q?aFZQDkGIn4BqTlBEdv1zRSU1jdIEn+WNvu8xiLE+3nwArZCxEtYGHyNUwxcB?= =?us-ascii?Q?GlLhMfnYr7PFTJJSul2hUrmBF3YEEE5X2BHt0l46WSPVnh4o+xa7LyU4vea5?= =?us-ascii?Q?E0NKsuiGlo17B+M844v/d8qEeXPOs1G+rQ8EpziHwV3cvHmDaxkV0/Wz5G6h?= =?us-ascii?Q?sMloiX13lrm44PdXfa7SdoYj0fSj6d5gDDlaY?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1885; 6:KNZklMfwxg+MQep6VB2ug4HgNWJMlTqYpr5m8J//mD1MlcTFxwFPHT5kph9Vy8E7jGAQJ68lrSTN+G6EfnIO68jnFC98ZNo/Lds2vrywKiP+pdRQHfHpeXeCCd+cFrXWGwolHjIjd0SMxrfdzb8t3HKhH4MWqV6juqdGbE4ipm1nfG1+rzIeXnoGJE0oJFyFo/UmWGnWytH6+z/AW9k3tQMWOqqQnv/f3mFWa9bcvZU/XjkvsYsPy4ElqYYkRtcDDiYrXWxWqHYr2wpwVcSZ4fbMkKgxAbBa9StF09rjlCLKFLzdNJ34ynbFsz8sIBFEgBpateMsmFesdPeNP/Bkl8fmuxGn4zO7GB30mRi54w0=; 5:nCd12Qn7tlfrT8gakK0HMq0uQQRaBaBmeRWhEW0usXbKJoNwYz0REYj1/Lj55pcbK3tcjUfN3QyGMB9YFlbfPz1eGtVjUALH6sRfffb3Zly3zYfxCpVJN/OSwZXJSHa0GAlbfA843Qp9vmWu9OLWqoKDmq4IjmTFT+UPSc5mqx0=; 24:3u9jfvgEEn38iE7tg6nJntA0K26Bl/lbKwcDNHi6ofXzEeNgmm1GwH4BOu2fHZ6VO7VQcYHjGl5E+2CMIkGbL5/YE+Qxu+g1Ru5EX7ru/sc=; 7:N3wIbyNsEInR0yD07GBs621asIfgmfN4umcXdJri43lgsiYKrYjxbnzgqwFh733uz/0tYQb6YGg2Y0iApjUTDfr7hdwOXUi+YVyWWJYqhYXdgA4yjwjqe4U3yf1BkEgNj7DUq/27df6pl70zvnk9mm9H331gcknvdXf0Zbl0kAGFEamyInIIRchuClYWt/BJqDG/mHMVY7TV6Mn/7Z95IRnb0iau25L/h55g/mkbQB86A8egDSTA/WNU+cAhlQyF SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1885; 20:2v4QypGB6tvAEivoDyTLhQt6YnRAkCojDReq3iozzaNNW4h0sZe6TvjaR75hVIDy0sZiYcrTslbJeh4VG7sEUdU1yExhZeA0BDLysLRJMNU6qYiUqz0HurpzPI7G0L4mOJgmO/iUrSeANKhrMN3EbYB1KMy2VFD7HoEFRwmqh5g= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2018 01:29:12.2016 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1936929f-4bea-456d-6e60-08d5595be2ea X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1885 Cc: Linux-ALSA , Simon Subject: [alsa-devel] [PATCH 073/187] ASoC: cs4265: 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/cs4265.c | 98 ++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 52 deletions(-) diff --git a/sound/soc/codecs/cs4265.c b/sound/soc/codecs/cs4265.c index fd966bb..4488d20 100644 --- a/sound/soc/codecs/cs4265.c +++ b/sound/soc/codecs/cs4265.c @@ -322,12 +322,12 @@ static int cs4265_get_clk_index(int mclk, int rate) static int cs4265_set_sysclk(struct snd_soc_dai *codec_dai, int clk_id, unsigned int freq, int dir) { - struct snd_soc_codec *codec = codec_dai->codec; - struct cs4265_private *cs4265 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = codec_dai->component; + struct cs4265_private *cs4265 = snd_soc_component_get_drvdata(component); int i; if (clk_id != 0) { - dev_err(codec->dev, "Invalid clk_id %d\n", clk_id); + dev_err(component->dev, "Invalid clk_id %d\n", clk_id); return -EINVAL; } for (i = 0; i < ARRAY_SIZE(clk_map_table); i++) { @@ -337,24 +337,24 @@ static int cs4265_set_sysclk(struct snd_soc_dai *codec_dai, int clk_id, } } cs4265->sysclk = 0; - dev_err(codec->dev, "Invalid freq parameter %d\n", freq); + dev_err(component->dev, "Invalid freq parameter %d\n", freq); return -EINVAL; } static int cs4265_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) { - struct snd_soc_codec *codec = codec_dai->codec; - struct cs4265_private *cs4265 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = codec_dai->component; + struct cs4265_private *cs4265 = snd_soc_component_get_drvdata(component); u8 iface = 0; switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { case SND_SOC_DAIFMT_CBM_CFM: - snd_soc_update_bits(codec, CS4265_ADC_CTL, + snd_soc_component_update_bits(component, CS4265_ADC_CTL, CS4265_ADC_MASTER, CS4265_ADC_MASTER); break; case SND_SOC_DAIFMT_CBS_CFS: - snd_soc_update_bits(codec, CS4265_ADC_CTL, + snd_soc_component_update_bits(component, CS4265_ADC_CTL, CS4265_ADC_MASTER, 0); break; @@ -383,20 +383,20 @@ static int cs4265_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) static int cs4265_digital_mute(struct snd_soc_dai *dai, int mute) { - struct snd_soc_codec *codec = dai->codec; + struct snd_soc_component *component = dai->component; if (mute) { - snd_soc_update_bits(codec, CS4265_DAC_CTL, + snd_soc_component_update_bits(component, CS4265_DAC_CTL, CS4265_DAC_CTL_MUTE, CS4265_DAC_CTL_MUTE); - snd_soc_update_bits(codec, CS4265_SPDIF_CTL2, + snd_soc_component_update_bits(component, CS4265_SPDIF_CTL2, CS4265_SPDIF_CTL2_MUTE, CS4265_SPDIF_CTL2_MUTE); } else { - snd_soc_update_bits(codec, CS4265_DAC_CTL, + snd_soc_component_update_bits(component, CS4265_DAC_CTL, CS4265_DAC_CTL_MUTE, 0); - snd_soc_update_bits(codec, CS4265_SPDIF_CTL2, + snd_soc_component_update_bits(component, CS4265_SPDIF_CTL2, CS4265_SPDIF_CTL2_MUTE, 0); } @@ -407,8 +407,8 @@ static int cs4265_pcm_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 cs4265_private *cs4265 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = dai->component; + struct cs4265_private *cs4265 = snd_soc_component_get_drvdata(component); int index; if (substream->stream == SNDRV_PCM_STREAM_CAPTURE && @@ -418,45 +418,45 @@ static int cs4265_pcm_hw_params(struct snd_pcm_substream *substream, index = cs4265_get_clk_index(cs4265->sysclk, params_rate(params)); if (index >= 0) { - snd_soc_update_bits(codec, CS4265_ADC_CTL, + snd_soc_component_update_bits(component, CS4265_ADC_CTL, CS4265_ADC_FM, clk_map_table[index].fm_mode << 6); - snd_soc_update_bits(codec, CS4265_MCLK_FREQ, + snd_soc_component_update_bits(component, CS4265_MCLK_FREQ, CS4265_MCLK_FREQ_MASK, clk_map_table[index].mclkdiv << 4); } else { - dev_err(codec->dev, "can't get correct mclk\n"); + dev_err(component->dev, "can't get correct mclk\n"); return -EINVAL; } switch (cs4265->format & SND_SOC_DAIFMT_FORMAT_MASK) { case SND_SOC_DAIFMT_I2S: - snd_soc_update_bits(codec, CS4265_DAC_CTL, + snd_soc_component_update_bits(component, CS4265_DAC_CTL, CS4265_DAC_CTL_DIF, (1 << 4)); - snd_soc_update_bits(codec, CS4265_ADC_CTL, + snd_soc_component_update_bits(component, CS4265_ADC_CTL, CS4265_ADC_DIF, (1 << 4)); - snd_soc_update_bits(codec, CS4265_SPDIF_CTL2, + snd_soc_component_update_bits(component, CS4265_SPDIF_CTL2, CS4265_SPDIF_CTL2_DIF, (1 << 6)); break; case SND_SOC_DAIFMT_RIGHT_J: if (params_width(params) == 16) { - snd_soc_update_bits(codec, CS4265_DAC_CTL, + snd_soc_component_update_bits(component, CS4265_DAC_CTL, CS4265_DAC_CTL_DIF, (2 << 4)); - snd_soc_update_bits(codec, CS4265_SPDIF_CTL2, + snd_soc_component_update_bits(component, CS4265_SPDIF_CTL2, CS4265_SPDIF_CTL2_DIF, (2 << 6)); } else { - snd_soc_update_bits(codec, CS4265_DAC_CTL, + snd_soc_component_update_bits(component, CS4265_DAC_CTL, CS4265_DAC_CTL_DIF, (3 << 4)); - snd_soc_update_bits(codec, CS4265_SPDIF_CTL2, + snd_soc_component_update_bits(component, CS4265_SPDIF_CTL2, CS4265_SPDIF_CTL2_DIF, (3 << 6)); } break; case SND_SOC_DAIFMT_LEFT_J: - snd_soc_update_bits(codec, CS4265_DAC_CTL, + snd_soc_component_update_bits(component, CS4265_DAC_CTL, CS4265_DAC_CTL_DIF, 0); - snd_soc_update_bits(codec, CS4265_ADC_CTL, + snd_soc_component_update_bits(component, CS4265_ADC_CTL, CS4265_ADC_DIF, 0); - snd_soc_update_bits(codec, CS4265_SPDIF_CTL2, + snd_soc_component_update_bits(component, CS4265_SPDIF_CTL2, CS4265_SPDIF_CTL2_DIF, 0); break; @@ -466,23 +466,23 @@ static int cs4265_pcm_hw_params(struct snd_pcm_substream *substream, return 0; } -static int cs4265_set_bias_level(struct snd_soc_codec *codec, +static int cs4265_set_bias_level(struct snd_soc_component *component, enum snd_soc_bias_level level) { switch (level) { case SND_SOC_BIAS_ON: break; case SND_SOC_BIAS_PREPARE: - snd_soc_update_bits(codec, CS4265_PWRCTL, + snd_soc_component_update_bits(component, CS4265_PWRCTL, CS4265_PWRCTL_PDN, 0); break; case SND_SOC_BIAS_STANDBY: - snd_soc_update_bits(codec, CS4265_PWRCTL, + snd_soc_component_update_bits(component, CS4265_PWRCTL, CS4265_PWRCTL_PDN, CS4265_PWRCTL_PDN); break; case SND_SOC_BIAS_OFF: - snd_soc_update_bits(codec, CS4265_PWRCTL, + snd_soc_component_update_bits(component, CS4265_PWRCTL, CS4265_PWRCTL_PDN, CS4265_PWRCTL_PDN); break; @@ -544,17 +544,18 @@ static int cs4265_set_bias_level(struct snd_soc_codec *codec, }, }; -static const struct snd_soc_codec_driver soc_codec_cs4265 = { - .set_bias_level = cs4265_set_bias_level, - - .component_driver = { - .controls = cs4265_snd_controls, - .num_controls = ARRAY_SIZE(cs4265_snd_controls), - .dapm_widgets = cs4265_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(cs4265_dapm_widgets), - .dapm_routes = cs4265_audio_map, - .num_dapm_routes = ARRAY_SIZE(cs4265_audio_map), - }, +static const struct snd_soc_component_driver soc_component_cs4265 = { + .set_bias_level = cs4265_set_bias_level, + .controls = cs4265_snd_controls, + .num_controls = ARRAY_SIZE(cs4265_snd_controls), + .dapm_widgets = cs4265_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(cs4265_dapm_widgets), + .dapm_routes = cs4265_audio_map, + .num_dapm_routes = ARRAY_SIZE(cs4265_audio_map), + .idle_bias_on = 1, + .pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static const struct regmap_config cs4265_regmap = { @@ -616,18 +617,12 @@ static int cs4265_i2c_probe(struct i2c_client *i2c_client, regmap_write(cs4265->regmap, CS4265_PWRCTL, 0x0F); - ret = snd_soc_register_codec(&i2c_client->dev, - &soc_codec_cs4265, cs4265_dai, + ret = devm_snd_soc_register_component(&i2c_client->dev, + &soc_component_cs4265, cs4265_dai, ARRAY_SIZE(cs4265_dai)); return ret; } -static int cs4265_i2c_remove(struct i2c_client *client) -{ - snd_soc_unregister_codec(&client->dev); - return 0; -} - static const struct of_device_id cs4265_of_match[] = { { .compatible = "cirrus,cs4265", }, { } @@ -647,7 +642,6 @@ static int cs4265_i2c_remove(struct i2c_client *client) }, .id_table = cs4265_id, .probe = cs4265_i2c_probe, - .remove = cs4265_i2c_remove, }; module_i2c_driver(cs4265_i2c_driver);