From patchwork Tue Mar 11 08:58:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Baluta X-Patchwork-Id: 14011335 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 04CC6C28B2E for ; Tue, 11 Mar 2025 09:07:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version:Content-Type: Content-Transfer-Encoding:References:In-Reply-To:Message-ID:Date:Subject:Cc: To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Z1UCzXUHSgWcfQB2vGcwiagSt5MUWom2vNc5p8g8uLU=; b=Z9zq1eLx+zr2hLGcg6HMSaGp/s kL9qh++lT0GSVcjXAjKbXa0NTKOzxILjNkE1d0meonHe+W5vbHx8tHBkcRm6nFCOpjVXrdOcXUMpR Za7Doke34v9Tb9HnjvGRhrfFYFrmfxo4CcOJZeAN7Ozba4PSYQglQbA6J30h/ywBeJ8/a0Ia2f73G SAVqxMH2vIMVyaBtw8iyMK93qgqQeqvSNP7eMhfD45WZ4ZVqXEGzGSbKkmMVnAOUFC9cKLu7aT7eh vL9mY6oBpmOQgZkWXWabU2nZgNrQw7M1Q0lP44PtPrge6SsY6vmRNMhr5cLkvgm9F9lJx6XuIQcra fXeCTZXw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1trvZl-000000055l1-1uDS; Tue, 11 Mar 2025 09:07:01 +0000 Received: from mail-db8eur05on20603.outbound.protection.outlook.com ([2a01:111:f403:2614::603] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1trvQ9-000000053f3-3bLD for linux-arm-kernel@lists.infradead.org; Tue, 11 Mar 2025 08:57:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fSSZZfr8vcyVCw2Fqjjnr+42OPwp6dYJFlJJVA/lLaMakDYTCjBpw7fZdEc/fAQRu4C5Zxv6enIiy5NroNzEcGsUCKLps2ZTDiXkWXS8crCvl4ZRtAcfjuVHBK0xZdTWwIIcxC+CtCIACzHLOAtTKceHCn16esJzEf+v+tqg20XpAWUCGGSSplZxS9iVPvGlPBBOTUgURFn4aCojvoeFR8CWeEQ9Flj7eCJOagHigscJF5UzjljHP6bardvBYrnTTu3SaPT06zs7dNnRY/E0JZK1mLxPM+QKkdbha4S3iuLJgExsJ9QviDyl2zlxQVCJwgzlflrjD6+PRT4y7XbQig== 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=Z1UCzXUHSgWcfQB2vGcwiagSt5MUWom2vNc5p8g8uLU=; b=v+U1/zw/5v1WCd3D6ixA0h8ZoeVQWI9v+YENhvKG/e1RjSRG5A7AOg+3MF+KWMShTZ0iwdiu+QhcFCSCQxnFRpg7EHpDPuXSXFP3x5P93uImakBKP3pADrkeaMC+sucQV9IYOu2do/6aZn2Ri9DdlSfH3WZFzxAwfvCYjrXzkGwC5TaKDaamYPfvTmnCGc+qGQZwq81cIXFNyoA/+0BiFIjuPWTjyyeoiubWLyWGNb8ZRDpzqSoq36nmhcdZZ4wXhBgvPa/9Plo1/1Kb7e6Ar4+vSZYjxivaZn72+YLSdlLYvsp1wUNACeE5qM5qDJa1OVODQJ3pg2Tn3+SIGIfi8w== 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=Z1UCzXUHSgWcfQB2vGcwiagSt5MUWom2vNc5p8g8uLU=; b=S4StQ1RLW+DWnxI3sZitC7N/BmEYtmZlMjhkRBKsdbEwIwvezqr1fgwdfeu+JyZZdJhhspNkR5HQv2zXQZFQEKgSp0k75F6aSrhG6jB+csydCGqIfT6DUME8ICYZ5y2pDh+4omDCPgqmhY8MTwQfLZT7i+/k9/lVeedhSTJu7twUgx5PxNZa/FeUiVe9r5DRRDf1PDC3gDL+oExZHsNTtoZmWpuLNiS0TltqwLD4usJ9ljkYgdOJgu5bwbgJoigF453IW6UrBFzJiE1SfJgdDQUKPI3qn9KmhAmSaPLGtcP5tkpCdkXqPpKk1ApzF4WdyOHjiR5BalO+clF1EaxJ1Q== 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 DBAPR04MB7431.eurprd04.prod.outlook.com (2603:10a6:10:1a1::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.27; Tue, 11 Mar 2025 08:56:59 +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.8511.026; Tue, 11 Mar 2025 08:56:59 +0000 From: Daniel Baluta To: p.zabel@pengutronix.de, robh@kernel.org, krzk+dt@kernel.org, shawnguo@kernel.org, mathieu.poirier@linaro.org, devicetree@vger.kernel.org, linux-remoteproc@vger.kernel.org Cc: conor+dt@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, andersson@kernel.org, Frank.Li@nxp.com, peng.fan@nxp.com, laurentiu.mihalcea@nxp.com, iuliana.prodan@nxp.com, shengjiu.wang@nxp.com, Daniel Baluta Subject: [PATCH v5 4/8] reset: imx8mp-audiomix: Add prefix for internal macro Date: Tue, 11 Mar 2025 10:58:07 +0200 Message-ID: <20250311085812.1296243-5-daniel.baluta@nxp.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250311085812.1296243-1-daniel.baluta@nxp.com> References: <20250311085812.1296243-1-daniel.baluta@nxp.com> X-ClientProxiedBy: AM9P195CA0009.EURP195.PROD.OUTLOOK.COM (2603:10a6:20b:21f::14) To AS8PR04MB8247.eurprd04.prod.outlook.com (2603:10a6:20b:3f2::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8247:EE_|DBAPR04MB7431:EE_ X-MS-Office365-Filtering-Correlation-Id: ea565c49-4df9-40ca-19fa-08dd607aaea5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|52116014|366016|1800799024|7053199007|38350700014; X-Microsoft-Antispam-Message-Info: pvx+LW60MqI696d+pKxk9vub9nIQTBZv2hYSQPiQluf2ctH2HKdPqIyHWtm0wMiKlcMKJqLYjgoAO0PYhs7cqJkUv6SQq8yLydQMqqPfV5YS6v5UWLYZenR6mfSLc0Ye1aj20AgxLQsTK8FcR/Pbrsxhu5kVssw8EM5JkgpqD3sAcm8pmG591notD6gGGHhdxcYswqZRRwVdiUEVu/5giMFAXvlSFLch6sROAF8+PvPLXq2YmB6UqzX0x4dWDZamyBKyg3cIC6tmZ2kIkEpnA9SsVQoAv5pf2XIckcHMYOsirjCzFRn9haZHTAIaKQqqpSTNUNv9fA7bZS40vvs/6npW41V2P3Cb+fAQd4ExS4GzJ6mG+B+FwKZcaTL6OgmAw5YFewiYV1fwTtvmDFEL8rfCeGCReqD77gEWcgJCb73eURtz+lGRoFaHdS9aWJOjeKu+yc0EW7Pu5fg9A1bd8GH21x3YockB2xQ51F8kIVxdwfjOUnE9mLNld44gNd+fCNghpuzqEXfbL3N6x/wyKfceXNZq8YjM+7OxMNE0OCJEdDoRW11sHsbTqN6ubuPRTVB5BehNt+psFNk2j/lMzVbaNDZm3e5gXJgvTidecgMgO80MEGe7K5PX1F5m+c7Gy/q1sRi9rkeuCi5yU1OekNKIk3gYVWcDu0F37xzM75Jvcl4xyObK2SxhSWTTRGb2/Sg4la7sV4EefJdTSLU9P525CDSg0aSiHv62HbOg10Afj8+8QvsdBmSKWQ2Rbl6FLMmXkMuwf3Y5BygFHPENUd4d45IMeVaaEm0Eb79KHk0PlYKFFmKcUGk+JvaqVxT24SWu0bJT3uEub5vbQTn+GIxrQ4yZq0LXolvmVwPNHzAMuRRPXbWpOR8mDQs+5l/HVVA/G8OtgXRTM8wRP4le6PFmcTPu4TNDOM1eg6pL3A30u5KyNszhZRoNoCkhWUjXxDG2cIZ5iCmnceOVtrJ58Jyg8l/ZriNvaVy23+5lCKOevvvGh6GXaMavxdKgBGehjgdQhHytSBq8alw7/4b99cEMpWQcAKhfu0Ns4z3bore/8jjkZqT3mkGFCId+YZrBgUN/EE4s7RehInfQmyuOfmdkl/w92QS0MQGH+52jA1HWzfywwFIkzaIvaSQKnp6IUp8kZNKbOtZgd5faSY7/Yh+tIt0CoK3hQ1v+Cqc9DxAj/UiI36lIlK9VlRGSbhG1rFWzDIP7bc9YziG7URnRLV77iIuz6niCMq7yyv2KsG5tnsxnoJGm5/WivbKVZxAbo9wLh56X580TsblDLknIJpL34j3Np/jDrdIALz3husix1EalUl+eO/9eMq9sjYJlpBBJFHcfBXuOPb+g0YID7EztScGupkfeu/ZfVweLSmkZdvds7r/FFLhXJA35Dx1qvEJOmL50SiYplOd9adGDxzmGfvzw2dK2uyByS6kC/vS8/60Qi2EsXf3zjFX0mBL2 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)(376014)(7416014)(52116014)(366016)(1800799024)(7053199007)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ia1E2eKjQ3nB8a6Z3pJNHZDBaYaJCFnU6EQBUrevOZo5z4n8LPqiYYqGuVDYmo3essXmFJXD+0TmazMt+bsZmyx6fv1998IT6uy4oCazSWwTn4VhmWh/I4wH36R9hjUtzHEnlc+QklwLwhmoH5eeN0M+AfHav1tfTYTyZ2iXg022GuZx2wRIbKfjtTvDdQKuJt1yZ7Gje2qldiRf6hq19DihaFM2s06PqR4BTSqqoSNZqT0ECohmU0jT8IsPvMsksCjt0PGVG/EIcVljyvsZcmTUqApJkPrHUQt2DZpCtu5gHBO7BP662+CPASN8G6PfcHuWBQ5tlp8Mq0L3Zj7P9Ygjp5skUPYX3N0xwh9wu+ZHpl3si7TTsyiXkrkHolPu5MJBvCDq1WJoaaM9ryp6F8yfCDY8J5iq7AMZdf4gNojVWLToCb2qPslZnGEoMW/mll7Coux81qH+rcszSsHsHLlJYG95fa8DnQ3y4CFhAuca5aV/UBFzCeakfBgdH7CVSd8hYBEqJtNCz+45y8FhkmDNNCiTlZ3ZRMdkWWFrWxeOZyLkdcF55Cmk0Yp+pM0oLAPOc5yNuhHP7PDCIPFalZp3ZrD9No7l17MPhPwsMcIKDlGoWmeFX+rKxjg893X7r1yIYvwOWogsMHce3hiP5VSpSd8G7dXEcx7kM8z+oaPqITbarjYqOXRKq4Vf7RtLuK2hM0iBSXcLJzLUiCKooCGMuORjYFiTQ+25nIqex1xfRup0JAoqmrrdXp+oE9wIf3+IwHcusnj2gsHtMxrVc+yGTTkANAmxVljCOuEBTmKLDbkz803ByB/oifQTw7+2X404/6ms1gYqFtjQWMmysrcTHCO3QnwN+ICdqagneYqF8+hAZMlGsPPK1buzCws+xEUTApxd6c6UE82US8+DbQlU5/TNRRi8Khyy9E0ReeJJgqylc0EZp9L2F+QxzNAMFud/13UH7D3a15koadS3TRnhaFWnPMKbEAeZK1hWrTzIgQWMhJF1HjGX2wonbMaeGcieXP48E0ofm+ofiQagidluCLADw/N9Rkn2oXJB2QDksWtRjuGEuDvuml8ul9xHJiDf1RnjveVblJFLnOHF8N3+AhHbLYJDX58j4nfgz6xyAnpn/WWuk6eX5c4fF/nCnVFzwaxhdUL57xOhWJBbsZYXKZvchK3v+XaZQVYgMkSyCkraAz+YGuwpwNJGhmzstbbUTMv1Esh/NkKv2SmEr3yZD9/H5NLVUlTGGieI5+8sthRvChuXFzDktsnaCJJ18f4apMhEpaBGbRRQTTG5He/VLXfvcJknUsjEQXArlGQg55GLhQAiJ6f+hb3o1zXogrLEYdmCwYJYndSPsRmfDNF8g50V3/66Tk78Z2sP7Ww1BvTNMkOP9qYVW0cWHIi4qMr/+W4anRoY7nnlEKHkg1P2QHMPqQ87KGKYABydNrENwMXtE1E2ySNfN2hGCYJRvxJ9kTwpnaJoaNbmUfT+FIARTVqP+5ZAODfdjBzUpU7UY0NerDJAamDVJ7ilyt3aYSTNlJWYCgFPYyprg6ijUe/tZp1+STtzlqhoGG3lIavtZloqWCVXXkgSl6y61XFY X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ea565c49-4df9-40ca-19fa-08dd607aaea5 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8247.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Mar 2025 08:56:59.6290 (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: ss4rDPfZyIsQdkMLZ7QG65AXLbdQdaFEMMZQMvWXtcPossmij7ZPn/VyICAfroupkC7nm3GJ904nvHP8qv4gaQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7431 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250311_015705_896553_E2DC8A82 X-CRM114-Status: GOOD ( 11.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This adds IMX8MP_AUDIOMIX_ prefix to internal macros in order to show that specific macros are related to audiomix. Reviewed-by: Philipp Zabel Reviewed-by: Frank Li Reviewed-by: Peng Fan Signed-off-by: Daniel Baluta --- 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..c2c3e8113182 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_RESET_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_RESET_OFFSET); + writel(reg & ~mask, reg_addr + IMX8MP_AUDIOMIX_EARC_RESET_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_RESET_OFFSET); + writel(reg | mask, reg_addr + IMX8MP_AUDIOMIX_EARC_RESET_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;