From patchwork Mon Jan 29 04:35:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10189199 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 86B676020C for ; Mon, 29 Jan 2018 04:58:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75CE128788 for ; Mon, 29 Jan 2018 04:58:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6AAAA2878F; Mon, 29 Jan 2018 04:58:28 +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 5A72128788 for ; Mon, 29 Jan 2018 04:58:27 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id E2617267CDC; Mon, 29 Jan 2018 05:50:09 +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 A59AE267CDC; Mon, 29 Jan 2018 05:50:08 +0100 (CET) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 9ECFC267CDC for ; Mon, 29 Jan 2018 05:35:07 +0100 (CET) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 29 Jan 2018 13:35:06 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id D870151E76; Mon, 29 Jan 2018 13:35:06 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,429,1511794800"; d="scan'208";a="270917000" Received: from mail-sg2apc01lp0240.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.240]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-GCM-SHA384; 29 Jan 2018 13:35:06 +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=jT9NWPcjtIiY1k4h6kvRHCMK27NCZ91JYZ5DEk0Y5TY=; b=mUI5Fha4v9kmMjc+cCnPT9gORdj9gMW4MvntV6k9q0/u101LA/opIBv+3IgakO8aLRB1zuJGYb7jDoqWrMazA8UI7iIsjKboaCLtOkqC7+IU/AlhXQxwC4xXMYz7y+WOHMdDonUa2lz0Ze7YlE6P47dCM/cuC3oCCBZKvT2JjR0= 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 SG2PR0601MB1887.apcprd06.prod.outlook.com (2603:1096:3:9::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 04:35:04 +0000 Message-ID: <87607lwafz.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:35:04 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: OSXPR01CA0062.jpnprd01.prod.outlook.com (2603:1096:600:f::41) To SG2PR0601MB1887.apcprd06.prod.outlook.com (2603:1096:3:9::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 5e5880ea-3ab0-4687-2a4f-08d566d1ab66 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:SG2PR0601MB1887; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1887; 3:v80VvZotnfpb+MDM/mhaCLUmt/jmOVIPlQxPn50GqAsAmPCmpKchlNAneU5klN3zresAc6NRA07nyVY7Z460KoPMCQ/ZpF55a75u/8R5FUVHqWNb5z2cB2e2T+eUgqXJ9yNNpMrNWrTLUBMv8fVXZDghI6jjo4w+CZVR0+h4+7rF5loy9SAWC7iFn2htzdVc/IEkCiLysfj8C6xZ4WYY1Erb54GGhbS45ciS2h+YSa05nazqPCjUPy8qN6r2NTQB; 25:vLHpz6UApkou2mj/ZUl0pjWxowpEsD99WfKOfOOwLVN6qoxlxzC4uRfy0c2SFUOKdJvRxXdKPihQXjdlVpZDXy/+I/fsHx2eZADeXG4p8QGZINdvU0UBqyRp+U19j3hq3uV8JRFF79A+i/Ne7Tfh0edOESQ6a7su288UUANVkSwasNsiI7a8ab6llGeKO+HswvyH5s68H3dmXCF7VrJ/xxp4ZgqnFpczwLs2HgeYXFuFTLvHvraT3yVwdjOFH4uPHuquKtzcbTO2qI1w13HdkCbcESM2jBIvvsRXSbDH9xR1/xEJEgAUEXoKn0jXF+heJMq8Ozlk2H8HrwxnWd0e8A==; 31:KThjKEeYm1CABu7M6Mcvaap87nW8DAwJji9VL6l0xCWcnJ5zEXmLIAoghR6DKR+AOYxa1U/GllORBZTVZDiNKmLU3k1rnXwW24w/JiswJV02aKZX8hAEGZXiHrCzdebL6F9evymOi49KXxR++BbsAUU0V2dmUSqwc963y5GAfE7I0jpvyxj+gUq0mcXKDPaJLSjrofQ+vABZdCh5EQG4imslWqtH7PJxUHB6sH595iU= X-MS-TrafficTypeDiagnostic: SG2PR0601MB1887: X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1887; 20:yXrD0vwtt+JR0pR34MrH+jytYjjbzT5J3kpYSUtoPq07qEP9wP9GEKaYEFcE6mBcrJt5om/sEhKfC8KX0A8MDg+ASCc+1h6EdEnQ8frldsh6W1ycNmXRBbDFpEsZ4E2p2NlPM3xGgRwayTbkRqyNYuhmVx/KLcHoHV3ZOVSXq+szgUDsOT8h/AiVdr9v42EtZb5oS2lsjAa9Fx881KEcMurZDV8VfdGC1wtxDihiaFfQey/tOriFFieaTYFVjTBbjjZ9fLv6qhWBvrLDXSwkysq/aFPHi103Zpp6+eLtCTi0e/9oQf8E8snCOE1IGC4V5hY2uEzd7qmatX9aLeNtMpIF1UDVfmT3//LUYef9GNtvM1JaCp8b/+ecA9KWFOA7ccSPWgXECV/ZH9WiiFE9LplY0naal2+2jKW3Ra9xW5nAxR5XDtgHqyiqRi1qmY6rlL183WLRJHxTnRUZOB2JJynxFAr48ps9FOZThVUkgfgXuOer0TAbwKLcnQQMJ4jY; 4:kiSnP0JIAxoWAHFW7PSroG3xZmXS5V9rU4mBAmzC32qX4BgV+8X4kelDO/0+fiAKGjlEMWfOJpZt1NA+EVDd2FHnsSAtqsczFrcjm63mY+cMG413smnFm8Ng5Rjxh9T4JMhZExi69RtlOylcj7gxD9+ikFc4rTaTAkptXw/UONBmNed6aqdgCh8IvtU3jeq5G1tQUR7At/jVbqbBtO7ctsJWSakchBp2hdaRnN95Q5aLqnlM5BpUyHIec0GH7BCm2WbpPs4g0xr9Lq0ZN+JpgDTdvzVNzSeOp+p6qZnzvfsA2dP/SbZT8plQQCiq57V8 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:SG2PR0601MB1887; BCL:0; PCL:0; RULEID:; SRVR:SG2PR0601MB1887; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(376002)(346002)(39380400002)(396003)(366004)(199004)(189003)(105586002)(97736004)(69596002)(58126008)(50466002)(36756003)(83506002)(6116002)(3846002)(23726003)(316002)(86362001)(305945005)(7736002)(16586007)(106356001)(2906002)(76176011)(52116002)(68736007)(478600001)(25786009)(81156014)(81166006)(8676002)(386003)(6486002)(26005)(16526019)(8936002)(47776003)(6916009)(2950100002)(186003)(5660300001)(53416004)(53936002)(7696005)(66066001)(4326008)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1887; 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; SG2PR0601MB1887; 23:uSJ3Sewmflhob6X1noQs00CtLmeBCzHKCTtG4A1?= =?us-ascii?Q?dl06Jru4iVsw9FUhli1y+3XXj00JEupJMiAQ+GubUnD1V/WnLt33/LItDm+z?= =?us-ascii?Q?IwHuh/pFjj2tFj1NLIWV3/JKI/D1CPsb1+vpvhE+syk24Os9gEO8k6yf7oH+?= =?us-ascii?Q?c2CPzcfxhstKy34qvtjp3LLRVqm9LwUSKniWWYOfvpoKYAiLblPDuFg6IYv5?= =?us-ascii?Q?e5MIhGYvZO+tbadmEVmPoKRPwt5HDCmEOKvAjhY7XX8n7bVvpJvKsHayh+OE?= =?us-ascii?Q?0BLfuSEkpg5mepKJXHIuFXhR4OKQePEPa+92ruU0udafnqjAk81b01YV/CQT?= =?us-ascii?Q?1pbmFSsC0TdvfFw2eMi3co+ZZaJqQnSF6kgT+Y/k81dXCe9u1Y+GTB0UUvBY?= =?us-ascii?Q?xqSe6P+h24eBvUBM/s13mFBQ+73UZuE6M8a8Idxxw740xGdvE0KNllRQMz1K?= =?us-ascii?Q?fbAl6xoqgBarR5SbvunZUfr8yEFj6mHzyOYhHe9Qcl31UBpx9h+7FnrfYON6?= =?us-ascii?Q?UtDQcA9lY8eZdxYlYWa7mW2/8DnmnQzZCS4zMi+az58VMIfMh+ayeKdKF2b1?= =?us-ascii?Q?/4ZAfEURG18ee7lBDFGkJ1iqnZ25nnjud+BXyfFz4qYdnQbhdDVKuRbHms1V?= =?us-ascii?Q?Q7GuPabhF3Fb+KiRzwuthX70pxziSYkQ3EYzwbz4556m462UJzWcgJqC5RIP?= =?us-ascii?Q?tRYWcAi/Y8ucmkE3Udaf9Si1KJpZbSwLgUI1lwcTA78POI3ac/3DQku3l2G9?= =?us-ascii?Q?S6AZd1Y3G7MMNT1OoRj23gy/6ROrITHKxkpT9S2UtKXsGWdp9gEcinBblFAP?= =?us-ascii?Q?uJ7BLhc1DSn2QQh+1qR1yM4dUyUpdNudTxmsWrbrKnb4vQGv1qJPMBOmJWFD?= =?us-ascii?Q?walrXl9bL/KtFPKI9UHogzQa5dEqyUVlirdeFNCBysA4T7M2iLcqAJz1+NmN?= =?us-ascii?Q?KjqgIGhmmo1es9I2qDLJYla+A53DVVmdV4GUdfIAW/nQ4sse9XL3F9dtqNbA?= =?us-ascii?Q?/PwP2JqCg8s/Mk9WvgZvW2xZXNM7zHxT1igtG62V7+yjVibB27xSrICZ740p?= =?us-ascii?Q?7ACM8kNR7OAkbeCGF//GJHEgjSVM1qeVLzC4c7RrFRuHB8osG8Q/FlkW7mh/?= =?us-ascii?Q?Ne53+STa6fY0Jh+PTwl+IkZ49Rhu7YjF3/zImDxVebgEe/ykhBD6jRQ=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1887; 6:hd62tDIbTEHsOOnhsQAuP3hZfbGs1gpnC4xtr5WcavH1n/Q13VI9Vuo64mNREsZMSbRwyhJJWTWlh2SBaashTz3bpsHHV4/R1ifbvQqu5/q6VeXTB0wh5UZeHbJToKrEh3BOn/LAtSqL8alCSIL/2lIYOZg9XmlNLiL3tG11nAbRnPWsZS2uciLZV2WVfVh4K6VaJlwsRmE4PNetM/45Gv5/4q6/nr/s9p+hF0ajtwwy65JzA5gtQ/qX4CNggYz4sa3RVbQe1z47PqiKYl90MI2+muhllpaDw4p7AjTDgJPtT0LwvwSOkQ7DIJnwnSklQhkGp4QGDsXg8bew0yVDxvRnlmcXecllWsJozEiO5tU=; 5:xphm8BgSFtAuzqmVYgbxHiYW7a0eTSqIUf/NjMqwqV5rK0uFnatPmNIJ8v0eU3nIGRMjmBrRXqvJQ7kCRs2DgV/gESb28i6Y+N7PaeUcONpofCUpbIUDIx17ntqdfBnQVgVFiLvTe7ELBT0/Ajv0u6eE+c8OhQh54rM5l7gGfys=; 24:/ipAePm6DR+I549B3cGIFDlwodSdBW2gL8wwo1ojWtsals9OqWlbYrKS/IHk2iuA4JciZPMJ/LS3mufS6Nzoq85WNNcV5URJSJatx2Lb/Yc=; 7:E8If+Ip4zcy+yaTGpHIVB8hSNwf92ZOgY+900pW7VWgI2rnV4pDf+LkAQo6phgPFVStBd7KzUtk2eEAVCvBQ/8aCxA0WiINNvFl7M7JY0A4VnK9z+M0282yuwYmF/H3nOpNmbv5ak538V/1PatSYPuFhFjvAD0ujzSQSvXfnp545vkVNH/aswojYe3Zi2XBk/tgk2F1hobaIi7AWcllZ35gtYaRV4uOfLMCjeGSV/vT2DcrwED4iFlPsf22lowOx SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1887; 20:F1XASFVjpxZCUfH1+ZBXt2a+5DcKJ7ub9TpcKmht2pjBaX0V7sJbq0WaIlmLA2WVEgOpUtFK4U1xO1ylvsz7JMpTXmJJjaOEjlUM+AlS180fnJs0eDxfVmfKvMRBBPncor8WQILWfjAdU/TSBGaGVoQV7jt/iVp4WIEP7yW30ME= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 04:35:04.8684 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5e5880ea-3ab0-4687-2a4f-08d566d1ab66 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1887 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH v2 158/186] ASoC: vc4_hdmi: 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 --- drivers/gpu/drm/vc4/vc4_hdmi.c | 47 ++++++++++++++---------------------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 0b20882..4f668c5 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -981,15 +981,17 @@ static int vc4_hdmi_audio_eld_ctl_get(struct snd_kcontrol *kcontrol, { "TX", NULL, "Playback" }, }; -static const struct snd_soc_codec_driver vc4_hdmi_audio_codec_drv = { - .component_driver = { - .controls = vc4_hdmi_audio_controls, - .num_controls = ARRAY_SIZE(vc4_hdmi_audio_controls), - .dapm_widgets = vc4_hdmi_audio_widgets, - .num_dapm_widgets = ARRAY_SIZE(vc4_hdmi_audio_widgets), - .dapm_routes = vc4_hdmi_audio_routes, - .num_dapm_routes = ARRAY_SIZE(vc4_hdmi_audio_routes), - }, +static const struct snd_soc_component_driver vc4_hdmi_audio_component_drv = { + .controls = vc4_hdmi_audio_controls, + .num_controls = ARRAY_SIZE(vc4_hdmi_audio_controls), + .dapm_widgets = vc4_hdmi_audio_widgets, + .num_dapm_widgets = ARRAY_SIZE(vc4_hdmi_audio_widgets), + .dapm_routes = vc4_hdmi_audio_routes, + .num_dapm_routes = ARRAY_SIZE(vc4_hdmi_audio_routes), + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static const struct snd_soc_dai_ops vc4_hdmi_audio_dai_ops = { @@ -1087,11 +1089,11 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *hdmi) return ret; } - /* register codec and codec dai */ - ret = snd_soc_register_codec(dev, &vc4_hdmi_audio_codec_drv, + /* register component and codec dai */ + ret = devm_snd_soc_register_component(dev, &vc4_hdmi_audio_component_drv, &vc4_hdmi_audio_codec_dai_drv, 1); if (ret) { - dev_err(dev, "Could not register codec: %d\n", ret); + dev_err(dev, "Could not register component: %d\n", ret); return ret; } @@ -1116,29 +1118,11 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *hdmi) */ snd_soc_card_set_drvdata(card, hdmi); ret = devm_snd_soc_register_card(dev, card); - if (ret) { + if (ret) dev_err(dev, "Could not register sound card: %d\n", ret); - goto unregister_codec; - } - - return 0; - -unregister_codec: - snd_soc_unregister_codec(dev); return ret; -} - -static void vc4_hdmi_audio_cleanup(struct vc4_hdmi *hdmi) -{ - struct device *dev = &hdmi->pdev->dev; - /* - * If drvdata is not set this means the audio card was not - * registered, just skip codec unregistration in this case. - */ - if (dev_get_drvdata(dev)) - snd_soc_unregister_codec(dev); } #ifdef CONFIG_DRM_VC4_HDMI_CEC @@ -1466,7 +1450,6 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master, struct vc4_dev *vc4 = drm->dev_private; struct vc4_hdmi *hdmi = vc4->hdmi; - vc4_hdmi_audio_cleanup(hdmi); cec_unregister_adapter(hdmi->cec_adap); vc4_hdmi_connector_destroy(hdmi->connector); vc4_hdmi_encoder_destroy(hdmi->encoder);