From patchwork Mon Jan 29 03:54:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10189019 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 6675B60388 for ; Mon, 29 Jan 2018 04:28:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 51ED728783 for ; Mon, 29 Jan 2018 04:28:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 46F4B28786; Mon, 29 Jan 2018 04:28:39 +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 2C0BE28783 for ; Mon, 29 Jan 2018 04:28:38 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 6BF3526797B; Mon, 29 Jan 2018 05:24:22 +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 4EF9B267973; Mon, 29 Jan 2018 05:24:20 +0100 (CET) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id 5D4A5267762 for ; Mon, 29 Jan 2018 04:54:22 +0100 (CET) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie1.idc.renesas.com with ESMTP; 29 Jan 2018 12:54:21 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 2389F770D9; Mon, 29 Jan 2018 12:54:21 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,429,1511794800"; d="scan'208";a="270912578" Received: from mail-hk2apc01lp0214.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.214]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 29 Jan 2018 12:54:20 +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=sWKSxahWkIs/KemY+a3I9/2z+9kNpKv6pV24E2qz0DA=; b=Q7OLqLWzmyiA2ebRmLLhEvJYJCOwuO/3181wRAEoHYxONtO1LG/6YTEz2F40qTHBmigGqSL2J/Zx4CqN/E85sdWLbYRpcnTRVYePzHZwW8ZL+4SVUyTlKR1yZjdGQisc837V2MMGyDMa1zL2b/CLLFLXyjrmxxRV6/ZeFDZN3og= Received: from morimoto-PC.renesas.com (211.11.155.138) by HK2PR0601MB1875.apcprd06.prod.outlook.com (2603:1096:202:a::19) 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:54:19 +0000 Message-ID: <87inbl1fu3.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:54:19 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: KAXPR01CA0037.jpnprd01.prod.outlook.com (2603:1096:402:1a::23) To HK2PR0601MB1875.apcprd06.prod.outlook.com (2603:1096:202:a::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 16e9815c-c2ae-4bd5-d9d4-08d566cbf9bd X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:HK2PR0601MB1875; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1875; 3:E+7BTpDUOY+sX33RfKoJTmRLEVRdsdci0qB+NA1VdLD7mSaZ+L9GASmsVwqw/q2OLZZb6xLUGYhs6yoSfTv6PzUWybZN2aVBscGo8U0S+sqb5KKU6unaWi8O7V0li9h8vabJoNGfi/GIbBU94MOW0/hhHvVlgBXaZAtMU2anrnGIx6dkYEZN3MbmCVxBPFvKkeguNCBM00cyZv3/qPlX0FL7e8RW8aCpjZ/0Sl1vLgMxlRwTqZA9+IGT36jeTEPA; 25:x+B5RxEmlbWtXg1CX7jeTd/kX9U4uN4fm6Q4teAnXva7HjymwvxNMACY5i7EPehqW+D37mboo5idtvhL4GoSZl6KVe6XwGejQkzUdfC1+riExWbT63aOMBN8UU0RpZRitgYYMcdcKZD588GFPifNrXHaZ941ZDlOfm0Q7SKLMSikBXhunGwdLvXZQ7JAq6ZlP9oyacFMkmsxBV0vtI8VLzf6/8Mc5gSihH0Pj58MLRLcLuM+T3WDjusm93Vhm7zF8totsRFziO1JxqLIXdwkSqIv67naxToiA0CGrk37l1Zu7db151uGEuHuSnT+SdWFRoeESJgmTr8DB9wBtJayAQ==; 31:jSdwmj1lnsow0299A7K8mC5kURxkDNIq0hqohEoZUuQmaX4adPD6kV3FGo4Fq3KScx2ymFdP4pTm1DaWKIE+gqRll/8gUGhLemmW2rcfovMb7LR3MM5I1zNJsS1dOXqsO5z4UAmb5N7Y2eO111+ELLTYqD+YoV1uHfNnjbhZZ8U5xVxGwhXI63O3shbOlXazgSHNCbCLVJHJOTWoUMI0klMdgjCywKiNNrCQq4L8VR8= X-MS-TrafficTypeDiagnostic: HK2PR0601MB1875: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1875; 20:ISAqHvq2cu7xgMM3JjL3afxGlJhv3oyjq+W8swxhZEov9uOcp6to2UMZSGgwB/vS4cIVuLWHxZ65+VMVp0MxD2A+DF1EVrO4mvMty/4Ya6Jqv4/AILFiy5xfWWsgDUug1H1KTOYL2G7x5fHJkbSwn5jsKPO6fetdYFyoD0HUcOS0ZvmFiGIpLIT0bY9xEZ7TdeCcMVRa1k8KVsCNw+h/cW8r4Ow6K87AjpBEmdWVpPH7FiBCPIVEBIS7JZ6vn01goBIoOcDimfv0AbdnLAG5L7Z0oCL98qcnQA/uK2N2JEXDQmc2gr97TaczdWkh8YEvfYn75iCT7MDbZq4ypD7d3J/qaKwPgNfGeKox6Hx1l6Fvlg4sgT79JxiwmJjcfgKA+5Z/VbMCsO+e9kSQ8mEAjaDxnuUdky5OoLTnU0bkNQC/OfeXv8xt1MOrbhG2pmlcr4C4+5+45Xoe/UZ647whnrg0FABqnqPxUnHew4Vl0unhpEFwnmGnvEb49tkuzBWA; 4:Bnm9RVmYDT8Su8p5jYRhoqhETYcRIqc1R/BUKdGhRbhLK13IE/kpIpSPIyEWoo3bJcZ/f829Su2L0YMdfylg9xt3rvxmr7L2PWT0zV/9K1wk1TvK66lzIk8m0W+dV9JP2gPpSVmyY5mT2i1TNA1WPfzxu+PvxXzfvIX9dmZVo10lwBfBnLhLufAmVnj0v6BknDMgVwMe82LE41dyzsyo8XIAFZBzCftkzZNYbZ7ILAmuWMHaLpT9FRzXBv3sknS7IJih+rcQL4Y/axzF90n5w5urbnl6zVKHxc69880GFWfB2t5/o/8l2t84hpK2cK7F 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)(3002001)(10201501046)(6055026)(6041288)(20161123562045)(20161123560045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:HK2PR0601MB1875; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1875; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(39860400002)(39380400002)(346002)(396003)(366004)(199004)(189003)(3846002)(6116002)(26005)(36756003)(50466002)(106356001)(53416004)(25786009)(58126008)(16586007)(316002)(105586002)(16526019)(97736004)(86362001)(47776003)(23726003)(2906002)(8936002)(81166006)(4326008)(68736007)(81156014)(8676002)(478600001)(66066001)(186003)(52116002)(305945005)(6486002)(53936002)(7736002)(7696005)(5660300001)(59450400001)(76176011)(69596002)(386003)(2950100002)(6916009)(83506002)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1875; 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; HK2PR0601MB1875; 23:ADQ9lxME/YEEve7QKo18pidcylrgFWzxHBPVDhz?= =?us-ascii?Q?GaLfGthOq9zYfkoGL77HZ+06F/7LzUSyEe89/2imwMbRPhGCv1twY8eFdU/L?= =?us-ascii?Q?BuDHUjm5gcqZH8VufDvNPfjUrEPwqGgcNfT4CuCcNi2cTnmrEQvJiJsUD9bb?= =?us-ascii?Q?dwb5Jmds6618n1hg9GV9P9hqaWmIfb/u+zfNv0JJFdY/1rj2rsKfOcPPaus1?= =?us-ascii?Q?kcVZd+ofEkLUFNM+7S0jzIpHWfgySiYnqP1K1m4Nmio0UbSZnNJ5dzGnI+a5?= =?us-ascii?Q?AUILbxidXCLpb7IM0glb4vDuxJavO04pCHHR2VGQW2F7OIvmKVCnsJ3wNnRZ?= =?us-ascii?Q?Mb3/u+oUVnItYGuZNBr1rC8RCkRkjE26CIpkOEAGeiWNDEIWcVgRTtQ+iVcX?= =?us-ascii?Q?BwF0g7Jdl4cMwQRqeruiQg8zpGrIqJAFVzZPts98ZJpVZFLBZ2YT3iqp4rYT?= =?us-ascii?Q?zrPWTR/2zzv8xo6MkdrnehsReUn8jjGOqnq7lqx9uo2cdqaj6RiFeJqhdcR/?= =?us-ascii?Q?pAl/gULLtJCT4PEPzxPQhNqp36Cn8fCF2nb70oGVXPzPLIK96kuHNdgJwL7J?= =?us-ascii?Q?4beNA8X9Aa7QNMFkvxcffVXD4J243R+82JoKfmwcaHKX+vtnZ3vG0bDreqLf?= =?us-ascii?Q?EWSHACZBBrbClfAK9FC7gckaJOL9PMgF47gapAPVHtsedb9vzZrpnba/O5T8?= =?us-ascii?Q?usJagw1e4OPGAroOd5AyGWKnGIi0NsOzrPH+i36p3/jPwLzM6NIhSrzV75lc?= =?us-ascii?Q?khS7YTCKg67Mq4UOeLavS+DNWm0PXD7byiF02IlghLBxXEteKkQAwItVtelv?= =?us-ascii?Q?hRi7fXQk+Hqe30Zf1wMze/0Ukuc+t31Ha1SdXQqwBy3lyXO9BjvMeaMDkbUo?= =?us-ascii?Q?WM9JKRpLbrA/MEKNgJDQntwjlBci/1hpNUpZ27Lg0c9+ETJ4CBuMdCAyKEei?= =?us-ascii?Q?rszufJMlZ4Efq04dEGGpYy9pTiLw9Hml4SNh3jVsm23WYjGYJAzkWVVaBDhD?= =?us-ascii?Q?+AWrZPbOniPl3sVZ3Jp3FwivCMDxDyY1NXOG5lvGlGbVNPRBxXHVuCxL61Ay?= =?us-ascii?Q?FToY59QB2ejjTdBIGtNGbDm6zrRmRVU6BD3HbsxWeWBM83+WLD9XVyc4rXKj?= =?us-ascii?Q?Lssf0+z18327aFciaBnOiA8ayeWiTRF9kVVg3PgfKY2gXdDrvfnfYCSw1tlr?= =?us-ascii?Q?s9TOC467Hxv+rKds=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1875; 6:GOPZdjwUrrlDaHPhrL3r7GfuUY77a85PTIzzPDr9Zq4B4Yf5cJzczzkjZfFtgPNyoCV3M3rewatQssp9TLJ9uc5Gni0A9udism13xjzZadOPG6eNhFkFeivLJouRu+G4wO5u5Ij64xbfb89q6SvG0Jk/LDkWNah8ILuf9cgntR+NeD84qoA+4tA+ByWsevxyYIqebTTDnveHdTeUEBVHNzrofQQJUb0/zrdx/Ly2G0gbTld7IMSdBentJyeKpt5NJf4VmUF8d6v6M3anXIU4WHcSCNuxMY2sE8x6C0yhvZCrAbuEqdTPjqsxDLBnPkank+fqR3yarcOw7aj4EW06sSOsrPOywa56VoNeE6mlhPc=; 5:2Ea8PtWShScvAde5ip2Tqpx4DUA2AkzIfBzxgRZ6lxPg2wVchS3DWiD/+ubjqmhtdW1Zr6LJNnT6jBPWgkLvUyq0bsvrHxKMegropod92lTbtw+rrT2dwlMqyX4aAfbK/AdK76wbUb7aAMg2KyvbDZocPGIKYOOrqmpNrI8zYiw=; 24:UHfouUdC6YSuSoO9UW6y8V+3bUpqeOjkd1Vudj0GpPFix+VNMhPwHTzNk4YLNX1pOAA1/zf3poECPLAeiVvpX+OLnVZWIrr5E0sJRQp8N8c=; 7:s6WRNKl9tyG2+C/yYaPEbpoV/46hR9kCvMJ6/f1gdsEx6Xn/xatISVDQIzxp70Dw6U1OsPTKGKX6UgvUdF/E9ZEx7PjKSkNe/YoD7Olll+3NkaCco6J5oRz7NtGSo2n6CJ2qIafhMP8eyQEE2HBBC2wVXfHuZWnoCTrbkdDgxL4sEzinyJZSuQN8D2OaibXO6U3AB2muyxU8ubGrnQIVlRH8lgPEkxgIm3CstqRcVRbmGXg3rbegUHJ/u3Vg9NM9 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1875; 20:fJc1TndXYRUmp4WDYKCPAJJVNtwnb7zvrWNnHNku0NNaYusouSE+asu27pfGzWh6/3RGinexov4eMVNhP0uy4q7QRLnD06VWNjB0TqP4uKZQtQr+YgwA4JhQgVgrEXgwp8m6d3GQL1/286coMUpfDF+q6rs9gz17izY9XExjxEk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 03:54:19.4500 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 16e9815c-c2ae-4bd5-d9d4-08d566cbf9bd X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1875 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH v2 074/186] ASoC: cs35l32: 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/cs35l32.c | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/sound/soc/codecs/cs35l32.c b/sound/soc/codecs/cs35l32.c index bc3a72e..4297058 100644 --- a/sound/soc/codecs/cs35l32.c +++ b/sound/soc/codecs/cs35l32.c @@ -43,7 +43,7 @@ struct cs35l32_private { struct regmap *regmap; - struct snd_soc_codec *codec; + struct snd_soc_component *component; struct regulator_bulk_data supplies[CS35L32_NUM_SUPPLIES]; struct cs35l32_platform_data pdata; struct gpio_desc *reset_gpio; @@ -154,16 +154,16 @@ static bool cs35l32_precious_register(struct device *dev, unsigned int reg) static int cs35l32_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; switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { case SND_SOC_DAIFMT_CBM_CFM: - snd_soc_update_bits(codec, CS35L32_ADSP_CTL, + snd_soc_component_update_bits(component, CS35L32_ADSP_CTL, CS35L32_ADSP_MASTER_MASK, CS35L32_ADSP_MASTER_MASK); break; case SND_SOC_DAIFMT_CBS_CFS: - snd_soc_update_bits(codec, CS35L32_ADSP_CTL, + snd_soc_component_update_bits(component, CS35L32_ADSP_CTL, CS35L32_ADSP_MASTER_MASK, 0); break; default: @@ -175,9 +175,9 @@ static int cs35l32_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) static int cs35l32_set_tristate(struct snd_soc_dai *dai, int tristate) { - struct snd_soc_codec *codec = dai->codec; + struct snd_soc_component *component = dai->component; - return snd_soc_update_bits(codec, CS35L32_PWRCTL2, + return snd_soc_component_update_bits(component, CS35L32_PWRCTL2, CS35L32_SDOUT_3ST, tristate << 3); } @@ -202,7 +202,7 @@ static int cs35l32_set_tristate(struct snd_soc_dai *dai, int tristate) } }; -static int cs35l32_codec_set_sysclk(struct snd_soc_codec *codec, +static int cs35l32_component_set_sysclk(struct snd_soc_component *component, int clk_id, int source, unsigned int freq, int dir) { unsigned int val; @@ -224,21 +224,22 @@ static int cs35l32_codec_set_sysclk(struct snd_soc_codec *codec, return -EINVAL; } - return snd_soc_update_bits(codec, CS35L32_CLK_CTL, + return snd_soc_component_update_bits(component, CS35L32_CLK_CTL, CS35L32_MCLK_DIV2_MASK | CS35L32_MCLK_RATIO_MASK, val); } -static const struct snd_soc_codec_driver soc_codec_dev_cs35l32 = { - .set_sysclk = cs35l32_codec_set_sysclk, - - .component_driver = { - .controls = cs35l32_snd_controls, - .num_controls = ARRAY_SIZE(cs35l32_snd_controls), - .dapm_widgets = cs35l32_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(cs35l32_dapm_widgets), - .dapm_routes = cs35l32_audio_map, - .num_dapm_routes = ARRAY_SIZE(cs35l32_audio_map), - }, +static const struct snd_soc_component_driver soc_component_dev_cs35l32 = { + .set_sysclk = cs35l32_component_set_sysclk, + .controls = cs35l32_snd_controls, + .num_controls = ARRAY_SIZE(cs35l32_snd_controls), + .dapm_widgets = cs35l32_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(cs35l32_dapm_widgets), + .dapm_routes = cs35l32_audio_map, + .num_dapm_routes = ARRAY_SIZE(cs35l32_audio_map), + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; /* Current and threshold powerup sequence Pg37 in datasheet */ @@ -483,8 +484,8 @@ static int cs35l32_i2c_probe(struct i2c_client *i2c_client, /* Clear MCLK Error Bit since we don't have the clock yet */ ret = regmap_read(cs35l32->regmap, CS35L32_INT_STATUS_1, ®); - ret = snd_soc_register_codec(&i2c_client->dev, - &soc_codec_dev_cs35l32, cs35l32_dai, + ret = devm_snd_soc_register_component(&i2c_client->dev, + &soc_component_dev_cs35l32, cs35l32_dai, ARRAY_SIZE(cs35l32_dai)); if (ret < 0) goto err_disable; @@ -501,8 +502,6 @@ static int cs35l32_i2c_remove(struct i2c_client *i2c_client) { struct cs35l32_private *cs35l32 = i2c_get_clientdata(i2c_client); - snd_soc_unregister_codec(&i2c_client->dev); - /* Hold down reset */ gpiod_set_value_cansleep(cs35l32->reset_gpio, 0);