From patchwork Tue Apr 8 01:39:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan \(OSS\)" X-Patchwork-Id: 879139 Received: from AS8PR03CU001.outbound.protection.outlook.com (mail-westeuropeazon11012050.outbound.protection.outlook.com [52.101.71.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 20BBA25F967; Tue, 8 Apr 2025 01:41:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.71.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744076519; cv=fail; b=IlbyaNYRgDSekBS8/Za470sr5sfONI9eVdqmbQzsU5SDuVHYi6cqdJImJmysFvxuuOf6vLl2hnw13H+srGyycUKXF21nJhYbA/7TwFhmrLXHMQJkJq5EBpNbvRBBIfWtaGisjHO+vUug/LGjJc0v4KV/71nehqT6MJ33trT4Fsw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744076519; c=relaxed/simple; bh=whEPXMghPFWJmcez/kNrfobL2JINxtIEXm48TIFMoEc=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=lJ33THa05LO19hBK2JzYMg5UpcvTY2jEltKCrU5hMiasGTkESdg+CsfL1D2BOXF9lYrW2NXNZhEkDUxECWoad+t6gDI7SJi2Srb5Czgu4x8swO98R6JOP53PZIizab5BiLMF2jc53xsPQJzFCf9jgNBN8hfL4pulxahbfqqAGRY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=GHkcXwbX; arc=fail smtp.client-ip=52.101.71.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="GHkcXwbX" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=EDqdMPbBClyaSpCphrXq+LOkn1eZbzwFoZhYSVALTwSWD8cj6csqIUMVoN8YAlZFngXAJnR+oik86OjSPFUxQLaeulpg+JCvrkciYjcqodP+KPHmFwZPKzt+xwwA8fvifyw2EM5x9YxgElzZEA+TtkfakLTudankRJqwRHdeB/GKtcsfrRaEHClZlR0e8NGWAhBN2St4QVELekJ7pO9/HtRfEC0UHRArCJ+VwCIe9Wt2hLnD9F3HvtaGg5IYMD3hQhZPEX84UU9sREZjGW4PyfnGYjKfDNBdBr/aU5jq00VMH57XOA5FM16Ir50OJHJMJN1AIqUKGaNQ2yuatpwVpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fLAs4qCLkaHaNr0pkS3WNZSi2iaLg2dcPaA6P89xO8w=; b=p8FJhhA396eCfJ6HsSY6DUfTqO6zN/Bd+AU+0RHtqJCg6wWDqZfjPa8KxIbp8fElKWJ3UzPo9YopuYqP25GhrtjtHuqCCmymMy0OQTD/BRNW+7iIsGw5x4a6KkavXQgNNCiLb7vfGkd15HXJWjHAwBE0XIBmK2qp3XSBIDcJwrPKdcf0AUquEWcopofCIUXmnCBslnvfvOUgsTLqga9xBXv56rFANMft+A80VDL2wr3Lq1z7PqAxoXqnSJxa6B9GTITViiFa5IQx2PbtQJ2XjFLVmJl0Jpt69bgTPiil5B7hdlWk0qvfpJA4GSF//Bah9ClMvrLOknoKBBt7d1vGCA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fLAs4qCLkaHaNr0pkS3WNZSi2iaLg2dcPaA6P89xO8w=; b=GHkcXwbXtxpP1r82D8R/aeKQm3Rp4VU4/+DgwfD2sOf0SSuwHYaLxeOJfx/8R/uI6LkFP/uSvc27Qn1y9L8rOrEHweCsvn/1uN7qeMGdul1FEL3bPWwjVvcfQ8o039fqgtwteeIao02okGsYpSQpnU30YIYEGcTNjv2fnjUjZz0UXSAYislSVSeB2Qt/U4ngTXzG/gJu7v4blfi8e+v6/0CleFj3vpJlpnFlHsw/ml1GLi8REoD/QHyjOVAfosjhEnUlws01vhjQ2nmVIZYgOUbsRBlLxvo5T81S7b7jYdW6imW5gGg3WSqnuzImJsG0I6cKVqmHvkaqTG/Ths5bCg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from PAXPR04MB8459.eurprd04.prod.outlook.com (2603:10a6:102:1da::15) by GV1PR04MB10583.eurprd04.prod.outlook.com (2603:10a6:150:203::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.31; Tue, 8 Apr 2025 01:41:34 +0000 Received: from PAXPR04MB8459.eurprd04.prod.outlook.com ([fe80::165a:30a2:5835:9630]) by PAXPR04MB8459.eurprd04.prod.outlook.com ([fe80::165a:30a2:5835:9630%6]) with mapi id 15.20.8606.033; Tue, 8 Apr 2025 01:41:34 +0000 From: "Peng Fan (OSS)" Date: Tue, 08 Apr 2025 09:39:59 +0800 Subject: [PATCH 3/7] ASoC: codec: twl4030: Convert to GPIO descriptors Message-Id: <20250408-asoc-gpio-v1-3-c0db9d3fd6e9@nxp.com> References: <20250408-asoc-gpio-v1-0-c0db9d3fd6e9@nxp.com> In-Reply-To: <20250408-asoc-gpio-v1-0-c0db9d3fd6e9@nxp.com> To: Shenghao Ding , Kevin Lu , Baojun Xu , Jaroslav Kysela , Takashi Iwai , Liam Girdwood , Mark Brown , Linus Walleij , Bartosz Golaszewski , Peter Ujfalusi , David Rhodes , Richard Fitzgerald Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, patches@opensource.cirrus.com, Peng Fan , Tony Lindgren X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1744076413; l=6651; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=ExGvRGQyDo4ZlYfuBr4C2ncIrF3BsbADUswuNAzOsIM=; b=Pa3lZL4adPD40he5sCxKg3rKTwy1y42SZQmn6hM54IhS7BJ5gTKEaihNQVMsYOOme2qYhA1Us vGrBo2uVVzhAadewcO/h/q8fKx2+K2m53cALd9zo97XSWA/yrrOjIwa X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SI2PR01CA0048.apcprd01.prod.exchangelabs.com (2603:1096:4:193::17) To PAXPR04MB8459.eurprd04.prod.outlook.com (2603:10a6:102:1da::15) Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8459:EE_|GV1PR04MB10583:EE_ X-MS-Office365-Filtering-Correlation-Id: 4d5b47a5-be2d-452d-a8e2-08dd763e7e9e X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|52116014|7416014|366016|1800799024|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?crszslRlhqQDL0g9lpeemUdm37Z+Otd?= =?utf-8?q?zsuOoARbkDi1E1ylLY6wbvDBq/XJRoB2ybCgQxlBTaN8BUdg3EeTCa5Gm9tsO/lRE?= =?utf-8?q?6M8ma/l5NVee3JwDTeXpXdpn/ghDRmRvJK19LXnC2CWUnG79PwzBbObcE+rUN9PEz?= =?utf-8?q?ceikAvdogcWGPSwBRDrvp92aiPkdAr4m8cqEAUnRX2hvStSfKSwE+yjUQ2/nCS84l?= =?utf-8?q?zDP0mjNbhVNHd1JSHPuHvcco14MCWTc3hW+aKpw9j2QnulEpNEnXn++fEOf1ZqzR3?= =?utf-8?q?jAkYAB2glhUKrpbeSTi6TamBpFWEIqFZ4I2I6gWyCjY4XEjwjiR7saxW5eqoWnXAU?= =?utf-8?q?VH7TTINed87nQtNm6lR3gXaAAcADs2HDW0dCHfMn7QArOreEGdPj8L46cLkZ84UFl?= =?utf-8?q?t4r0I4UWQ9Z20/9hQzciW07fEjcXjI25rFtZ5gzB7kXAfd1OHR0qV3xchkxOra1nn?= =?utf-8?q?i8I/aQKy99MIzsKpAsslVuw7wmM3XDqMkgI2FYhBEOXLF6DlfmmXiEPapWK0kwhLG?= =?utf-8?q?K7uv7f2rhLby899YZVp9ep9Nilf8jzPz/WFkumTys31CXuJBlU4p3oV9EKAhqL5AH?= =?utf-8?q?j93HOc4B2gdYe6L0uLY1E1NR9eb5P9Oc5uhYNJIdnl8OR4C9r/QIuaiyDNqY3Akjv?= =?utf-8?q?L78vDJP9CL75+c4mwxjSQQTMvJ1yhS4WqqxiXdydulNGCsTiSTAuaFTgklKwDjInt?= =?utf-8?q?qrajDaXxGPfROsDjhJKKDZnYWyV628MYkgXn9us8eqEXIY/cpoVIAmX+qOiTY/uN0?= =?utf-8?q?S1mNX2h/Iqji2br7Uz1k2JbFPyDzJYc+/AU892Q009za4iM0y1+msnT9KwnDogjO/?= =?utf-8?q?d3JDsgnk5gL97OLIRoBSGve9HR/JMY0nY72+Kt9IpftumOQcG4CUb64kwxJZnBvZU?= =?utf-8?q?SLXyo/KcIggJlrovUZ6BNj8eOtB+ar1W7oGwKhM9EQBwF/aKLx56MvY3Xp0cZaFvu?= =?utf-8?q?sq84ytuTqbXa5okqTfBZz4Zj7YwXSODV4WO6C0st9HWeyKxyLpIt/Jv3iADlmxeBr?= =?utf-8?q?ATub6ZBN94lQRpTIKk8ZedWwlrLd1uSGHA8NDY3q10w00SZCgs6rw9Jj48CjYYGs0?= =?utf-8?q?mAMVHr5mrSLBEXzfMAB90/N3wNcjxX2DZ8NTBq1bYZzKWZYPKnjybFbWnqayu6BKw?= =?utf-8?q?rNs9+f1Xlu+rHWHMU7iGzqIG+m+hpCa9Ioj1Wjw1tYSYyj/oZWKyLK1PDZydo/YF1?= =?utf-8?q?evMgcm8L7OsKhV31LoGXiKzCw2Yom4XuHFPQ+Q6E9RIRKv9MTobfg7dWZtwiBnJ4f?= =?utf-8?q?7pGYLdMJguvQ9RXG5MKy0ypu1a3C5HQ7DSkjZ7FIGFQSmfOYrFQXxu01NJo4LUSNQ?= =?utf-8?q?pkfk7EE5WAETEU9VufFAu0aOgf1V877eMFA8DGJYivdZiE52dulU3xr60cqIg0187?= =?utf-8?q?xAW62oQgwPsZPjbHMNBWIKZiMyGXX9Hiw=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR04MB8459.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(52116014)(7416014)(366016)(1800799024)(921020)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?v/gom/j4yGS3IafM3XGavVc6NErs?= =?utf-8?q?sIttLKzENroFVlXhhXHQWqzbaN9yMTEVuODLKLSl3QUMakzgaJ50IQ5xU+5xgEdMY?= =?utf-8?q?jm7ClrrmrCCulS2T9T/PB8ZdBwArAgrqoKqfgFZ8n2zdj7705lWrcRqp8MZqBxxl7?= =?utf-8?q?ZQD0uOmUTc84mto/6ay/RBi9uxRgutU9AwFjjZ17QPbsF80K2g3YrpxPUcEcJEaYn?= =?utf-8?q?IyXIBfQjGmYtMme4MCm3acpsGyUyDSCOL2xrcHZlHBbjpKOcU2yrt3X3qO5H7jDCE?= =?utf-8?q?WNJwtpt3r+s4iK1Kw+XQh/mWRtmgL++BE4lZCkvU+yZ6XqZ2dBxyMhBzmzCWijtT/?= =?utf-8?q?MKCpfBPAk/M/Bu2FsAE/GKHeC2Ham4oj3/6bNYLgq8tOX7qvxrkf90H9oxl20ql1y?= =?utf-8?q?DAITIP3W0IBDKHjbDZWz0NUlF8Mhzq3MKvq/aLr2SGlA/wNBNShKP2D78/9AufO1S?= =?utf-8?q?YctUUkiyA/1NbVwMgITPVHoUjHOdUAGPquAiUvIi+unYnfnEw6k/h766/7A0BH7qb?= =?utf-8?q?bXgnygbGZheZOOgk7wu8lf2xbRtRADIJo9LjAlzwG0lYXoctH7eGCIrGhtklPUvkS?= =?utf-8?q?QCs4Hnh9LsqcHF7oOp8ChcPOswwcEgkTXiuLpU0+2IaxJRCiO8N8B5b9TZ2KmARdQ?= =?utf-8?q?/wS84rXtCyk6URmXpF08q5noYMp9w1HYKAuIXdsDnMk+irohgKE2HAlGlhSLePGPO?= =?utf-8?q?pXg+tV6hj4vu7Bz1w+H4cC+abULp15s6U794jU8twqiXXwuGKICTmgyE5ekdcw235?= =?utf-8?q?G4KieNPgHoqZLAM50+9ALcF3v3zVvUMOlWgVjtIpISxuFn4GAFR3Dm8Txg8ajLCBi?= =?utf-8?q?DfjuTBN9M7JTEFpJS1N2GZqjGUyHIO/6BK/0Q9Nhsj3+uLeqUNM48MD62aOJrkLxu?= =?utf-8?q?lDvQkWODrxYnLP8UQBF5n63LLOayS4DiFkO0yCJ2PelNxVSS0DHVpwPbbYAz3zozx?= =?utf-8?q?Ae423/e7aIMh1W4j6/M7mmi+C7UsHXd+Jnoe4vMSdCRYLpJru9zVRu13w6YxtZZnO?= =?utf-8?q?4ZTsdpGIgo95BfUJgE8UA+LzpaKWN7i8YzfeTNf0YAtc0j2n+EcBXAITsFXL99SJp?= =?utf-8?q?OlMu9vj2A4Nzs7FeICZtp/k11PRR8Ev+aZhDOCCStdiH7CYpYfZf/AsJObzdYk2dY?= =?utf-8?q?TChSAaDlpxM4OOaUeo8sprzMYET/b67d+LVBYjxq+pbdxSgDdAGp/cUztzQVStjCJ?= =?utf-8?q?Xr0qikJ9YbR7Y4k4SbqXN5BGZIB+BDemYFlNyO9HqAv24eVckF/DXp2x+mtOC3YRY?= =?utf-8?q?l8YNCQvxnXwADQWAY6P7u/X6hnJlpTc0MMTxyYf7sM4M/l9GIehAsWoDuKA9TVXrN?= =?utf-8?q?I90lbCPgqd8PERGDAzlY16yWL1DuwKOi9yEFDl3VBRQ7jlKJZnEOae0iB4WvqurWB?= =?utf-8?q?kFFIOFB5s+STQx0n8VjxZm1DsgRmqynGpAWBNHKyjmqyP8UA4nKJgCMY3v3Bnb47k?= =?utf-8?q?4WNNsCp0L5JgdwLaL6i3zf6vC9IEuATdIj9TMPtX7CaAbMjg4/Kl5amfgmkCieOxa?= =?utf-8?q?zn6/UB7fB7jH?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4d5b47a5-be2d-452d-a8e2-08dd763e7e9e X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8459.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2025 01:41:34.1992 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: rVlrOuq+ZXyx9cb9TVeLGrcKaBfqfPJXiuE5FCqvNUMQ2VgphYcj5oCv79+mkQciDz5CPJnSLU2ozAJCFVU6YQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR04MB10583 From: Peng Fan of_gpio.h is deprecated, update the driver to use GPIO descriptors. - Use of_property_present to check "ti,hs_extmute_gpio" to set hs_extmute - if returned value is true. - Use devm_gpiod_get_optional to get GPIO descriptor, set consumer name. - Use gpiod_set_value to configure output value. While at here - reorder the included headers. - drop remove hook after switching to use devm_gpiod_get_optional - Add return value for twl4030_init_chip to propagate value to parent in case defer probe happens Checking the only user logicpd-som-lv.dtsi that uses polarity GPIO_ACTIVE_HIGH, so all should work as expected. Cc: Tony Lindgren Signed-off-by: Peng Fan --- sound/soc/codecs/twl4030.c | 76 ++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 46 deletions(-) diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 609886461805f85f826a002942bd07c9105f2038..2879b44eba41daf9a1877bc604b7bbfdbf476c47 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -5,18 +5,18 @@ * Author: Steve Sakoman, */ -#include -#include -#include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include +#include +#include +#include +#include #include -#include #include #include #include @@ -39,7 +39,7 @@ struct twl4030_board_params { unsigned int ramp_delay_value; unsigned int offset_cncl_path; unsigned int hs_extmute:1; - int hs_extmute_gpio; + struct gpio_desc *hs_extmute_gpio; }; /* codec private data */ @@ -213,8 +213,7 @@ twl4030_get_board_param_values(struct twl4030_board_params *board_params, if (!of_property_read_u32(node, "ti,hs_extmute", &value)) board_params->hs_extmute = value; - board_params->hs_extmute_gpio = of_get_named_gpio(node, "ti,hs_extmute_gpio", 0); - if (gpio_is_valid(board_params->hs_extmute_gpio)) + if (of_property_present(node, "ti,hs_extmute_gpio")) board_params->hs_extmute = 1; } @@ -242,7 +241,7 @@ twl4030_get_board_params(struct snd_soc_component *component) return board_params; } -static void twl4030_init_chip(struct snd_soc_component *component) +static int twl4030_init_chip(struct snd_soc_component *component) { struct twl4030_board_params *board_params; struct twl4030_priv *twl4030 = snd_soc_component_get_drvdata(component); @@ -252,24 +251,20 @@ static void twl4030_init_chip(struct snd_soc_component *component) board_params = twl4030_get_board_params(component); if (board_params && board_params->hs_extmute) { - if (gpio_is_valid(board_params->hs_extmute_gpio)) { - int ret; - - if (!board_params->hs_extmute_gpio) - dev_warn(component->dev, - "Extmute GPIO is 0 is this correct?\n"); - - ret = gpio_request_one(board_params->hs_extmute_gpio, - GPIOF_OUT_INIT_LOW, - "hs_extmute"); - if (ret) { - dev_err(component->dev, - "Failed to get hs_extmute GPIO\n"); - board_params->hs_extmute_gpio = -1; - } + board_params->hs_extmute_gpio = devm_gpiod_get_optional(component->dev, + "ti,hs_extmute", + GPIOD_OUT_LOW); + if (IS_ERR(board_params->hs_extmute_gpio)) + return dev_err_probe(component->dev, PTR_ERR(board_params->hs_extmute_gpio), + "Failed to get hs_extmute GPIO\n"); + + if (board_params->hs_extmute_gpio) { + gpiod_set_consumer_name(board_params->hs_extmute_gpio, "hs_extmute"); } else { u8 pin_mux; + dev_info(component->dev, "use TWL4030 GPIO6\n"); + /* Set TWL4030 GPIO6 as EXTMUTE signal */ twl_i2c_read_u8(TWL4030_MODULE_INTBR, &pin_mux, TWL4030_PMBR1_REG); @@ -297,7 +292,7 @@ static void twl4030_init_chip(struct snd_soc_component *component) /* Machine dependent setup */ if (!board_params) - return; + return 0; twl4030->board_params = board_params; @@ -332,6 +327,8 @@ static void twl4030_init_chip(struct snd_soc_component *component) TWL4030_CNCL_OFFSET_START)); twl4030_codec_enable(component, 0); + + return 0; } static void twl4030_apll_enable(struct snd_soc_component *component, int enable) @@ -714,8 +711,8 @@ static void headset_ramp(struct snd_soc_component *component, int ramp) /* Enable external mute control, this dramatically reduces * the pop-noise */ if (board_params && board_params->hs_extmute) { - if (gpio_is_valid(board_params->hs_extmute_gpio)) { - gpio_set_value(board_params->hs_extmute_gpio, 1); + if (board_params->hs_extmute_gpio) { + gpiod_set_value(board_params->hs_extmute_gpio, 1); } else { hs_pop |= TWL4030_EXTMUTE; twl4030_write(component, TWL4030_REG_HS_POPN_SET, hs_pop); @@ -750,8 +747,8 @@ static void headset_ramp(struct snd_soc_component *component, int ramp) /* Disable external mute */ if (board_params && board_params->hs_extmute) { - if (gpio_is_valid(board_params->hs_extmute_gpio)) { - gpio_set_value(board_params->hs_extmute_gpio, 0); + if (board_params->hs_extmute_gpio) { + gpiod_set_value(board_params->hs_extmute_gpio, 0); } else { hs_pop &= ~TWL4030_EXTMUTE; twl4030_write(component, TWL4030_REG_HS_POPN_SET, hs_pop); @@ -2168,24 +2165,11 @@ static int twl4030_soc_probe(struct snd_soc_component *component) /* Set the defaults, and power up the codec */ twl4030->sysclk = twl4030_audio_get_mclk() / 1000; - twl4030_init_chip(component); - - return 0; -} - -static void twl4030_soc_remove(struct snd_soc_component *component) -{ - struct twl4030_priv *twl4030 = snd_soc_component_get_drvdata(component); - struct twl4030_board_params *board_params = twl4030->board_params; - - if (board_params && board_params->hs_extmute && - gpio_is_valid(board_params->hs_extmute_gpio)) - gpio_free(board_params->hs_extmute_gpio); + return twl4030_init_chip(component); } static const struct snd_soc_component_driver soc_component_dev_twl4030 = { .probe = twl4030_soc_probe, - .remove = twl4030_soc_remove, .read = twl4030_read, .write = twl4030_write, .set_bias_level = twl4030_set_bias_level,