From patchwork Mon Jan 29 04:39:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10189219 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 E69E660388 for ; Mon, 29 Jan 2018 05:02:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D6BBE2621D for ; Mon, 29 Jan 2018 05:02:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CA6B8286AD; Mon, 29 Jan 2018 05:02:32 +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 EF39E2621D for ; Mon, 29 Jan 2018 05:02:31 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 09F7E268338; Mon, 29 Jan 2018 05:57:54 +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 4B4EB268334; Mon, 29 Jan 2018 05:57:51 +0100 (CET) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id 1B5C5267A6C for ; Mon, 29 Jan 2018 05:39:33 +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:39:32 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id AEF995D5B0; Mon, 29 Jan 2018 13:39:32 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,429,1511794800"; d="scan'208";a="269597566" Received: from mail-hk2apc01lp0210.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.210]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 29 Jan 2018 13:39:32 +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=R6cCUHY1nQmwxH0+9JukCmzboIFFYqPVBxFmr59c1Bg=; b=Mzi8inBkd9q22JeNaTAXnZBm/3IN2Zl65AMFa34HfplgT7Tu9kKIswBJJTsYyXycSlthTDwu0fTitaua7YqcCwC9qO4E5EBwOaEe6w9NjSG/ijra0M++kXiGZJe77SngKdqKsZlBCALUW7xpPSwXU3CxqvQzdLMgdh8mk4KpES8= Received: from morimoto-PC.renesas.com (211.11.155.138) by KL1PR0601MB1880.apcprd06.prod.outlook.com (2603:1096:802:8::16) 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:39:30 +0000 Message-ID: <87r2q9uvo5.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:39:30 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: OSBPR01CA0027.jpnprd01.prod.outlook.com (2603:1096:603:1e::15) To KL1PR0601MB1880.apcprd06.prod.outlook.com (2603:1096:802:8::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 1c7e5233-4c35-458e-342f-08d566d24994 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:KL1PR0601MB1880; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1880; 3:lA13DTtT4cSybHO/UXIIhH4qO/awgXzxrB8v+GnaFy5/OulFEktn9K5pRj3qcokMjNSzVPCQgd+YoydDTFzlyCchY1lf/5LfURTE9oRtJ91X+QCrPuJWlrS58hQ8YgX0SP21//+FeIlbbUURdTi3I8q8OPOTwTD6xT6T4F551SJ2Py07wEL3SC0jUzOoWds08qm2CGZ7oSEIM/V+SO+JW6psMKjR7b0AGuFpqX5C5I4wIQQXv4+xMUg57hnnxERB; 25:fW4s/2pSOZMX8fyl5wvHxSM7zm8m6B4redYMdit7iwYrC1XKdIDcpDUxGQ08a16wFtI77F9nhyT8JhU48N3sfpvOjiz4SNfCPGUnuy7qINAffZC44S2f0kv8q7VnOwZRCaVO9FlmnBGEyIK7GdJjYGr+G5d7JX4DnwCyPWB0hGpQjonFAoVK06pdns7Uz20tJaVLZ4+lF3NTZ1DLeW8QzFzy2yxUnniWp5FO998c37obptYEkfQdFEJEZ5J46RfJe4F9bPz5tB10ROg1G0uvmNIrXEWw8p5Pt4U3yKFVpjR0mKd19pT4ZMFFYDZiYWsSe7OFzF2QQRoiw8Hjwp/u2Q==; 31:MhPNy9ie4LKw7q4vrqjllNuoq0wi18L0I/PEQnDX69CLU+YyUjmX0rjbTC4Cs8VryDZoH0rP0quLqlz+/6lhWl/7SEawufLb8T8KWkbYRAMGFfICK7jxZaBjJU3SoVl227V9nW4C3dPlJTf3PR3CLiss2ruAe9w74SGJnZ6iXVP0dF+NM9FBdSaNeRCdBy9BIr+5T2zfmfjxB60vRolDRzJT63NQdfT8EdRC4xHK5CI= X-MS-TrafficTypeDiagnostic: KL1PR0601MB1880: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1880; 20:rt9vqee6Uo8Bp9HsvzC3XnzeiVgonw3+xL5tetGHd2GYNq17AEw/OL79NyvVEH4eeJMt7rip/kceoQLhbaJFQ51lR029ocjTSjaxOmSxBqV3oh/RvFERSiikAaj22aOC4swKHsogxmp9JwkDwjhpub0HZNbkuB1nLQqvMgTqyn3+QzNJxHITBB5q9CN77OSQyu8EI9dGABKC65ipEsY4PorWk7aBRvdoh8aU97UnL4ObihMkl8ubjijgpD7hnSoXrZzshDiWbJKG/vjcmQIPJMhor7YJsOhMjM0yF199m1ePhddPsXuKngw18Xicgm8Zl3NG4a/+tnOayvMSfsMqwSmSc1J9O3O7Oc+k4BwtIaKSI45UwQhXTSep5aKBmYf1kJ606HOUgGzKO8JrWb2SmYFn7R7QJK7acHiupfIe7Co+SOhxnGHdQFPq2eQC5gveRbuRHsb51XV9GyIhS6bQjlTNliz3JpsbcLO+GJ1xcJ/JwpLPtVrZE7aJFXWfTH1T; 4:AjUkzLV+VQLxMcOXQfwj8iEJc5Fkjg9qRDFEleOI4L3Liqq1fuIvUStzgh/6NKSZ31ackbkh32ax7JCCWbR5FxBEF6UtmIqOMb/g9bmJHrkM3taU/LilOerHSga7Fx4HtJvd5cDDhJVVFZ32R4d7WSdrerNja+c0Let2F0vpg021gLiokHBuB4Xmj+VXTvARPzY8sbLd88maawJoXH2mP9K5DjuSadsxhgUgEIRsku+qU7HZHggVaBeJVLoa6oD8yl96XoeHvAWljtPipGgl4+GtqdiXDg/xEPor6eJQqworR37iR7DG1UkziLHBBLue 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)(3231101)(944501161)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041288)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:KL1PR0601MB1880; BCL:0; PCL:0; RULEID:; SRVR:KL1PR0601MB1880; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(39380400002)(39860400002)(346002)(366004)(396003)(199004)(189003)(59450400001)(50466002)(106356001)(53416004)(36756003)(66066001)(86362001)(47776003)(386003)(69596002)(58126008)(16586007)(316002)(2950100002)(6916009)(105586002)(83506002)(305945005)(7736002)(5660300001)(23726003)(6116002)(53936002)(97736004)(186003)(16526019)(3846002)(2906002)(26005)(6486002)(478600001)(8676002)(81166006)(81156014)(8936002)(76176011)(25786009)(7696005)(52116002)(68736007)(4326008)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1880; 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; KL1PR0601MB1880; 23:JMIkFD8iUXBCfzb9nicGI6LYBqvvIb29Fa3d5yJ?= =?us-ascii?Q?zMaqnLISCrRgFTZWOeh0+d4BJ/qQA9IYv6Jm1w26bbPJeAE2Ql4TO6VeQM+i?= =?us-ascii?Q?3Vv7uFIZbxkwP1itYnWGWycajcvIhE+dgpjOvzx2PJZNx17cVFyDwYjxRhor?= =?us-ascii?Q?eDxOCrYFwaohlrgDhk/u/uOquSFIWIM7bjMwKOuNLr3guWwSeug9UewgTHN/?= =?us-ascii?Q?W41iDaew2tKqTwIqYW3FkjdkWo52tAkS9P72FIPs9EDibMpWFwoiDW9mWzWy?= =?us-ascii?Q?4keq4eeO/njBdIKmZP4ROLQox7X6SP5TtS2jRcfHG9ULyrr/5JwNWwSSXy9F?= =?us-ascii?Q?O9wHplCMoyEG20dpFgACS+WsRWUMc2CEFgR/lO1LhzKrKlHNwtfhZnXR4Z1l?= =?us-ascii?Q?3HCKn3YjRmbCVtL//9UOLAX4ZwSfrufw1eds+n1ISIY1Gv1di27xlP3VZ4Lg?= =?us-ascii?Q?3C3+xooIW5fPtrxiT9FgQA5RghJriV6UgZ2q1oX9qYtjL96roxzK2nNjxHeP?= =?us-ascii?Q?bPBfPuhnn/h9Zq6k1hmvAxwzdN6TDNizlMYnO0m6pjv8CoABEdW2CmxaP19k?= =?us-ascii?Q?3SaQYhURY5y8yzs387O2bOxgqzLvt/0eG4QaC+dVTwkbShcY3eS7+Xw510Dh?= =?us-ascii?Q?7po+DzcQTOsVUWtjgvPv6IC6B1Ihe72brV7UpXXkw5KwSZl6bBiQtVGBRTA2?= =?us-ascii?Q?rFwbzImepBmnFFeeDPsH3S94ht3KlEfZvxhBHYp/pV8aiEJEK7zp9Uv6utqC?= =?us-ascii?Q?6k8BoGm4ylHUdkecCKQkguDw0O3iYU91NTCtJXcbmEzAuqjkaMaytvg7lHvs?= =?us-ascii?Q?J64EdIsnFudYNIEZF9R98dN5sYYznjFBakKcepKnmZRU+/JPhT288izx8aRu?= =?us-ascii?Q?ogF8ec9hffnIkiF8fX0SqZyXGvdmnFjQhuwlQfLO6blUH+rUVthUamciFcVd?= =?us-ascii?Q?UL3sMd1oinpMnx7HslwtwqxyoODIB2jrdNzCX2WWx2lpndUdMbn+PJmnVoUn?= =?us-ascii?Q?5w3ajeCma70mDYMK/LjIqD1JqWJCPFd4HQ5MaKh87d0gAk34K+GkrgGsOIay?= =?us-ascii?Q?kIIowvXWjcbtUHv7lg31d8oiaIcrLF3UU02VpIylyggeMj+ikAZXhuZ3D5Eu?= =?us-ascii?Q?TNU5y3Az378DdRT5UY7pmqQqQFMIfzK1eUjRzOmgiyjZmnfh134khLrj/IlB?= =?us-ascii?Q?d6W/MGRvU+bsOe9M=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1880; 6:bEnuzmn+PZhsf+NnYunR/WLnjekw1N6F2E45ExHfm4ztYRZSk6H5wyApu1/0df8s17yU8CeIX9X6GcTtFeS4rzO9bc3eiYHoyL6prlVk1QLffrV7X5j3ZsAsJuEuktdMQwECM0/pLr4irPmSOUEVia68VOZyBFVJKUoFcOoPYZgXlmndkYA0AdinJ5HaFoB+h4xS47J4vDBLQlQ1YbTF7tHZ3eJJOVI4/wWJYvEx475usHb8442C3bye2TBBw0/mJp4HfPmDzdqdEKA1+qTfj3ykS5+WDCCqztA8+4hoW/VrUTvfAL9p8YpYVeTKPNXHjpYnRhvkpFfJWoK5DhFVTI+qNuuQiTL40vcca/AeqQA=; 5:xRZWd/rjfgNJO51EpQAGStqu9jIZAiVcxSy/IoHaZLB2nNuL2LS2/zcJhntAaklpAOuVsO5H7inPgkb93wDJW6aAJPF3/AKArn8fRCHgC9nN4l87X5JnfixTOuZfWMwxUCSbhto2TD4zlkZdnkf04QgS+/xzxZMa3VKVoeJMN8w=; 24:MbaisPZVcHBaXbyQnkmNcfVUoWVYuJ9OWW+WGKG78HdKBynYKLUqtTorG+eFmWO19KCb1/KrTRawLJIh7d2fZJd1ta7dJnCvZGzb/XHo3D8=; 7:AqdcTR/yt42NRFgFTJ1ryLN8SJCV6nAQ4V3+a6ilkqWyX+r2MtMmJPIODj2p0ZvrYE9xfoPEhC+uPVNS/FpQkd0sSGdMxHjn9AZkMvYBTBPSJXeS3xlqpfG+yFHkaK7JK9I1TL5miWaYi0nKQCd5C8y+kPymOlEYUXbQVTMtLWASSkIOs3IfMytVwEEzsojaoAXXvchZ8RWvZseNcMZtpxQ6YWU9Z/vvb4eGN2CYVVHNK2Orx86MG0jd/kjStsWl SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1880; 20:aYwOtUG2fpnkBvplTE3ocrAN97H0W9VsBsxxJ6UlL6gbkyrUNw0XfdFHG3wZtBSR4EOkEsEkGxZ/aQX65B5PIqA5vGF8XhdV22rbMbzdIUQB9+GBFFrazdSGmFXjReAMA8lhmmrdO+iieY+kEiEwgY6szsq/yhiF/Cdg6pgq6EE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 04:39:30.2345 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1c7e5233-4c35-458e-342f-08d566d24994 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1880 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH v2 168/186] ASoC: isabelle: 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 = 1 -> .idle_bias_on = 0 .ignore_pmdown_time = 0 -> .use_pmdown_time = 1 - -> .endianness = 1 - -> .non_legacy_dai_naming = 1 Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/isabelle.c | 57 ++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 32 deletions(-) diff --git a/sound/soc/codecs/isabelle.c b/sound/soc/codecs/isabelle.c index 5ca99280..1664203 100644 --- a/sound/soc/codecs/isabelle.c +++ b/sound/soc/codecs/isabelle.c @@ -867,7 +867,7 @@ static SOC_ENUM_SINGLE_DECL(isabelle_amic2_enum, static int isabelle_hs_mute(struct snd_soc_dai *dai, int mute) { - snd_soc_update_bits(dai->codec, ISABELLE_DAC1_SOFTRAMP_REG, + snd_soc_component_update_bits(dai->component, ISABELLE_DAC1_SOFTRAMP_REG, BIT(4), (mute ? BIT(4) : 0)); return 0; @@ -875,7 +875,7 @@ static int isabelle_hs_mute(struct snd_soc_dai *dai, int mute) static int isabelle_hf_mute(struct snd_soc_dai *dai, int mute) { - snd_soc_update_bits(dai->codec, ISABELLE_DAC2_SOFTRAMP_REG, + snd_soc_component_update_bits(dai->component, ISABELLE_DAC2_SOFTRAMP_REG, BIT(4), (mute ? BIT(4) : 0)); return 0; @@ -883,13 +883,13 @@ static int isabelle_hf_mute(struct snd_soc_dai *dai, int mute) static int isabelle_line_mute(struct snd_soc_dai *dai, int mute) { - snd_soc_update_bits(dai->codec, ISABELLE_DAC3_SOFTRAMP_REG, + snd_soc_component_update_bits(dai->component, ISABELLE_DAC3_SOFTRAMP_REG, BIT(4), (mute ? BIT(4) : 0)); return 0; } -static int isabelle_set_bias_level(struct snd_soc_codec *codec, +static int isabelle_set_bias_level(struct snd_soc_component *component, enum snd_soc_bias_level level) { switch (level) { @@ -899,12 +899,12 @@ static int isabelle_set_bias_level(struct snd_soc_codec *codec, break; case SND_SOC_BIAS_STANDBY: - snd_soc_update_bits(codec, ISABELLE_PWR_EN_REG, + snd_soc_component_update_bits(component, ISABELLE_PWR_EN_REG, ISABELLE_CHIP_EN, BIT(0)); break; case SND_SOC_BIAS_OFF: - snd_soc_update_bits(codec, ISABELLE_PWR_EN_REG, + snd_soc_component_update_bits(component, ISABELLE_PWR_EN_REG, ISABELLE_CHIP_EN, 0); break; } @@ -916,7 +916,7 @@ static int isabelle_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 snd_soc_component *component = dai->component; u16 aif = 0; unsigned int fs_val = 0; @@ -952,7 +952,7 @@ static int isabelle_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } - snd_soc_update_bits(codec, ISABELLE_FS_RATE_CFG_REG, + snd_soc_component_update_bits(component, ISABELLE_FS_RATE_CFG_REG, ISABELLE_FS_RATE_MASK, fs_val); /* bit size */ @@ -967,7 +967,7 @@ static int isabelle_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } - snd_soc_update_bits(codec, ISABELLE_INTF_CFG_REG, + snd_soc_component_update_bits(component, ISABELLE_INTF_CFG_REG, ISABELLE_AIF_LENGTH_MASK, aif); return 0; @@ -975,7 +975,7 @@ static int isabelle_hw_params(struct snd_pcm_substream *substream, static int isabelle_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) { - struct snd_soc_codec *codec = codec_dai->codec; + struct snd_soc_component *component = codec_dai->component; unsigned int aif_val = 0; switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { @@ -1003,7 +1003,7 @@ static int isabelle_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) return -EINVAL; } - snd_soc_update_bits(codec, ISABELLE_INTF_CFG_REG, + snd_soc_component_update_bits(component, ISABELLE_INTF_CFG_REG, (ISABELLE_AIF_MS | ISABELLE_AIF_FMT_MASK), aif_val); return 0; @@ -1087,17 +1087,17 @@ static int isabelle_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) }, }; -static const struct snd_soc_codec_driver soc_codec_dev_isabelle = { - .set_bias_level = isabelle_set_bias_level, - .component_driver = { - .controls = isabelle_snd_controls, - .num_controls = ARRAY_SIZE(isabelle_snd_controls), - .dapm_widgets = isabelle_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(isabelle_dapm_widgets), - .dapm_routes = isabelle_intercon, - .num_dapm_routes = ARRAY_SIZE(isabelle_intercon), - }, - .idle_bias_off = true, +static const struct snd_soc_component_driver soc_component_dev_isabelle = { + .set_bias_level = isabelle_set_bias_level, + .controls = isabelle_snd_controls, + .num_controls = ARRAY_SIZE(isabelle_snd_controls), + .dapm_widgets = isabelle_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(isabelle_dapm_widgets), + .dapm_routes = isabelle_intercon, + .num_dapm_routes = ARRAY_SIZE(isabelle_intercon), + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static const struct regmap_config isabelle_regmap_config = { @@ -1125,23 +1125,17 @@ static int isabelle_i2c_probe(struct i2c_client *i2c, } i2c_set_clientdata(i2c, isabelle_regmap); - ret = snd_soc_register_codec(&i2c->dev, - &soc_codec_dev_isabelle, isabelle_dai, + ret = devm_snd_soc_register_component(&i2c->dev, + &soc_component_dev_isabelle, isabelle_dai, ARRAY_SIZE(isabelle_dai)); if (ret < 0) { - dev_err(&i2c->dev, "Failed to register codec: %d\n", ret); + dev_err(&i2c->dev, "Failed to register component: %d\n", ret); return ret; } return ret; } -static int isabelle_i2c_remove(struct i2c_client *client) -{ - snd_soc_unregister_codec(&client->dev); - return 0; -} - static const struct i2c_device_id isabelle_i2c_id[] = { { "isabelle", 0 }, { } @@ -1153,7 +1147,6 @@ static int isabelle_i2c_remove(struct i2c_client *client) .name = "isabelle", }, .probe = isabelle_i2c_probe, - .remove = isabelle_i2c_remove, .id_table = isabelle_i2c_id, };