From patchwork Mon Jan 29 03:53:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10189017 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 C70B660388 for ; Mon, 29 Jan 2018 04:28:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B414628783 for ; Mon, 29 Jan 2018 04:28:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A8E1428786; Mon, 29 Jan 2018 04:28:19 +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 9372228783 for ; Mon, 29 Jan 2018 04:28:18 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id A0DD5267964; Mon, 29 Jan 2018 05:24:19 +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 A7A64267962; Mon, 29 Jan 2018 05:24:18 +0100 (CET) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id E05EE267760 for ; Mon, 29 Jan 2018 04:53:54 +0100 (CET) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie1.idc.renesas.com with ESMTP; 29 Jan 2018 12:53:53 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 6655276512; Mon, 29 Jan 2018 12:53:53 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,429,1511794800"; d="scan'208";a="270912523" Received: from mail-sg2apc01lp0243.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.243]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 29 Jan 2018 12:53:52 +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=I2F0rRGmdZtCHSbZGQ8/aKvu3IvgEqtMAx4MtTv3Q0k=; b=jxbUtde0aVSmHMiHCDOFAaMdaxDJ50WKL9k3Y2VpAsb8mhHX2b9OxkOs7OaROAhdYSy2Ts8wc4x6+SKXodkVU3iTu7ltfpAa3sbUrJL76fbpU2o5HDEqVVK6Tt+erRvmYwAjN0F1clhCvTg/hLza/LoIn1TnoNn/5JM3xpiZovk= 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.444.14; Mon, 29 Jan 2018 03:53:51 +0000 Message-ID: <87k1w11fuy.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 03:53:51 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: TY1PR01CA0132.jpnprd01.prod.outlook.com (2603:1096:401:d::50) To HK2PR0601MB1874.apcprd06.prod.outlook.com (2603:1096:202:a::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 8d2c0ca6-7aac-4bb3-c397-08d566cbe8cb X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:HK2PR0601MB1874; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 3:timNvNSQF0UHfNO+BezOQgPRjE2ejuuo+L1HZsdSWQ26laLUuMSvghUqV4C8uaNL1nxmlWyEPG6IQYIipcEvKQW9WlQLHkWoaF6mEYQj8wUufsvUJtq67AZS3iKg3sqhYKqkocZ2m4lVCp/sOyy7QRfLS5bCOG+5MLr/D9uT4EtnFclpwgzRbBs20XNnX8k2nSWag1Jt21Sc1NugCkqROQtcqQIh4WFJHHSEjKv7sv8dSdKOUI2SWGX5JmF/gpv7; 25:6GB9tPuoTmw9ZaBYYgIDmKeINTeSXpch1S/uOBBmj+hHsxNehhJdumBcmD0FypY+zwZehvZ7ZPOoi1+1jV1p1g/oR21doZVVgBDi6xjwZrpV9J/8vcvdkYvTS+uhntRNqaTScxQSy5FSNCJA4BV985SENc509F/z0a9maCQ2MOEfYXzSauF1GYIoGFA3f+nB39ef6fhMvsJ2DAIu2AEnCV4jks6OZ7CCo/FyL1Etg+jXmdG/HwzQOqgRzK7xA8ZCx3Fpry3GVTGimFzTm1nlzugnUKlBG5iv7LZ7qzxNnh/ry2TwpOEAx9sG5o3lZcyLsJ1AZGNzXegM1uZt4IBUvg==; 31:7Uc8iyV5YZ/qtkzs+ea1pqLhMaHnR3Fq5YsJfwnB40LXFWuKwmEISmsVT+QrI38ITpBIPG10NB8EHoH2bVKB9AJXWzkZrKNXkNY28qHHqn8aCZsIZDYFkqm/ZCx5hCSoNgV0CIO7zMle6xFDpWA0TksCE/Rz4x91dBBOncbTACsEmlzrUijmWKcKVOz9QjzTd9ksrINz4pRNVlraOgMxgUA+mkO939DPhHYRDmnazws= X-MS-TrafficTypeDiagnostic: HK2PR0601MB1874: X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 20:Qd02Ll95IWS+Yyot2FDuaIy2epVA9rI3vAw2zLwJ/iqvqQ9Tg6c6vQPoVFxwDMHOyOWrDRpEYG/jW42JWnalRqjJO827RkL29JyI7KPnW/+IwPXwYv5AHVyJOv8qHkSfJIwehTTwzWwW6jXwL31ecGK24G/xql2jJ5HiUF+wSa9rhJphwqfv64riKGkgOdTznv/G7RT4Um5fv62V+1T+kh8KRbqW/9ocS5JF5UeD/pK04CQMKtaw8hfGXXQs1Xx04ho55QWVDiRuKpqCazOqUFE/tClhBUoDtOB+N22IwRrC7RdPvjOD/WKsv0ruiZRNiQ9kUQR4kyYsJYM1D6dF0IICzIXZ0CcjiMdiKRdFxreA3K/hNoESZuMUlkZhCgAVoUNYlTcCuukxLvaD+3bXJ4c0kye8eJ1q7R9n37BUIVBJxFCPvJAYa7vS42jL+KoYS+6KwKON82DaPKBYeLxPHbFlIgc/oF3aFO5gGemwrki19xlChJNrLni9hsgC9zrh; 4:92zERjl0t4RdPkkjbndBEeuz5Qu/PNDJ0rChr2WL8ZagB8UEsUqtuvMKRFR4uPp8rhAFDVscRrzbG4lroTHv75BEDvh8gHj8V6x2lry6glKxLFeXlOBSTe9NKwvLz1JoQEuCfmoV7g7HiHv82+iFA8jKil3cmj1qZbSgWqZbd3dD3Yxm+JuJtzv3ZyQEH/HH53cArtkbrVXH1FD0XIgbo95fuIkc416cCwJ5RRy439ipMGqJONVV3w1KzDrJXDAODCT+Z4yO0Nhud8uPFaYB2fnEO6+hAnAiJDHGBeFIkwCtenX/BPNYwsnM3WGzz53b X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231101)(944501161)(3002001)(10201501046)(6055026)(6041288)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:HK2PR0601MB1874; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1874; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(396003)(376002)(346002)(39860400002)(39380400002)(199004)(189003)(26005)(83506002)(186003)(16526019)(68736007)(81156014)(58126008)(36756003)(8676002)(81166006)(105586002)(8936002)(86362001)(575784001)(6116002)(3846002)(2906002)(66066001)(6916009)(2950100002)(16586007)(316002)(23726003)(69596002)(5660300001)(478600001)(47776003)(305945005)(106356001)(7736002)(53416004)(53936002)(6486002)(97736004)(59450400001)(50466002)(386003)(52116002)(76176011)(7696005)(25786009)(4326008)(21314002)(16060500001); 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:2VHovoP8GlfT4zduygs2X5zv+4PnYHtPqICGSyf?= =?us-ascii?Q?mMYz2SVaA1b3tjEWrtZY0Nt8GvXa/3IWO4JFjiR1+mjRFlrbkJKJgD1DkT3k?= =?us-ascii?Q?lmWTKs4A5j1T73vgDClhgMIN9wWhwUSk5J3dfC4ldFpekwh4t5HorqIoibYD?= =?us-ascii?Q?lmJ/SsYOt1sn5YQ6+6Z/qZhU+NSk66NmiPlX6R4hbfdHDwo3KmAAjvxuHLmx?= =?us-ascii?Q?qqdFR9dWgV3VUuxp7YL9HCuZtlEC+8DtaD3ADm5UVVSlepoIfDjfrz9VCbyh?= =?us-ascii?Q?OIxfUP+1PbAILbifgO0DeZQ2x+VQnfwcFbn6lSfEueVi1iQBoWJApCpyvuGX?= =?us-ascii?Q?AJKmeenD0eft6zi5H3oJOTd7AyzPsT0GgLJ2RgCdI8omJemdsvRQ1amnSec4?= =?us-ascii?Q?FHZOtjH0aAz6YxdJF0xXFKaaL6jtC4gN6Q06+JlOp37Tj7uxuXbq/DRwNJxR?= =?us-ascii?Q?ePSHLJTQGoYAHDemNDsLtU/jsYzOjubeUOJkQfLnr9JFX/wnNviUID2h8hmw?= =?us-ascii?Q?hEPpcKYqBaiL04C8SAUw7r76aDImxlqMzbQPRJqW5E42iN5F5/qaSf/pFT7/?= =?us-ascii?Q?fX7hWQtiU0NB20obvlrB5QUQ8TCfr+ZD32C+pla9CrrvC23z08AXB0sYEN4D?= =?us-ascii?Q?wAj/u1mq4YEZx22xtjjm8OXtbPsdABsqBAn7tG7XOteEUtMV9ZNm52z0kstS?= =?us-ascii?Q?JQvkQ3ilgX+4jUCQmxzO/EnUYibmZoea1e+x6Z+idtkhYYq6jQOLCe+W8wsk?= =?us-ascii?Q?92wLL3RNdVHMgBbbpmR6eWuuSMbbsl2YFdEcNqPTuOuSwU7uPqJqmARiQCY7?= =?us-ascii?Q?dZxenHxfElzwGL4gk0jtRBxR9wKtMtTcluAUSiTgLzdjjwkA59y+dIFBeKRe?= =?us-ascii?Q?LSco096NXsXPkLdpMhrGieH/A6AeewhdxBgIw+qN20FlQqjnDyeFpeQcFtWI?= =?us-ascii?Q?nAN39LNrPCZvKcr8gf2NhOBjpxalckvXr4rvkn6Z+bpFBTZIIleLKC35U6sJ?= =?us-ascii?Q?0cbvL1UvlKIM06tgnXv5zp+G90LjPIbSGhRcLe0m0Iz0mUSdKlSw6DyOY9qE?= =?us-ascii?Q?REjEnsDMnLz5tcjIV5ER5pzBRk76hkLu2o0t0Qcx1V5+khWDxRSykw/53Gt6?= =?us-ascii?Q?NDTTnV96GLeXvPzF11gfhoAuUN/8K3wEr95zV8keF+vN0N0oZLWOcQtfiK9r?= =?us-ascii?Q?pCbavvAyQOgDc4peAtMQ/o3Vw644KnYCnNoQ1?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 6:/4FMzrYDSTj891fiESkTtN7Lv+fwzv4vSomj0VzeYa4gf0ZDliqQO0r1y9/jYpnFuY23qVd4XJ4rErwnQY5iHeIPlhVCfbDirigYPGEUS+tUpzr3aT35y9fcBWUj6/RlOdx41C8tlE2FQEPGX0+k7N92wVQ+PnwS4N3sVdD5rwta4CynWxfUmATdTyW2O2EY41iekrO5zwsOAmznRDQgyok7gbx3+y2UsulP62k2oBdNIbUo6kapFLT8pZ54nPEPB7taoxpg1LBeXFKm1GwyzpoKk+QSr2tGqLHoI8suUUtryJRdyzu8az07tsuvhNKon6bC7+/U0cIHyaYzhsl//+7l+fn9EyORePwrnnpRuNU=; 5:ApQuvPbSy9DWnM3Pf5Ww9aHj2UxJ+iWTZI7Vsn89ljtIXEcM/zi2aepPHqfkVf1YymptDYScm+CQ6UAy9BAP4ppbl+EqSg764M8jXG86waxNLeDfDt9JKx0cwsmey2gkyvcT/ZQ83Mcv2jcG4xCEI9tUGyKv1Aln/p1Q1EYJEog=; 24:lxv3MufomxHOjXtBP+qMIb/7uC/Nf7rxpWWEoh8ZvkvQHshMKWJ7J8YE/Qy4DSj5dVCpheLx066kQjhQcz6kN0X3BloCDiTVNrC0IFduJNY=; 7:1SWIw/hCyEIZ8Rw3hxgMwEkf0nFugK1vdwm5aztRhiNvWOUfnfNsg/81QXOVsi4M2rmuexZb7r8tNlWfcGY8PTvGBnY/3PcZIamBPbue76ZQrSIMHliYwkhnzMy+A8WzdrjVpWIlslZJUMTk0U/+TVcUnLmEHINcsSCNy80kmtp4HteBjx1hSZDVoDwwF/qMhbkbrT2Xt2aRn8W5Aw9VJtQOH5H1PBWmWv5GLz/gt9ihwlTsairryKW6bhhxEeln SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 20:7K+8Ze06fbB9ZBuG3+r4j63U2wKUx7vNnTo4B9t0WedSthlrmorzkKhcLttyQAy1CEd27tfnJlT/xHLH1erTNJKdR9xipZ2EprpJc0uFHwZpj9tmJ11s6PBa6VB3th1sj+ocGB6wXHeNuIFHaxRKdW9gSeI4mk6HSObxEPcHszM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 03:53:51.0199 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8d2c0ca6-7aac-4bb3-c397-08d566cbe8cb 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 Subject: [alsa-devel] [PATCH v2 073/186] 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 -> .use_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..275677d 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, + .use_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);