From patchwork Tue Feb 18 08:57:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Baluta X-Patchwork-Id: 13979329 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2047.outbound.protection.outlook.com [40.107.22.47]) (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 505E020CCE2 for ; Tue, 18 Feb 2025 08:58:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.22.47 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739869083; cv=fail; b=gK3FJ4SFz4x1kpFLdIhEAjCm/QrWDJjFDL1nxBr/DQ4iUiJ0FtiAOpMjGThTv+G6cuUFCeqmjHWxKFgn99H3wnoAFC2rLe3ichVDu0SeErewMxX84bW18N1XPSpOzsUwCa6GWdQXQ3ArdHwep53t+G9RHrKaYkmlpPHQjzqYpH4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739869083; c=relaxed/simple; bh=3pQUmdQFac0Fh+WNY7acYRrP67tRCEqVJs7jhVNrmaI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=fUtqeTIsXjR+d/5U+owjAYwuO67z59//pvKNKWT828PiYnd9GzIMI1FsLFv1CA9pDfF7Kly7ZVWbBH/mekzu8r7gmH2lIaa8Z0sjdfD/Xi6vrO47xvXyc/ToG7sbAPN9zlLihGUdgzq2mV5ESgpL62PhVlQnhBzXaXvX02bSaHg= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=RWZNkcZl; arc=fail smtp.client-ip=40.107.22.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="RWZNkcZl" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=X07EvDnoAsJ94h+4MI7t4ivc8WRWyeQBVceTNUfJW9EhXx6gYiO/m/EMrMTKR+f0BqwUNIVXJskbVVC6bybvyiTB2kbqe7wrTEg3YvzKOxgm6iMxpIgTN2f6GxCf9TbNhWyV2TKqD72qDwCJFnFKZMDxuZm+rP54oxySVOa6NdGHCPNuFolQXgdSd34XwjYr27oCeM3o7vGmO4jpC92ofxCZOw7DzwYZMKwlRfb/Ef7PYqBbZ/IoXNEdy/NkoGCco5i/qjGOr4s0Mt4ISLF6/oFUMSPjCelQXSp+pOVFk61bImGts9FQtivFO18Qe6AQz8h/uWTJXCqtOh0PKiaiow== 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=vLGCak/e/d7wgy18Oz5BexielpgJfmnmXgnHx0MQkjA=; b=EyE2s3Y+Pt8BK0E+vhuGgC/wd6x1gGcWuEWN70IhdwuUZWSFEbYnSh0uw7SFmwF8gJeX0InXfPbPoZACfJOwQI6+ddI1S+PpgAfZ6+kjF9/N/+m9TbA2nyORMBtGnGZ5OnOy2bBUXzy8mDQh/vLtwra7zHN8oiGNfEjg/DjNN7n2Q5cjPS7UgArqAsod2Rl1+nPTo0lW3UiCn9s32oDmuwuyD3oasqRhjB+tzMSQWKYagYIAK3RPVGlveU+Ke9S6ziqkJ9xseEDeY0vU+0VYwJz2yeS4z8/+7iHhy/mdnSTSYl7W7VFMA7Z6ObZcaaTH/wBLy59PLcl/IAPMdJvcjw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vLGCak/e/d7wgy18Oz5BexielpgJfmnmXgnHx0MQkjA=; b=RWZNkcZltncP81X24sx8xADzNGDjYj0CIsnMw2aTHQq46mIEIN/tNcH1FKKenLvX3+cg+21R01lG1KP50h5JNxGy/ti15UHAlFki+SoIgpbI93PKZ7jg4NLjrpUVl6tn02gtb4Rii31uQmVlkvZyuRCRXsrJixVfiWOz8b56o8gajNtfti1bNU5DnhuAMLF05fX1Qlv1rIuizNfjN0zJf/RMxzEJ2VpCfAnchO8UCqGTu87vLgrBClNwyqS3KKfP5DGib4jdsNTwRVHj3IY77tBLP1zvFx71QYO9U2+veiALZGgoEDWKXyoNUKMORM0YSVpE2PBvSpWVZznM2HEBTg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8247.eurprd04.prod.outlook.com (2603:10a6:20b:3f2::13) by AS5PR04MB10057.eurprd04.prod.outlook.com (2603:10a6:20b:67d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.18; Tue, 18 Feb 2025 08:57:56 +0000 Received: from AS8PR04MB8247.eurprd04.prod.outlook.com ([fe80::84f7:e2c3:ceed:c0a6]) by AS8PR04MB8247.eurprd04.prod.outlook.com ([fe80::84f7:e2c3:ceed:c0a6%5]) with mapi id 15.20.8445.017; Tue, 18 Feb 2025 08:57:56 +0000 From: Daniel Baluta To: p.zabel@pengutronix.de, shawnguo@kernel.org, mathieu.poirier@linaro.org Cc: s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, andersson@kernel.org, linux-remoteproc@vger.kernel.org, iuliana.prodan@nxp.com, laurentiu.mihalcea@nxp.com, shengjiu.wang@nxp.com, Frank.Li@nxp.com, krzk@kernel.org, Daniel Baluta Subject: [PATCH 1/5] reset: imx8mp-audiomix: Add prefix for internal macro Date: Tue, 18 Feb 2025 10:57:08 +0200 Message-Id: <20250218085712.66690-2-daniel.baluta@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250218085712.66690-1-daniel.baluta@nxp.com> References: <20250218085712.66690-1-daniel.baluta@nxp.com> X-ClientProxiedBy: VI1PR07CA0286.eurprd07.prod.outlook.com (2603:10a6:800:130::14) To AS8PR04MB8247.eurprd04.prod.outlook.com (2603:10a6:20b:3f2::13) Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8247:EE_|AS5PR04MB10057:EE_ X-MS-Office365-Filtering-Correlation-Id: 013b4ba8-6034-4b8f-3562-08dd4ffa5645 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|52116014|7416014|1800799024|10070799003; X-Microsoft-Antispam-Message-Info: WddgqdECqPHBN6CFl8SUA6XXqd2YY1etfL11sGq5QcmABGRXNNfkC+0Gz64w1hdy0EZii+jhiZkd1irYJZCkbHu4kmjShZdjPpX6qaBE8Gu1qvY4ZXwYmBvKW56yGj2HslXwJfe5ZNNCNjD81T65eDhP4Tg3kn5kTa0xm43qqAyxPK53LMMlyMlpCGSgPnovDDuEqbrSsWS9G1qrMh+llGL49ZZ+fgzUeH665CLa9Zb9nSvcNMOcWjPhmOEpgV+rePK1n56enl5wGgTuuxIQkzHgjic2mRReLB8K3U172J9A4vVZlUUG1NOQDliq+FfhqLGsau/cQ57O1MWhZHKntYvnwnBNoVqJvwbScVEPm0dMXKYsRPJ7XnwZ5vOMb+2pNH0O85mVC348acRp6RFXylZ/RRBn/KRwz0FXyLxjVLerdCEOUBzPLEFNGmZc5ay5o5nwAdPdPIl4s+VTashPWJMTPrbzOah/mxmbLxej5LkMjhhAfs7CesmCnOXcIcMocYHkTvO+WpnBM6wfI+9kac6CsbndJfHLo4+drbUfPyBIadYi5H9GFeiZMqYQ1HX9WzLmvVRk1n13BSMeWpD9z0aNSb3KVvb4SFK1US/qYPb/+KTvNN7pb+R6+pJY/V7LW84E8u1Nr9J8xiPoKh4FmxksrNbUI1M/68pCswngzw4U7ltN769MqIMULlaWQujfERLUkHqPvwQzto93QLNuwGt52JNPbl9zYLhyS61+ANu/8BuXve15+TbArZXxcVbTcDbspWVbXYBySXAbvJeQiu9z9MrUDrb+g9qjwnyq4JPg9uIo+OCtozS3FrqjSDkJcBeY4hpGNwkBvPFx/0+pyLqvnSymIzetP4AwqVOvTrRzzE22QblSPbbPwAafKC1QlGfZGfqdYQvkLG9mPWLzDoiPil+CNfYyLzJkqBesd5ShE985LzBYvkEvwx4c7IQnItYcbfWkeQSCaXnfo9gzx7sExmQnybYqHtGeZhFH+GxGkzbqmTRU+09RT7wF3U4EHsyUOc30k0X2v6Q89/4EzdzAtk59h1+aCwDTlTNLWRleTiST3uKx6V6fES9Lb9iAtLLAWrsmw1mo5O0/+On1ZCuPEU5ze2sD2HM2OCH6on6IIgpkB5mxyvLhbOiWglekPjtYvbaB5izazMwAsNPvaShDixtaDy9UcZ2qHiHgWBq/mgTZKR4uI9WfMx6BPDADyU5lSRkNwEmsJs1Dy5bB5rR8Frmi0JWXU/uy5Th4tUuE2OHKEaMJnRj0GmxtTXMmGuNcEspiRxrVKikrOwRRpreL5P/GF6tsqgp8RjjIhND3C2R4MArgr0DO19hcXl0z19aivSVRGauPVRAGmbXaz3LqEA/a7eHpBii3KCI7WoE4agZOlAyU1fSPjFOCj41V X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS8PR04MB8247.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(52116014)(7416014)(1800799024)(10070799003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: L+Y5HPI/OVVecZdm7EDxkdW+ii20DKfx/b/DGJB2TosrowOFacuoAzFqcj2W2Sb4NIhmOxZ8C9MuSiPzT+2IrJfPP2hOjWIUoK/sXN4tiy9COITB5e1Pi8kLRGXX3NLgJ0iAli+wRuCBaHaWnvE6BxY2OoKQuc+W9uwkiNinpu9ui7fC/66YXTZGqUcB6/n6RIy8KFQjOWYKIfcC0idAoS6BUJrjPYmtbECX/2sj82SnOwuu8O437tSJySo2LOe9gOCkn1LriCgMQ1SiPUgHzCs6/HpxVSEggilSDhxdTMx24WSHohVBddRzmR3NA7ETnA6Bdu/FLfHwq867gN2al5gVTwlKepSfgP6N+4DYo8KsbkNqcZIwP9yO2gmYcqdJtgKlydlP8epAxBGe3rA94zRMC9pq+j0Ux7soq5lAeIxfhHD3t4ZnHIvWSSHKqBeS1B25Y/CA+NmLO50+7Gjpj4pp+E+lQv+u0rPsMChK0S6Xi3X1kq+4BDIirXiLfagdO0RUaIZR8mbm4TbRdoZZL/rGHEouSBzzdqTQkHnOV2l33k3Eyqhye3Dw61hTR83N+hGOtG2zWAgyddlkL5Gy0KtxGj9A6cCYl+nF9mCrF//iwuC88pyKrVmgXl0pcinYko9W39B22sCIBHWatvWSzD95NOEV6y5hhCCyvk7Cj6OgcSeggPtgL20FuAzQnXK6Xs4AFtltx4fMROVk2WVK8b5ua7Uip4Vn7MhMRxgrns2gmOdrVG9zsomTFVs49IenCTz2DLYKSy4t3y926BQQYi0rY9Rj1+kspKyFeJMRE+d1PN3Um8vdCkA7AZPpL89YTrooOkGxwfQgBmtER8vggr+Ma+NQ2pBHwciBa5B09rY9i0N3dNlj9c3SwmBwdK9f2sqmd4B26RsElPp5jltKGV8hiqQhFjl+wywPeUlSuPxqxqZy9h/z9pQF6zlTMhUlDGT0ITFknxXMjMDP/Oi6X2dtkFl7UOtjK4m+aWs+i1lha9EXpdt1d/ta9YnkLYqDG2t+bQKSSQMJZkZVXPdbH9gw0J2SWSa3+JcDL0ygv5wa6ckFH5ahnIy1l8F7vXuxeTw+TkFX/DJ75Yu6TYpPPgVYBKIy57McRHMo/3VuxklxzcJg53akcjLTmuQkawtJX6GKWmdbFszYogBCx5TAFcIwI1clbdhoDUGJSIVYquqvcuO7IDcL6Yxr28gRII/NKcPw2Ou1xPFW/MULnIi3gaBAvbypZylWROmqCg0ZS/++dDMfroLxWeIzsP2EniUGoIpetc/gPTAnxQ1FgDbtCQxSQRD7EY9dg1u+4G+B233orWWls7YfDOlbMUDxQTmK6zCremt82UDXqcBEkuCUnVwnpl2OcwF8nf/md5G/R0qQHO7XajTWyqCXfklnRm5L58wJvn043Kp9ril/aStqkL8YghcryZ++qjQ1QOexNz3Zj3yf9mH76n3CVgAKKG8UiT5DdWqGJfBSveEElAzwEWeL136OxLbI4+8qGuGn2fFNKpXmd290pmOpvuj2bLT0WxLmEZisviQBQMsng5T8zhmzGE1Bz/FeR8p2fJbowfTdZO1mEvUe3zK0kkbw4xSG+eYVpd8FQ45/FSQ00xwvN81/lsBg9Gt4SC86p5YUgzkMP/IRRL+h+Tvtk06PFeDuMnTkusZxxKYsNxVmpA8hrg== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 013b4ba8-6034-4b8f-3562-08dd4ffa5645 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8247.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 08:57:56.6158 (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: UWGAHBNuwZao1Js+2jSc3aVOKn93ksCoSi+fvCFtSF8sU5SshpG3BjY8RAQ5TRRnpQ1HvaHAErUlBjQXy2krog== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR04MB10057 This adds IMX8MP_AUDIOMIX_ prefix to internal macros in order to show that specific macros are related to audiomix. Signed-off-by: Daniel Baluta Reviewed-by: Philipp Zabel Reviewed-by: Frank Li Reviewed-by: Peng Fan --- drivers/reset/reset-imx8mp-audiomix.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/reset/reset-imx8mp-audiomix.c b/drivers/reset/reset-imx8mp-audiomix.c index 6e3f3069f727..1fe21980a66c 100644 --- a/drivers/reset/reset-imx8mp-audiomix.c +++ b/drivers/reset/reset-imx8mp-audiomix.c @@ -11,8 +11,8 @@ #include #include -#define EARC 0x200 -#define EARC_RESET_MASK 0x3 +#define IMX8MP_AUDIOMIX_EARC_OFFSET 0x200 +#define IMX8MP_AUDIOMIX_EARC_RESET_MASK 0x3 struct imx8mp_audiomix_reset { struct reset_controller_dev rcdev; @@ -35,8 +35,8 @@ static int imx8mp_audiomix_reset_assert(struct reset_controller_dev *rcdev, mask = BIT(id); spin_lock_irqsave(&priv->lock, flags); - reg = readl(reg_addr + EARC); - writel(reg & ~mask, reg_addr + EARC); + reg = readl(reg_addr + IMX8MP_AUDIOMIX_EARC_OFFSET); + writel(reg & ~mask, reg_addr + IMX8MP_AUDIOMIX_EARC_OFFSET); spin_unlock_irqrestore(&priv->lock, flags); return 0; @@ -52,8 +52,8 @@ static int imx8mp_audiomix_reset_deassert(struct reset_controller_dev *rcdev, mask = BIT(id); spin_lock_irqsave(&priv->lock, flags); - reg = readl(reg_addr + EARC); - writel(reg | mask, reg_addr + EARC); + reg = readl(reg_addr + IMX8MP_AUDIOMIX_EARC_OFFSET); + writel(reg | mask, reg_addr + IMX8MP_AUDIOMIX_EARC_OFFSET); spin_unlock_irqrestore(&priv->lock, flags); return 0; @@ -78,7 +78,7 @@ static int imx8mp_audiomix_reset_probe(struct auxiliary_device *adev, spin_lock_init(&priv->lock); priv->rcdev.owner = THIS_MODULE; - priv->rcdev.nr_resets = fls(EARC_RESET_MASK); + priv->rcdev.nr_resets = fls(IMX8MP_AUDIOMIX_EARC_RESET_MASK); priv->rcdev.ops = &imx8mp_audiomix_reset_ops; priv->rcdev.of_node = dev->parent->of_node; priv->rcdev.dev = dev;