From patchwork Mon Jan 29 03:07:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10188879 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 32BDA60375 for ; Mon, 29 Jan 2018 03:12:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2315E286E3 for ; Mon, 29 Jan 2018 03:12:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 136CC286F3; Mon, 29 Jan 2018 03:12: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 B1334286E3 for ; Mon, 29 Jan 2018 03:12:32 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 6AA0F267990; Mon, 29 Jan 2018 04:12:28 +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 BCABB2678B3; Mon, 29 Jan 2018 04:12:27 +0100 (CET) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id 776512678B4 for ; Mon, 29 Jan 2018 04:07:30 +0100 (CET) Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie3.idc.renesas.com with ESMTP; 29 Jan 2018 12:07:28 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 963266788B; Mon, 29 Jan 2018 12:07:28 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,429,1511794800"; d="scan'208";a="269587978" Received: from mail-hk2apc01lp0212.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.212]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 29 Jan 2018 12:07:28 +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=GhkOOYQlYr78UU58k7Prf+N6JtKH+wan832ZOaettSI=; b=VZbV20wV/eD1JWgFkOT/XT971VHSXHSzlHYmgO4BpbVFlmFO5HFFOEYouZgPqe5ADPTztdjv1E4vyrYNNw2UBkyZcOd5/puPIxy5PuGUJ55Unu9mI3TJ9zXtp1Akrj/vAeRm/d42HQddh4r1iFKRkdHVhLK7MLTgy5grYQD9O+E= Received: from morimoto-PC.renesas.com (211.11.155.138) by KL1PR0601MB1877.apcprd06.prod.outlook.com (2603:1096:802:7::22) 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:07:26 +0000 Message-ID: <87607l4b53.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:07:26 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: OS2PR0101CA0020.jpnprd01.prod.outlook.com (2603:1096:600:3::30) To KL1PR0601MB1877.apcprd06.prod.outlook.com (2603:1096:802:7::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a2b26e81-a2ef-4af2-1b1d-08d566c56d29 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:KL1PR0601MB1877; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1877; 3:MvSPjqwfoDza94lK+7f23YmAqmwUxWvxlGDJjeHPyVqY/WtN2ZYTD3xYArpFer+QTeiaSCKyK9Qgi1MY3DV8cA5IA86csIP3IyFojWtm7UDkcI/ghq3W/kBV1NmIASRSIW/qSHpjmgje7SGc1DhaIhgibYBCQ9oLK2H34vH0HVkRoiT2aXebpRsrUEOg5LgL8E40wOG84xbM5KXHq9Pq/MrYkONBef/MnTtpyw2YpYzbtKjsXArGHGULYedGiDOG; 25:/ul2HvCfdQ0iaxs1pkDXoyGR7NKIXSGSE3VW3myBKeLr/CzZet2YBXKD5eTF6kT3X4SuFYA1FGlBwDV9RWR+KxWNgVIAaCS5BzPAyQ35ZK5vTRL9KNTCfa0wYxqZDBU1hx8ogU+1mDW5Co8OFa6FXWf/QXRbPcj+NjUOQr61bZlTaDhbNjxEpg9PH4u1c+8u05suHFe38JKxDEhiKPsD6wENJXqFPOWKgAetjOzqVF3jBV+dsBjSMSbtfR9YVk4/BKAbj9Zeczs1psrBNWPXOjQ6b9GkCxqoW1YFBEFm+cCy8gXVRW7Ohw8sbtsCmwp32hO0HO/SYGGZATQ/TMd7Bw==; 31:rzE703wOWkXV27hltujqjMP5OwND843iyq6i/17Porgfv0OoxIMaex+NyGgQxEUVzWgz+qh7rMsiqHqRM2Uij1FGRFvmKpXPrgnOTpgHQQfXxwzcHYL7bJXQt3+heYNgppwdDaoPvQG+ByYQ33pzxPcqcgtFW8tkTVNQ1xuNGE3HWa2cIJOKPLjuUr/W1QLewzq0oUOWRJPktneUr7DiEwHLzOilegtsgptVwuM066A= X-MS-TrafficTypeDiagnostic: KL1PR0601MB1877: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1877; 20:AL3tTlokCfEjE37VubK7fwolE9DC/c3dMnaFcowXDRZUPLHQXgKHmidskwwZFf3DpMs3d9QMEyyIJubEHuea48upzAUMzx+fme53C9/MVHETkbWilludiyHFXBNaoU4ADus1GA4Y6sdh15qKKX2gutB7ytNkUG6itBOnlhttYdSoacic/5nKubKinY2FOoEBlZnL9Jv36zn0GvPYCXlfRfakdY5YZCUkH96jNkVRfQSgIiWjac3wICN1YKFi85nyhuqcL+qxS0zdd12q34zO/cPT8IC3b+isBcRwgKNp4GKuBdcbr43ILrEf9BVqaqkNKMfFOmWUjO/rJYMBoDMxHp7bpe8ZsqC2ENatWhAnKoRDqhe3o71xwsGvB3Z9piHTj0ccWKvEwD8KIVGTCvBpqYlzGGEws499xv6IwE3dvQNgWn0aIube31nM4GiHoPDatR4JIKdB8DMzapsX0wDGJGchVSH+ilrRJQfK77nwqdBDBs4/q9CnQ2LWwnhWlLxC; 4:EDprbdsdtUQ7xUaRHZlltLVZShzXkhzn5uMtFov1DnnR8G2HASnNEWF8i0mWbvdMnmM8/9G8wiML5QMxevmfTOIpcOcrwEJMo15FU8uS7d6CeZDKi3yX+QCLJLOrhKLaGQ+hiOoo2jHXlkExd1IC1hqL2t3Af9QwuQonzcB4d3//MT0/INah1wtwiBGp/dvB0VcP1J4EZ5tBUtu462Fy5P7PWTpsHc+6pYkL8+bjrkl4i8pXZ6a+0EnK2WdGphlWBovLI6DaTsUqPXEYUlga+L9iaBoj8iYXShHbYLOE/1Q+0XrP6UMRppqcZBNWTXFW 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)(10201501046)(3002001)(6055026)(6041288)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(6072148)(201708071742011); SRVR:KL1PR0601MB1877; BCL:0; PCL:0; RULEID:; SRVR:KL1PR0601MB1877; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(366004)(346002)(396003)(39860400002)(39380400002)(189003)(199004)(47776003)(26005)(68736007)(8676002)(386003)(76176011)(59450400001)(5660300001)(83506002)(66066001)(7736002)(305945005)(16586007)(2950100002)(16526019)(575784001)(316002)(58126008)(186003)(81156014)(69596002)(8936002)(6916009)(7696005)(81166006)(50466002)(52116002)(86362001)(4326008)(105586002)(25786009)(23726003)(478600001)(6486002)(6116002)(3846002)(106356001)(97736004)(2906002)(53936002)(36756003)(53416004)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1877; 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; KL1PR0601MB1877; 23:gna6Cm4qV6V48MNxcYjmn7L3DWgqnTcpw1j9ews?= =?us-ascii?Q?fbW5GVQvEh/NiZWj6znqdF9af6XXUkDDjchaak9EDXHND3XCzWkfRetrFKph?= =?us-ascii?Q?lQcxfFywEYRq4NI7aLh1pGYLRqrTjHon05MOgtiM0J6hJCkXSz7txBRMPkli?= =?us-ascii?Q?Idil7dBeq/Dp4HsmK6RW4/kJeCCjIPpAUVGgq5BDtWOZoKh7yH/3Iv0NqImR?= =?us-ascii?Q?ZqdhkZ26PAMp/Gu6BN9Huv9qih9CLlMTHCRi7bDNxvCjwwh2rZ/DS2dlea5K?= =?us-ascii?Q?k6iXzFtMnaL25jOaPUnJ/zadcN+OQiz8niQLY71MAt8EFogJz/PrADbgtRXH?= =?us-ascii?Q?rXx+EjIbG1VtCFfW5wfmZI9Ci84VafJBVJFNrlIUim/gxjpKPTTUSooK2N68?= =?us-ascii?Q?pJgaA4YpzPfsP2TF1yWc+q7ovCo5B0CV+cJEeXXZn+SGM+QVZbQV5G94BsLc?= =?us-ascii?Q?aYBq3+zUYQ2K6Fay9uvyripK9kgK/oW4+wxt+x7igu2uTmKx7sEwyxIo77O3?= =?us-ascii?Q?j9aY+l5AZnTNYF+23yJ+jzRdhDI0JIoIG0Q1wobTXQAl3JchYN793iurwmgN?= =?us-ascii?Q?7ClYN/HmaupiF5vYSTAjMs4/eBc/xyc+3ht3aeXOnDOa5SY+IC5jJcj4g7nj?= =?us-ascii?Q?p/etqyqHOubQzQds4aGA4MX3o1WgRsDN3HIQptJYmxqlm3HXiERSFDZHjCoo?= =?us-ascii?Q?YvmaiNw+eOVPJnnBGT/HYTjtnBZQPvv2nP6VCJIHEEHSsWAx6EbRfO4ixvc3?= =?us-ascii?Q?vqWktr2W0rOzU18cGcyyOSF+ITCIZSWFVy+ibEA0ZXB2oCxZ4V7tNMBda4DK?= =?us-ascii?Q?PmTkY6KBE60IJLpz4LYI/NzAgZ+LDUpFI9cwlyZGq1M9YJRmumBA0iCqKZfa?= =?us-ascii?Q?NIeGwumQQm2cJ6CoeG7Bzi1g9/9NPbhhtXD4Rw/fdhjF4p0IY2hYWiDjWPRm?= =?us-ascii?Q?aFQY5zRWuCwGKFPRKsVLXjZ5GPVRDfvugd/xPOOHBZrshCZ29IikUetfwnh8?= =?us-ascii?Q?rnFh1GhNAoT2NbbPFAUgSz5Ug8tTBfw5AcrUMSR5KIwK6xFQDdhvdCYIItuW?= =?us-ascii?Q?8tuG77KU8emzF32zUxyUX4L71VrigqE8l/eKsH7ydYTKJG9M6JnUOCpzCSgS?= =?us-ascii?Q?bHmncfaZMwI9pnmlsRyaefjA1+UmjiUe0KeyXestYiLEOH34kd7XvETz/qC2?= =?us-ascii?Q?Yy0Y1+8F2RFi54fcoNCnsr5rSymB/y8afKCnC?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1877; 6:IWpwAI6u01crURPQFUFjSwP+GVO3X7YxQMvap+ZQ+GlBS6Qc85V8h1n1Xu6kXuShAAZOKeMhihCiZyuGG5w1DV3w413pslLjtXLOsCLtM9FDC1NYB3N031lo6RAysffV+iVVLCgrvF4nX6XzT2yxeTrpI6iegNMlIDibFU52M6r7gRsBjoXIzQbz2OFtDwecoOpz2U+qXCAoT5FcGXLTnm7NWDIuTPJw8u0DzY2gq1V0xtJmwbL7XeDDHY/VDdQLTbOtdMgVAfLuTGIiegHHyEzu9riGEs5ZlleeRWk7cpNzGLNRi1gvGWdXGIadwQLMu6+7HzHCUSItT0SuiXjcXoUzK2tMde4AA9T8ILVsq80=; 5:Ztr96iXBEo2lhwr4+K3a8Hci+qDw1rvdvb4dgxPpGERqAxhof8B/3KR5/+I6HgUBRK7ZHultKcTUCLRnTb8phr3FwNdBiiSkrmZZRXWYJAgmqTPs94gfNHICMm7Hi/z5WdOpXefEN3R/wf+fqMsLbcV+9hmmkewjhq7MaozyESU=; 24:4FQt7WvZ9eYqf5xGxpJThXXnndmArTOwOOryXXuaAOK/kAlw8uINFu/N8yW/maM9qPkUTeISLtdvrVZ+ZdYIQMBETKAejxVX61mwtPFRgc4=; 7:Hv5vrHiFlC/6yWap5PsssyCe7/C6qUViJl5/tQGxDraMSvJNojaL0uB26qUI3uhxKQicJAlEpoo+CMGbu1nRw4lHOeiOGslCdcmlAIOIf9NktgW3UNdKMJDM63cs27heTqo2mn7fOOiWaVG5sRcCma7m6PdluS7s95KhFCAc29h32g4Pi+yqe/ug3yx5jvXEJaVUfZbKnv2+IuJnL6PXM+PoePjjIpBzwWXF9phd6FQ18Q4v/TbOQ++xPqBsMF8X SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1877; 20:BYCNoQxcjBHoVcb+uaj1MfWY82Z0JeBmKDqH+377AC0bCpuopnSrpEawRm0CUmtpscqF07U2RFUJGIFDlkIQAJFuiEmhxYcI9UixX/MOp9FdaA5WvAGQhmx5ol6HE+TZ4dcpGyN/5qcbsKlzuZdKBZQUPDnH7a6/9RB/Uv9MZn8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 03:07:26.4575 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a2b26e81-a2ef-4af2-1b1d-08d566c56d29 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1877 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH v2 034/186] ASoC: wm8988: 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/wm8988.c | 127 +++++++++++++++++++++------------------------- 1 file changed, 57 insertions(+), 70 deletions(-) diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c index b0d0219..6220011 100644 --- a/sound/soc/codecs/wm8988.c +++ b/sound/soc/codecs/wm8988.c @@ -119,7 +119,7 @@ struct wm8988_priv { const struct snd_pcm_hw_constraint_list *sysclk_constraints; }; -#define wm8988_reset(c) snd_soc_write(c, WM8988_RESET, 0) +#define wm8988_reset(c) snd_soc_component_write(c, WM8988_RESET, 0) /* * WM8988 Controls @@ -244,16 +244,16 @@ static SOC_ENUM_SINGLE_DECL(adcpol, static int wm8988_lrc_control(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { - struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); - u16 adctl2 = snd_soc_read(codec, WM8988_ADCTL2); + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); + u16 adctl2 = snd_soc_component_read32(component, WM8988_ADCTL2); /* Use the DAC to gate LRC if active, otherwise use ADC */ - if (snd_soc_read(codec, WM8988_PWR2) & 0x180) + if (snd_soc_component_read32(component, WM8988_PWR2) & 0x180) adctl2 &= ~0x4; else adctl2 |= 0x4; - return snd_soc_write(codec, WM8988_ADCTL2, adctl2); + return snd_soc_component_write(component, WM8988_ADCTL2, adctl2); } static const char *wm8988_line_texts[] = { @@ -555,8 +555,8 @@ static inline int get_coeff(int mclk, int rate) static int wm8988_set_dai_sysclk(struct snd_soc_dai *codec_dai, int clk_id, unsigned int freq, int dir) { - struct snd_soc_codec *codec = codec_dai->codec; - struct wm8988_priv *wm8988 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = codec_dai->component; + struct wm8988_priv *wm8988 = snd_soc_component_get_drvdata(component); switch (freq) { case 11289600: @@ -587,7 +587,7 @@ static int wm8988_set_dai_sysclk(struct snd_soc_dai *codec_dai, static int wm8988_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 iface = 0; /* set master/slave audio interface */ @@ -638,21 +638,21 @@ static int wm8988_set_dai_fmt(struct snd_soc_dai *codec_dai, return -EINVAL; } - snd_soc_write(codec, WM8988_IFACE, iface); + snd_soc_component_write(component, WM8988_IFACE, iface); return 0; } static int wm8988_pcm_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_codec *codec = dai->codec; - struct wm8988_priv *wm8988 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = dai->component; + struct wm8988_priv *wm8988 = snd_soc_component_get_drvdata(component); /* The set of sample rates that can be supported depends on the * MCLK supplied to the CODEC - enforce this. */ if (!wm8988->sysclk) { - dev_err(codec->dev, + dev_err(component->dev, "No MCLK configured, call set_sysclk() on init\n"); return -EINVAL; } @@ -668,10 +668,10 @@ static int wm8988_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 wm8988_priv *wm8988 = snd_soc_codec_get_drvdata(codec); - u16 iface = snd_soc_read(codec, WM8988_IFACE) & 0x1f3; - u16 srate = snd_soc_read(codec, WM8988_SRATE) & 0x180; + struct snd_soc_component *component = dai->component; + struct wm8988_priv *wm8988 = snd_soc_component_get_drvdata(component); + u16 iface = snd_soc_component_read32(component, WM8988_IFACE) & 0x1f3; + u16 srate = snd_soc_component_read32(component, WM8988_SRATE) & 0x180; int coeff; coeff = get_coeff(wm8988->sysclk, params_rate(params)); @@ -680,7 +680,7 @@ static int wm8988_pcm_hw_params(struct snd_pcm_substream *substream, srate |= 0x40; } if (coeff < 0) { - dev_err(codec->dev, + dev_err(component->dev, "Unable to configure sample rate %dHz with %dHz MCLK\n", params_rate(params), wm8988->sysclk); return coeff; @@ -702,9 +702,9 @@ static int wm8988_pcm_hw_params(struct snd_pcm_substream *substream, } /* set iface & srate */ - snd_soc_write(codec, WM8988_IFACE, iface); + snd_soc_component_write(component, WM8988_IFACE, iface); if (coeff >= 0) - snd_soc_write(codec, WM8988_SRATE, srate | + snd_soc_component_write(component, WM8988_SRATE, srate | (coeff_div[coeff].sr << 1) | coeff_div[coeff].usb); return 0; @@ -712,21 +712,21 @@ static int wm8988_pcm_hw_params(struct snd_pcm_substream *substream, static int wm8988_mute(struct snd_soc_dai *dai, int mute) { - struct snd_soc_codec *codec = dai->codec; - u16 mute_reg = snd_soc_read(codec, WM8988_ADCDAC) & 0xfff7; + struct snd_soc_component *component = dai->component; + u16 mute_reg = snd_soc_component_read32(component, WM8988_ADCDAC) & 0xfff7; if (mute) - snd_soc_write(codec, WM8988_ADCDAC, mute_reg | 0x8); + snd_soc_component_write(component, WM8988_ADCDAC, mute_reg | 0x8); else - snd_soc_write(codec, WM8988_ADCDAC, mute_reg); + snd_soc_component_write(component, WM8988_ADCDAC, mute_reg); return 0; } -static int wm8988_set_bias_level(struct snd_soc_codec *codec, +static int wm8988_set_bias_level(struct snd_soc_component *component, enum snd_soc_bias_level level) { - struct wm8988_priv *wm8988 = snd_soc_codec_get_drvdata(codec); - u16 pwr_reg = snd_soc_read(codec, WM8988_PWR1) & ~0x1c1; + struct wm8988_priv *wm8988 = snd_soc_component_get_drvdata(component); + u16 pwr_reg = snd_soc_component_read32(component, WM8988_PWR1) & ~0x1c1; switch (level) { case SND_SOC_BIAS_ON: @@ -734,26 +734,26 @@ static int wm8988_set_bias_level(struct snd_soc_codec *codec, case SND_SOC_BIAS_PREPARE: /* VREF, VMID=2x50k, digital enabled */ - snd_soc_write(codec, WM8988_PWR1, pwr_reg | 0x00c0); + snd_soc_component_write(component, WM8988_PWR1, pwr_reg | 0x00c0); 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(wm8988->regmap); /* VREF, VMID=2x5k */ - snd_soc_write(codec, WM8988_PWR1, pwr_reg | 0x1c1); + snd_soc_component_write(component, WM8988_PWR1, pwr_reg | 0x1c1); /* Charge caps */ msleep(100); } /* VREF, VMID=2*500k, digital stopped */ - snd_soc_write(codec, WM8988_PWR1, pwr_reg | 0x0141); + snd_soc_component_write(component, WM8988_PWR1, pwr_reg | 0x0141); break; case SND_SOC_BIAS_OFF: - snd_soc_write(codec, WM8988_PWR1, 0x0000); + snd_soc_component_write(component, WM8988_PWR1, 0x0000); break; } return 0; @@ -792,39 +792,40 @@ static int wm8988_set_bias_level(struct snd_soc_codec *codec, .symmetric_rates = 1, }; -static int wm8988_probe(struct snd_soc_codec *codec) +static int wm8988_probe(struct snd_soc_component *component) { int ret = 0; - ret = wm8988_reset(codec); + ret = wm8988_reset(component); if (ret < 0) { - dev_err(codec->dev, "Failed to issue reset\n"); + dev_err(component->dev, "Failed to issue reset\n"); return ret; } /* set the update bits (we always update left then right) */ - snd_soc_update_bits(codec, WM8988_RADC, 0x0100, 0x0100); - snd_soc_update_bits(codec, WM8988_RDAC, 0x0100, 0x0100); - snd_soc_update_bits(codec, WM8988_ROUT1V, 0x0100, 0x0100); - snd_soc_update_bits(codec, WM8988_ROUT2V, 0x0100, 0x0100); - snd_soc_update_bits(codec, WM8988_RINVOL, 0x0100, 0x0100); + snd_soc_component_update_bits(component, WM8988_RADC, 0x0100, 0x0100); + snd_soc_component_update_bits(component, WM8988_RDAC, 0x0100, 0x0100); + snd_soc_component_update_bits(component, WM8988_ROUT1V, 0x0100, 0x0100); + snd_soc_component_update_bits(component, WM8988_ROUT2V, 0x0100, 0x0100); + snd_soc_component_update_bits(component, WM8988_RINVOL, 0x0100, 0x0100); return 0; } -static const struct snd_soc_codec_driver soc_codec_dev_wm8988 = { - .probe = wm8988_probe, - .set_bias_level = wm8988_set_bias_level, - .suspend_bias_off = true, - - .component_driver = { - .controls = wm8988_snd_controls, - .num_controls = ARRAY_SIZE(wm8988_snd_controls), - .dapm_widgets = wm8988_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8988_dapm_widgets), - .dapm_routes = wm8988_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(wm8988_dapm_routes), - }, +static const struct snd_soc_component_driver soc_component_dev_wm8988 = { + .probe = wm8988_probe, + .set_bias_level = wm8988_set_bias_level, + .controls = wm8988_snd_controls, + .num_controls = ARRAY_SIZE(wm8988_snd_controls), + .dapm_widgets = wm8988_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8988_dapm_widgets), + .dapm_routes = wm8988_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8988_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 wm8988_regmap = { @@ -859,23 +860,16 @@ static int wm8988_spi_probe(struct spi_device *spi) spi_set_drvdata(spi, wm8988); - ret = snd_soc_register_codec(&spi->dev, - &soc_codec_dev_wm8988, &wm8988_dai, 1); + ret = devm_snd_soc_register_component(&spi->dev, + &soc_component_dev_wm8988, &wm8988_dai, 1); return ret; } -static int wm8988_spi_remove(struct spi_device *spi) -{ - snd_soc_unregister_codec(&spi->dev); - return 0; -} - static struct spi_driver wm8988_spi_driver = { .driver = { .name = "wm8988", }, .probe = wm8988_spi_probe, - .remove = wm8988_spi_remove, }; #endif /* CONFIG_SPI_MASTER */ @@ -900,17 +894,11 @@ static int wm8988_i2c_probe(struct i2c_client *i2c, return ret; } - ret = snd_soc_register_codec(&i2c->dev, - &soc_codec_dev_wm8988, &wm8988_dai, 1); + ret = devm_snd_soc_register_component(&i2c->dev, + &soc_component_dev_wm8988, &wm8988_dai, 1); return ret; } -static int wm8988_i2c_remove(struct i2c_client *client) -{ - snd_soc_unregister_codec(&client->dev); - return 0; -} - static const struct i2c_device_id wm8988_i2c_id[] = { { "wm8988", 0 }, { } @@ -922,7 +910,6 @@ static int wm8988_i2c_remove(struct i2c_client *client) .name = "wm8988", }, .probe = wm8988_i2c_probe, - .remove = wm8988_i2c_remove, .id_table = wm8988_i2c_id, }; #endif