From patchwork Mon Jan 29 04:32:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10189189 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 DAA0F6020C for ; Mon, 29 Jan 2018 04:56:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C995528768 for ; Mon, 29 Jan 2018 04:56:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BBEE028786; Mon, 29 Jan 2018 04:56:45 +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 38EE428768 for ; Mon, 29 Jan 2018 04:56:44 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 0935A268081; Mon, 29 Jan 2018 05:45:23 +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 1C996268082; Mon, 29 Jan 2018 05:45:20 +0100 (CET) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id DE692267E21 for ; Mon, 29 Jan 2018 05:32:59 +0100 (CET) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie3.idc.renesas.com with ESMTP; 29 Jan 2018 13:32:58 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 58E9276316; Mon, 29 Jan 2018 13:32:58 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,429,1511794800"; d="scan'208";a="269596771" Received: from mail-hk2apc01lp0207.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.207]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 29 Jan 2018 13:32:57 +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=js+QMnyaRICkLXsfxitoA4tohxiCpxUTQHV64VibcV4=; b=PAgPr1Yz8XBWZTeNOosCIFc1aJ35bFnZD1imyF0YL24cgV4i0cxhRePHF0sX6b7xl0Kw+qox1KIk53uk6xU97QGnFxhh9upfOne2ap8y7hIDALSxsMLG9Il5oCNVB6Lz6gGCCIdiBXpEsUp7u5Zg33kwQxw5poQpKlgO2+NBxvQ= 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 SG2PR0601MB1888.apcprd06.prod.outlook.com (2603:1096:3:9::21) 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:32:55 +0000 Message-ID: <87d11twajj.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:32:55 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: TY1PR01CA0095.jpnprd01.prod.outlook.com (2603:1096:401:d::13) To SG2PR0601MB1888.apcprd06.prod.outlook.com (2603:1096:3:9::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 26df0f93-d442-48d4-4d64-08d566d15e4e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:SG2PR0601MB1888; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1888; 3:NETCd5EaC0u2HYhTAq/A93M0QDDxvJyqRZx7bbY42GRHRaFfGMrfc6eCcJ95LIoXz9YNzl7IrNNkoK9lpD2Uwa9u0iAQz8TcPpZlP4HeuuidfTr5YFwBuLea9rqr6StEbuzVO9KooPCj3duhHY7o+8WJ/AkAwO5jcXwriS50ioT6pTtajc8qGPaHYT6lsaPJOsFSEaPuYnAGTZw/lDee4WQBf5PVyVmMvf5KJHZlO5UbIe/p0w7lHtX9qAXBd+Cf; 25:WTUGc14RF5k6eLfh/yHWspEzJUjR3pKqM6BzpzmFXGVooTvogFkBG+mTAmQZk0/Q6R7alYAidz+OEkYBZWTIDZh8e3UOOUzzJ32o0HNmnU06QJXrsv5R0ShIyHDe2tCECF91QaQkblumh02NlFXmM4s9QGnQCPfnI7mX7IdPd60ob04Je9Zo6ozxYzReHajDxR0nDWpJwCaiE7mUlZE3ynlPjhPVXCOA9ITMtr3J1gKCjf9Hm1iaxDMb71MXdNeFNN8Q+WWEh1byNTz6A9QuMNH/43WupNfxtedenA8XNqDZ3nl8mpd+ned5WUo7+sxl2oNjRPOC2VnaAdRxaMT8Fw==; 31:pgfSA2RjI1OT6/+FZbXNiov78iCoi96Uk9HrDlDLJU9L1fDi9XMElRxcnGDyhCcYpGsUgwy/S5HPQfVLDTXZkZn0MQeWXcPC58++L5NDv6Lj6RQHBBzz3krWAQX7bRYQrCkvtu/XGy+I08+AB/VlX894u91qRvIe+TOyviF6KPlmwMZ3QJx4p40O+qOIYVFeJfcQDfk+mm4KlADCT0Vg+T7x2CAZMiLL5g4aB4afiHs= X-MS-TrafficTypeDiagnostic: SG2PR0601MB1888: X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1888; 20:uvU+fOLvU6+iaQcnFF3mOvyKXYCVJeJbqRW0hGNeHFT5vIaxlIgfOehQQNLU6yHzuGmP16L72F2MMhZIXWtQkQx55GzvnYe0MLE+toBTYdAn333H4cJPYXwtKp+tsHDOqIU9Imzj4cPpXzI+2U+7g/XXhSLgHiV50pZXI6nDsEGwggSvVvVqAy2GssxmbgfbKBQ7tbn8dD5e9Y16LYSecZHtUIIYj8fiU8ryrgTjKFesCbz6jcVORgvbo9vZXx1UPSO5NMYvsMa7h7CVv9/W29zpwP5MgGpVOO9WICckhGaiYMwmXmF/gYM2GLeZsZn/74vM/SXR9q3//jNBQ0nanzkFVuA+seBHJM/WbyBljgGVoViZZPzUunSR9/DGc9FdUBwEb2C5aAlP6QcFfCIxRzq5AZq2T/uWg9B2sOblJP5GaexinjGsIS3YugCtbltZJTThq60s0lcr9migfNaAFjmTqOjt9yG0kkn7J+jyVyNmc1CzefZ9Lvt71+7+VKEx; 4:YdHYxE7T2QyBxcVq20LKpm/XhN4d7lLewBY/LbMA/Sa9oPcercwWDcY0zaxmXCZhMqgt1c6diR/xPQw/qDRJHjdO5gCRvS6bKvnRICHAjaxQd3j3A0V6PvMjDmZgT4+AUZEid9evif/Zyh0jQj69Eqrpjy0ILouLAWKbKoUcPE5/f3SNUnPqqgvufMOUc8T4G1EbNL7+el3MxVxbymBU/avMtypBMc50gk8Sg/JFYnuiyFsG0UEB9Te4xnDxvXVZTVJhmWkiKP2AnYYu6TtBbDBIsLqKUUi5iEDhLiV2qP3KNw0t09rzaH7SiswleEnp 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:SG2PR0601MB1888; BCL:0; PCL:0; RULEID:; SRVR:SG2PR0601MB1888; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(366004)(376002)(39380400002)(346002)(396003)(199004)(189003)(6116002)(68736007)(47776003)(3846002)(50466002)(66066001)(106356001)(23726003)(2906002)(478600001)(97736004)(53416004)(16526019)(81166006)(81156014)(305945005)(8936002)(8676002)(7736002)(186003)(316002)(58126008)(386003)(59450400001)(83506002)(2950100002)(52116002)(7696005)(4326008)(25786009)(76176011)(6486002)(105586002)(53936002)(36756003)(86362001)(69596002)(26005)(6916009)(5660300001)(16586007)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1888; 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; SG2PR0601MB1888; 23:SptcJzMhDlxDB8ghQZLOGKal0+OpMnpGnmukgR0?= =?us-ascii?Q?E4/hkzTEIfi2YWAjm8XZI7AAwJAttIaz86XL7v56XZENwsOcx3mitACdAfsJ?= =?us-ascii?Q?Ub4X8jzm44bVTUFx0CrDtv+NwLB1brJC1ppiBbLQBwF1nH+5eC61MheJEgp3?= =?us-ascii?Q?Us/Rn+E0fLdovWfMPpsFhHqs9MOGQhW32roIqJl9ikPe8F4bT5e1f6F1fyZJ?= =?us-ascii?Q?cUHFFK1mBY4x0tg3iXqJT8i8wvHckgHsQNb3WIMGkMlsPjOWas582mkcLx5L?= =?us-ascii?Q?NYc8O53eouvB6aRgRTpgxAjRusboWBBOjoR9Hgqq7l8yYrlW6IVVFwpH4KUU?= =?us-ascii?Q?0nLFcrGehgi+Ox78nIQk9goQSr4QnpiA2FdO5vxG9AFDt3eXzNaxEbM3ykrn?= =?us-ascii?Q?Bx9bKtlVC0ZVv5u88NT1Ag7eQbT+2IT6sUAfE5CmbcTNbUW2aNsAeupj/ZdL?= =?us-ascii?Q?XSSlUtE7RcSKMYuQGnLer/+u4YM3Lfz5ilHJHnXl/pFLoXcVvQyHAcFIpEqx?= =?us-ascii?Q?CpflRhX0toTunKJIl4PYzlASb8j2G/19jNdveZ8a2O2yDytQ4hhfxOOS7vBL?= =?us-ascii?Q?msbZzT6nvFisxuc8OMaRUGqFOtYtQ6uk86pw5bJOyk2/VFj5OAfGxasA9Yio?= =?us-ascii?Q?iQ9XzKa5NK1ibxP1s93AIhm8eMkhQryqihGzAs9aVFE50xZ7SDelWeBwMXM3?= =?us-ascii?Q?Fwiqri0K+XCnWBNbb4fCP34bWQQz0bm3TUENjXHDdQ8E7DYvMs+rC9BmXzzL?= =?us-ascii?Q?Qar14HQcQxwbOa2kixi4FKcq8PSpbv8dK/pu0kxJRMEx9AoGreIQ8qEI2dRx?= =?us-ascii?Q?tkxsxlEitzYilrNONUBVSWEs9F/zWHwiz4KpyfwAvrHyEP5xjx0BEaswX6Ma?= =?us-ascii?Q?0u4gKfBSTiwCSklp9/xpWw0rqT7sZRMUJ1wHmJzIznPF09QuKMjLyb/cDZ+O?= =?us-ascii?Q?ZdV1YOH91x+sEYln/uIiY+nOeuz1MBi/c01zAtbMrXVnWHn3zqiJxv7dSx0r?= =?us-ascii?Q?ze7noHMSF28LhkkawpZgSv/3qiRh3LgIKJH0lh/Bsirsk1cZFdfYod4tYYK+?= =?us-ascii?Q?68Sr3t+otxkw+uZC3/wM8G10DasnNYyjNmSN0VSYzlncFfQ+GgmUxtF0i70P?= =?us-ascii?Q?46fgHH2yn+wESST1p/9c6vpsqlCH9cbxchAWWGF5MtufW52qi3oxp7bxaN6K?= =?us-ascii?Q?rilx9ZO3H144RjPw=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1888; 6:gSR3FVBbxIjlP2oLeXvo56j9pj3YTOZJO6xogjgfjd0/7I0vhbF8UmgBOguFfvAfCqUr64on+zpQGV2zzrf8wgK4AxM39anFOmHFM3q9341KT3h4l5Wzt+p1zYTrwreIRA2lo//y5Fbdn3dB+AI33C+IGJ11NTMic9U9vWldbgIMUyyKn4OkkRUZCNJxBRr6R9sT+SPXBcqKTX6qv9mCHZQvHv+Usssc3dVzcBvkXglmoDT4Yp4rA8/Qf9Uf6IInzUGVW3XO4PJy2eailE/dtPjgtSuFS6U0mhvCEoB7QUOj2v0BjkpzpZ7x/H5NqPDaOoSB8iwysVqRhjepqkLrKlabtlB/8shEKStKNJnd6t0=; 5:JIct0Dxz5yvHPfcwGtPXE6jd3TPD5BfRuWALtRocEoi7r9VDeDKdFheFl/3bdqwwvYT4K1T2HYT9mjhtdaGMDeAXlJ0WwKCXJhewbAL+0k/nn+3ykxk/PStHYXoPGuIP924TBXgPzl6nZFAroXOLPFUkjfCixPM0BJjTZ+tFEbE=; 24:xEeoCp53JhAnTXBjlIX2YcDoL5HgUoXocX1VWNuHPAn5DyGGXGpATnuBWdr5Bbxw0REEoMeVMaESFH97+rUsFeFho1SWoEzd2MEhy37HJyQ=; 7:RhLw/9Ki/kUbEC2zqIA0X/XkXaCOX+6Bd2LaATGBxHdMMnttdvXDKn5QWWjW9bIOGVRqlR04N8a151rHokCmCFayXMCRlVqU79GRXPKz/Iv39nEBffIXFYzX5HnM7jytKJbC5dDAKMc849jYrzqu0qakCJxrVx9bNakcaZ8ImU0nWtf8HCYhDq82gD+QnJEfbRQR5RAp/pKBcfDL0ALm38jPxo75uAx0HsV4iFU/sXqXswgLxcMHY8VmybEIMWi8 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1888; 20:zHd6cD6IHEhAmea/Iq1qxEpodj+NwQPCAZOGOMhGwcY2d0Pv9RxH5Z3vP9KgGmUPBNPJJNQje0Y3BSWmfDx9JiTn3Q2N8GWfSy6d2xp4EgRcXSSgUEkkMSOQ/lJ9EixNjJcQaB4N0ZndALr8o7z+oVNTnIz/EGNYJGlqu9aOmto= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 04:32:55.6056 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 26df0f93-d442-48d4-4d64-08d566d15e4e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1888 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH v2 153/186] ASoC: es8328: 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/es8328-i2c.c | 7 -- sound/soc/codecs/es8328-spi.c | 7 -- sound/soc/codecs/es8328.c | 147 +++++++++++++++++++++--------------------- 3 files changed, 73 insertions(+), 88 deletions(-) diff --git a/sound/soc/codecs/es8328-i2c.c b/sound/soc/codecs/es8328-i2c.c index 318ab28..19baa32 100644 --- a/sound/soc/codecs/es8328-i2c.c +++ b/sound/soc/codecs/es8328-i2c.c @@ -39,19 +39,12 @@ static int es8328_i2c_probe(struct i2c_client *i2c, devm_regmap_init_i2c(i2c, &es8328_regmap_config)); } -static int es8328_i2c_remove(struct i2c_client *i2c) -{ - snd_soc_unregister_codec(&i2c->dev); - return 0; -} - static struct i2c_driver es8328_i2c_driver = { .driver = { .name = "es8328", .of_match_table = es8328_of_match, }, .probe = es8328_i2c_probe, - .remove = es8328_i2c_remove, .id_table = es8328_id, }; diff --git a/sound/soc/codecs/es8328-spi.c b/sound/soc/codecs/es8328-spi.c index 8fbd935..d242bd1 100644 --- a/sound/soc/codecs/es8328-spi.c +++ b/sound/soc/codecs/es8328-spi.c @@ -28,19 +28,12 @@ static int es8328_spi_probe(struct spi_device *spi) devm_regmap_init_spi(spi, &es8328_regmap_config)); } -static int es8328_spi_remove(struct spi_device *spi) -{ - snd_soc_unregister_codec(&spi->dev); - return 0; -} - static struct spi_driver es8328_spi_driver = { .driver = { .name = "es8328", .of_match_table = es8328_of_match, }, .probe = es8328_spi_probe, - .remove = es8328_spi_remove, }; module_spi_driver(es8328_spi_driver); diff --git a/sound/soc/codecs/es8328.c b/sound/soc/codecs/es8328.c index bcdb891..e9fc2fd 100644 --- a/sound/soc/codecs/es8328.c +++ b/sound/soc/codecs/es8328.c @@ -116,9 +116,9 @@ static SOC_ENUM_SINGLE_DECL(adcpol, { 48000, ES8328_DACCONTROL6_DEEMPH_48k }, }; -static int es8328_set_deemph(struct snd_soc_codec *codec) +static int es8328_set_deemph(struct snd_soc_component *component) { - struct es8328_priv *es8328 = snd_soc_codec_get_drvdata(codec); + struct es8328_priv *es8328 = snd_soc_component_get_drvdata(component); int val, i, best; /* @@ -138,17 +138,17 @@ static int es8328_set_deemph(struct snd_soc_codec *codec) val = ES8328_DACCONTROL6_DEEMPH_OFF; } - dev_dbg(codec->dev, "Set deemphasis %d\n", val); + dev_dbg(component->dev, "Set deemphasis %d\n", val); - return snd_soc_update_bits(codec, ES8328_DACCONTROL6, + return snd_soc_component_update_bits(component, ES8328_DACCONTROL6, ES8328_DACCONTROL6_DEEMPH_MASK, val); } static int es8328_get_deemph(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); - struct es8328_priv *es8328 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); + struct es8328_priv *es8328 = snd_soc_component_get_drvdata(component); ucontrol->value.integer.value[0] = es8328->deemph; return 0; @@ -157,15 +157,15 @@ static int es8328_get_deemph(struct snd_kcontrol *kcontrol, static int es8328_put_deemph(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); - struct es8328_priv *es8328 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); + struct es8328_priv *es8328 = snd_soc_component_get_drvdata(component); unsigned int deemph = ucontrol->value.integer.value[0]; int ret; if (deemph > 1) return -EINVAL; - ret = es8328_set_deemph(codec); + ret = es8328_set_deemph(component); if (ret < 0) return ret; @@ -455,7 +455,7 @@ static SOC_ENUM_SINGLE_DECL(monomux, static int es8328_mute(struct snd_soc_dai *dai, int mute) { - return snd_soc_update_bits(dai->codec, ES8328_DACCONTROL3, + return snd_soc_component_update_bits(dai->component, ES8328_DACCONTROL3, ES8328_DACCONTROL3_DACMUTE, mute ? ES8328_DACCONTROL3_DACMUTE : 0); } @@ -463,8 +463,8 @@ static int es8328_mute(struct snd_soc_dai *dai, int mute) static int es8328_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_codec *codec = dai->codec; - struct es8328_priv *es8328 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = dai->component; + struct es8328_priv *es8328 = snd_soc_component_get_drvdata(component); if (es8328->master && es8328->sysclk_constraints) snd_pcm_hw_constraint_list(substream->runtime, 0, @@ -478,8 +478,8 @@ static int es8328_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 es8328_priv *es8328 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = dai->component; + struct es8328_priv *es8328 = snd_soc_component_get_drvdata(component); int i; int reg; int wl; @@ -492,7 +492,7 @@ static int es8328_hw_params(struct snd_pcm_substream *substream, if (es8328->master) { if (!es8328->sysclk_constraints) { - dev_err(codec->dev, "No MCLK configured\n"); + dev_err(component->dev, "No MCLK configured\n"); return -EINVAL; } @@ -502,7 +502,7 @@ static int es8328_hw_params(struct snd_pcm_substream *substream, break; if (i == es8328->sysclk_constraints->count) { - dev_err(codec->dev, + dev_err(component->dev, "LRCLK %d unsupported with current clock\n", params_rate(params)); return -EINVAL; @@ -513,7 +513,7 @@ static int es8328_hw_params(struct snd_pcm_substream *substream, es8328->mclkdiv2 = 0; } - snd_soc_update_bits(codec, ES8328_MASTERMODE, + snd_soc_component_update_bits(component, ES8328_MASTERMODE, ES8328_MASTERMODE_MCLKDIV2, es8328->mclkdiv2 ? ES8328_MASTERMODE_MCLKDIV2 : 0); @@ -538,25 +538,25 @@ static int es8328_hw_params(struct snd_pcm_substream *substream, } if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - snd_soc_update_bits(codec, ES8328_DACCONTROL1, + snd_soc_component_update_bits(component, ES8328_DACCONTROL1, ES8328_DACCONTROL1_DACWL_MASK, wl << ES8328_DACCONTROL1_DACWL_SHIFT); es8328->playback_fs = params_rate(params); - es8328_set_deemph(codec); + es8328_set_deemph(component); } else - snd_soc_update_bits(codec, ES8328_ADCCONTROL4, + snd_soc_component_update_bits(component, ES8328_ADCCONTROL4, ES8328_ADCCONTROL4_ADCWL_MASK, wl << ES8328_ADCCONTROL4_ADCWL_SHIFT); - return snd_soc_update_bits(codec, reg, ES8328_RATEMASK, ratio); + return snd_soc_component_update_bits(component, reg, ES8328_RATEMASK, ratio); } static int es8328_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 es8328_priv *es8328 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = codec_dai->component; + struct es8328_priv *es8328 = snd_soc_component_get_drvdata(component); int mclkdiv2 = 0; switch (freq) { @@ -589,22 +589,22 @@ static int es8328_set_sysclk(struct snd_soc_dai *codec_dai, static int es8328_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) { - struct snd_soc_codec *codec = codec_dai->codec; - struct es8328_priv *es8328 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = codec_dai->component; + struct es8328_priv *es8328 = snd_soc_component_get_drvdata(component); u8 dac_mode = 0; u8 adc_mode = 0; switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { case SND_SOC_DAIFMT_CBM_CFM: /* Master serial port mode, with BCLK generated automatically */ - snd_soc_update_bits(codec, ES8328_MASTERMODE, + snd_soc_component_update_bits(component, ES8328_MASTERMODE, ES8328_MASTERMODE_MSC, ES8328_MASTERMODE_MSC); es8328->master = true; break; case SND_SOC_DAIFMT_CBS_CFS: /* Slave serial port mode */ - snd_soc_update_bits(codec, ES8328_MASTERMODE, + snd_soc_component_update_bits(component, ES8328_MASTERMODE, ES8328_MASTERMODE_MSC, 0); es8328->master = false; break; @@ -634,15 +634,15 @@ static int es8328_set_dai_fmt(struct snd_soc_dai *codec_dai, if ((fmt & SND_SOC_DAIFMT_INV_MASK) != SND_SOC_DAIFMT_NB_NF) return -EINVAL; - snd_soc_update_bits(codec, ES8328_DACCONTROL1, + snd_soc_component_update_bits(component, ES8328_DACCONTROL1, ES8328_DACCONTROL1_DACFORMAT_MASK, dac_mode); - snd_soc_update_bits(codec, ES8328_ADCCONTROL4, + snd_soc_component_update_bits(component, ES8328_ADCCONTROL4, ES8328_ADCCONTROL4_ADCFORMAT_MASK, adc_mode); return 0; } -static int es8328_set_bias_level(struct snd_soc_codec *codec, +static int es8328_set_bias_level(struct snd_soc_component *component, enum snd_soc_bias_level level) { switch (level) { @@ -651,8 +651,8 @@ static int es8328_set_bias_level(struct snd_soc_codec *codec, case SND_SOC_BIAS_PREPARE: /* VREF, VMID=2x50k, digital enabled */ - snd_soc_write(codec, ES8328_CHIPPOWER, 0); - snd_soc_update_bits(codec, ES8328_CONTROL1, + snd_soc_component_write(component, ES8328_CHIPPOWER, 0); + snd_soc_component_update_bits(component, ES8328_CONTROL1, ES8328_CONTROL1_VMIDSEL_MASK | ES8328_CONTROL1_ENREF, ES8328_CONTROL1_VMIDSEL_50k | @@ -660,8 +660,8 @@ static int es8328_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) { - snd_soc_update_bits(codec, ES8328_CONTROL1, + if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) { + snd_soc_component_update_bits(component, ES8328_CONTROL1, ES8328_CONTROL1_VMIDSEL_MASK | ES8328_CONTROL1_ENREF, ES8328_CONTROL1_VMIDSEL_5k | @@ -671,12 +671,12 @@ static int es8328_set_bias_level(struct snd_soc_codec *codec, msleep(100); } - snd_soc_write(codec, ES8328_CONTROL2, + snd_soc_component_write(component, ES8328_CONTROL2, ES8328_CONTROL2_OVERCURRENT_ON | ES8328_CONTROL2_THERMAL_SHUTDOWN_ON); /* VREF, VMID=2*500k, digital stopped */ - snd_soc_update_bits(codec, ES8328_CONTROL1, + snd_soc_component_update_bits(component, ES8328_CONTROL1, ES8328_CONTROL1_VMIDSEL_MASK | ES8328_CONTROL1_ENREF, ES8328_CONTROL1_VMIDSEL_500k | @@ -684,7 +684,7 @@ static int es8328_set_bias_level(struct snd_soc_codec *codec, break; case SND_SOC_BIAS_OFF: - snd_soc_update_bits(codec, ES8328_CONTROL1, + snd_soc_component_update_bits(component, ES8328_CONTROL1, ES8328_CONTROL1_VMIDSEL_MASK | ES8328_CONTROL1_ENREF, 0); @@ -721,80 +721,80 @@ static int es8328_set_bias_level(struct snd_soc_codec *codec, .symmetric_rates = 1, }; -static int es8328_suspend(struct snd_soc_codec *codec) +static int es8328_suspend(struct snd_soc_component *component) { struct es8328_priv *es8328; int ret; - es8328 = snd_soc_codec_get_drvdata(codec); + es8328 = snd_soc_component_get_drvdata(component); clk_disable_unprepare(es8328->clk); ret = regulator_bulk_disable(ARRAY_SIZE(es8328->supplies), es8328->supplies); if (ret) { - dev_err(codec->dev, "unable to disable regulators\n"); + dev_err(component->dev, "unable to disable regulators\n"); return ret; } return 0; } -static int es8328_resume(struct snd_soc_codec *codec) +static int es8328_resume(struct snd_soc_component *component) { - struct regmap *regmap = dev_get_regmap(codec->dev, NULL); + struct regmap *regmap = dev_get_regmap(component->dev, NULL); struct es8328_priv *es8328; int ret; - es8328 = snd_soc_codec_get_drvdata(codec); + es8328 = snd_soc_component_get_drvdata(component); ret = clk_prepare_enable(es8328->clk); if (ret) { - dev_err(codec->dev, "unable to enable clock\n"); + dev_err(component->dev, "unable to enable clock\n"); return ret; } ret = regulator_bulk_enable(ARRAY_SIZE(es8328->supplies), es8328->supplies); if (ret) { - dev_err(codec->dev, "unable to enable regulators\n"); + dev_err(component->dev, "unable to enable regulators\n"); return ret; } regcache_mark_dirty(regmap); ret = regcache_sync(regmap); if (ret) { - dev_err(codec->dev, "unable to sync regcache\n"); + dev_err(component->dev, "unable to sync regcache\n"); return ret; } return 0; } -static int es8328_codec_probe(struct snd_soc_codec *codec) +static int es8328_component_probe(struct snd_soc_component *component) { struct es8328_priv *es8328; int ret; - es8328 = snd_soc_codec_get_drvdata(codec); + es8328 = snd_soc_component_get_drvdata(component); ret = regulator_bulk_enable(ARRAY_SIZE(es8328->supplies), es8328->supplies); if (ret) { - dev_err(codec->dev, "unable to enable regulators\n"); + dev_err(component->dev, "unable to enable regulators\n"); return ret; } /* Setup clocks */ - es8328->clk = devm_clk_get(codec->dev, NULL); + es8328->clk = devm_clk_get(component->dev, NULL); if (IS_ERR(es8328->clk)) { - dev_err(codec->dev, "codec clock missing or invalid\n"); + dev_err(component->dev, "codec clock missing or invalid\n"); ret = PTR_ERR(es8328->clk); goto clk_fail; } ret = clk_prepare_enable(es8328->clk); if (ret) { - dev_err(codec->dev, "unable to prepare codec clk\n"); + dev_err(component->dev, "unable to prepare codec clk\n"); goto clk_fail; } @@ -806,19 +806,17 @@ static int es8328_codec_probe(struct snd_soc_codec *codec) return ret; } -static int es8328_remove(struct snd_soc_codec *codec) +static void es8328_remove(struct snd_soc_component *component) { struct es8328_priv *es8328; - es8328 = snd_soc_codec_get_drvdata(codec); + es8328 = snd_soc_component_get_drvdata(component); if (es8328->clk) clk_disable_unprepare(es8328->clk); regulator_bulk_disable(ARRAY_SIZE(es8328->supplies), es8328->supplies); - - return 0; } const struct regmap_config es8328_regmap_config = { @@ -830,22 +828,23 @@ static int es8328_remove(struct snd_soc_codec *codec) }; EXPORT_SYMBOL_GPL(es8328_regmap_config); -static const struct snd_soc_codec_driver es8328_codec_driver = { - .probe = es8328_codec_probe, - .suspend = es8328_suspend, - .resume = es8328_resume, - .remove = es8328_remove, - .set_bias_level = es8328_set_bias_level, - .suspend_bias_off = true, - - .component_driver = { - .controls = es8328_snd_controls, - .num_controls = ARRAY_SIZE(es8328_snd_controls), - .dapm_widgets = es8328_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(es8328_dapm_widgets), - .dapm_routes = es8328_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(es8328_dapm_routes), - }, +static const struct snd_soc_component_driver es8328_component_driver = { + .probe = es8328_component_probe, + .remove = es8328_remove, + .suspend = es8328_suspend, + .resume = es8328_resume, + .set_bias_level = es8328_set_bias_level, + .controls = es8328_snd_controls, + .num_controls = ARRAY_SIZE(es8328_snd_controls), + .dapm_widgets = es8328_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(es8328_dapm_widgets), + .dapm_routes = es8328_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(es8328_dapm_routes), + .suspend_bias_off = 1, + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; int es8328_probe(struct device *dev, struct regmap *regmap) @@ -875,8 +874,8 @@ int es8328_probe(struct device *dev, struct regmap *regmap) dev_set_drvdata(dev, es8328); - return snd_soc_register_codec(dev, - &es8328_codec_driver, &es8328_dai, 1); + return devm_snd_soc_register_component(dev, + &es8328_component_driver, &es8328_dai, 1); } EXPORT_SYMBOL_GPL(es8328_probe);