From patchwork Mon Jan 29 03:08:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10188887 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 EAC9D60375 for ; Mon, 29 Jan 2018 03:14:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC112286E3 for ; Mon, 29 Jan 2018 03:14:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D0599286F3; Mon, 29 Jan 2018 03:14:34 +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 30E69286E3 for ; Mon, 29 Jan 2018 03:14:33 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id BF4E72679D2; Mon, 29 Jan 2018 04:14:20 +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 941B62679D2; Mon, 29 Jan 2018 04:14:19 +0100 (CET) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id 9F8D92679C6 for ; Mon, 29 Jan 2018 04:08:36 +0100 (CET) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie3.idc.renesas.com with ESMTP; 29 Jan 2018 12:08:32 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id F37D750C8F; Mon, 29 Jan 2018 12:08:31 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,429,1511794800"; d="scan'208";a="270907933" Received: from mail-sg2apc01lp0244.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.244]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 29 Jan 2018 12:08:31 +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=5f55uKiYhEWlpiV8+eutwjILxzBeTz38qm8QV3oodx8=; b=o+mjeAcdfhZ1ZUjEaLuBfVbm8+EsEOiO/U4X81q0RDK41mn2lCwLDPWAtKhuyTKP9I2YoJl2WBuveIuVOHwt2nblptHzPbq3Qsq4wGTnYEpv8ELymKuJcvXMVhs2xWoXyw68+6DWuW2RXdm/2rbcB/EXG6QuRigmnEfPwrm4jGY= 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 HK2PR0601MB1876.apcprd06.prod.outlook.com (2603:1096:202:a::20) 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:08:29 +0000 Message-ID: <87zi4x2wiw.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:08:29 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: TY1PR01CA0164.jpnprd01.prod.outlook.com (2603:1096:402::16) To HK2PR0601MB1876.apcprd06.prod.outlook.com (2603:1096:202:a::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 11a727a3-af82-4bcf-d3cb-08d566c592b8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:HK2PR0601MB1876; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1876; 3:uhboi/dkKn8k6atnfhBjd4RaGU/qdHJVKSkxzCqQrJDuPkK9OJihpMPvvd1ytYGfDAkATgtDwsvXSx8Rvt3o06OqSw+iSbkmXsZw8cphZSvPbPWIvNQWU5/rTtTK10W3rnjUtRwOOdiVarRWGowxZZmwy/2AerKnzqWOV4VbQKbDPzcPR4BzYj/VCSMAvv7RvJDCK9AhXGdRiRiVHPqPbiNgMKLHdZ/el49vfKRfqOjbuhAVS33kOetkPcqOYapR; 25:APvtDP05VxPKFR83ibyEia00M+lxpao2eaSgyOBiwQhckmiGoSJh1/bWS9HU73vmthKgKcr15El1SlTrhyYkPt/Sv9qGVcz2yIUdPzD0FW46iMMgbdSPZl/6AtfFLOGFjogWkKje60Ps/IoFK/ThZVW01lOgZPt1oRb29P1ggZL8tKMqfUkI2+ebBvo7Ma7DGmPVyQGp5oo0P8qussw1dT6f2s0DYpvUMRu6BPXXrflOsnKdeR93qqle6ZQPZk4lInKs76hbmLciCkGCHO98wnTFGy3/3iJ01qfz5TxTs0j5QxaIAtW+4fQa04M4GgoUDJI/q1N0H4Wlr4TGzgIZUw==; 31:gZtAIk+VyA0bSLwu4SRZmvmOch1fS8NFcMo81K/R9x2zi03muQnX79bRJ4Jj1z23ZogNuDb34pAP9QO+u9bTXTi6jhQ9uuzP5JwGkuh91F3m/Hfew5o8BQgl0R2QjGQNqemyyqtugi/yfsmo2Wez4WMuSXM3jYqBFJcnx+TwZKXHV3y8HlyvTa2nA+znZ1sHu06r9SY2hQEh3ObUJUY+Y6bgbVOEvLdhhm+gNNF2RuE= X-MS-TrafficTypeDiagnostic: HK2PR0601MB1876: X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1876; 20:GtaXZqtAiIVrGjUWjQsuaEfnFf8rfVNess1PgqIxbOesAGSILJqYfFTdK66N/lYHd0hU1NNW3/f9we0noNjzBAZkVJO1nAB5s5vT3mgVAaQsdPs2aIXMebBRXZklLuUb1yNF6mn33lFDnZNeM8AZBSeQLoW0d3/pwXpbbnwC5B7CuZPGLNeEBulaNfEbNSKE0/k3H3tiYIkjdPXWT5WG/NquYxitCd5eUS930Qh3C3Sh5zO/o+gMDyS+yeJvMmevgXuL2BHFJ313HaxQluwIKRiA7rX/jI+PhfGFZWWPhKCErCW4eMG7qK26mCrKsqAPxZgfVwtwLHLLLpZt+S1aHrMvi63qKLujBz49ocbJ3ECPe0J3H32eMLWU9tKLYYG55G2nCtVJ2HhRG/03YmzJju/Gc2SjcL1EP8uq14pM3HIf8PxA02E5R3KONu0tF5r5a+bY33PULccgG8NpTyE7q/HpgLN5ycxfKvgtVLs5cUPx1Jdzlk9VJBIirpmyApC/; 4:+zumoNKeCreayqzfQNc44bQ/rwiMOIu3SGVRmm8/0pjuMfAL30zJH9dKF90mnj3/YI9FD8MFGHV0deHG6Fvc2tj34E5LEIljtV+JOUcjlAErI9agCseZZ8YiujflZM+sP5dAZOaJiI5yMBsRAJsx1sIOOftqUS9xin86rgvR4YFrWhJ6BWBfZILX15PNhDk0HSefXNJHPI03AqS7O137apVHLhaf04mrHAUcFg5oFnDrGh5A4MhQY3tuGV4A3I1JQCECs0awI0bVkIzYljy4B26qof+khuPtypjdZOg1NqxnL4EajhSTGuz4E1lvDQD7 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)(10201501046)(93006095)(93001095)(3002001)(3231101)(944501161)(6055026)(6041288)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:HK2PR0601MB1876; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1876; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(366004)(346002)(39860400002)(39380400002)(376002)(199004)(189003)(3846002)(386003)(68736007)(59450400001)(4326008)(16586007)(6116002)(36756003)(478600001)(106356001)(53936002)(2950100002)(6486002)(6916009)(50466002)(26005)(23726003)(8936002)(105586002)(53416004)(47776003)(66066001)(5660300001)(97736004)(58126008)(316002)(186003)(305945005)(83506002)(76176011)(25786009)(86362001)(8676002)(16526019)(81156014)(81166006)(2906002)(52116002)(7696005)(7736002)(69596002)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1876; 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; HK2PR0601MB1876; 23:3ICu1zaOEgSMWmyxlrN34QT0bLJnVZbIp6s/wS0?= =?us-ascii?Q?cP5Qnb0uwroSdUKUvYSjwg09zxLyEwv7GVsVN58/yel1NLdRW2S68Y1k1P/l?= =?us-ascii?Q?q14x/BqwLCQRxfpSM6qGEDjINfStewli4925vWZ0BKruqAd/7HOBT2W1DxeI?= =?us-ascii?Q?yXCgnp0Aej8pjEwNeasXwW9zfkeI/YJ+nr5JJ0zCQNzpLi2OZd5Y8+7quI6C?= =?us-ascii?Q?xuPKSBETR+yA9NS16FegGr2QaEocS5Z8OXwCRMdxlZ2oDrlOBvwyjdK+ye7P?= =?us-ascii?Q?FgZzXKFaQUDnmoQyKUpujx6lpS5s8O4bZyLMRGM4HUZ6U2pc/umgy2pFbMvb?= =?us-ascii?Q?mnijlAV9Gijg/snkZOGpIJDU4+GCRbJqmYJV4ECQ4heecAqreKx8dGiTR/te?= =?us-ascii?Q?EcyPIDD4WdPbYT7FY4/7D9uedcB4Hjhjr+QitUC3Pb/2PjLI+Hn+u9iWi/6m?= =?us-ascii?Q?iuUziiwowi/jMvSo81A77V2Z4zgPmU6xqs4BmlTQZDtKqlQuh4e4FNnUTX7M?= =?us-ascii?Q?Ttl+81imWg238/P00y4HWbXtvV8KDKeDrYxE9I/PS4HYjCGkEM35zzLyrlMa?= =?us-ascii?Q?mevXjCMZ1u7RQ/TjJD1ros+KCDbLEsJlpRvGQfq0wrF9x/KmCSw2k00+y5+u?= =?us-ascii?Q?njYY6/7IbieVNmcCNHGN1gYG4sjBpI3NIPvj70+vb1sBw+FGEk6ESvs93Lib?= =?us-ascii?Q?FtCFaWwCVvf0FQpqifcqEWyjwRlFxbwuWsEdzm4PA7CgP12TIM55SgmIqZ8e?= =?us-ascii?Q?R8fPY8TcPRYcLucQUp/Cacbj19gD5uhuq/dq+HnHuC37dmq5bCK+iKuUYQWa?= =?us-ascii?Q?Rf3QrXEYZ/bysHsJR9LKIBCu/+gudChn1G3293wgC2QWg0MoD/jlVkq8QxDR?= =?us-ascii?Q?IF9o58jHANprP3FX7iT4MILg/3CWxwKINxI7uOjZsTrr1gAdJrp3AtyA8Mr7?= =?us-ascii?Q?hZN1lgGDxbwtCm30hweNZY+KpWEq+W8icadFuE0CW+4EnrrbJ7EV+k7h29QM?= =?us-ascii?Q?iGOQ7Uq1BvIXviO1c7ujO827BaffUP8REQzwXUC2qf4ooR2I5498HEeNR6XQ?= =?us-ascii?Q?xEfnABVIx0aSpS0bQKZPEPO3nrb7ouWkn+AT/ErFAhFr+kSeKSfJVpHR9/TN?= =?us-ascii?Q?2fSwvHh+vP63U951Sar0ykD+gZWpUOgZ68s4pUd99bA4O1Ym1xVZ1N1AsTC1?= =?us-ascii?Q?dNrXWGzSvJk9dQ7Q=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1876; 6:ovMYWAwFtY25rJvomTOH1cEhM2/OS9mBUuL+DgDTyJyPw3wz0ya+E9A37kbIXDGziojShuP8qO2avIyV28eHg+68Wm0cRzaOUQX45pDaEAzSsMIHuQSYeHImgKYg57NlRjql8WP9HuzFOtf2Ayi4dyJTTVVq4V4OifDOxonjpZhIfewurzSkQIXmAf7sFqLXzE07Trd6pVsvpiBxggqgym8JhOKxT2xbDVjIB/LdGQxAnH3IodeA/snSmua+SZmBKKgYcUDJsO8P4n8JSCZlXssPBTVkkuAAy1tK7d3yhoPYzPYoLYXNq+NTeWCCJDKRlECnFB8pqVhme0FESrgSGMYl80VGEZPjvPn6tGvld90=; 5:6Be3o+MrlEzMZOrtAGZOlM8Dmc485KuxvGv1SCybH/7vIJma51/RYAe7EfxpndPaph80L7hdM4Egu2+AxO5TUuUQikFgfO0LWCvH2XIpFwNHBMQrlFc8aiae0+KBLdw8LDjEyOdRBAELvHUzpPkzbG+MygtGoQVk2Aprbr1Gjs8=; 24:z8xfHwGambwOmyV/JjLapt6A3nTJ9jXb8g/y8JlFWIyf4dQVrBwSxd54XIWT8RoDvviRjhopZ1I7C2II+cIIs80jWD3/gWdSgGelOv5VzYg=; 7:HssNK1fwHmTUm9rd2/BHZIr6lziSY8DDoBO2tvgCgyb9DG+DlXzoAerrdfp+VZW/XBlw8TbO6hGZu1qyx8VSwhfCUbOHvRNDyrBKD98CGGaRa7vF1Q7AFXVl+QaxOoMeG2ACs5PBowqvNQd8F+nmwD4YIP+GewHZ91vfZCJS34F/1oBhZf7DcDUMBH+Wy5qqsNLZVIpVg8PznfhqDy0ALJs97M98TlkNtEMoP2rg21om1m9QpR3orgXi+mVWooeY SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1876; 20:eEysslKWBt/WmAYC3wQ96fPpAxDzcBUZifBK9O6VMp/g/8RUKmExLii2d2m6T+XX4i6PPZXOM1x/29VTBEeBiJXx+FBkYTBr0IXaIUEpGy2J8U8/7mWGIQC9htRtpCPQCdIIpmwjoP8cULvK+qaHKdq+ndeV/tcAzDhu7TMCzeA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 03:08:29.6313 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 11a727a3-af82-4bcf-d3cb-08d566c592b8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1876 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH v2 038/186] ASoC: wm8991: 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/wm8991.c | 167 ++++++++++++++++++++++------------------------ 1 file changed, 80 insertions(+), 87 deletions(-) diff --git a/sound/soc/codecs/wm8991.c b/sound/soc/codecs/wm8991.c index 802c0694..76a639d 100644 --- a/sound/soc/codecs/wm8991.c +++ b/sound/soc/codecs/wm8991.c @@ -133,7 +133,7 @@ static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(out_sidetone_tlv, static int wm899x_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); + struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); int reg = kcontrol->private_value & 0xff; int ret; u16 val; @@ -143,8 +143,8 @@ static int wm899x_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol, return ret; /* now hit the volume update bits (always bit 8) */ - val = snd_soc_read(codec, reg); - return snd_soc_write(codec, reg, val | 0x0100); + val = snd_soc_component_read32(component, reg); + return snd_soc_component_write(component, reg, val | 0x0100); } static const char *wm8991_digital_sidetone[] = @@ -361,14 +361,14 @@ static SOC_ENUM_SINGLE_DECL(wm8991_right_adcmode_enum, static int outmixer_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { - struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); u32 reg_shift = kcontrol->private_value & 0xfff; int ret = 0; u16 reg; switch (reg_shift) { case WM8991_SPEAKER_MIXER | (WM8991_LDSPK_BIT << 8): - reg = snd_soc_read(codec, WM8991_OUTPUT_MIXER1); + reg = snd_soc_component_read32(component, WM8991_OUTPUT_MIXER1); if (reg & WM8991_LDLO) { printk(KERN_WARNING "Cannot set as Output Mixer 1 LDLO Set\n"); @@ -377,7 +377,7 @@ static int outmixer_event(struct snd_soc_dapm_widget *w, break; case WM8991_SPEAKER_MIXER | (WM8991_RDSPK_BIT << 8): - reg = snd_soc_read(codec, WM8991_OUTPUT_MIXER2); + reg = snd_soc_component_read32(component, WM8991_OUTPUT_MIXER2); if (reg & WM8991_RDRO) { printk(KERN_WARNING "Cannot set as Output Mixer 2 RDRO Set\n"); @@ -386,7 +386,7 @@ static int outmixer_event(struct snd_soc_dapm_widget *w, break; case WM8991_OUTPUT_MIXER1 | (WM8991_LDLO_BIT << 8): - reg = snd_soc_read(codec, WM8991_SPEAKER_MIXER); + reg = snd_soc_component_read32(component, WM8991_SPEAKER_MIXER); if (reg & WM8991_LDSPK) { printk(KERN_WARNING "Cannot set as Speaker Mixer LDSPK Set\n"); @@ -395,7 +395,7 @@ static int outmixer_event(struct snd_soc_dapm_widget *w, break; case WM8991_OUTPUT_MIXER2 | (WM8991_RDRO_BIT << 8): - reg = snd_soc_read(codec, WM8991_SPEAKER_MIXER); + reg = snd_soc_component_read32(component, WM8991_SPEAKER_MIXER); if (reg & WM8991_RDSPK) { printk(KERN_WARNING "Cannot set as Speaker Mixer RDSPK Set\n"); @@ -927,31 +927,31 @@ static int wm8991_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, int src, unsigned int freq_in, unsigned int freq_out) { u16 reg; - struct snd_soc_codec *codec = codec_dai->codec; + struct snd_soc_component *component = codec_dai->component; struct _pll_div pll_div; if (freq_in && freq_out) { pll_factors(&pll_div, freq_out * 4, freq_in); /* Turn on PLL */ - reg = snd_soc_read(codec, WM8991_POWER_MANAGEMENT_2); + reg = snd_soc_component_read32(component, WM8991_POWER_MANAGEMENT_2); reg |= WM8991_PLL_ENA; - snd_soc_write(codec, WM8991_POWER_MANAGEMENT_2, reg); + snd_soc_component_write(component, WM8991_POWER_MANAGEMENT_2, reg); /* sysclk comes from PLL */ - reg = snd_soc_read(codec, WM8991_CLOCKING_2); - snd_soc_write(codec, WM8991_CLOCKING_2, reg | WM8991_SYSCLK_SRC); + reg = snd_soc_component_read32(component, WM8991_CLOCKING_2); + snd_soc_component_write(component, WM8991_CLOCKING_2, reg | WM8991_SYSCLK_SRC); /* set up N , fractional mode and pre-divisor if necessary */ - snd_soc_write(codec, WM8991_PLL1, pll_div.n | WM8991_SDM | + snd_soc_component_write(component, WM8991_PLL1, pll_div.n | WM8991_SDM | (pll_div.div2 ? WM8991_PRESCALE : 0)); - snd_soc_write(codec, WM8991_PLL2, (u8)(pll_div.k>>8)); - snd_soc_write(codec, WM8991_PLL3, (u8)(pll_div.k & 0xFF)); + snd_soc_component_write(component, WM8991_PLL2, (u8)(pll_div.k>>8)); + snd_soc_component_write(component, WM8991_PLL3, (u8)(pll_div.k & 0xFF)); } else { /* Turn on PLL */ - reg = snd_soc_read(codec, WM8991_POWER_MANAGEMENT_2); + reg = snd_soc_component_read32(component, WM8991_POWER_MANAGEMENT_2); reg &= ~WM8991_PLL_ENA; - snd_soc_write(codec, WM8991_POWER_MANAGEMENT_2, reg); + snd_soc_component_write(component, WM8991_POWER_MANAGEMENT_2, reg); } return 0; } @@ -962,11 +962,11 @@ static int wm8991_set_dai_pll(struct snd_soc_dai *codec_dai, static int wm8991_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; u16 audio1, audio3; - audio1 = snd_soc_read(codec, WM8991_AUDIO_INTERFACE_1); - audio3 = snd_soc_read(codec, WM8991_AUDIO_INTERFACE_3); + audio1 = snd_soc_component_read32(component, WM8991_AUDIO_INTERFACE_1); + audio3 = snd_soc_component_read32(component, WM8991_AUDIO_INTERFACE_3); /* set master/slave audio interface */ switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { @@ -1007,37 +1007,37 @@ static int wm8991_set_dai_fmt(struct snd_soc_dai *codec_dai, return -EINVAL; } - snd_soc_write(codec, WM8991_AUDIO_INTERFACE_1, audio1); - snd_soc_write(codec, WM8991_AUDIO_INTERFACE_3, audio3); + snd_soc_component_write(component, WM8991_AUDIO_INTERFACE_1, audio1); + snd_soc_component_write(component, WM8991_AUDIO_INTERFACE_3, audio3); return 0; } static int wm8991_set_dai_clkdiv(struct snd_soc_dai *codec_dai, int div_id, int div) { - struct snd_soc_codec *codec = codec_dai->codec; + struct snd_soc_component *component = codec_dai->component; u16 reg; switch (div_id) { case WM8991_MCLK_DIV: - reg = snd_soc_read(codec, WM8991_CLOCKING_2) & + reg = snd_soc_component_read32(component, WM8991_CLOCKING_2) & ~WM8991_MCLK_DIV_MASK; - snd_soc_write(codec, WM8991_CLOCKING_2, reg | div); + snd_soc_component_write(component, WM8991_CLOCKING_2, reg | div); break; case WM8991_DACCLK_DIV: - reg = snd_soc_read(codec, WM8991_CLOCKING_2) & + reg = snd_soc_component_read32(component, WM8991_CLOCKING_2) & ~WM8991_DAC_CLKDIV_MASK; - snd_soc_write(codec, WM8991_CLOCKING_2, reg | div); + snd_soc_component_write(component, WM8991_CLOCKING_2, reg | div); break; case WM8991_ADCCLK_DIV: - reg = snd_soc_read(codec, WM8991_CLOCKING_2) & + reg = snd_soc_component_read32(component, WM8991_CLOCKING_2) & ~WM8991_ADC_CLKDIV_MASK; - snd_soc_write(codec, WM8991_CLOCKING_2, reg | div); + snd_soc_component_write(component, WM8991_CLOCKING_2, reg | div); break; case WM8991_BCLK_DIV: - reg = snd_soc_read(codec, WM8991_CLOCKING_1) & + reg = snd_soc_component_read32(component, WM8991_CLOCKING_1) & ~WM8991_BCLK_DIV_MASK; - snd_soc_write(codec, WM8991_CLOCKING_1, reg | div); + snd_soc_component_write(component, WM8991_CLOCKING_1, reg | div); break; default: return -EINVAL; @@ -1053,8 +1053,8 @@ static int wm8991_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; - u16 audio1 = snd_soc_read(codec, WM8991_AUDIO_INTERFACE_1); + struct snd_soc_component *component = dai->component; + u16 audio1 = snd_soc_component_read32(component, WM8991_AUDIO_INTERFACE_1); audio1 &= ~WM8991_AIF_WL_MASK; /* bit size */ @@ -1072,27 +1072,27 @@ static int wm8991_hw_params(struct snd_pcm_substream *substream, break; } - snd_soc_write(codec, WM8991_AUDIO_INTERFACE_1, audio1); + snd_soc_component_write(component, WM8991_AUDIO_INTERFACE_1, audio1); return 0; } static int wm8991_mute(struct snd_soc_dai *dai, int mute) { - struct snd_soc_codec *codec = dai->codec; + struct snd_soc_component *component = dai->component; u16 val; - val = snd_soc_read(codec, WM8991_DAC_CTRL) & ~WM8991_DAC_MUTE; + val = snd_soc_component_read32(component, WM8991_DAC_CTRL) & ~WM8991_DAC_MUTE; if (mute) - snd_soc_write(codec, WM8991_DAC_CTRL, val | WM8991_DAC_MUTE); + snd_soc_component_write(component, WM8991_DAC_CTRL, val | WM8991_DAC_MUTE); else - snd_soc_write(codec, WM8991_DAC_CTRL, val); + snd_soc_component_write(component, WM8991_DAC_CTRL, val); return 0; } -static int wm8991_set_bias_level(struct snd_soc_codec *codec, +static int wm8991_set_bias_level(struct snd_soc_component *component, enum snd_soc_bias_level level) { - struct wm8991_priv *wm8991 = snd_soc_codec_get_drvdata(codec); + struct wm8991_priv *wm8991 = snd_soc_component_get_drvdata(component); u16 val; switch (level) { @@ -1101,22 +1101,22 @@ static int wm8991_set_bias_level(struct snd_soc_codec *codec, case SND_SOC_BIAS_PREPARE: /* VMID=2*50k */ - val = snd_soc_read(codec, WM8991_POWER_MANAGEMENT_1) & + val = snd_soc_component_read32(component, WM8991_POWER_MANAGEMENT_1) & ~WM8991_VMID_MODE_MASK; - snd_soc_write(codec, WM8991_POWER_MANAGEMENT_1, val | 0x2); + snd_soc_component_write(component, WM8991_POWER_MANAGEMENT_1, val | 0x2); 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(wm8991->regmap); /* Enable all output discharge bits */ - snd_soc_write(codec, WM8991_ANTIPOP1, WM8991_DIS_LLINE | + snd_soc_component_write(component, WM8991_ANTIPOP1, WM8991_DIS_LLINE | WM8991_DIS_RLINE | WM8991_DIS_OUT3 | WM8991_DIS_OUT4 | WM8991_DIS_LOUT | WM8991_DIS_ROUT); /* Enable POBCTRL, SOFT_ST, VMIDTOG and BUFDCOPEN */ - snd_soc_write(codec, WM8991_ANTIPOP2, WM8991_SOFTST | + snd_soc_component_write(component, WM8991_ANTIPOP2, WM8991_SOFTST | WM8991_BUFDCOPEN | WM8991_POBCTRL | WM8991_VMIDTOG); @@ -1124,78 +1124,78 @@ static int wm8991_set_bias_level(struct snd_soc_codec *codec, msleep(300); /* Disable VMIDTOG */ - snd_soc_write(codec, WM8991_ANTIPOP2, WM8991_SOFTST | + snd_soc_component_write(component, WM8991_ANTIPOP2, WM8991_SOFTST | WM8991_BUFDCOPEN | WM8991_POBCTRL); /* disable all output discharge bits */ - snd_soc_write(codec, WM8991_ANTIPOP1, 0); + snd_soc_component_write(component, WM8991_ANTIPOP1, 0); /* Enable outputs */ - snd_soc_write(codec, WM8991_POWER_MANAGEMENT_1, 0x1b00); + snd_soc_component_write(component, WM8991_POWER_MANAGEMENT_1, 0x1b00); msleep(50); /* Enable VMID at 2x50k */ - snd_soc_write(codec, WM8991_POWER_MANAGEMENT_1, 0x1f02); + snd_soc_component_write(component, WM8991_POWER_MANAGEMENT_1, 0x1f02); msleep(100); /* Enable VREF */ - snd_soc_write(codec, WM8991_POWER_MANAGEMENT_1, 0x1f03); + snd_soc_component_write(component, WM8991_POWER_MANAGEMENT_1, 0x1f03); msleep(600); /* Enable BUFIOEN */ - snd_soc_write(codec, WM8991_ANTIPOP2, WM8991_SOFTST | + snd_soc_component_write(component, WM8991_ANTIPOP2, WM8991_SOFTST | WM8991_BUFDCOPEN | WM8991_POBCTRL | WM8991_BUFIOEN); /* Disable outputs */ - snd_soc_write(codec, WM8991_POWER_MANAGEMENT_1, 0x3); + snd_soc_component_write(component, WM8991_POWER_MANAGEMENT_1, 0x3); /* disable POBCTRL, SOFT_ST and BUFDCOPEN */ - snd_soc_write(codec, WM8991_ANTIPOP2, WM8991_BUFIOEN); + snd_soc_component_write(component, WM8991_ANTIPOP2, WM8991_BUFIOEN); } /* VMID=2*250k */ - val = snd_soc_read(codec, WM8991_POWER_MANAGEMENT_1) & + val = snd_soc_component_read32(component, WM8991_POWER_MANAGEMENT_1) & ~WM8991_VMID_MODE_MASK; - snd_soc_write(codec, WM8991_POWER_MANAGEMENT_1, val | 0x4); + snd_soc_component_write(component, WM8991_POWER_MANAGEMENT_1, val | 0x4); break; case SND_SOC_BIAS_OFF: /* Enable POBCTRL and SOFT_ST */ - snd_soc_write(codec, WM8991_ANTIPOP2, WM8991_SOFTST | + snd_soc_component_write(component, WM8991_ANTIPOP2, WM8991_SOFTST | WM8991_POBCTRL | WM8991_BUFIOEN); /* Enable POBCTRL, SOFT_ST and BUFDCOPEN */ - snd_soc_write(codec, WM8991_ANTIPOP2, WM8991_SOFTST | + snd_soc_component_write(component, WM8991_ANTIPOP2, WM8991_SOFTST | WM8991_BUFDCOPEN | WM8991_POBCTRL | WM8991_BUFIOEN); /* mute DAC */ - val = snd_soc_read(codec, WM8991_DAC_CTRL); - snd_soc_write(codec, WM8991_DAC_CTRL, val | WM8991_DAC_MUTE); + val = snd_soc_component_read32(component, WM8991_DAC_CTRL); + snd_soc_component_write(component, WM8991_DAC_CTRL, val | WM8991_DAC_MUTE); /* Enable any disabled outputs */ - snd_soc_write(codec, WM8991_POWER_MANAGEMENT_1, 0x1f03); + snd_soc_component_write(component, WM8991_POWER_MANAGEMENT_1, 0x1f03); /* Disable VMID */ - snd_soc_write(codec, WM8991_POWER_MANAGEMENT_1, 0x1f01); + snd_soc_component_write(component, WM8991_POWER_MANAGEMENT_1, 0x1f01); msleep(300); /* Enable all output discharge bits */ - snd_soc_write(codec, WM8991_ANTIPOP1, WM8991_DIS_LLINE | + snd_soc_component_write(component, WM8991_ANTIPOP1, WM8991_DIS_LLINE | WM8991_DIS_RLINE | WM8991_DIS_OUT3 | WM8991_DIS_OUT4 | WM8991_DIS_LOUT | WM8991_DIS_ROUT); /* Disable VREF */ - snd_soc_write(codec, WM8991_POWER_MANAGEMENT_1, 0x0); + snd_soc_component_write(component, WM8991_POWER_MANAGEMENT_1, 0x0); /* disable POBCTRL, SOFT_ST and BUFDCOPEN */ - snd_soc_write(codec, WM8991_ANTIPOP2, 0x0); + snd_soc_component_write(component, WM8991_ANTIPOP2, 0x0); regcache_mark_dirty(wm8991->regmap); break; } @@ -1242,18 +1242,19 @@ static int wm8991_set_bias_level(struct snd_soc_codec *codec, .ops = &wm8991_ops }; -static const struct snd_soc_codec_driver soc_codec_dev_wm8991 = { - .set_bias_level = wm8991_set_bias_level, - .suspend_bias_off = true, - - .component_driver = { - .controls = wm8991_snd_controls, - .num_controls = ARRAY_SIZE(wm8991_snd_controls), - .dapm_widgets = wm8991_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8991_dapm_widgets), - .dapm_routes = wm8991_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(wm8991_dapm_routes), - }, +static const struct snd_soc_component_driver soc_component_dev_wm8991 = { + .set_bias_level = wm8991_set_bias_level, + .controls = wm8991_snd_controls, + .num_controls = ARRAY_SIZE(wm8991_snd_controls), + .dapm_widgets = wm8991_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8991_dapm_widgets), + .dapm_routes = wm8991_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8991_dapm_routes), + .suspend_bias_off = 1, + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static const struct regmap_config wm8991_regmap = { @@ -1319,19 +1320,12 @@ static int wm8991_i2c_probe(struct i2c_client *i2c, regmap_write(wm8991->regmap, WM8991_RIGHT_OUTPUT_VOLUME, 0x50 | (1<<8)); - ret = snd_soc_register_codec(&i2c->dev, - &soc_codec_dev_wm8991, &wm8991_dai, 1); + ret = devm_snd_soc_register_component(&i2c->dev, + &soc_component_dev_wm8991, &wm8991_dai, 1); return ret; } -static int wm8991_i2c_remove(struct i2c_client *client) -{ - snd_soc_unregister_codec(&client->dev); - - return 0; -} - static const struct i2c_device_id wm8991_i2c_id[] = { { "wm8991", 0 }, { } @@ -1343,7 +1337,6 @@ static int wm8991_i2c_remove(struct i2c_client *client) .name = "wm8991", }, .probe = wm8991_i2c_probe, - .remove = wm8991_i2c_remove, .id_table = wm8991_i2c_id, };