From patchwork Thu May 22 17:56:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 892358 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2077.outbound.protection.outlook.com [40.107.20.77]) (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 83F681A3148; Thu, 22 May 2025 17:57:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.20.77 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747936629; cv=fail; b=Vpgu5qd1vzBRn4eD08/hLAOe/V81+TG4zGNYzYElMIXeUgk2ioIsk5C/4DIDdCXe/P+fXm9AIjz2R/EwjYiAfK3snD9FjOTkLhaym9RyTuAJBT2j5+QGNlGf2GeSCYSvMZzGUHVrlerxUZp0uAdI6Q3/btQJ4/C3jMkqUhlikcI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747936629; c=relaxed/simple; bh=dbvfHs4Y1u0Z4nbcX83zBCGc85HmV+AR+iGjoQBpZS4=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=ppXh4oALThpcaLaYT3G7sElmq+aA10eJKgeim3KjesCkQzkuQ7uVOMQyemhHnpverEnxmCbhWfVRPNvCbFEPewaDp2i+AwgBlc8LkEkPoE3TLPAI6yE7qfdO8DP8Xf9zyvORBkMdar2V5BE/bnyouSOqjq4QBUGA+CY2okHVC/Y= 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=C6HBtYL3; arc=fail smtp.client-ip=40.107.20.77 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="C6HBtYL3" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VbZzQixfOaKS/399ARfEjuUfcop8QA3hgziLl+trWw6Lu/peCMoop5e6x2Cph2p+tTgWPe78pGCLFFs0/JGSAsoCzm+90/BBDW110MI0twSA1SaKGJ+zjx5zKq+sCL1QNuspkFQMHXopzL4k5Y9UA7HgJx33NYK0JGEOHzd8gxC4KqIGmd0WwGc3yK2xQXeuRlYZFK/CMF2RsHtM6wmjkhxmxvZK+FuLZnjgnUohjeEUUOuzqEZMWPjuzYaXINyuORY11ygs6TlLpzgz3m3Ey3CRNUeccc4PgCTYiMXsoelykN5AIFmY4rCh1kwwGvLhIM8DZYlnFP4Vx1UCyBCUQw== 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=+VETvqoxvgoeZOItDUdI81FqR1pnbi0KyE/AF7g8nYA=; b=RJ4CJdw13VVk/9BGJiv/HJ67neaUmsnM7Hqoq/0yTrbMhmcJUxh5/lknUfpYKyI28JppBXlZFCH60vI/je5WL+0tyg4FemHxY5GCnX2/qZWIm/hJNmgF0TRPMEQDuUYnBM5AfbSh2/CDFs4TeWpZdshRWnqBisLq6+H/yUFgbwIPGrhPglKKP41HAawfbIJlJ/DGKHLOvOfb9G2y4hB5+nu57dnuCcdBSfzGXcgJwE5E+JcQCJ7SrXdbX0s2WUJMs4xmnZ0KK6Gu9KisZlZA1yPu/YyW9AAaW6ir5kZarxIUE/KU3rkmF2hUasAyNMUdwdswBLNv/DDl6B7wXzZl+Q== 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=+VETvqoxvgoeZOItDUdI81FqR1pnbi0KyE/AF7g8nYA=; b=C6HBtYL3d5D3HZQNgAlp90/kX65TbwWWe5yLtQDajys83vO/Zq1U20ZYPsMH2WxGoSQZEZCFqmgclgTDrSiYR18wV+MUlMELq4tuF5wyhRn/wDyIjlL06JJj8p/Z/WY18mDM/AAGFZ9vcucNmyw67gyosiWGXINqyLBoaHe7zLv0nqLZccXUIU4ajIewZsLrSbcwND4C6e1V+HVWSYtaSfqC1X7pG7ZT4+aw5PXDpgXQ+3+2XH24IJt1Sdf75A+WFnYWRcx1MIzVZXj20LUkB7/SV8Z9Ec3Bz+Ia1XXKXd0md9WS3DB3zNRFzauJzVc6c3IqwVpJmRQHmBK0szWaCw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by AM9PR04MB8779.eurprd04.prod.outlook.com (2603:10a6:20b:40a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.19; Thu, 22 May 2025 17:57:06 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%2]) with mapi id 15.20.8746.030; Thu, 22 May 2025 17:57:06 +0000 From: Frank Li Date: Thu, 22 May 2025 13:56:40 -0400 Subject: [PATCH v5 02/13] media: nxp: imx8-isi: Allow num_sources to be greater than num_sink Message-Id: <20250522-8qxp_camera-v5-2-d4be869fdb7e@nxp.com> References: <20250522-8qxp_camera-v5-0-d4be869fdb7e@nxp.com> In-Reply-To: <20250522-8qxp_camera-v5-0-d4be869fdb7e@nxp.com> To: Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Frank Li , Rui Miguel Silva , Martin Kepplinger , Purism Kernel Team Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Robert Chiras , "Guoniu.zhou" X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1747936611; l=2343; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=dbvfHs4Y1u0Z4nbcX83zBCGc85HmV+AR+iGjoQBpZS4=; b=XYssoSUC7BG/I0OwAGTgjZnBdh8e6lnW7eHuduxdXMNhGZsqJ2Zv+/cdF1X6uHLyyjxbeTbda M+rfI0mnYYiACM3cn+SvJc+4q3uWdnF8t1rZmvqwdGf3+fr04PKZfwy X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BY5PR04CA0006.namprd04.prod.outlook.com (2603:10b6:a03:1d0::16) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|AM9PR04MB8779:EE_ X-MS-Office365-Filtering-Correlation-Id: 9e70d656-1375-40c9-d9dc-08dd995a10a2 X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|52116014|376014|7416014|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?Cy4e/l4SJnK72bpkHqJfsPxNtfoXser?= =?utf-8?q?FW+muwi+jvpYTS5ko232WOMre69koNhet1KQUK8g1HRPAG1tLeGJdbs527nHQJlnk?= =?utf-8?q?ql+M4gVXSFJeptpZmd0vywjj8wtpmAftuWN9Hzf7Aera1Wy707p2LwvQsgG8Z2KVW?= =?utf-8?q?mfcNAfO0bw3mS+rQx23/vHo0C1zSjtQYnbdeXuKvWgm4p8UjuQlVJ0mry9k5S3CMX?= =?utf-8?q?lz6yov//vCctDoNRPIeuyq6W5Ih2XVvn2ax/5lRY91ihLy5oT4JAPBc0DFqUhxhZL?= =?utf-8?q?0E4hZPrDDden7xwPIRjOaVkW+4jfYRm0zt7lTeWlNWj5yuOifmSK2IPPBReHL8/fx?= =?utf-8?q?r0VcOY7tOG70eflpZevoicTgPcRLG2oINFt7OFmemxSbFN1HV7dBqWlCTHvSbgTS3?= =?utf-8?q?qyYDuL+Azf6BCsN0eKhdIttQaGNzlqjOD+79k8XL8KtxMQcDvqQkCCdE+zXZxHYZz?= =?utf-8?q?4HEyooRd4pJldtqMB2eA236rJqGqkSUqjE/yUXaftYOm/ICD0C1kj7eBIyuC3R536?= =?utf-8?q?ub+Md/c2qcFTMCM/dsOgxeYBMr84ZQBWC9fEZUwcZoVNOlS6RZDL2tLXiuHgILhdn?= =?utf-8?q?yRjMRQvBj4ufvQ42y8exDSxmUJql8dFG2cG9Fmt6jDgwqzUE/BEP+R9gShYR6TDus?= =?utf-8?q?qfWY58vyDah7IhJtliP8WKlLRDDG6uUA6Kt7ss63baMZIjzWfsi+hFPqyFXiZmXtb?= =?utf-8?q?G5eEVaZzQERFOiCMxKKd8OnV4EMq2AGfn1NrGg6k2MrbW+ysDbxwqYUtpAuARu8+V?= =?utf-8?q?I25mJQ0f8jR5LIUYm9DAp/vYW0fo7noXX88O9flXF9eodegfpRlDBqe5FmYRrzbls?= =?utf-8?q?rwEdD7IFgCaWeEJH/4AGDcmP0HjGi0U/hopXnFKrEsrbJeU98jUgnYTy/dvSPsRQw?= =?utf-8?q?hsBqkFyIf+jfQA0D2rLMkIC3qcjWkq+xZp/qCpNwiZbAdypXAJLVNkaQE2VDfBxj1?= =?utf-8?q?GLyDHzqYcRY+Q7QKcfKM1hLqoqwVsaL2mkG/NhB4UVgl0VCYQYHwKLgZDdC4ecVXk?= =?utf-8?q?NsczKZ8df4afdqkmrYH46RNMXkU8fGz9jHKiR2ksqSwVsTCcYnnHDGVaoAeVNRX9H?= =?utf-8?q?t9mvCMZTxb3NXZ2QvtF/BuRaKei2z0CHCCbOwUpr/U6ylr9ztWiOnKzsb95qCDM4q?= =?utf-8?q?8CdechCCtCYGAMmxXacAwA/LEKU2lzgjKbIxTrs3M2HI3cmUc+Vg+8lVU+slTmFB7?= =?utf-8?q?EmYT2xiEbV45+M8Jn2uSEzuj2mKZra9Mx3n6JlaB0mOKtBoY8gfev3cdiXEjFEP/x?= =?utf-8?q?c0RjWgEKgWM+7RUYYS/O8uKR7RradkAHZkEGczD6GwZZ+geJo2rR/NX/5PR5lpj/0?= =?utf-8?q?noeWuvgU53JtR3lZZegPKJnwet1y4N0BPhjEONuVzsau7E/GsA4Yr0iK/QydYE3jd?= =?utf-8?q?49Ndo96wXeDraHzJbGpTt6NofYDZuKooI8zoKcy8antjtPhkLAy4P0=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR04MB9642.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(52116014)(376014)(7416014)(921020)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?08d0pvsYpuXKMzlSFClRvNOP0FcR?= =?utf-8?q?vXVreXJ6ePm25rYGX+/bC1GaNjftQ3Ei/tZUWk+mkzHucJd4P16Zl63fllM30oX2H?= =?utf-8?q?zoJl2Zlcf36NQqHOreVM9Xdlgziep3G6pqnQdzNxgQEdeWa+ejQReMhJDKO5rL7zg?= =?utf-8?q?lNJzdtoEWsIqq7OCZAsbyAnsJxanN7CAapd5pq5Zt4FnSVL1Fk+qC1f0lnWY3inEz?= =?utf-8?q?xvuc+h7TCLeUOaokR32E5qWaTU9i5DvCHceIRybnEao+Wj885fScm7Cl/tGQhQK+a?= =?utf-8?q?gwOxBOyQDeprbb1gjnWpgXSHvTEts0azWYvpgS5yw3LdiLz7e3QUAw+lRzzvc/WvV?= =?utf-8?q?RHgulkT9V+9eCjpvOHgD8DHqi9iRmqf43NpvdskiiFoTG5GugVuSURqpQiys35oAj?= =?utf-8?q?soxN94GllTHD7xUixBIbVAiWPDogxvwIUTzjtoN3jHw4J4LbGYp6TK8IjT7Qs1CQj?= =?utf-8?q?444Qqf1MSwRm/ww88ytW78bZNsoJlS/kg5ICfwxgjMsbZ6QH49SRQLK/Hc7gW9K+B?= =?utf-8?q?1qsn7m4VTVAhPwyHhF46ico2gUGg/gWHNWbrp1/23jQKMfoiFYEhkQoN/1cFHtMc8?= =?utf-8?q?kJweBt8SWg2BG7b7vDPU/SaBue4M0reJN61CvOXfHwOVjt0ZSYP1qa9mukIJ5JORD?= =?utf-8?q?E9u+xRFurh7Kt+ORW8w4rBtbtG+Jso8qs1KVfJaf33NlYKtREq//E7mE3GsYaXS72?= =?utf-8?q?9lkWSL5hEBO+NdUhhWU8lPj2bTVB308K0boE4vmGW1Gnweu4lhhSVEbHMsVbtcVjQ?= =?utf-8?q?2gxlh3ZyaqMJ6UIHQ00z3CoSMuJiKOTOfkHaL6UM59uQ7dkDEz8bug3nWozP+5IYY?= =?utf-8?q?JGGmerw0zvU1wVshxE+MYkDTfnoKORWdTGZKjJLVhXcfdG2KiHqyFdm6XmLuFfY4J?= =?utf-8?q?CwBfCa6cDzU3yGaGhF053Ct2zE81wCP6tsDr63OG2gE6TQkjyn8HL5nIkIVK31Xil?= =?utf-8?q?IjVUSDlSKu/ioBljoAakuoGfQtBNfEyYbJvvLMEK4QPPtiWE85H9oHCjUawk4lmBg?= =?utf-8?q?mTStTLagMe8Ue7RbLpwgKt0MJmbGXceBe78CxuwWhPqHYFrsvVuFU0t0hnCQQPoSa?= =?utf-8?q?qj9URi7yLiGhtcD9XVYhoJ++fNcO5nRevoNUKaSDptJbjkgkKrWb+rFP4c+w9Y6kw?= =?utf-8?q?+udXK2THv0tuuQy8PtJY1oqg/5wrEmR08pmI2ZXOtt87VNzC5WKdKlnb9yUdR/0to?= =?utf-8?q?uVcQHdstbgoVKeXrNCNRWsMaK+VEt2cnZBsa2jPyYqD0MwimVjZYYZ9ACtDrVzM67?= =?utf-8?q?LEbNa7txA44WxxLosE0u3sE597u8uwmv7+dQ1H/UfrJUvCK1/mxal1iJ85vNZNIla?= =?utf-8?q?yokOinEAoduMNes8mimadCh/jNDMMcXF5G/wNlwM0+OE8RWGLQ0Q0ehMvxifUbJUv?= =?utf-8?q?vTl4R0gM29YxEd1btlMPfHB48lVuBvSEWTL5SfSUd05d+UR1im3d0N9U7Zp1Xd5MG?= =?utf-8?q?UzQ0VnJ8WPsbbEZHJIEMYS4QNE57ng8mYcGboZEkNzsuIr32+hRIbZMMUePYGvLZK?= =?utf-8?q?daRYWqNXlY13?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e70d656-1375-40c9-d9dc-08dd995a10a2 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2025 17:57:06.3060 (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: XIkbaUYdSjULMyAfNaE4MxTbM+FB9om01OOXrmxE+AfrZoiIIuqsja86gtNZ7aGNESF1b9gjl3r4y+6sIYgthQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8779 Allow num_sources (drvdata: num_channels) to be greater than num_sink (drvdata: num_ports + 1). ISI support stream multiplexing, such as differentiates multiple cameras from a single 2-lane MIPI input, or duplicates input stream into multiple outputs. So num_channels may be greater than num_ports at some platform. Reviewed-by: Laurent Pinchart Signed-off-by: Frank Li --- change from v4 to v5 - none change from v3 to v4 - use routing.num_routes = min(xbar->num_sinks - 1, xbar->num_sources) - replace xbar->num_sinks - 1 with routing.num_routes change from v1 to v3 - none --- drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c index 93a55c97cd173..55454445359f4 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c @@ -188,11 +188,12 @@ static int mxc_isi_crossbar_init_state(struct v4l2_subdev *sd, * Create a 1:1 mapping between pixel link inputs and outputs to * pipelines by default. */ - routes = kcalloc(xbar->num_sources, sizeof(*routes), GFP_KERNEL); + routing.num_routes = min(xbar->num_sinks - 1, xbar->num_sources); + routes = kcalloc(routing.num_routes, sizeof(*routes), GFP_KERNEL); if (!routes) return -ENOMEM; - for (i = 0; i < xbar->num_sources; ++i) { + for (i = 0; i < routing.num_routes; ++i) { struct v4l2_subdev_route *route = &routes[i]; route->sink_pad = i; @@ -200,7 +201,6 @@ static int mxc_isi_crossbar_init_state(struct v4l2_subdev *sd, route->flags = V4L2_SUBDEV_ROUTE_FL_ACTIVE; } - routing.num_routes = xbar->num_sources; routing.routes = routes; ret = __mxc_isi_crossbar_set_routing(sd, state, &routing); @@ -453,7 +453,7 @@ int mxc_isi_crossbar_init(struct mxc_isi_dev *isi) * the memory input. */ xbar->num_sinks = isi->pdata->num_ports + 1; - xbar->num_sources = isi->pdata->num_ports; + xbar->num_sources = isi->pdata->num_channels; num_pads = xbar->num_sinks + xbar->num_sources; xbar->pads = kcalloc(num_pads, sizeof(*xbar->pads), GFP_KERNEL); From patchwork Thu May 22 17:56:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 892357 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2063.outbound.protection.outlook.com [40.107.21.63]) (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 113241A239A; Thu, 22 May 2025 17:57:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.21.63 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747936641; cv=fail; b=pyHSSZSCuZ4Aan6A2wu8a4W8LcvDwzT4SS03wFCGwsiGBkfEgLmdo0f0nhdXb9hX2oAG8+liDAT0tA3SbYSnt0812ELVGCPxeB/VP3ZH3zRpR27lCgB9D0BMm5L1wZxbgf8NEgDMvZgnXlXcKe6NnZMmsfP26lzlDLVnGdF+lgs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747936641; c=relaxed/simple; bh=fqwXtCqUEC5fQ1kuDzhvENyE4RRLXfgHO0RIN9hrMBk=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=I8l7iHaccUQRGhMc+aBAENgb8krc47KqcOy9p8smORFqIJZxXIzVxoX1ZikCO+E7OAZiLuJxNnvdm8CPqAayulNkYQzDsqnBlcytJv+LR5L1yeZLr0/8hNfvtoDPRtMA2awyZnsXi/f3NEFgSBOp/RmGJYCBqVLOhKd2izd4jr4= 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=OV3+VNoQ; arc=fail smtp.client-ip=40.107.21.63 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="OV3+VNoQ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZuatY2+FZ42flr/MziXMlE1y662csWRqW+TpwuAq5BNqiIJ2xFx1DBb6vJQmp5WffKsrs83ZU9qxWmvL8EjCrIFt6QzmyOE00kUHL0AwO5CRDLk/u/NayNzIh2ggZyTvRUVfKpOJIa1Kj0CQiNiwxd8WRf/26KwSr4q1Sf44UB5KXwTjvYqNzzYSFOqa/+ZelF5XmINMufgDW6Dx8lSBuEQ9keNVmyKZO2sDVBm5/Uj+uOF5sqFklM0PGFrdxDmpxJAsr/QAQri0OukdaUSABQr3wvRQcC3OzXhKCE+wK+86/DqvdzTszhjVYV9RnQB8CH/hSW6dyjzgy8x7C0Wz7A== 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=GLCIfAQkZuA4HrGCxjFPi+uIvxtJ7dh4K2YNX0pskQk=; b=FoZYZIEsCqFcMd6EIdhd/+DCGfRekqfU2EcDy5uhjx4bKrnMLpiHlnYUHhVsXXfCcGqjSVmis1d59WIfGV64ZcDoa3qK5xtG6T5KO9+qfQVyCQ+6fWhFmhRjw3b/G3UlIyeoOEOigiWT2II3poh9zxV+thYZhplcVuE/+MEwyx6ZIxEwGU0AEtc1VkACPXJWBeyqZgODH6xIQSgSpN7JJOpKHq5nFdn1Bnzk0OyU81UOCRQ9pekCnWyfhEQLt3+wFODepWKvIGulXt3eaNI4NSCEdup2YkbAxXf6sLCGepErrTxQQjrJJOOktZmJRyo0HUkXDIOaZ5Zs3unzXLdgQA== 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=GLCIfAQkZuA4HrGCxjFPi+uIvxtJ7dh4K2YNX0pskQk=; b=OV3+VNoQEquK+XCV/yXzg0mLUBo+EgauqRTlRuMH5loLhXBazdZWDy0eb90b4MYbXbaxzcTi1YkPzxJkaqc5U3HiRu5S/+7cMvxJrR+XIcvGUwY225zHlwnfo6XeXPeBp9tEXotbf6Q28JDaBTxZZAxnp1AcT6IZLkUzcVjCvm4TUzULoXvCTHO4WsZA5KcPwxz9+H7GCsFeHQ4tY67TYv7cnDjgLe6atSpHfCirKL/95vyWCAdudKi6J0MJwIONk64ftjakluKPExowK0Urtyrb27CaB2i5URPK4nLq9BYOrlsWzpxA1XYqFcSaewpxGJff6HzmdyvvnS92MLy5VQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by FRWPR04MB11272.eurprd04.prod.outlook.com (2603:10a6:d10:19c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.21; Thu, 22 May 2025 17:57:16 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%2]) with mapi id 15.20.8746.030; Thu, 22 May 2025 17:57:16 +0000 From: Frank Li Date: Thu, 22 May 2025 13:56:42 -0400 Subject: [PATCH v5 04/13] media: nxp: imx8-isi: Use devm_clk_bulk_get_all() to fetch clocks Message-Id: <20250522-8qxp_camera-v5-4-d4be869fdb7e@nxp.com> References: <20250522-8qxp_camera-v5-0-d4be869fdb7e@nxp.com> In-Reply-To: <20250522-8qxp_camera-v5-0-d4be869fdb7e@nxp.com> To: Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Frank Li , Rui Miguel Silva , Martin Kepplinger , Purism Kernel Team Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Robert Chiras , "Guoniu.zhou" X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1747936611; l=4969; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=fqwXtCqUEC5fQ1kuDzhvENyE4RRLXfgHO0RIN9hrMBk=; b=nSZOiELzIVkLl9fyGCrV7RI0iLuEoLuCK/tYx+T5PtwkltfsOz2Oz4wQoQ4PWdeSODhUbfUQX 8uXy/ncsVdaBqwUqv4ofkT77SqVlN7IEwG8PREhAU069BTNrRdWeDPc X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BY5PR04CA0006.namprd04.prod.outlook.com (2603:10b6:a03:1d0::16) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|FRWPR04MB11272:EE_ X-MS-Office365-Filtering-Correlation-Id: 897808e3-5065-4e3c-ee83-08dd995a168b X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|7416014|52116014|376014|1800799024|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?/bOjVgVZYYbdUctVNgjwPuJhQ6tBLOq?= =?utf-8?q?F4IrSYlXhLUXM+PAiuVARD5V0Bvm6gDh8XQl8XLC6QMk4OFqWvDgtyqCXgGZMmhwC?= =?utf-8?q?TUOBlTsLzVR+J2ZGIoXaUSgU8xqO8LCfaKpSkxNlANaUNxKm1i8/QGG0ZV2j3I0O0?= =?utf-8?q?g7m2Nnlpd4ah4uqqKH7B2/riETey4S4dFhHuI3p+ulbS22n9SzGxQ3y81C0qXGxEa?= =?utf-8?q?nsi58plBVS52FjIj8wyBtswQCXJ58eLkpv4nJED4yV46Or6SzCRAGD+S9/9kksTRe?= =?utf-8?q?1iI3gUo/nW++Y1JMK5I7R+zhiXouonbYFnO5h9EARkRcsyMagyz5z1D9+d6cHZvg1?= =?utf-8?q?HGAsbgZFde69iLy8S+7ffbEq0pdX8lJawfI2K8Qa1sARys1uLdZYwcyeXWbJ8rDjK?= =?utf-8?q?sjYuSkohhk018in0dIFuckqfkAznJwq3gxa/UHBrQ0jnacrhGaaBPPeja6Iqgt5pg?= =?utf-8?q?pT+Qr2iuKvQRsIqSE724Duq8hK2K07Rivq7DaHqdKMEivSkWgKxoLWo77USYtwWNA?= =?utf-8?q?zRxvAjbf4MR2yfQeE95xNxmN+MQfWICKz284BsIaLu/5vFWCRnaw0Yyq2oyqoTWCL?= =?utf-8?q?kH2pSeOQQjGA1hYzl5xXQD/yA5kNxZo7+XnkuCQ3ekbtu9hVxNlOVzKhIvNgyf+og?= =?utf-8?q?kyOdd6Pao2oxEoLwgSCzx3ogTL6+AVwTLx2XWhlYbEvN44ykGg4BQUZv2rCAIGZLy?= =?utf-8?q?UDDIv4kqORNaJrJ54whYAMdaYe+jNMPZfbbd1WX9fLrJPEx5gIstgnZeCh0qKAXkT?= =?utf-8?q?cNVcDDunjxHpeZNtZ8R/+sN4B6yPNb4J2eTeG0WkiOy+PUqCBkH+utwa/hZfvLWo+?= =?utf-8?q?zVt6lnevam5XWYjeFUpCGIeJCiGc+r98moBC873eOgJoxkAxce0Vag/gXPAx+ThP4?= =?utf-8?q?iDY2uSX/pvlQCNU14LHSH4oQC3woXNHSygS7nfRHYMtRDH9ziYZTwbTbaorlMW/uc?= =?utf-8?q?WqI7VnzUcxyadNX6dYaEJ9H6PqqBnJJFkEYZ8PrDmTe3Z4qDqphT9oqT1bF7YLUfy?= =?utf-8?q?92YTR2GslQ16ENcFixA6ZHkLcWYOpgkRoBUHPXD3sv4LHKNdoxxThnwvdetgjYwhO?= =?utf-8?q?cWH98HNtfVm0Yhb2eenFYck8s60mbp1lUqzzCPOi7AZRT/FWlZF1Obd9hPXEmiMAQ?= =?utf-8?q?UdTXYUuy5jU1mJQvL3TFZ0HHAFBO8xWt/St419ZekFx0gvw9kN4PulBDU34E3tjgQ?= =?utf-8?q?FeXxw3+9cMkH4yuzHvB5ylJSyrOYwz1o7QrD14L6NItUFkxoYjxfw3EbIw/WNf2pO?= =?utf-8?q?jPWRehg2s54z33z5R8VJUGYP5bE4JhVOPLHjiXh+4e2FWV//tuDlyAd1Zy/I1eqTi?= =?utf-8?q?ITrXrutGt5XKcU6HupgMOTv6TDKc5YwJDY68rRBUo9hRDjAwR1qSC8hTuMgKDfYr+?= =?utf-8?q?TdpPflCCHzLvJulTUGMDIGIUYUXItivkSESchvEz0uMXJ+Airzsu6E=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR04MB9642.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(7416014)(52116014)(376014)(1800799024)(921020)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?MqM3vlqjac9veuIz6g5FLDetLmU4?= =?utf-8?q?Q+aOi5w/sQH1XHsV6/AVhxwvknUocEeEPYACWoEZBITimxvCsQgzi2dZq2EJFaXMP?= =?utf-8?q?1YLMYldwRWxJSkyVCLIwTQ6u2BYqhmARh+05xrrMlyK4GBgtOaw4b9ZfpAYjYr/FT?= =?utf-8?q?Zzj2aV/yTBs0PZx/f6aCI9uJgFvxMk7gn9ossPbY6oS2TQ+m9iNuGq/Rxo0h8nAZ5?= =?utf-8?q?UPD/CJW/zWDF/Z0VteZ/Aa9Vm8EWCCmradmJnvgxy7bATJ7TW/niDmnQ+WAVs/0jl?= =?utf-8?q?muoR9JvliMrPT26hv5w8T/+az0b+xjIMdyjRWO+O5xfli3Y6atREnH6N1FaSxeQe/?= =?utf-8?q?SM8BFGMXI4l3UQkIhYjvFVVFLSxVEyTRIaDrtwfTQjAXMRPMgb4BsvF6dN4mVz8+u?= =?utf-8?q?mTdopC3DXfBHQFvwSur/8+5S7wU3hJru76M2dpUoEtMi7C9KewnYjnzWGuIQ7VlLm?= =?utf-8?q?aGXCdr90e4pkPsazaHAJSOpwpfM4i4YQxa8RAZKWsq8H8+4o420j42FLJeFXcHMCD?= =?utf-8?q?5mFbipICs8QMXGWtwoIZsY+UZ88yllW+ej4AL+3WrBBKlC9lv+dOboVtz0bLew7eK?= =?utf-8?q?NDa2wifvB1xZrwg/7wyeNqkaDACh97qC0wuUbTJH0tig/6tmfW3L+GwqDnwEUKKiE?= =?utf-8?q?hs4RhQd4xhRnTLDISjlLHjOlGyLH49fx0JVjCCQvu09WfQWY2QmHO7ku98DIThUE9?= =?utf-8?q?ge9j/H1U/QNtu6Dm+90n1yemcEKH3lk92VQlqOyfyGPGTcsDgF8lF7LSwi6suTsFV?= =?utf-8?q?PnScS02ELQt7r+wrK/G5T9Rvkl3yKPb8NweWEmRYnzi8z4xJav9dqKwUgrZLg/+5o?= =?utf-8?q?fhtMcawq78lkWwn5lPNIf1goDv80aKXqT/276CgM7yePdPK5RB8PUV/bwVKH6MkNS?= =?utf-8?q?RtAK5bZMKo5bw0IG2xiBbqpTIw9/VMRiv4PiI8019+7ODftJX0cyR40fWGUSLDRV2?= =?utf-8?q?H99kxk/HFMBDZ+s8VNN5i7LPwK1Sk+KWOofwYlkDkGfod3b83fAb+TIIPO6EYw3b/?= =?utf-8?q?uKy1Tm4uledFyuli43YLjq9oVH4+9+FC+C4V4OAyZhVis1kujTwLOqvszUpH26T9m?= =?utf-8?q?2Q0Wx3RUcqmngjjYSwmOntBKvSQvC+vD6hFunMFmgSJlrm0cEldFGRuDEPES8oqpI?= =?utf-8?q?HMv8EQKAujXJKhmT1BPOQNbPdbilL5ACOwAA8X91lwmBpfwNnd/G9+hhZNUGUAcsG?= =?utf-8?q?s0MSzm3aqrq8ZkK6w29qVndg0H8UemS9ibEzAHTzXCMN3VX5g5fTAqNaYJraVki89?= =?utf-8?q?h3qe+77GwSayz2Iw4U2yLJknUgLYwF+HzX73Dk3qctOyBXRNCvva4VzI4bZw0hFqZ?= =?utf-8?q?MzzlmazoYVbP6zWO11PTIVGQEskV4BK/gMzlkbJJeX2WMYS9Mkrg/F6puTnYeUakz?= =?utf-8?q?c5fJ1EwQEiFaiuhckrPcD7MrHE5L/nigEXvxKhuDU7ppIQrd0VH/CHiqPcpilSTnZ?= =?utf-8?q?vRJ3wG7+ZiEXdrct9jvVgTi+dmFq7G5AIi+60hxW6nHQb6lFVXPOuAh6OPfJxIi5o?= =?utf-8?q?9DD52R9qCD0I?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 897808e3-5065-4e3c-ee83-08dd995a168b X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2025 17:57:16.2682 (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: VRTivAfiFJCg7WlgixYeVxXP3nCA142gm+bkOvo5XeDcEXC+kw00R3N5ZAGDcE0e8nHLnJVpRrdTPTFcR4J3Pg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: FRWPR04MB11272 Use devm_clk_bulk_get_all() helper to simplify clock handle code. No functional changes intended. Signed-off-by: Frank Li --- change in v5 - none --- .../media/platform/nxp/imx8-isi/imx8-isi-core.c | 46 +++------------------- .../media/platform/nxp/imx8-isi/imx8-isi-core.h | 3 +- 2 files changed, 6 insertions(+), 43 deletions(-) diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c index ecfc95882f903..015350c6f2784 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c @@ -275,11 +275,6 @@ static const struct mxc_isi_set_thd mxc_imx8_isi_thd_v1 = { .panic_set_thd_v = { .mask = 0xf0000, .offset = 16, .threshold = 0x7 }, }; -static const struct clk_bulk_data mxc_imx8mn_clks[] = { - { .id = "axi" }, - { .id = "apb" }, -}; - static const struct mxc_isi_plat_data mxc_imx8mn_data = { .model = MXC_ISI_IMX8MN, .num_ports = 1, @@ -287,8 +282,6 @@ static const struct mxc_isi_plat_data mxc_imx8mn_data = { .reg_offset = 0, .ier_reg = &mxc_imx8_isi_ier_v1, .set_thd = &mxc_imx8_isi_thd_v1, - .clks = mxc_imx8mn_clks, - .num_clks = ARRAY_SIZE(mxc_imx8mn_clks), .buf_active_reverse = false, .gasket_ops = &mxc_imx8_gasket_ops, .has_36bit_dma = false, @@ -301,8 +294,6 @@ static const struct mxc_isi_plat_data mxc_imx8mp_data = { .reg_offset = 0x2000, .ier_reg = &mxc_imx8_isi_ier_v2, .set_thd = &mxc_imx8_isi_thd_v1, - .clks = mxc_imx8mn_clks, - .num_clks = ARRAY_SIZE(mxc_imx8mn_clks), .buf_active_reverse = true, .gasket_ops = &mxc_imx8_gasket_ops, .has_36bit_dma = true, @@ -315,8 +306,6 @@ static const struct mxc_isi_plat_data mxc_imx8ulp_data = { .reg_offset = 0x0, .ier_reg = &mxc_imx8_isi_ier_v2, .set_thd = &mxc_imx8_isi_thd_v1, - .clks = mxc_imx8mn_clks, - .num_clks = ARRAY_SIZE(mxc_imx8mn_clks), .buf_active_reverse = true, .has_36bit_dma = false, }; @@ -328,8 +317,6 @@ static const struct mxc_isi_plat_data mxc_imx93_data = { .reg_offset = 0, .ier_reg = &mxc_imx8_isi_ier_v2, .set_thd = &mxc_imx8_isi_thd_v1, - .clks = mxc_imx8mn_clks, - .num_clks = ARRAY_SIZE(mxc_imx8mn_clks), .buf_active_reverse = true, .gasket_ops = &mxc_imx93_gasket_ops, .has_36bit_dma = false, @@ -386,7 +373,7 @@ static int mxc_isi_runtime_suspend(struct device *dev) { struct mxc_isi_dev *isi = dev_get_drvdata(dev); - clk_bulk_disable_unprepare(isi->pdata->num_clks, isi->clks); + clk_bulk_disable_unprepare(isi->num_clks, isi->clks); return 0; } @@ -396,7 +383,7 @@ static int mxc_isi_runtime_resume(struct device *dev) struct mxc_isi_dev *isi = dev_get_drvdata(dev); int ret; - ret = clk_bulk_prepare_enable(isi->pdata->num_clks, isi->clks); + ret = clk_bulk_prepare_enable(isi->num_clks, isi->clks); if (ret) { dev_err(dev, "Failed to enable clocks (%d)\n", ret); return ret; @@ -414,27 +401,6 @@ static const struct dev_pm_ops mxc_isi_pm_ops = { * Probe, remove & driver */ -static int mxc_isi_clk_get(struct mxc_isi_dev *isi) -{ - unsigned int size = isi->pdata->num_clks - * sizeof(*isi->clks); - int ret; - - isi->clks = devm_kmemdup(isi->dev, isi->pdata->clks, size, GFP_KERNEL); - if (!isi->clks) - return -ENOMEM; - - ret = devm_clk_bulk_get(isi->dev, isi->pdata->num_clks, - isi->clks); - if (ret < 0) { - dev_err(isi->dev, "Failed to acquire clocks: %d\n", - ret); - return ret; - } - - return 0; -} - static int mxc_isi_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -457,11 +423,9 @@ static int mxc_isi_probe(struct platform_device *pdev) if (!isi->pipes) return -ENOMEM; - ret = mxc_isi_clk_get(isi); - if (ret < 0) { - dev_err(dev, "Failed to get clocks\n"); - return ret; - } + isi->num_clks = devm_clk_bulk_get_all(dev, &isi->clks); + if (isi->num_clks < 0) + return dev_err_probe(dev, isi->num_clks, "Failed to get clocks\n"); isi->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(isi->regs)) { diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h index e7534a80af7b4..bd3cfe5fbe063 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h @@ -169,8 +169,6 @@ struct mxc_isi_plat_data { const struct mxc_isi_ier_reg *ier_reg; const struct mxc_isi_set_thd *set_thd; const struct mxc_gasket_ops *gasket_ops; - const struct clk_bulk_data *clks; - unsigned int num_clks; bool buf_active_reverse; bool has_36bit_dma; }; @@ -282,6 +280,7 @@ struct mxc_isi_dev { void __iomem *regs; struct clk_bulk_data *clks; + int num_clks; struct regmap *gasket; struct mxc_isi_crossbar crossbar; From patchwork Thu May 22 17:56:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 892356 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2073.outbound.protection.outlook.com [40.107.22.73]) (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 A4D2E298994; Thu, 22 May 2025 17:57:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.22.73 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747936650; cv=fail; b=mqjFgfdM1YX8TEHGgp0vfX+SCsnV5kWeLQaPJKgqVGIzV0lL/K7f5z+C7sYvk/yy1nFNWl3vU7hL21Lx0OEYWYieJ9LJiNlhzPL4LUV+3Ourx8ZBcNkDksCXRJ3HVlt06YBowagId1lUEySPq20T9Tg68MsT5V4yXiNTLNu3JSg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747936650; c=relaxed/simple; bh=1WOdk6X4SKbrjfoujDuYUBNioWb4sTvULnF6n9hwi2Q=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=ivDGu1ZauRr/4jiSLDSp+6hd+QrRHDRTT+A6U00B3PVt+9Wx3ApIukRuNwe1dWPU7EtqLQ58Bj/aBvaHhYqdWiIYz0aIcO3a9jFTWV7dsitI2zOLKS5mj4SJLbGoniRb/u610ow61Fexb2vleZ2NkaK6a0/B+S0u5YpmJUWCIGs= 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=lL0f3AHj; arc=fail smtp.client-ip=40.107.22.73 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="lL0f3AHj" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tcHpl0pUdbhgKLmjKyOrPcehL0pUG45rQL8mWjW2iRfUoGcBgztOiTBCWdhWdh/JglPKW+LEQaksdDCem8YdKvfZMu9DeV9zifMIWqOGNlzW3AoVeW/jNVOXjNv75Jm/p4xNM8YEFwbKy0178ETuS8YLSsIuYgDz5gI0QIzC2+naff0sBPMHyURLanZRUYiMqaM/iAVV/n5SwnHtqi9qeLiZtOWOSPIWvkyrWZuBUQuCv/e1e4FZKNvPcpy1q+Ew/kGn79UGKDN7do8JJQ17iCcW3n31qQtW+CnaP5hIH+Pu/G/ITREzg7WdObWpHQwxU02NPpkwzI4nqvCBRBIfOw== 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=yms8VojLzC6S+Hq/lXOhPH64QgJIIDIc/Ounz5olXtA=; b=SZtUqXB3cZ6ARXVMwoCrfl4bQpC1QpiRgM/3udDIfAmN/UbiwI2eA0KJ4S2V9G3uMfv1T5Lr3XvG0QpDONvR4QUmmqMNHEI/kWorLAraT+DZnwBIuMlAXlgWdadp711lR7XqXL3+hHf2ESuB8O0Z6HJCEDXIMY3OdOrh45h2NL6JyWA/xtwe3X53juDklFJSRxqjofrd+360jnlwfJanv6++WsaDObG4H7MJNu+edZ+VjwRa8Os2l9qAor5H/kOYzeP6dZotiDMIyaG4Jjs79WGkvvXEM2yRuOlFvAan+IJVrOVvsv12QIlYBtLFaq4MgMt6D6pa1gmWJ9hEiEUl6A== 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=yms8VojLzC6S+Hq/lXOhPH64QgJIIDIc/Ounz5olXtA=; b=lL0f3AHjKiZwrow2N8Mg+ZLzOw8Tpkon8Cmb+U8yaAguazZyOvUMFLHCIHGMdugB0kjySQcSgkpbGIXgQ4A3ubPf3XeWQvQgOwfcRYZAqKlaN9/tL5pGjrw/88HXVB8GkUnLpFERfew23MHP4jG/gfujlPNXMFB9OQWCCa69jNjceZaEeArfQk0HajoOf5+6zRvqeutrp8e8XL0WIZl2jQ9enDcbVIP7D6Z8LY1k8cdIF9xViVQIz0JU0Um4WDSaOgsPIcJvKA9nA5ABzg/HXpVrjjBzrLHmCLuK9XTwV1LZ88ZGbdscSQcF0hlOyhyCY7FLBqYgE5Fmam20t7pTkA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by FRWPR04MB11272.eurprd04.prod.outlook.com (2603:10a6:d10:19c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.21; Thu, 22 May 2025 17:57:26 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%2]) with mapi id 15.20.8746.030; Thu, 22 May 2025 17:57:26 +0000 From: Frank Li Date: Thu, 22 May 2025 13:56:44 -0400 Subject: [PATCH v5 06/13] media: nxp: imx8-isi: Use dev_err_probe() to simplify code Message-Id: <20250522-8qxp_camera-v5-6-d4be869fdb7e@nxp.com> References: <20250522-8qxp_camera-v5-0-d4be869fdb7e@nxp.com> In-Reply-To: <20250522-8qxp_camera-v5-0-d4be869fdb7e@nxp.com> To: Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Frank Li , Rui Miguel Silva , Martin Kepplinger , Purism Kernel Team Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Robert Chiras , "Guoniu.zhou" X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1747936611; l=1609; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=1WOdk6X4SKbrjfoujDuYUBNioWb4sTvULnF6n9hwi2Q=; b=VJQHr4/GHGBGqt8vc5Aqbup+5l9GBt7KcfAZ/LtA4XTZ4TaU8peShgEsv0pF3nWmr0C4J1Yae wV43Ys7tZ3XCztvmCNQNXi2Hes8/AbtjQzuNn09J5CS6F7COkJUqHgB X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BY5PR04CA0006.namprd04.prod.outlook.com (2603:10b6:a03:1d0::16) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|FRWPR04MB11272:EE_ X-MS-Office365-Filtering-Correlation-Id: 417c3d6d-df5f-4839-f3dd-08dd995a1c72 X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|7416014|52116014|376014|1800799024|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?snUhYGWMRICxhLh8TvMST/7FF7taDeJ?= =?utf-8?q?FFtZEy/XPUkJ5hrSlchgcmDWCHlB+NzXbTohf6mJAKXm7fx76SJPoYreW0jTAvfWL?= =?utf-8?q?p8PFzWpT//o4DL7sMTJLl2HDBMZGVWKi39j0qnTGW2YHC7Xb+vPU4TZ4bZcdj95Qn?= =?utf-8?q?DiQie8zAJgHSbUObvij4WQTdDUBujucNQRrc/O6gez8SSTvi2dd5yhfuc2MIg9Re0?= =?utf-8?q?PxiFkzSyTuoyDTGRhQPUwCtLBwrPEK64qz8cNOrxZsRyn3ldxzAcFIjjaocBBLZS1?= =?utf-8?q?AIJ7KMxXL5yoGodnaD2cOiSgkAx4paCxj5xOCFTb4mzZiaUBIBPJRNfaynHCmI9p+?= =?utf-8?q?7TUqclzMd2dDUfElJFtfIUdqsBMczJbMlGv5j2PrDAaXVtIHcquqxt1yS12C4lHve?= =?utf-8?q?kvSUlxtx0naDXnzvJoxD01pu5zQauKh+dtxNufca3RwXhfioGHbWQJzkqfZe3f4Sr?= =?utf-8?q?qFBTGmO5xgaE+9GzI44MWMIrDSf09fVlxIFH/ihGLQVz6sMCQdK6VM8fE10PuqsUN?= =?utf-8?q?DAzZnWoR2OYmhYN6rknGMhHHiOUyw0E2ciGkifkXUQMJJcbMOVyPXJdjeBDXqzhQ8?= =?utf-8?q?vKnuIBrmijzbDshEFVtFw6xGQqg2+341bNx4v5ZPXfgNgs/jz4cOt8YDyqChMlU36?= =?utf-8?q?d1QVJewR6Tj5NBFsWshRu9jQH8ho7KN7h3Edg7FyXikX/tqdsoDId4LM8bg7UPHEw?= =?utf-8?q?kj6uPGYET4tZRTHeR3sPNo4k3Av8+KfLYAd/Hh8bJ7CILYjknYHzIWtwAKU9NQ8tP?= =?utf-8?q?KQ6Z2LmbuSE0g4a6l//zY3QGY6UlcL2z82MVWCqUqmOc6/dMrxxaADJeSma41Prf2?= =?utf-8?q?kjo5C5giPV4LJep8pczNxITkTRfTQj1oiP3hbnYuEczwgzKfXiDaAD/+xKeUigClh?= =?utf-8?q?Sk46PzQmn2QHRhGpwPA/86XB4ZKCQO1Qqe06zucxfe+wrTEK4ADuqRzj/4VvkaLT5?= =?utf-8?q?uRxYf/yL4BvZhGapNng+FeHCoaeqh9a3qdqxEDeu40rFepwduJavADfPumfK8scsM?= =?utf-8?q?VWj9nsfn/9DNSDa0sT+X4Cbi/Db7Cj4qO8/19fIShUWNVePp04T/k3+afMM8j4kIW?= =?utf-8?q?h/24KiiA9LL5Tes/jxMMgesJw3msVylmxmok01O1oZ6OjYLESOZRl1gvoMfkcr6bp?= =?utf-8?q?yMLdfJlWpQvCp9JGdwhUXwLlRGvyWa83YXSpnjxUxQ+N9Qukre9JeNxhCnlntMLRv?= =?utf-8?q?SqmQmZ4n0893Me1FDQzlw3H7HpPQGsz0RnQXwoyta+b357K5k3We+QrZp00cBIzzn?= =?utf-8?q?kmRMvsMzaNbI4fd6xfYY9nx9+W3TyQFn6ex+Nsap895NtDCZ1CD+h7akyS4P5USXC?= =?utf-8?q?mYXh+1lZJum2x3EB7ZNurB6Nmw7EQAIL9OX7Yy332DdEfuT89AsIxHvVjoUpJS6or?= =?utf-8?q?NY0ows4QCNz1L509dc2VMzvwYnH0BLb8c+dnfqIk6c4ZUXJtXLQP4o=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR04MB9642.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(7416014)(52116014)(376014)(1800799024)(921020)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?YZPPU32raK5LTXXqrXyEGzweuQh4?= =?utf-8?q?Sm0lWSIgRzjZn3liJn5aGOJryk7zS6Hk6xyP4HbKOQPxBivWg5PhiKunJ9fRSgvCk?= =?utf-8?q?NCcLNSGZUL7aBd/Dkxn3/6xB54v2dqN73Sggv4Ys+9b9i0J74KjxmO0qEWvSVSjbm?= =?utf-8?q?SISkvTFiRBKPGATaNe+hd8WXevJlChNgji9a3payMGU9WBgloa4ne4xBK9ozWkkJu?= =?utf-8?q?15VOCfIKJa1N5Ukf3ppXGkkLSrhHwgD2kJQ43pcE3bfBCjllDct7xyo2FpPWyyKZZ?= =?utf-8?q?xPAg0PC5NW7x4c1VZw619Gd+bDFqVtQUQM53Yt6YXg09TPKGAWdErKyI+JmqXp+hh?= =?utf-8?q?Wu0FPuFHrq24Lr+8onR1zy/prWw8+3BGDyB64Q7zhuR9l7CjzUhOahWudBSFwh5ko?= =?utf-8?q?SUShJejhunRD3qFa/mnStLPX2LwpHgDLT8w4L6m0m6kf41Z2IRW3rvVBadxeYTJyU?= =?utf-8?q?dzX/QwzoEqnqOArk8BaB4BEgda+0tYCSsABMFPN744NiYRm8FN4m9I7mnq1BVk4Dv?= =?utf-8?q?RpsDDsChn0+kGiMLIveb24JwL97S3lGdF5hN1Zz9drthIpf0koTf5oDnB7WUFQ3J+?= =?utf-8?q?1iFb26BWtlBkKUX2SnVBdx9kY9ktG/WSiNAXEptXh7eaDeBVM/GukThA3cJELkAuw?= =?utf-8?q?xPZsl1yjWKxw5b+vjhEl/iqYWR4GmFAnwLRGNc32DMUfari/QgpobZQBv3QlVhRVs?= =?utf-8?q?zf0/NDcl/U48Dtfg2pNl2pHdFfW9ebzTWCbntLHswlal5n2zDbXlXQ6lPdjVGU8uD?= =?utf-8?q?6spdSam8SWCyKLCYbticapRfBgMByxdUn5/VaQuC65k3ChF4rSVDb9dDiRQ66Gyd9?= =?utf-8?q?xxNeusA+yV/qEgNgLIJy2lGUwQobKwujUFkyiSDSEhqbBMwgcupdZjJhPUSGNuP3B?= =?utf-8?q?OF3+sn+XBJWrrvHqqp1/tGf6BJ2+JurfgVRWlj0dZvH95v4fhv37gPNhwPlviaFGA?= =?utf-8?q?BTuj7msK+kLBbtj4vwzEfZ+P/2Vo/7PkC3mdTaofp2CMSqvmtLY+WES8VOc7NCtWG?= =?utf-8?q?ov72xS6RiiTf5090XUmcbTpmVP6/V8+JUxPuPQ8xJjc32/8az5B92WmUiKdbT2CXM?= =?utf-8?q?VAGmLFHEsy7Aeeg18rTVLcMdvPkAzhZotVVL1LeZGDD/CAVJ7TVAlS/hXY29yUy78?= =?utf-8?q?q7V9tEg7HTKwEeTRbQWe9O6D4TWPR+1E7BH90ouYG5CWPYDCk1ImF6eCAvC/2ir7t?= =?utf-8?q?guCm4O0kce1PKoYcRLJ05PqSat1Ckf8rNpLly6ztNYYR/b/LDu7Kkmz7AcmXeLbPp?= =?utf-8?q?u7XzdwvLqn0be7us6ysdoZSc116TV0pBbrJfIuW0MHe2x3sZJrUthHFLW4hiQ54pB?= =?utf-8?q?nI5NTlOgmBoKcYhvD5qksBp1YpK8MCvJGaTRhl2bwISrcUOD/ayYLu+J3TV6pI8Y+?= =?utf-8?q?Jv6UykEFGKDEuDPW6t2HC6+Bi3uHB3wxm8GWqOUhDK9c+Fi6BLQibnwgh4ZbAqvMD?= =?utf-8?q?Rs2w70G/1u/dsoDiFADj8Mr2f9PAsaizVuuPEWuTVe1E1fc+W9FufUVvf3F9uWqLs?= =?utf-8?q?A10Ccp2Q6dLW?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 417c3d6d-df5f-4839-f3dd-08dd995a1c72 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2025 17:57:26.1709 (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: mr6dPoubkmRCThTGPUPq5arUQypC+Ff9nwLinzXahA66qM60JQmAmuFXJR01U6ZIl7thESRutfBh1aseQqxAVA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: FRWPR04MB11272 Use dev_err_probe() simplify code. No functional changes intended. Reviewed-by: Laurent Pinchart Signed-off-by: Frank Li --- Change from v4 to v5 - add Laurent Pinchart review tag - wrap error message to new line --- drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c index 073ea5912de3b..4ab2749e460d0 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c @@ -428,19 +428,16 @@ static int mxc_isi_probe(struct platform_device *pdev) return dev_err_probe(dev, isi->num_clks, "Failed to get clocks\n"); isi->regs = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(isi->regs)) { - dev_err(dev, "Failed to get ISI register map\n"); - return PTR_ERR(isi->regs); - } + if (IS_ERR(isi->regs)) + return dev_err_probe(dev, PTR_ERR(isi->regs), + "Failed to get ISI register map\n"); if (isi->pdata->gasket_ops) { isi->gasket = syscon_regmap_lookup_by_phandle(dev->of_node, "fsl,blk-ctrl"); - if (IS_ERR(isi->gasket)) { - ret = PTR_ERR(isi->gasket); - dev_err(dev, "failed to get gasket: %d\n", ret); - return ret; - } + if (IS_ERR(isi->gasket)) + return dev_err_probe(dev, PTR_ERR(isi->gasket), + "failed to get gasket\n"); } dma_size = isi->pdata->has_36bit_dma ? 36 : 32; From patchwork Thu May 22 17:56:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 892355 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2065.outbound.protection.outlook.com [40.107.20.65]) (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 8E30E29B221; Thu, 22 May 2025 17:57:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.20.65 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747936660; cv=fail; b=M9gM8PAB/1R2k91CLrv1PHNsrIM+RIurvoMPpIs8xDegPBEt11rYTqWRxBMXeu/DF+4ZOD9hm7oovv85I9wHOYETDKS/DpqiUGchMItFTBgcLZ4AaFRgONn3OzymFTHfL0oQhokQr98k7hpG3t7TFpqHymXwK/HVsPFA+H0By8c= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747936660; c=relaxed/simple; bh=dN8ODpN+tTAy8TgZSSH3Lz1SaGinboLijPzWlhqnxNI=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=DLUvcV6DvrvW/DNGBKSTedenEznrVtQlqvuAIqorm7oP004L4AYwjAh/1fRIW0m4mEJYcko3URpOUCc5WU2/+u3cCwRckjCf2cmG0zajiA74KBj1aBn0BySUi/xBygEuvRJnsxquhLAcPTiIyNRBLVY+yIdS4KIFxKLtGTg9tJg= 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=EydrhKQf; arc=fail smtp.client-ip=40.107.20.65 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="EydrhKQf" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ct84xf/B6Hr0v9KyH0NcTd4xIxNXoO72u6nkv88ig+++59eCpch12FjNUx/t0nZd4yQ99H5jCu1OxpHO/OCGVi3t0DCLH2C1/7KejAxTIaBz7PQuNPx+yP9lPSZ5aj7xMahgoGMYasOi6rRsED0ft1bNWdQmAfiohDkgPTiDPotj9RWwwyOWiESELYxoTihDUsLKk8Jc4nDvUi96I1YHeCEklCpwW9UDc3k5SCEZ+BmwjJ8gUTMTfN74fzBEKLMQYHilNT8Gqo0+DCTZ/NW2qcxyDan9IUYTKpcG+yaslRF4Dsv8Hnf/ZfV+FI7zY1UKVdT1xOpyozHTNQoWTTjiiQ== 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=YvWS0oe93wfZfydGOkO4YkhPPDcZkq+glSSo3ZgQAOQ=; b=VZrRkobVawOp45qNKPvdoZ0Me8lD0ZQCTfr/yBlYLOphGiOrCjcIb1tilgsCYcZaevhwLGrl9V/EDsBgu3EQ1F3zlHWQT/U3nd9THI6WMtbOj+hNJ34UaNT4RYE+eQaTiL1h7Cwd/1XuB8zWg8m5q79IGSP2Wa9FRlBLFhxD+qDxtPLdt4aACwBVAq9c1mqNrURVxsM4o0b9IRAJ8UW5B8810jEyKzb47VIyh7yBnwK0o9VLsw49uzT+J8yslYrKVvoGijGM4RbfinhovL+CmjQGjgnuaccnMxqUmC0yG0a4XuwtqcdhAbJCBrgA/oMF3cA4B/OM7osJSRPoAGZF7A== 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=YvWS0oe93wfZfydGOkO4YkhPPDcZkq+glSSo3ZgQAOQ=; b=EydrhKQfuA8JSOECjKbhLuE8otUwGlooGc+kUaMPausA4RwRta1S/b4a66oEkCJVRAqiAd5g3I+jtllYHTDZeyoTWmvFXb5/LY96BHrQR4i1/u8FAY+xwR9C6pYyi013U/oV/oR6FcjN9eBBQHiKZJW/ajzynWBTTjIgVRiRcg8RXnR+JXhFWdtGfmzxMJftBofMhVMcNMXf622N/ncc+NRJHDfQg9w3RPK5zudkJcDWqB2KZxv/ZiLPcirfXiFuI6JeXxO1kvAZrV8pG1T/Q/Q5fbgkLSfNVIFqCaBOt7QiZv7GGtlgAYkqVjPJItvdvZU3MFfCKfa1TFV6g0+6+w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by FRWPR04MB11272.eurprd04.prod.outlook.com (2603:10a6:d10:19c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.21; Thu, 22 May 2025 17:57:36 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%2]) with mapi id 15.20.8746.030; Thu, 22 May 2025 17:57:36 +0000 From: Frank Li Date: Thu, 22 May 2025 13:56:46 -0400 Subject: [PATCH v5 08/13] media: dt-bindings: nxp,imx8mq-mipi-csi2: Add i.MX8QM(QXP) compatible strings Message-Id: <20250522-8qxp_camera-v5-8-d4be869fdb7e@nxp.com> References: <20250522-8qxp_camera-v5-0-d4be869fdb7e@nxp.com> In-Reply-To: <20250522-8qxp_camera-v5-0-d4be869fdb7e@nxp.com> To: Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Frank Li , Rui Miguel Silva , Martin Kepplinger , Purism Kernel Team Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Robert Chiras , "Guoniu.zhou" X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1747936611; l=2983; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=zaB/XpRgTLtOf/8XnErKPHAjG6EGhnt3Df6Vz1XFRo8=; b=aQDp87hjJQODu+MaXk6bhbU2gWOL6r4ifrGS9B3ArrC9sLPnhjG2KZ7D5YF/AD5XIMb7hr7Hq Eid61iHRe7tBCHx1mxHI6m1z3hxH93sQAYr899LPlqqew3vCxxfpSFc X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BY5PR04CA0006.namprd04.prod.outlook.com (2603:10b6:a03:1d0::16) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|FRWPR04MB11272:EE_ X-MS-Office365-Filtering-Correlation-Id: ef19b122-bd19-4b6b-5a19-08dd995a2267 X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|7416014|52116014|376014|1800799024|921020|7053199007|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?TRhgSTyFiD9Kxz0Dkod1lP2kE1T/dnD?= =?utf-8?q?tu8kjGoM/FgeEyAmrNwvUGX2FSks9jK0Rz640feIUc1RA1dnL2voK2CcDP/wELvq8?= =?utf-8?q?ImAspwIGPfcV8ql7n/Q0XyT3oU1TzwRqjLSi466z23d2g8ZdY652fSc416XiQYAwa?= =?utf-8?q?AAXbsbR1I+ugWUveBrSdo8nNfyNy7eQiljnFQS9uKPa2Iw1DjaKyoClwqlM+tEgW0?= =?utf-8?q?lQ94SJCU2Rv4Ho1rCjSkq9l5eX6PcmjlHUPzgFanCUqvbWZUpxPZovD30SYj6KnJE?= =?utf-8?q?0fgb5mG/p9zNjZ+l68cKgDMpHuLDG/pEpdEO6aCCCJzPOHmU6bYYL8ek8LeLHiF3r?= =?utf-8?q?lVcZML/V5aG3Imwau3i6mYzp6yn/JprjHZajJpu0cQo4443BSftTc66apkNOKD2Le?= =?utf-8?q?ubJBokIRXiONDrG259QUGJAo1UWf0TlPFtYxi6MGKt6ocio0y9CAma5TrIjVbpMV5?= =?utf-8?q?NAjvLt64p2mrb+tvc1Fojtil7l4mvWLIPBTZ4IOkMd2gq7h/gHfzJ7mqM5Sv/S9RA?= =?utf-8?q?C/qvBgLDvfN9Oxvu7HZwi+/fTTC5f8NWGFgKIVpOnQY9+xGbwuQp0Cax5GNAjl9s3?= =?utf-8?q?AevhOvJFBZmbX4hl8Q1evxyBI9xmTqqFuLTGPAzTmk1ifL2DnTLoT86RWOy1ewtNT?= =?utf-8?q?NEDz8hajWLkGT7uFdIRCFc7Pb0/ms6IYv90zjAWkhcxOG2ZzreEK0CSqpCYjpXkFA?= =?utf-8?q?tIIv3/tNm7aWdyOW+1rkpNAyIVcQdIFV9fG5hF6zqj/WT76M6rd9k94+nRUDWhFCZ?= =?utf-8?q?n4ZZmFx+AUFC5PZ7viyDLu6UIibYcBWnvSfCqKOFkPH4ULgiqUzPLDwHXEQECoIVq?= =?utf-8?q?++J5bBcF7sE78HOuCjYuyEmFgal/0u65j1DcXUGvjHu5jEU7fDUZTQLVvv1rL4Wh4?= =?utf-8?q?hmc4zdqGy8iptBaoyTp+OibJJUblFL6pPVLKrAx+E4KWg48xhI2/sB0UO795Ti3Qz?= =?utf-8?q?zE4kAy8eE4CdQHtGXvwzSIn0yRRVIV+Csf69JFnW9pyFauJ2kd7rDpPI0mtWhEJVn?= =?utf-8?q?RLOvuXE4V6eoP7HF/eoav4pntJs77iOZoFWya4Ww9vWq+CQ2W0M+03bJbcFbNtqIv?= =?utf-8?q?N47FZFtfz+Doq+JCntKHLSfvDIrI86Kx//Ex9khrJvIoi7IkguKLs8IgIXYWWqtYZ?= =?utf-8?q?+OBBGSM/SYMUYW/hKC4/7zRCqhnV1CuwzKpViG3AZQiXzqg38nz2wpd9ZP//Row4C?= =?utf-8?q?dRX2pAseElDARNJN6nq1eInpWPxQWpsfM8fxid5WvQZWYSG/G+3JELN63OqyDGES0?= =?utf-8?q?YTPIFlYmU3GrbhSTGeWzn8WhejmyCyffQiYwh5UAleH9JHvbZE+oFrF8ESDF69SgD?= =?utf-8?q?IKxgT6oe/UP2qfhVxGfpMcUejlsoXJXcCPoNmLGbie+WEu7FW2T8erol99DveVPEG?= =?utf-8?q?B5xh5+yD/BhDv7/fKyHSjfZ+j97nNgl7+BMl9KMQutUann8uBUs79o=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR04MB9642.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(7416014)(52116014)(376014)(1800799024)(921020)(7053199007)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?1Z2mjNdqNw2AWsrw7S1G1cXgcseI?= =?utf-8?q?tTkAHoJRNgxTy3/rjCjrP8v9GnLBFeEgQ+erGv/polcAGMOzF97mN7uQ5RuLVvyN+?= =?utf-8?q?CGb2FPJK+wPyx53zFdgIz5EHBMIoPxq/qn317c6xqJgOL83YahfzY0HaSqSJFk6qs?= =?utf-8?q?585Wlzl/kC5dnmW1yvewOpMVtpycCUK3T1zpgw5NHH0MrpmpsaZMyrrD4zVpqg9XM?= =?utf-8?q?UH34yj/jgINwog2qDIkXAkVN04+MeEXeRHqP/PU3qsm5UB0vxq03XqyqK4vrfqwjS?= =?utf-8?q?brq/lJUrH5MiRCT0udFXZyRKBik6gx0dzix6ZJDYrgOb8Ahlkr683y/VfdeF6Yr0d?= =?utf-8?q?3Wj1H6WxuFPnt6N5x1Dj4UzQy8NbJNy+qtI7iUSGGwR6Ymy2YUizbGw+0O2vH94Nl?= =?utf-8?q?QYTMVJNgyq4bnL0PXEj6BelOJeYlDVQicOA4sNPNjygjb+NJhWR9t/eskKhQvYioE?= =?utf-8?q?8fGZslGLtq2yiYl39dctP5gS1M5L+zawuL58APSQhKHR3HPmoQe3Oo9XD8fW8e2aV?= =?utf-8?q?/0abe3oTYpAoZEiOX5rXyfK8Q6J778WSgmXcz3I7ISy6x7WjbCdjUTU6fh8Oq1NY3?= =?utf-8?q?oQLPjIBEdM2GBQ5BwfobCwuzf1TZhpTPlRc1a2ZLamMVz+4dznTWSnrHGE1FZGxEZ?= =?utf-8?q?v5nCvUQLgdmRZN+RkA4z0U9ZrY6L3KA0HCU9TYuyclRArlj0ImsW/w/mvGSFAcYgV?= =?utf-8?q?WKXdZCPWBseQ/iIoEzF+InJv5ZkX1peWCuIRCRCI28w5I7BMi9J6+5VUwa5OC42jA?= =?utf-8?q?udOpdXOJoADuNxfaYukmaz1vB1CQrfCGFpeaO4AWZM2mMbirlwxk9G5EhRY+R0+s9?= =?utf-8?q?sZ+7nahIyINvAjkYbsEGwAZNgzQ3w4voHkHwoGfBvbgM3PSMIWH2z6YQYZMlJYlb4?= =?utf-8?q?O918JIeIp6+NzWDkxqViUaFecaDhTKivSE8k6rPRQH4W0zeHcg00YsTg5CyGtA8Jn?= =?utf-8?q?4YT09kN020yvNxKm1gNkMCs26kdAcVe1FU2iR2mhVpQD8QYiwv5bKLvszqQ2EoPv/?= =?utf-8?q?J547YcmB4Q3P0/EqOD5LyBULKb9IevHCFxHq5v+4DYB7/FPgKw06dd/0/LtLh0ZN1?= =?utf-8?q?CsnHnZaBF6Phl9F3ksLebqRrEXdG/WxvZ2URS7SIlhB8FG+cu/uXXJhCPRsL6zzNz?= =?utf-8?q?rC1kX6MuV7kqpL7UZjM+I3jqgGKKqnJBXCQ/gEaSFUCqzxfRF+z2iTTkUQqviewV0?= =?utf-8?q?WUJktMCwAadlub7KSWokT3yTDhyc60r2B4+37pQacS4eSC1bBQ9TcdfMxc+4t032t?= =?utf-8?q?Nz4Qp+A5YVnFwv6OqLgsj1PATXNnXiT9aCNVqoNJsIIEmlZ1bYcVQolJlIb0neM4Q?= =?utf-8?q?9B2CT7jM8LFyXlGlDJjAJl68lbSMqDgd7n31IquzeF0+rUXUBYljVfeEm4gAph32H?= =?utf-8?q?vJmq2+e7VQ5pQ11dnbwmRrnTPDNswqj31h63cvGCcpu7v25qvvIS30bHTz7SqvE+B?= =?utf-8?q?XHTlnMVPMbQ/Cov1SJSnN8fngX8BlcGmJs9uNCoqvHpRXBxx1dAzEjCi/y5B/rebR?= =?utf-8?q?+OJK6OzpcaJO?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef19b122-bd19-4b6b-5a19-08dd995a2267 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2025 17:57:36.1638 (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: +/PbSi34zE3iInH4Pq1Zqqzx5AuP55KExBv5ZRwAhplD0xWobck3jmJ8cFTAkgNQXEJTh7EkABYoPFL4Lhagvw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: FRWPR04MB11272 From: Robert Chiras Add compatible strings for i.MX8QM/i.MX8QXP platform. Remove fsl,mipi-phy-gpr from required properties and add new reg space, since i.MX8QM and i.MX8QXP use dedicate control and status register(csr) space. Keep the same restriction for other compatible strings. Signed-off-by: Robert Chiras Reviewed-by: Laurent Pinchart Reviewed-by: Rob Herring (Arm) Signed-off-by: Frank Li --- change in v5 - none Change from v3 to v4 - use MIPI CSI-2 - Add Laurent Pinchart reviewed-by tags. Reset description is not very accurate, but it should be good enough since use SCU reset. SCU reset do reset for PHY and controller. change from v2 to v3 - use dedicate csr register space change from v1 to v2 - remove internal review tags - remove reg maxitems:1 - remove 8ulp part - add 8qxp compatible string and make 8qm failback to 8qxp - limit reset and power domain number to 1 for 8qxp and 8qm - remove power-domains change because 8qm/8qxp only need 1 power domain --- .../bindings/media/nxp,imx8mq-mipi-csi2.yaml | 38 +++++++++++++++++++--- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/media/nxp,imx8mq-mipi-csi2.yaml b/Documentation/devicetree/bindings/media/nxp,imx8mq-mipi-csi2.yaml index 2a14e3b0e0040..3389bab266a9a 100644 --- a/Documentation/devicetree/bindings/media/nxp,imx8mq-mipi-csi2.yaml +++ b/Documentation/devicetree/bindings/media/nxp,imx8mq-mipi-csi2.yaml @@ -16,11 +16,19 @@ description: |- properties: compatible: - enum: - - fsl,imx8mq-mipi-csi2 + oneOf: + - enum: + - fsl,imx8mq-mipi-csi2 + - fsl,imx8qxp-mipi-csi2 + - items: + - const: fsl,imx8qm-mipi-csi2 + - const: fsl,imx8qxp-mipi-csi2 reg: - maxItems: 1 + items: + - description: MIPI CSI-2 RX host controller register. + - description: MIPI CSI-2 control and status register (csr). + minItems: 1 clocks: items: @@ -46,6 +54,7 @@ properties: - description: CORE_RESET reset register bit definition - description: PHY_REF_RESET reset register bit definition - description: ESC_RESET reset register bit definition + minItems: 1 fsl,mipi-phy-gpr: description: | @@ -113,9 +122,30 @@ required: - clock-names - power-domains - resets - - fsl,mipi-phy-gpr - ports +allOf: + - if: + properties: + compatible: + contains: + enum: + - fsl,imx8qxp-mipi-csi2 + then: + properties: + reg: + minItems: 2 + resets: + maxItems: 1 + else: + properties: + reg: + maxItems: 1 + resets: + minItems: 3 + required: + - fsl,mipi-phy-gpr + additionalProperties: false examples: From patchwork Thu May 22 17:56:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 892354 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2081.outbound.protection.outlook.com [40.107.21.81]) (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 5C60C29B8DB; Thu, 22 May 2025 17:57:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.21.81 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747936671; cv=fail; b=KoXjdegrhyh+tdPOyGlfmOGQfGodkxW6MpH2hJpngqxZCjNtslhFcCGYPq0RqFYN2axiR94jv3hZ+8wqkrC36NCS0bawtwUpe160pCYlnS6ZLZT1i5nJXWyP09y+yBBJhTdkc7q7pPSlLZNgF0+YXmWEDdFfVUh9j06W7Ysrf74= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747936671; c=relaxed/simple; bh=FPa4YzYlpLsluVUau8kaPkuqmo5jDaC+9IpQrQmhdAE=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=m3vAO6Cv7UROvhATaPshnzuxNpP2RpPesJfEXbUlzVZsxVgTk1U/ESOpVPj674Rz0D/oXJlE9QEL3m28EvBG3qfBtzpqXc9YDpeySMgmw+fHrZazeMwiLs4rifGkWp/OaG7nRugxcAAzTffVc+/iM+mcIIkD0H2ZrGSQJuLinW0= 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=jNQrgQpr; arc=fail smtp.client-ip=40.107.21.81 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="jNQrgQpr" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cisLzvNniZLuzUT6pYGvK/230WE6g/O8SDT2rzC4JE/aDGILolQj2R4RHjrUqkFz0BXqJRHDGV7HtyQYH6DYJFd2RMF7To1GQKUpShS1j76DK3vXo10p305Eb4gyMSUB5NHTPUOCt8+FsHf6svAzKTYON+YgzDhCMlWNSyR44SUfIfMeqCfX0+k/p3WZGSSfMnGhOqKRy9kdv7yGvjlzJIILm76thJsuayGu+4PLIXYFlKVmP05C10HpBoXZe+M+tQzgwjPr2981yKbn5ZuRUAeciavS2+R5EHWftMqyHWTK3qqPHprESQwqXcfUBQHPjtyIiTkuTJo/RR5RQqyC+Q== 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=/MMt3cwDxpKSObS3qUWZGqRJJRxSNYTh00DQoNXLMuc=; b=qVVTReSD5tuIqKhaevzlr2QtslDbUST4PUdjlKK94f7AEu6GDYKdUK38nL+nqLk/ENIBJ9VIYdvr+FKgI3Dwef+9UBvnU9F+UXU1vcxsZiA1ujMKsSbeMyfsdwO6z9W5WmUep5v5MPpRaI6IazTZAWPOsIu0/9CV+FNIvbRlD6axWU3Xxq5NnteuXr530lCQh2uEbc2I/nRe+NC1bm+zBJNlv9tm9fuw8++l/z26RfSETk42Xz3h9gtikFLunz+ZEHrpV5/2PTxQKsmWb371vMFrfDLboPs3Y7kRQmnPUopMjpspQPQbyJrdukCBehwLra4VobWde37KOrUnS6db7g== 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=/MMt3cwDxpKSObS3qUWZGqRJJRxSNYTh00DQoNXLMuc=; b=jNQrgQproRQOPyNk35ETmBKCnZW/uELJW4Pm03W3zilYkn1S4TItaHCgocWZI0Bgo5wOJI2SxHAdrwpp5wYm4xojzJj6wuJBRgqgHt/elTZJRwFYXmSg6KFAt8+I2qkOVWLVDxxXN7De63HfHS4p1oRMM3HOKt3SJ4BHQW1lzOs/r3SipYmZ86D+zIVNjA39B+U2lEqqTaHej4X3MRAFyRKWlxTTtXsK5Sw+5760TKAA+Sn9MCGcGgQ/YKH1tD02dZxwap5ZR28q9AAfQtT2D5HQJh+vWIuQgnIGDHdOwHkJXg5h0fP4DLkPYSvVv2qnEne5cPZ/m5YNqD5/pI+sHQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by FRWPR04MB11272.eurprd04.prod.outlook.com (2603:10a6:d10:19c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.21; Thu, 22 May 2025 17:57:46 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%2]) with mapi id 15.20.8746.030; Thu, 22 May 2025 17:57:46 +0000 From: Frank Li Date: Thu, 22 May 2025 13:56:48 -0400 Subject: [PATCH v5 10/13] media: imx8mq-mipi-csi2: Add support for i.MX8QXP Message-Id: <20250522-8qxp_camera-v5-10-d4be869fdb7e@nxp.com> References: <20250522-8qxp_camera-v5-0-d4be869fdb7e@nxp.com> In-Reply-To: <20250522-8qxp_camera-v5-0-d4be869fdb7e@nxp.com> To: Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Frank Li , Rui Miguel Silva , Martin Kepplinger , Purism Kernel Team Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Robert Chiras , "Guoniu.zhou" X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1747936611; l=6189; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=FPa4YzYlpLsluVUau8kaPkuqmo5jDaC+9IpQrQmhdAE=; b=43RmRaZd/pPjCZ1Xh/WtGWTMTBIFQwxsYHgOPtkAUrgsyv8Zo1GSGbW3attfaWJBvUJmPwYXN nyxDjZP6JT5DPIsg5u6W6BHZ0cwJaVTtLo9fA9B7E2k04O3EuXnjPpw X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BY5PR04CA0006.namprd04.prod.outlook.com (2603:10b6:a03:1d0::16) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|FRWPR04MB11272:EE_ X-MS-Office365-Filtering-Correlation-Id: ef1d61e6-4b75-437a-19b7-08dd995a2858 X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|7416014|52116014|376014|1800799024|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?AbYCcKrkeNNseIHf5q14XtXDLDZ4mid?= =?utf-8?q?02kNd5TYgrpcwQL2F9NrF5k+i/ZkxEiKWjf9PkUPGUR/Bri/fuwAPkbXgkpzBNFti?= =?utf-8?q?pniCdeSys8fWPUhaq57LADDMc3W1Dr+wNBEUxd5tKl2+VjVz31fF6l4PidXQmntJx?= =?utf-8?q?8Bs0CnHGBQT3vqKbSvLJk+KoeCOzX+UHD3ywEkJIRbNwdpnUQXbJPw7zSZfDGszPl?= =?utf-8?q?I/Ui4ZlRdujzQZFMYxd55fAJfT+AKVSrdj3cmu5pD/6De17ivM6mRKV+Qby4cgnzq?= =?utf-8?q?POUqXTmAVLgaPvVD+7/VfFwR7+dWAu+2swTXu1XkG8lkXk3WP5DLnFXKNwWaTuqV0?= =?utf-8?q?wX1hGcBlXzfraZ8lPo4SiT8vkoal179E9TFtnqPUaMATIi8HB7kOOA8Ekh/HDFgI2?= =?utf-8?q?SP8mmW7stvYDHOMhp12LWocRlyV2eUtyWSQWQmq6SfHEfPr3+uXMFriwYlVIyN+AX?= =?utf-8?q?D+HQ/cebfFcUqeaBIEv5c7FkoDgSPuSqQjrzOMIDf/jxDjl6CF2q29O/NLw4Eo7xk?= =?utf-8?q?VSXqDLh19rsUu9lhYGk9Ob0VJJlFHUL0BtXVBOh3t3O3CbRlFSPujQDi8MjuTkdE8?= =?utf-8?q?hm/QyzmCqO/Z6tquXZT0zEn1va5JGr9tODSI0V2VqEGdc0/OxjMfV9tYbCgAjXOi9?= =?utf-8?q?BSEpziNwYTS2Gocm5oPRhvYS75s58Zdo+ZkgkjAYAgH6sd+mKktr6nNEYnC8A9m5P?= =?utf-8?q?HhkPJhdwihcoybisp4QRYfkwmbDLnNLM3DUv3HX8zxVTw5sHFbXhc+qZQ/bVRhHL2?= =?utf-8?q?QDQftyZmHpQXXrL0TPbrSocX9jnUWioPfYba3ed8lNAYPZ/bTfalLdsEfjGyDQRmX?= =?utf-8?q?t67CFZRBhwg3U4sg4KwKujnd6sIdXUHM23qQLzD2HQmy9y+BFnf2uhjBnt2uMonUY?= =?utf-8?q?uc9t9uWe13y6iwLXpvXEsyij+DTVgcl2/j5ewK3tuJRW5ROGy8hB1+2RpScRynT0r?= =?utf-8?q?dHX5F9EgOWs9wyf6Knba/aeCHEYp8dytUzN7hJCEGd5DuexuySW6zGmYx/wqmCyKn?= =?utf-8?q?0EMdaka92ayyW7IOXaUSVTKhhXajNtypV/FRVQGZNPiNRhSMths6CHMLkYc4Nio4j?= =?utf-8?q?9Yn2A5vRGJKU6fY5fvNnwUWnwb65IEJNjvICudoZS4mgahI8rbtlRzOb7vdLfjEZs?= =?utf-8?q?t7Ekg2ILQi/vmvYc2H7nSSh9OES8b2z+98nUdQyrs6cKuVh5Q6GrlY8JZAxgSligj?= =?utf-8?q?NBatR7F3vnN8eruYlkcqJuYnWzQf2fgM+rnanZIzktY9wbeS6NoaFXu72ox0z3FjZ?= =?utf-8?q?mVcbs+5C3kHSNlr1xg92apypZKuQobg3VT9px5draP8IezfYM6owFt3mfHjmULyTI?= =?utf-8?q?4e6Y3nK8kjQCp8QhZH87zfIG84mUUtQOmqfUXkkQ9zmXbvU936NpH8dbkc2BC0Wg3?= =?utf-8?q?c0Nr6IOkzvvBvAqvr2E+MwSJ/vKY3uGKvlYyOOHOKW2zWlSuEZhccA=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR04MB9642.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(7416014)(52116014)(376014)(1800799024)(921020)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?D5W4JScPQ9yOIqOEXBSqHAu0Brqd?= =?utf-8?q?oyRvexnELKjUAqB0ombejmSOOB3IDWCdZCuYlI+oyWjTtDAO7QSWI389wMXnJPy5f?= =?utf-8?q?XrqNJ3jSb6WSUV8pH/wblzv/NJXEreIsYPYVX6gXcRE2YxMmuai2azIUQ9/b/iqXx?= =?utf-8?q?jlENhGLYxxxnrPXYv+DG9+rnoZddhi+G/cxqPSI4vWGvhWrGEGS7dFKS5nzq5tyhf?= =?utf-8?q?kKe70GQC5AytKNHKcKXbOrTye7eKcLq3eiaEMsRaYJFFzqkeRymgh0w9MDuV/ahzW?= =?utf-8?q?RdQoAoqT2Zyy5JFwaSdz2goxufaCqmZl9Jm1oBXfcwtlfeiDkRtzva5669hN3K7go?= =?utf-8?q?V3WdhiM+F/3kT0SRAoVgjfYMxzqqZJn1umXxH2oajIsixBc+xSL4+Kc3u1iDF5HXL?= =?utf-8?q?3sDOgMyFcLpSqZtKSGG1uUolrxkf4EdQzJjZOyv5MMpYUR22nFiRdjJ3OFf4egYGr?= =?utf-8?q?ETjgY6JsFdQvt7Uaivupq40sQhI+3qXBqabE1h5y5U/GJby5pJKOwyOdCMXTz6BAV?= =?utf-8?q?bUsovTXTWIIc/5yB6Rj9vfUU3kKpKTXmAmUkbbDn+4BauVnvdQviDegX1ozfdJpJX?= =?utf-8?q?VQfkTgwrdrEfk9ZVXPW6anEhn7/I6mPPwKDp4ikdRO9OMNd0nLX5ZPU4vURLsxGTf?= =?utf-8?q?MmTiPl+txvFnmw1cth1SrcWwriFebC9Mzntoc5siyePY5V1nhhwdy3XEP0TbkqGvw?= =?utf-8?q?Dwp9XmPOZoeoEofawZ2F17K0e10qnrwG5C2UeE0SeIpOXqeUr1Dnu4dvOTXsxpUOp?= =?utf-8?q?lTly4Qix4MkXRW89dBnDhUl/Zh52DHe9C4uxlqHC4KdY447GCddWVyaBDTpWrAus8?= =?utf-8?q?rx5ugbow/fo7rjAfsrxNNa5/YWLx0X8yae7N6FbIroVERwfBl3n78LlNhDUNG4L8w?= =?utf-8?q?4IxoYB2RqxFR0eq/Mg+oh4fa/7FjIGlgGvFywYN4Auf9uYhtCULYMxyXw8HHzgc9c?= =?utf-8?q?+xPMidxb5EGtq6jP1kbzjgEEsDwLuIrkK2U5dTuQvU3aBgXvfE3fNgWFKftvCKIKL?= =?utf-8?q?4UVj5L5QVBzUWX3N2XDq9QYTM1VQF+a7T7jwjLtXPHRjINMWEo8h2ZG7DYggTSqCk?= =?utf-8?q?caKJ59n2V5AyuzADSrEPKWcIMII1jRzLSfrXyrclGX7tfoK6fkgp4nHHvBiEMkK0y?= =?utf-8?q?8zK4NZVC+vle/7910csM5b+6rZ7zHhzVtqmFU2YX/G0APLVlQ52/WMZEpy+OTB4Fv?= =?utf-8?q?htUgg/RvOqU2FDvlQSoLWyL3//likb2ESHUlyCzAoF1dl3nqJVn/XVXX83DDQ5Gdy?= =?utf-8?q?mmvcN6QiYhDG3mlDthfcSJtnIz+ynSazVcNYPxUS9w1ACDacqeh+OVFJMHL8FTHib?= =?utf-8?q?+kOg1cPyMmK2rWqpz+9r18cN2OgvtQT5+I8MbfETIPFcvH9bGuK1fDxPyY4/N0smI?= =?utf-8?q?7wJr1314ev1RSDjysR4R0Gq+I45IUfkHmaaFsC6Dq5KalRVhFtakOFtgOrCnNuBSp?= =?utf-8?q?8TKJpsAcgsKxF6tfV9WLUjt/LAuLUJbMqJQBZoWVsnTlEycIiBYu4hp0lNiN6NYMa?= =?utf-8?q?yAbo2zK3C/ED?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef1d61e6-4b75-437a-19b7-08dd995a2858 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2025 17:57:46.1390 (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: 3Howfv+0X/ygdAMcIheZgO1P1tZS9eKpSDmPa1vcTXCy2O0u2CN0Bobrv5G1/+VNmr1QWcBrmRklJXSGvSr5Lg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: FRWPR04MB11272 Add support for i.MX8QXP, which has a dedicated control and status register (CSR) space. Enable obtaining the second register space and initializing PHY and link settings accordingly. Reviewed-by: Laurent Pinchart Signed-off-by: Frank Li --- change from v4 to v5 - add Laurent Pinchart review tag - wrap some reg_map functions args - add missed \n at error message change from v3 to v4 - remove reset_delay - sort register field defination - fix error messag in dev_err_probe - fix comments - use true for 1 - regmap_clear_bits(state->phy_gpr, CSI2SS_CTRL_CLK_RESET, CSI2SS_CTRL_CLK_RESET_EN); in imx8qxp_gpr_disable() - use regmap_write to clean register at imx8qxp_gpr_enable() - remove reduntant CSI2SS_PLM_CTRL_POLARITY - rename register DATA_TYPE to DATA_TYPE_DISABLE_BF change from v2 to v3 - use dedicate csr reg to control phy and link settings. Change from v1 to v2 - change 8QM go 8QXP, 8QM will failback to 8QXP to keep consisense with phy drivers --- drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 111 ++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c index 59ec7107b4508..6501843ae72db 100644 --- a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c +++ b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c @@ -5,6 +5,7 @@ * Copyright (C) 2021 Purism SPC */ +#include #include #include #include @@ -88,6 +89,7 @@ static const char * const imx8mq_mipi_csi_clk_id[CSI2_NUM_CLKS] = { struct imx8mq_plat_data { int (*enable)(struct csi_state *state, u32 hs_settle); void (*disable)(struct csi_state *state); + bool use_reg_csr; }; /* @@ -167,6 +169,95 @@ static const struct imx8mq_plat_data imx8mq_data = { .enable = imx8mq_gpr_enable, }; +/* ----------------------------------------------------------------------------- + * i.MX8QXP + */ + +#define CSI2SS_PL_CLK_INTERVAL_US 100 +#define CSI2SS_PL_CLK_TIMEOUT_US 100000 + +#define CSI2SS_PLM_CTRL 0x0 +#define CSI2SS_PLM_CTRL_ENABLE_PL BIT(0) +#define CSI2SS_PLM_CTRL_VSYNC_OVERRIDE BIT(9) +#define CSI2SS_PLM_CTRL_HSYNC_OVERRIDE BIT(10) +#define CSI2SS_PLM_CTRL_VALID_OVERRIDE BIT(11) +#define CSI2SS_PLM_CTRL_POLARITY_HIGH BIT(12) +#define CSI2SS_PLM_CTRL_PL_CLK_RUN BIT(31) + +#define CSI2SS_PHY_CTRL 0x4 +#define CSI2SS_PHY_CTRL_RX_ENABLE BIT(0) +#define CSI2SS_PHY_CTRL_AUTO_PD_EN BIT(1) +#define CSI2SS_PHY_CTRL_DDRCLK_EN BIT(2) +#define CSI2SS_PHY_CTRL_CONT_CLK_MODE BIT(3) +#define CSI2SS_PHY_CTRL_RX_HS_SETTLE_MASK GENMASK(9, 4) +#define CSI2SS_PHY_CTRL_RTERM_SEL BIT(21) +#define CSI2SS_PHY_CTRL_PD BIT(22) + +#define CSI2SS_DATA_TYPE_DISABLE_BF 0x38 +#define CSI2SS_DATA_TYPE_DISABLE_BF_MASK GENMASK(23, 0) + +#define CSI2SS_CTRL_CLK_RESET 0x44 +#define CSI2SS_CTRL_CLK_RESET_EN BIT(0) + +static int imx8qxp_gpr_enable(struct csi_state *state, u32 hs_settle) +{ + int ret; + u32 val; + + /* Clear format */ + regmap_clear_bits(state->phy_gpr, CSI2SS_DATA_TYPE_DISABLE_BF, + CSI2SS_DATA_TYPE_DISABLE_BF_MASK); + + regmap_write(state->phy_gpr, CSI2SS_PLM_CTRL, 0x0); + + regmap_write(state->phy_gpr, CSI2SS_PHY_CTRL, + FIELD_PREP(CSI2SS_PHY_CTRL_RX_HS_SETTLE_MASK, hs_settle) | + CSI2SS_PHY_CTRL_RX_ENABLE | CSI2SS_PHY_CTRL_DDRCLK_EN | + CSI2SS_PHY_CTRL_CONT_CLK_MODE | CSI2SS_PHY_CTRL_PD | + CSI2SS_PHY_CTRL_RTERM_SEL | CSI2SS_PHY_CTRL_AUTO_PD_EN); + + ret = regmap_read_poll_timeout(state->phy_gpr, CSI2SS_PLM_CTRL, + val, !(val & CSI2SS_PLM_CTRL_PL_CLK_RUN), + CSI2SS_PL_CLK_INTERVAL_US, + CSI2SS_PL_CLK_TIMEOUT_US); + + if (ret) { + dev_err(state->dev, "Timeout waiting for Pixel-Link clock\n"); + return ret; + } + + /* Enable Pixel link Master */ + regmap_set_bits(state->phy_gpr, CSI2SS_PLM_CTRL, + CSI2SS_PLM_CTRL_ENABLE_PL | CSI2SS_PLM_CTRL_VALID_OVERRIDE); + + /* PHY Enable */ + regmap_clear_bits(state->phy_gpr, CSI2SS_PHY_CTRL, + CSI2SS_PHY_CTRL_PD | CSI2SS_PLM_CTRL_POLARITY_HIGH); + + /* Release Reset */ + regmap_set_bits(state->phy_gpr, CSI2SS_CTRL_CLK_RESET, CSI2SS_CTRL_CLK_RESET_EN); + + return ret; +} + +static void imx8qxp_gpr_disable(struct csi_state *state) +{ + /* Disable Pixel Link */ + regmap_write(state->phy_gpr, CSI2SS_PLM_CTRL, 0x0); + + /* Disable PHY */ + regmap_write(state->phy_gpr, CSI2SS_PHY_CTRL, 0x0); + + regmap_clear_bits(state->phy_gpr, CSI2SS_CTRL_CLK_RESET, + CSI2SS_CTRL_CLK_RESET_EN); +}; + +static const struct imx8mq_plat_data imx8qxp_data = { + .enable = imx8qxp_gpr_enable, + .disable = imx8qxp_gpr_disable, + .use_reg_csr = true, +}; + static const struct csi2_pix_format imx8mq_mipi_csi_formats[] = { /* RAW (Bayer and greyscale) formats. */ { @@ -865,6 +956,25 @@ static int imx8mq_mipi_csi_parse_dt(struct csi_state *state) return PTR_ERR(state->rst); } + if (state->pdata->use_reg_csr) { + const struct regmap_config regmap_config = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, + }; + void __iomem *base; + + base = devm_platform_ioremap_resource(to_platform_device(dev), 1); + if (IS_ERR(base)) + return dev_err_probe(dev, IS_ERR(base), "Missing CSR register\n"); + + state->phy_gpr = devm_regmap_init_mmio(dev, base, ®map_config); + if (IS_ERR(state->phy_gpr)) + return dev_err_probe(dev, PTR_ERR(state->phy_gpr), + "Failed to init CSI MMIO regmap\n"); + return 0; + } + ret = of_property_read_u32_array(np, "fsl,mipi-phy-gpr", out_val, ARRAY_SIZE(out_val)); if (ret) { @@ -984,6 +1094,7 @@ static void imx8mq_mipi_csi_remove(struct platform_device *pdev) static const struct of_device_id imx8mq_mipi_csi_of_match[] = { { .compatible = "fsl,imx8mq-mipi-csi2", .data = &imx8mq_data }, + { .compatible = "fsl,imx8qxp-mipi-csi2", .data = &imx8qxp_data }, { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, imx8mq_mipi_csi_of_match); From patchwork Thu May 22 17:56:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 892353 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2040.outbound.protection.outlook.com [40.107.22.40]) (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 C1D651A0BFE; Thu, 22 May 2025 17:57:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.22.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747936680; cv=fail; b=ZibaPVvZt7vwccqiOFeqK0Geb7dkshHJcG9GENXCA4V0vczxHTbZRfgGwQxqGoi+XC/nX1S0Fc7XYRiP+KXVbWFlZz4WVvhS8ql3KoVu7sJA8yHTqCR8IFmJwcWMgPmxfbPRXE8puTCRzoD4hSCzif6uNCF4iLb2TLjFlOrQcWg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747936680; c=relaxed/simple; bh=H2odYwzKjtISs7uP7SOMA3RDqcdl36SlVfsAu1fu3Qw=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=L+Q0rIkQxoETPXdpViE5W02mMM1ZFBxg+bFwkQdDk79jqfF9kLaVnpzbws58q/VTB/NUFznrfYz4Zrcu73Qp7DWxHpeu5biCXhRmauMQCTP6pkLn7/SWwGlbHa+V+AkjPG0XG6SLG+qYA/PZVk8EKFvu3P/Dc9wONwiq2/+BTtY= 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=nrqHwoEL; arc=fail smtp.client-ip=40.107.22.40 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="nrqHwoEL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bH9ldbEWQQ4nk+OML8RL9BXEKY2mQ0r2eDWJFz1ANO3thunA4l9+LsWi+q/FwJx+zFov02xf/E2rBAZPeuzAQn7A8mAR7PqdmVC37ab70ZX2fhC/uzDt3aX/1y4Q2t4oOjoJIsHJVa5bBzAATo/pm0R6sl1xtotD5N45miXJPEEyuAroPNDknhepAObSAsUuRW5T0+tx0ULEUM8W2nFjU5OXECgIvhSfn4Kfm6RJF+lwyBLeoGdoNftI7G1gdgKHew3LZAF2WfmUN9ambi7XlqC2NGbVnCybQPz2mOjR2GMeFDXG9PuPXo6+w5DdqnaU3M4ybKrKP9/8jwio9kRurQ== 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=Mg4vLCn9IW26ljIAr9900mrwyK6zczXhRUfFEm/PCUo=; b=ZZ2aRqEusCVd2SpZyY4DRqENz8rZ0iu4xP+F7/cAnJzjQvNxmzHTYph3q3w/uZIDu/jwo4CghFleVBeXxplyfrwj2NWfRkkPNatj8r8iHs7Hv6Zl2cJ969vuakrNZstleOkVYWspDKi1jqTQ2pFXRqOD3t/mubruJW+aeDf5v68sXtuw0PQzfGA3qwhgegDVkWU6acuJrkK2w3FHxoFKgoYFIJRLiOBVyfgTi8tzAR85+nWJWw6A6fSOADUk41uOyZe+Att3oyjX0BH4TsDDJ6JhIb5ubQrWm/IzsCE09KISGXbwGo1PMJkTufdx+xE6COX+jkUPE435PIjUEhhwIg== 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=Mg4vLCn9IW26ljIAr9900mrwyK6zczXhRUfFEm/PCUo=; b=nrqHwoEL7/EO9AbXOFsLnKezklXH7M821AAc1SgH/QDT2M8uB5SjRPPklXSy5KFGKIgR5m9zcTMsmq6/W59cq0LNt5RX2D0Wbm+5npLqCIrT0xOmrSuJ+CCFuQQCNGkgrF/c00lkqxlUbwvq5GfGCbO5wnM8IPVbn6NL6BOOLVfykTzjHUD+Luqeo3GqVqe+UwxRv0yLxLYQvk3+kqdeZzseHQn9cXe1JJjcXMn9BjLn8Gh3QXDhokYoUZeTEzUOXq370n8hQomJRtF5XIOa5bPGH/y/d4KnFSlqmIaCOOrfEXqmXJDc98c79u9bEbWCE5ZiLroJtL4eGqb8UiEzSg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by FRWPR04MB11272.eurprd04.prod.outlook.com (2603:10a6:d10:19c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.21; Thu, 22 May 2025 17:57:56 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%2]) with mapi id 15.20.8746.030; Thu, 22 May 2025 17:57:56 +0000 From: Frank Li Date: Thu, 22 May 2025 13:56:50 -0400 Subject: [PATCH v5 12/13] arm64: dts: imx8q: add linux,cma node for imx8qm-mek and imx8qxp-mek Message-Id: <20250522-8qxp_camera-v5-12-d4be869fdb7e@nxp.com> References: <20250522-8qxp_camera-v5-0-d4be869fdb7e@nxp.com> In-Reply-To: <20250522-8qxp_camera-v5-0-d4be869fdb7e@nxp.com> To: Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Frank Li , Rui Miguel Silva , Martin Kepplinger , Purism Kernel Team Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Robert Chiras , "Guoniu.zhou" X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1747936611; l=1691; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=H2odYwzKjtISs7uP7SOMA3RDqcdl36SlVfsAu1fu3Qw=; b=9MGlrT2Blxm/AH2mtiMSu+xUNIvnSfu+ylnUnaWpePf1nLD8yzED9F9UH7m2W8VjjNTxa2Q1V uuTch5UgHPIC222IpkGrsTDKVEz0cHjX1v1TZlXYLJ0NzBbHQBrdSIk X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BY5PR04CA0006.namprd04.prod.outlook.com (2603:10b6:a03:1d0::16) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|FRWPR04MB11272:EE_ X-MS-Office365-Filtering-Correlation-Id: 2bcb7772-5175-4f48-6027-08dd995a2e61 X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|7416014|52116014|376014|1800799024|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?bANnKi6QbWFIdh3boolQUH/RSJjQuKc?= =?utf-8?q?BTscxQDNA1hwn5wdTdA0ZcNPCNUGGRexPBwaXHLwpoD72p7SC/jqOz5T89JxKiC3n?= =?utf-8?q?FqQY03iq+HcOT1wHhodmcqLYtfJ6t7qB40+qA7Vva1SVKShHZDsHTicLQObdY+wwi?= =?utf-8?q?ayj/CM8cw+PlUEinHWjiwQeeejXEnQHkjVkHvKm7wP9KxHbtd9VGbYvlg1pUjeoAr?= =?utf-8?q?8qCKe7op6fbWDzQ7Mgag0uqgPJsN3OWqWXKafDNWTtN3O2jXWaCOxgegPr5L35cv3?= =?utf-8?q?+NKQd4H2U/pxBORGwC1abIWX6j9J530NrXi82SIDhE8/c+FCuwsj7lI3yXW4H2247?= =?utf-8?q?lMgLSn9piwjDTYdJUAhS+TtbRoIzU1hHIM+17J4HqqCYtr8+aE06QFBtP3AtnM/ha?= =?utf-8?q?XlEKkwRmopDkM9sIxfAVhEZVJWA+/joLFAXeFv/kL3AU7jkZQacCJbA8B0gjNI9TH?= =?utf-8?q?Doxfev6YpaAaS/nAVABHHh+vdkD2WcrGqAUgtvhryGp60Zitfh/alCH+3HAqoe5zB?= =?utf-8?q?OmuM0v5S4IpI5wxREhV+/DATCso/l9PizPQ793PqwUkD9dQEza2vX8Mr2uOX4xFl8?= =?utf-8?q?HUHe/d+YJtL7Pza3C2rOXzxzg7Qb78MCEH589rlg6575jvddgXnUrr/xKbzsW0dvE?= =?utf-8?q?3d8lSgvaAkiUCSr2KqI0On3p97aAearQuw0F8DdwPIB0o6Jh8popNMwdVUJW12t65?= =?utf-8?q?049ahdsEjrXcGCSPRBILvzK0qrilvpKCjzLRpkolE97T2OGlb3gokRZhzHhO8W14l?= =?utf-8?q?Wf3L1PpSYxjp7Bx++ncqosBkkKuLti7MmuqiaZMNDNHRpX9Y+m0KIz9IfSOqrc2dc?= =?utf-8?q?uifzTFgP1f9R2cLN8mwerIt9iFzINp/lQQeG7CygRgZCzSPkSE1w9uDA6ech+ZGyA?= =?utf-8?q?gOkj1lCGjM8VAQakcUqfc6XYRNHq34rRkcPlcwn5JgUCfCGxUkbo2NUAZrNy8/yyn?= =?utf-8?q?v1ZnXRoZHMwgKVBWIz8BGm3/KSZCshamZJ6dFS55F/ypPJdbns1K0Twbh6Trp0Qfc?= =?utf-8?q?v049HABmuFjEKX3GWSNLNcHYEgCB6B+55pcjwJzy4SaRuBqpIa0jYi8IxrmG78dBN?= =?utf-8?q?a05HJ1y57/0mYzOxhG4wfkk1SbQpuPiBptkc5kbiIZ3DBbyYENqQ3GcH+ofM7sKqz?= =?utf-8?q?96dt5mw3grFiiKqGHKpxjgQSopg96aTtQo1Nq89w3KRZpvG6QNdLqRGfJHAaJQDKc?= =?utf-8?q?Zc3iBr9utORXhoavNrOANuw+Mxp5QQDpbtorIJ8xA3vM238f5reRKCCJm57I1VO8/?= =?utf-8?q?N3qliRCf+GNciQKjNIwt+tUMYJHBS2Ht9GVpczCZWHpJinMaVTa1RKQao/cx/R6/g?= =?utf-8?q?0fnhZ8aaMKa2pYXiKiQy+dvLOorjN6yckO8h8210AmasjriwE7F44EREUfnbheZVS?= =?utf-8?q?XsssVvUWw0AlLjVjLrGcxYaGaxjlw/43ve2XKvvxAwkbLDgFCRF/Ko=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR04MB9642.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(7416014)(52116014)(376014)(1800799024)(921020)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?xccIcDqhLyLnEiOq2E6AIzKIx7Hz?= =?utf-8?q?YaID4UUko8/jFv4uzkyS5EoSDLlQEDIWasMwxZ+TvrSL3yolTR7bS2shUU2ClrSVS?= =?utf-8?q?MQKTYgk9rCldJiMnNOCex5/kBEqFA4xGCxc4U1ASck7XQSXFUIEyXSR5zZQQc6XEz?= =?utf-8?q?sK1njvQzK5tpuP3TNRbfPWLjoGf1FVAytLwpbNV4wxFK4lrTu1Blp77AvaW1dKpsW?= =?utf-8?q?Gof29ijNBLsoP3ZWfpdgZjVVvy6oLiAgKMvHwKgEHcFW1C4N0gVO7O7Ren+6BdIjT?= =?utf-8?q?YkP14i1NTCPrrOKXpbsq1VDj0JbjpGyDpZzunJjWLSBic3YaOTvBfZKD1iPPJgoc8?= =?utf-8?q?+p7QZRO59stPzccNJTnScFLIR6+M2aKt6TDB4aL1RgHOk7rJBq9iS4oy69/E5pJvL?= =?utf-8?q?5w3lorSUNIN3u88/S0jvBUAwri4qw+uFKjU9fnM3Y8L0+Mo6fy4ujIQYPkMHuGwUj?= =?utf-8?q?ZfhvRIegKh7r5yTEDlKeVCYIpP3woFb+Ms2LvepNd0ZkvwDWX4dctW74CIMgBPGHP?= =?utf-8?q?WWyi2LFU/oRvBsZn+A3jywn73VwLCJ1krCGHP88W1MI2mohFZBLu6KDVn+b0BNP86?= =?utf-8?q?5QOOg14vpeoUssbY9h2P3KBlFBbJ0sc+742e2G16Hn/yR3XXilmX01FZGDpxbv59b?= =?utf-8?q?XM54e3xGB4EmlJZ3mjkfV2cuFSNgFj3/pjISlDA5dtUwHNIE+xJjPvUq8RmCYjD77?= =?utf-8?q?ujfo7T8al99Vdm3QcwVOAUr9972u07XgXvLz5Py3/ksd261Arx2E4Le/l1rYCpvAh?= =?utf-8?q?27EPL0K70+PK0qBMWbNcwO1aFvbTejKrayp9EPE5yjoPHsQ8yiCzQ+FkKzr9H3+6u?= =?utf-8?q?DdeO4HqTo18jqbHvB5ZLSEnszUbx4Y68hNib/l/AuZpeeElmaYbbDMbxfTviG3//z?= =?utf-8?q?Mhz8hXQZy93fYLLLJ9RkmL/y619tPa+Y6j9hsjj/ITsSYL6LLCocd6TqLDEM9b1j7?= =?utf-8?q?6QekRr1MzaN2yKXRyGt3s0ayWEY+xvtgR6N4YQ63t80qqhikSZfTkmNCwrlwGZChd?= =?utf-8?q?XKhS1DZ1hT6Q/lfzM/WAV3kgzHqblMSUkAoJhGuewfs8hyArkuEbP22T7nHOeTmI5?= =?utf-8?q?EWd2mqvHJCKW5YvRruLN4xi2T/q6C5qogA9Y+DCL8NRQG0jjwYzM3tUR6IRzXBOHc?= =?utf-8?q?5ZwPYp5CAOUOBjPrXb9itO/nn+CBS8dkSnTEFwht+tn8bYA6QPtYg2q+DdjWlbwlI?= =?utf-8?q?uBFxoXgO/YNRC6bxFxfcvF5jaxdte9Y2WnK7srxRRjY4/ewyWsd62hckh0khIF2jo?= =?utf-8?q?l1ab/0+lKbcR/bN2NTQfyHVFizGjy4lMC9Lr/jYVrqs2AE2FiMidRzVJK3XH0xW7i?= =?utf-8?q?EsvAQlFObG1eVmLuj8fifnh7j5rpfidcl/5AB28M4wDVdOLQtd2KrQkWI60TRMTPI?= =?utf-8?q?g4Q29rmO7S0cPSFgABn8Ku2dWmJG0hNlQwcsIoBP2wkWWLISwWyxWW6KPVYp6J2ua?= =?utf-8?q?LPy8r1fGBH8KRkW+mwg8vFxv92cYEXuler1uNyMlJDfPsk26yPr9y3gXjIV2V6Ek4?= =?utf-8?q?s0CQF1dVUcJV?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2bcb7772-5175-4f48-6027-08dd995a2e61 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2025 17:57:56.2749 (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: Vh4wC3Yu0EUV/a+d+/22SRAroykLKaAvegebN1huoPZLyeSrKAc+GfpvTz5BTHkKN76fZKHoS9N5g0JW+MjfXw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: FRWPR04MB11272 Add linux,cma node because some devices, such as camera, need big continue physical memory. Signed-off-by: Frank Li --- change from v1 to v5 - none --- arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 9 +++++++++ arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek.dts index 353f825a8ac5d..68442c8575f3f 100644 --- a/arch/arm64/boot/dts/freescale/imx8qm-mek.dts +++ b/arch/arm64/boot/dts/freescale/imx8qm-mek.dts @@ -113,6 +113,15 @@ dsp_vdev0buffer: memory@94300000 { reg = <0 0x94300000 0 0x100000>; no-map; }; + + /* global autoconfigured region for contiguous allocations */ + linux,cma { + compatible = "shared-dma-pool"; + alloc-ranges = <0 0xc0000000 0 0x3c000000>; + size = <0 0x3c000000>; + linux,cma-default; + reusable; + }; }; lvds_backlight0: backlight-lvds0 { diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts index c93d123670bd2..44bda183492cb 100644 --- a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts +++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts @@ -187,6 +187,15 @@ dsp_vdev0buffer: memory@94300000 { no-map; }; + /* global autoconfigured region for contiguous allocations */ + linux,cma { + compatible = "shared-dma-pool"; + alloc-ranges = <0 0xc0000000 0 0x3c000000>; + size = <0 0x3c000000>; + linux,cma-default; + reusable; + }; + gpu_reserved: memory@880000000 { no-map; reg = <0x8 0x80000000 0 0x10000000>;