From nobody Sat Sep 26 20:31:34 2026 Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11011036.outbound.protection.outlook.com [52.101.65.36]) (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 415263B14B7; Mon, 31 Aug 2026 03:33:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.65.36 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788147202; cv=fail; b=mw6OEpLb/ymfDDljg40kl3PXJSWQvlSmGxVe242shp4uFaLr1TdQffX41OBRDQIe7BXsryQhYc4xKSYL5yA6VsPh0mcCFESQstvBCGU+hbbcA43AMWoBsyweZC/VkpNpW7K1xJYefinxNaWxx4kctwoBZHcFW59LXB8TKxlQqTY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788147202; c=relaxed/simple; bh=UHWeKUc1ebS3XaJwsLh3Svxgz08aX5ts6yE0mzyLR84=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=dRr8qZmqmuZUGsBoejfsR3apxBuIG/2fcD4TD2Bkjwn11a6Ld8QMxN9P2z2koypo+rHkEiYhnF3esUfLTepYeI74YJr00UBr7Za5OWGz7d9UWUkcNtdWtJj7ZVYav7GNevYC70xo8pjvhu4fSAwnaMI4N4p+nmhvWpmY28X8ptA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=H1e3ID8j; arc=fail smtp.client-ip=52.101.65.36 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="H1e3ID8j" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eWhFD4NesHdcukBIOgzx03JLO/Pbe8SeqQ3QWjPaLTa5B5CAKJPmBHBf26GynG5u8BVJVBRSDTXYhEOIplg7OFiCMHZLAAFArkikQwuM6xPeZoY6M5JDDKx2tL8VIEb2agmpFVypbfomCmXt/nEM/xOLoyefPtFHA4D0QddbbTPpHmn+AhLobyXtCOE2OT87jqm8lxOLuAHr8ftrRr1Nw+rAfjezqeibUjei+gOPrY6H3jz85buoc9mdexBTomdqRdXKnZkK4aWpIhxIEQO8PxX3R10rkZCyCgRIN6VZaZ5sQWIYPFAyYGrTA9MXfmeCgSzqOKd0jmegB5gBZc2LNw== 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=VRt2et0mtUSluEneDeBbpZ6+G7nJgKvh4j69NOEabJk=; b=hrIN+OL9h5Qoan6cPCF8M3e+X8Dq69kCSOtl+ext/DSFFX1iNIIK00sSNuxb11xF9koRm2LcG0DmIeibZmuhk1OFJ3dfKhY6WfGlt4a6maK86fFI56I/lAj7YWBzU6303iM/7vbvoJem+bWBee2YuqRuC/vLDwsJNOIQE2LETHPTWh0WAqNUEVGJoPjXjHqAKakUV/Uwprz76nx/iqQ5dkXuhbbPFwTSPs404KXmJt9C8paB6bLs6HT6e2c1kbAuENY9z2D+jSmPFeGP339iZwRK8SkS3Ag7MT3y++ckvu0LTuYa/mLweQM9LuWAK5NQlRJMA47yMv9snYweVqOhgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VRt2et0mtUSluEneDeBbpZ6+G7nJgKvh4j69NOEabJk=; b=H1e3ID8jtc6n2ok1EvH2QBjw1/QR83J+jiAX5/+U5kHQtGfBTGxevk+u8t/GQqKhIClzO5W2XhWodZHWmQhIjW97AwDxLgf1ld5qXwnIw9/c6WWjvHVkFAiv1/NSW+xJo8J+6xSRhr75HxU9piF870mxEu6v/QqHAGjFSUG2tnzUz4MVR9Caha2SLZwTnFV2OQ/FTGuqUX1hEFcrFmlWs+1rSDjKb2nCNfYU4s9QgwK6mVtVufXjfHQbt5bjsUGC1e64ScmuiCUOD1CyxKr+Pu00I9YVcSCA5JGOos+ru6cP8SQLdG67F2gAlYMxDcYJHe9awY4weyxfNxWItFn/Uw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from GV1PR04MB11513.eurprd04.prod.outlook.com (2603:10a6:150:284::9) by AS8PR04MB8772.eurprd04.prod.outlook.com (2603:10a6:20b:42f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.13; Mon, 31 Aug 2026 03:33:03 +0000 Received: from GV1PR04MB11513.eurprd04.prod.outlook.com ([fe80::29e0:98a1:4577:2cc7]) by GV1PR04MB11513.eurprd04.prod.outlook.com ([fe80::29e0:98a1:4577:2cc7%3]) with mapi id 15.21.0360.008; Mon, 31 Aug 2026 03:33:03 +0000 From: Guoniu Zhou Date: Mon, 31 Aug 2026 11:36:56 +0800 Subject: [PATCH v2 1/6] media: imx8-isi: Reorder mxc_imx95_data to follow mxc_imx93_data Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260831-isi_imx952-v2-1-fafdb4b446d4@oss.nxp.com> References: <20260831-isi_imx952-v2-0-fafdb4b446d4@oss.nxp.com> In-Reply-To: <20260831-isi_imx952-v2-0-fafdb4b446d4@oss.nxp.com> To: Laurent Pinchart , Frank Li , Mauro Carvalho Chehab , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Loic Poulain Cc: linux-media@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Guoniu Zhou X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788147422; l=1777; i=guoniu.zhou@oss.nxp.com; s=20250815; h=from:subject:message-id; bh=UHWeKUc1ebS3XaJwsLh3Svxgz08aX5ts6yE0mzyLR84=; b=frJuTCI47OzF2z1FLnfpuUK2D/sQMXpUfER5hD4Xofk5e/qGqbUfpaBxGcENm0FBzJvPYmRKe IIvJnyR8hOrCbKNWPNzujNmtfGbZXTsCbMT7QKoKOh+SpauKrx5tZs2 X-Developer-Key: i=guoniu.zhou@oss.nxp.com; a=ed25519; pk=MM+/XICg5S78/gs+f9wtGP6yIvkyjTdZwfaxXeu5rlo= X-ClientProxiedBy: MA5PR01CA0191.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:1b2::14) To GV1PR04MB11513.eurprd04.prod.outlook.com (2603:10a6:150:284::9) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR04MB11513:EE_|AS8PR04MB8772:EE_ X-MS-Office365-Filtering-Correlation-Id: 11bdd2f4-4b19-46bc-93e3-08df0710906b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|19092799006|23010399003|376014|7416014|18002099003|22082099003|56012099006|11063799006|10067099003|921020; X-Microsoft-Antispam-Message-Info: Z6TT0zygwc3lOiDVZ91kHNhEDdQNnYtLD9828nReGFINMtVYsQ/0WTmBZMUsN6JrcNgafMW4ngoPaizqQztw82Evh0zWAvX5BmfI/qjN3YC87qefRf9D0kJGKbz/2HF8TPkEKZzSb+c6+5Bye1OjgACpSdomRglyQfj7fOuMEz1uHDCIcV3QOuaqNguj1hPkTmq3vj45Dm0lwwAF4m5SXRBheFmhRbSqRCjq9r2/7d9iCpPUdlh6JrosK/i9xRYKbJsdsjMPR0QVvsJUf48Qzfu5XKx6KjUAWbmj4X51zfhDmi/XXwNrQKQuJV0VEkMIU4HgRaMW0c6P6OuyAmu3yXrLg2Q3QuiJ8iZbbzq25uyEotGjmN5N/3eVsbLudvY+15qpm2Osjrw+m7RQZNesLyUpsm9u+TxAqR3/az9FbnYCdrXNJNBlxhhNzmAFTm0A0fLoaqiEWTkvWRtQK+BMrDRfZTAiZn8qqJ8635IgyULvLIwZaeduH69/NXkKXnblTQyk6xwt+JUb3QOl7RcBm5lZMGM45e6U0W7yPfjXqHdD5JA1H854uapYXdR/l8/SL64G4DKBw2OEQf3Zow6mmXLD1IZCN45n7RBABbNkdyMhkgoDw0Zj9C6U+178SMfTPKlQhoMO77r8odpvLvWvUHnUCsebntPD8Qf05Ap8kwvZbdUAkTNIfqBiPnh052vEudvJ1BzJf4U4tWm6HQbg0A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR04MB11513.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(19092799006)(23010399003)(376014)(7416014)(18002099003)(22082099003)(56012099006)(11063799006)(10067099003)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QSs1VEpkamYxeFhTaGtnR045ZjQ1M3crVkU3cy9yV0VGS2VsUDF4cXZGeTlm?= =?utf-8?B?ekROZ2gxMjgxS0RDemExZW5DdnlLN3BZRWFkWTY0RXVkd0piZHlHaS83THRp?= =?utf-8?B?V3VxMm42eEdDaGxqZkNwdUoyeTNOemdtcmJERVFGYkludGdiQU4xUWtFVVJ2?= =?utf-8?B?eHBYOHhqREpzeFlZVER5aXg1aUxFUXd2WE1ZNVVVSDRzd3Y5cENEL3F5bndo?= =?utf-8?B?VTRTaGpwVG92ZnpCREU0elBadUNLdldaUTgzQ2FpTlJMWHBqeG9LS3FOQWxM?= =?utf-8?B?RThqcnV5Wk1VdFNlb0VTTy9yMjVyN09BakVtQkIvSE1uemFONkk0d2pIUm9q?= =?utf-8?B?MkY5V1dqRXhxM2RQMDFmYTZScFlhVmE3Wk13L1lGNERWcXRoeG1JZEpoSHBp?= =?utf-8?B?dkFhQUdic2FyeFZnK3BhZjBYZ0lkemhpbTlkV0wwNkRaOGVXa0F4MnM1akRl?= =?utf-8?B?UUJVMXRkMGpSUmx6d29sb1VrdkdoRGFqck5jQVlPV2J1TEg2QmVoQ2N4cUJO?= =?utf-8?B?QWM1NmJhMkpWeURtMDRtUER1U21pay9sdnIvNEhCWCtTRURCanFRRXppTmNi?= =?utf-8?B?anJXbHo4MjNqeEtnc0RlYTc1dUtLU21ST08wLzNkSzl2YkZ0ekdDckF6ano5?= =?utf-8?B?TmMydEhOUW1saThGd2tONTJMS2hHcHpaWGdhSmRyUEZiSk9mY1hLTzdIYlB4?= =?utf-8?B?Q0J2K3IwWEdkWnB6RGJhbkwycXYxSXp3R2dUamVXUXRFUFhVV2NBYitIbjRZ?= =?utf-8?B?RHZJbkhXazBRSEk2dHhicG1mOWUzZHUwbm5LWTRBVkI1Y1ZGVW9lRVpkeC9Z?= =?utf-8?B?ekJQYTNIbzAzZE8rRktoQ3RRRHcwSmpWdHhaTGRvemRIUTQwZ0VXdjVYRzlN?= =?utf-8?B?T25aeWNhcVMwLzhqS2tnaXR1WDBLN3BWOXVOYVVmNkV6Y3JnOUovaVMvNUVY?= =?utf-8?B?TTR0N0RGMk51WFVhVGFnWVFJRndPN29Gd3pOT3NqUFVNMGYrNk9tblJFWnIx?= =?utf-8?B?eDRKM0RNL2U1NytoZ1Z1RG1yT2t1U2N4a3czYUxTcDAyM0FGckF0WVV6Mk0r?= =?utf-8?B?eUwxRGlVeDlxbXBxSUhKMFdCdmthSHVYdCtCZ1lKd0JJNHo4RjZXcUZXaEtx?= =?utf-8?B?dWdiUnFjM2hFMGVRamNUUDZMV0Fad1FxbGFWTWx0aE4wc3lMUnFBeUJUMjU3?= =?utf-8?B?REtDMVVCWVZLMU1rZE1Td2pnbjdDckxBOFFKQ054cVRmZGZCQ20xWG9aSm85?= =?utf-8?B?OW5uUWpBdGhlQUlxZkgrZGlMeDVReVZHMml6K0g2dzBoV0M2a3Z0cDNvcVBm?= =?utf-8?B?YWRpZk8zYnl4MkxKVUlMaWNCSDJZT3NRTDhVTHhES1BwalY3Z1lWdW83Z0Iy?= =?utf-8?B?cHlUc0owNTBqT0VqNWhFOVBEV2NEbjF6aFhyYVZWYm5TMVkydDV0a0VUUm9D?= =?utf-8?B?ejF4ZmZsVXRQcGFxNzBGSEwwazVtVGVsbllmU3liVnR1ZVpPRUtiZUhxSUo4?= =?utf-8?B?UUZYTGNnQkV2OW45RlBXTHI3RDZ3WGZzOTRkOHBVTnd4bHlBeGVrQ3Y0VWlM?= =?utf-8?B?ampDY3M1UWx3cS92d0IyWlVRUHlqVDNFRWVDNnhCVFV6ZDBvTEdnSEJhSjVI?= =?utf-8?B?WjVVRGFXZzJKTVZVTkJoNWVqMFoxbkFzalZERTRwMFlDNmFvM2hIWW80WkNW?= =?utf-8?B?alo1SThQTE5lUzg1Nllqa0s1a2UvYm95TXdYVkxDZ2toTGgzOVAyYTAvNVRZ?= =?utf-8?B?Q2Z0VW5lM3RrOTVwQWVabGFJV0ppeFdPcGl6bm5MS2plL29vWUFjRVFKWEt5?= =?utf-8?B?M0swNm51bDlETElKT0FocHhTYnZDdG52M3QyNm41ekpXNlROdk5rMXN1Q2N6?= =?utf-8?B?emRkK1ZLWWZhYmVwcDFZeXMxRnJGb29pbTdMeXh1eTVFYlNwZEJlSWhDRHkv?= =?utf-8?B?V3BUOWZ4MWNDUEx6WEdTdmQ5R2JwbEpYVDJCbEtSbmZWbUx0dFhWcTlEMXRq?= =?utf-8?B?OFZWQzBxcTYrL05kNDdqMXBQWUNlWlFyWEkyT0NjSDEycWVnVndIWm4xVERI?= =?utf-8?B?V0s5MzJmd3dEbm53T0l5Q2dXVTBDOGsvVHVQYU42YVdNbWFGbXcxWEUxTFg0?= =?utf-8?B?TmZYMDhHd1FsWUE4U20vWFc2bXhoMWczTlBsMEpGS3NSbjFaWHhiNXVSZ1R2?= =?utf-8?B?M2lqcTlrY2diVTFtS1djWXR4V0JLZUZXTXpNS2pTTHJjUDdNVnNSaE9VOVFj?= =?utf-8?B?V1RZUWg1dndMcGgweHI1VlIza093dEZVTGVnRTZHRkdxYjh0T2M3SWdWRHVV?= =?utf-8?B?RHVWZEZUSTF5allxdlMraVA2WkFWb3k1YlJLemowYjdnR0VlTjY2SER2TFRz?= =?utf-8?Q?93AEOsy0+amJuIAVGeuRREu/Gte3btSIMP0nz?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11bdd2f4-4b19-46bc-93e3-08df0710906b X-MS-Exchange-CrossTenant-AuthSource: GV1PR04MB11513.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2026 03:33:03.5291 (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: dli699YpdNcVKVCl1oENwDxAqyt+uRKVn2pCbxyM1TA9SJfFlNr/LD8Ew+UzYLNi7tY624HFCAK89nimt/64MIxH8MINHtA3uLxZdD+Hn1s0cJa57mobDBy6hnI5XvGf X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8772 Move mxc_imx95_data definition after mxc_imx93_data to match the order defined in the of_match array. Reviewed-by: Frank Li Signed-off-by: Guoniu Zhou Reviewed-by: Laurent Pinchart --- Changes in v2: - Add Reviewed-by tag from Frank Li --- .../media/platform/nxp/imx8-isi/imx8-isi-core.c | 24 +++++++++++-------= ---- 1 file changed, 12 insertions(+), 12 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 0ae5f35e017c..f2a8eb82fbfd 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c @@ -314,18 +314,6 @@ static const struct mxc_isi_plat_data mxc_imx8mp_data = =3D { .has_36bit_dma =3D true, }; =20 -static const struct mxc_isi_plat_data mxc_imx95_data =3D { - .model =3D MXC_ISI_IMX95, - .num_ports =3D 4, - .num_channels =3D 8, - .num_vc =3D 8, - .reg_offset =3D 0x10000, - .ier_reg =3D &mxc_imx8_isi_ier_v2, - .set_thd =3D &mxc_imx8_isi_thd_v1, - .buf_active_reverse =3D true, - .has_36bit_dma =3D true, -}; - static const struct mxc_isi_plat_data mxc_imx8qm_data =3D { .model =3D MXC_ISI_IMX8QM, .num_ports =3D 5, @@ -384,6 +372,18 @@ static const struct mxc_isi_plat_data mxc_imx93_data = =3D { .has_36bit_dma =3D false, }; =20 +static const struct mxc_isi_plat_data mxc_imx95_data =3D { + .model =3D MXC_ISI_IMX95, + .num_ports =3D 4, + .num_channels =3D 8, + .num_vc =3D 8, + .reg_offset =3D 0x10000, + .ier_reg =3D &mxc_imx8_isi_ier_v2, + .set_thd =3D &mxc_imx8_isi_thd_v1, + .buf_active_reverse =3D true, + .has_36bit_dma =3D true, +}; + /* -----------------------------------------------------------------------= ------ * Power management */ --=20 2.34.1 From nobody Sat Sep 26 20:31:34 2026 Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11011036.outbound.protection.outlook.com [52.101.65.36]) (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 8D9653ABDB3; Mon, 31 Aug 2026 03:33:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.65.36 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788147210; cv=fail; b=KFQuce+oM5ZMtUOWoc+v3zdPvuNJZfwZHLtNvWv2u3ETYHag9/schzx/g8NT9XP1nNj/UJZdYzGAJJauxLA+tDPnsViLfRRUHru75O4yjZmfpflwWD4HD7IceEUhumx61jmesiUYKd5n8LM62fWRLsosFKzNIgcDG7v35bxWVjs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788147210; c=relaxed/simple; bh=GeZTZaOQbUbILfPgV/r09iumcpZs5WGBVnI52ri84CA=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=Mpm2M9ja5qEEmQ7/FY/3NdUPychfj3qrKq1/aNXRyneuIUYFes0/nTZkdBgLWrHPsFvIykThKJJxv2Ot1S58bjKxRmMHof+zd/ymMY3v1LI8qfUwAxErkfzCzqWu9DOM64y3mYVghXxy995xii660SnZqhn4T+P5zM5du5bJ89Q= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=lX4GDnYX; arc=fail smtp.client-ip=52.101.65.36 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="lX4GDnYX" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=m8/HuTfgFZfkogt78ftZDKvRyj7lHgbhCoFkpq7ueEc/BosWDNjUq8qGppEsci5zbr0M0H+rvfzmFDKeNdAflyja4tWw765h3dRPOUUFb7uW395vui/YcbiHFrOoEm+spM1HPzppTtyOU4zC7VvufJQl50dKHRPIdIFEuFpYi669arg9X+X5R3cLtEZDB+HGsR/UkbQMDjBW+oIAsXKTrlh6TVRBsjZYVEljkXVLtnbks2RrE9rgnONritYizDCaGFUVJ2vF1OliO51Yige7/EF8NsMzHxJ3Z25iCW4Mq2jxCy8HbPWbnIcQR5dlm1PQIx7pMkSu8dqSr0hgGs6LeQ== 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=0lXP8rbHr3mgLPjblwCC7UmOKlNfrTlY5mRIDgBqK88=; b=HbRhdQsSQ1/ovpBXivXKaBXKYbeKZ3E1/O8FiWFiuoZ7veLgZEt3DSQD24lYTudQGJJtupLaZSlMsmShbUVwZeCIvSlaFbyywAPpnql3hGQfdUYep7dpYY27AEgNmIQF6tqW4jNfiS61GQO0irIPybvY8JFHZYveNJQ5wqN7A/ZWGvAfLgtV1EauoNlSeiAGrKP31j/WeqRGTdZco2zVa6iGQTSVJkrm3ALpIpwVUXuEP2/Ce9LScKP+Khn29YCAQbM6dYWh+cL2qk6aws64QOfO4NbWCFh7AyJugCdyaFX/mbWt9p2CfsMj7GxM7odLMVSUb79j0ZCFxdw+jdnuJA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0lXP8rbHr3mgLPjblwCC7UmOKlNfrTlY5mRIDgBqK88=; b=lX4GDnYXT3H1dpEJ4T5fHzYnONqLq9tCd9xqVeH366Fhm5Bjn1JO2U1kBWAVUCnhg2NmXGE/zbhvNcNcaKd3seTWigtp1K1CWpUaAqv1m5R2PVX+ZdXhjJC4B6XJHSiOtOXPCXC5gquAr+MUpmgG9tEu9eTcebMFp8TVtJ03PopuQ/ZgJQs7tSjB7FMCR9zP8Kvmh/Y0dnturDpK3zpo9JNGo9DSPmfUn2QN0/6a94iUsgkpqGcBdb3H657GhjbrJohv8v/gjwdbKUDTKwfn6csu3hLi4ghY0pLTW1hrWHFasmIQSt5eyuvCWqTiVbqTpkxZowsspy8/LiiZ8Ci3iw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from GV1PR04MB11513.eurprd04.prod.outlook.com (2603:10a6:150:284::9) by AS8PR04MB8772.eurprd04.prod.outlook.com (2603:10a6:20b:42f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.13; Mon, 31 Aug 2026 03:33:10 +0000 Received: from GV1PR04MB11513.eurprd04.prod.outlook.com ([fe80::29e0:98a1:4577:2cc7]) by GV1PR04MB11513.eurprd04.prod.outlook.com ([fe80::29e0:98a1:4577:2cc7%3]) with mapi id 15.21.0360.008; Mon, 31 Aug 2026 03:33:10 +0000 From: Guoniu Zhou Date: Mon, 31 Aug 2026 11:36:57 +0800 Subject: [PATCH v2 2/6] media: imx8-isi: Use per-platform format_mask for output format field Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260831-isi_imx952-v2-2-fafdb4b446d4@oss.nxp.com> References: <20260831-isi_imx952-v2-0-fafdb4b446d4@oss.nxp.com> In-Reply-To: <20260831-isi_imx952-v2-0-fafdb4b446d4@oss.nxp.com> To: Laurent Pinchart , Frank Li , Mauro Carvalho Chehab , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Loic Poulain Cc: linux-media@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Guoniu Zhou X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788147422; l=5531; i=guoniu.zhou@oss.nxp.com; s=20250815; h=from:subject:message-id; bh=GeZTZaOQbUbILfPgV/r09iumcpZs5WGBVnI52ri84CA=; b=0g/jittTCBQiqcuQ5yAOpXc9ZaLbp04oVrR9Filw+bf85MrBr9/A3hFYJTwMyn0d/p2lku/t+ RlDgTYZTbzAB1kxQ3P/fV/dK8DNU9wWj/vYaR76faHewzrIcIxnOp9s X-Developer-Key: i=guoniu.zhou@oss.nxp.com; a=ed25519; pk=MM+/XICg5S78/gs+f9wtGP6yIvkyjTdZwfaxXeu5rlo= X-ClientProxiedBy: SI2P153CA0036.APCP153.PROD.OUTLOOK.COM (2603:1096:4:190::11) To GV1PR04MB11513.eurprd04.prod.outlook.com (2603:10a6:150:284::9) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR04MB11513:EE_|AS8PR04MB8772:EE_ X-MS-Office365-Filtering-Correlation-Id: d828b987-38aa-4a5b-58b7-08df0710944b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|19092799006|23010399003|376014|7416014|18002099003|22082099003|56012099006|3023799007|11063799006|10067099003|921020; X-Microsoft-Antispam-Message-Info: YLPjmyTSKFzaVP5v80GjD6iLS06udQgaAuDHYWVnESXTL4W02IPX3JFJcRsGGc3MFeo+grKdTztJeWm4/XLHx4KS9R5mzN+jplamlNG7i8MVCeM1mLgS6r+C62kYeC4EiTG7JLlsaCOlhmAq4EoXKBgM3uNBfux4MoC6F1j44GWQFJFKsKTpB7xe6l2YrgJV0MtD+jOhWxIB9Pnl7fAm/DYdKl/YqGHFrkPtxm9CPu0rjDSCkwMxc4ektTXXqZYkScIiXALFFg99SSiBH07ERh0aZJI/cY5ZJqxGt8yZI8J+ptpGnseuRS9cYPKzY6g8mdKvLfzu0nC3tJBsEeilYL2X25ig6OESTQKCtQOfWDFBiDfkN+emUwn4TEJEtrX+7Npk92ItxTC/btjZ4Br+AQnt1z6ewqvKCtySUwphdNNvZrTWoDdo+gZsEC1+kjizRRBjwxuqWRQbEH9qft/FyclYn4hCcVZ8bRYdOUgEgOC+aPHnEwUNmCSxKIEMKVgPGtBMQdlMRYbwUYHTKtB9J3Tk+35puIcGWwmD7Xq619bQxn9TWou8M2/Xvl5YFtYnxXhHfDo9+yuUdig70KRaPJigCw8ImyC848EZFUlwzoq1IEGJSjwWmvpl+xZh4J5q5VR9jeyz6Ms4ws5rZJ0JzFMg4VdFiRNmXN3k23DPTNEKJ/DFJvf3KY8Bnl8h1YF1EEqxTRNlg8AbnFpZjREWAg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR04MB11513.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(19092799006)(23010399003)(376014)(7416014)(18002099003)(22082099003)(56012099006)(3023799007)(11063799006)(10067099003)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TldEaWw4UnZtZjFyNW85UHlSOHljY2V6WHJOZ1g2RlBpZkxMK3NuejUyWURF?= =?utf-8?B?dVdZYU1OZ2JiNUppQzVLblk1bVZVeGl4WENnL0Q2bWpwUVhJWWs1ZDFRR1hh?= =?utf-8?B?ZDc4ai9qYlRnWHcvaGpJajFlNUVld2xUd2tSb09yc3dueUlqZUZ4aEh3T3hD?= =?utf-8?B?L2F3eE0weEFMVWtyZWd1VHpZQmh3b0pHQ2pmZWdFc3I1OHBXZE1hNmZMSkFi?= =?utf-8?B?TWJZT1Z2UW5HOUkwd0I3SExuVVlqQkhYMGwzSmNOUzhrbGRpVFdWVWM1dTQ4?= =?utf-8?B?VjVzVkhONHF0M2pQdUtOUWw4aUJ3YXMxcXc0TllPVzlheUJFcGpLa1EzRFhS?= =?utf-8?B?ZUlaengrOERwRXpzZzM2MHhuQkREdU1zZEVVc3hXL2oySENITVBrN05QUXAy?= =?utf-8?B?cmwxbzY2VnRHelZLRGFYN1hJM2dma212V0VUOWROWjJLSlVYaGRZaW45WnBj?= =?utf-8?B?eGExd1ZOa2N4TnV3VlJib2xPcDhSMjFLNkR4VTE4R2NNdG05YVJNRTczMCty?= =?utf-8?B?Ni9DM09WcU8zSjhtWmVmT1RVbndmcWFhMmxITjVGNlM5enhpYzZlRmNyQ1B6?= =?utf-8?B?bFdUUlR1MHVxWG5sZnBiOVpKK2hPdENndEcxbkRjUXZWZEN2ZmMyQ2Q2aVF1?= =?utf-8?B?VTZsMnFqMHhGTmpFN3R0UXZ5M09wUzhEYytDWUYyeHh1UkwyVlJhZ081YW1G?= =?utf-8?B?bndMMEl3L3o5cDBVbFFsWXpoNEhJU2t6WUVMKysreTdIRGVoVkdJN2lXZDla?= =?utf-8?B?bHVVRm0zK3JwNnpzV0M3UTdhVWkyc0dOcll4c0h4RDdja3BXVjFud1hSWklJ?= =?utf-8?B?anZ4VFBXYkhxNG93Y0J3Zm9TbTY3bUJ4bjM4VHoyZlNMOXZ3L1gxLzNuenRx?= =?utf-8?B?N0dzcmhuWTgxSkxFUXBaVi84Rk44cWlEWXhTMW5BbkZoTW5ra29teHMzM0FH?= =?utf-8?B?VU9BQ3RoQUQ2eFBnSHhzSzI0cWJCdEhiYXU0aU83VUhvUktzWGFnUDhBQ1g5?= =?utf-8?B?c1MvS2pqdkxHMUxNNXZPVThPdnRKWThYOEJ5UDdNUjYyVVNjdlpNc21YaHhn?= =?utf-8?B?UXBDTHBWTTVPNDJseEFDZkJyZmVadUtGaEtoLzFuWFp0VndDc0VJcnBYeDNV?= =?utf-8?B?OTBGUFNkQUxZeDBKcWFxTlFkd0NkQXowbGhGSHpVbUJreXVwcWNBa1YydS9l?= =?utf-8?B?c2dzMU5WTEZHZkdCU1BFVmF3K1QrWmdZUVhUbFM3ZmMyRFRtanNnVFlQbzZs?= =?utf-8?B?QXhjMnBzU3ZsdjRjTG5qVmFzY3E1UlVOY3liUVcxOE9XQ1BROEhGOUNwTWdX?= =?utf-8?B?VFdMczI3VHJhcE9PaDg2eWhEY2lob3ZMQytyK0FEdEMvby82VnNyaDRhL0Rm?= =?utf-8?B?RGFUUTdlUzcrM1BQV3dYYWd6NmhTdXV6ZWVBT0JKQzV0Tm01aUZEZmZVY21W?= =?utf-8?B?NEdsY2tTczBLbGNuUHEyWDlocDdRR0ZMeE5Ed2lIY2lZb0FyM0NzQVBTNUVH?= =?utf-8?B?NUZaUkNmcE8rTzYvRWZkUEw0SGxIaXE5REpYOVNyYS9ONzYwRXBiQVdvQmRJ?= =?utf-8?B?UnhkT3p0akZLNnBVeXV3NWRkSGw1dW5XeHpBTUszeDlCdmhZN1owazlPL1F3?= =?utf-8?B?eWx0b1lBYWVaUmhTMDMySkY0dHVxMkRGZUVoUWQrK283TTNIbmorY0VPUkM1?= =?utf-8?B?bS96K3ZFZWY5dEh1Mm9GVWc5WWdMalRXYnRxZ3crcEZLL1hIVVVSUlJsUDVx?= =?utf-8?B?UFpQd0lFYUc4WS9lc0ZIUktKRTBnV2ViYUZXaWFoTzJKaFkvb2lxVkx1WWZu?= =?utf-8?B?SzB5TmwwdkYrT3JjSytyeXpTaUZMNWxhNHl3MVZwM1Zha3NBRnFJWkhIVmJF?= =?utf-8?B?RmZ1bUx6VmlLWExPbmtwelJtd0l5RFB5aFNua3NWeVdJeUQwUlR4NEVnRko5?= =?utf-8?B?VTJZQ3JVS0JOK2tXb1FaUDcrbm93RVJGaW5qYjg0QXpGUkZPeWZFN2x4Rktw?= =?utf-8?B?d2krV2I3aTNrRGRzK3V0WFNoa2gvcDRnMmV3a2VNUU5PakswN0x0YVN5N0FG?= =?utf-8?B?dU1Jc0xkbHJ5cHhLbTkyVXU0cGwwWUsvR1MyM0VCSm5TazVnUmduRWljOG1N?= =?utf-8?B?Um5SR2N6bjNYMnhHQnNRRVVtNFVCRWg5OENYd2VHc2tEYTlsR2VEVU53U2tr?= =?utf-8?B?cG1GMTJhY2F0enF1dENJMmFvVTVaQWtCOE9rRUlpVXVEYWNPdmpqVk1pQ0Fs?= =?utf-8?B?NWlBMXRZbW1DcjYrdVlvM0lCVGdYS1ZRdmJtTS9ybFdwNWxJOC9BeDRFOXhm?= =?utf-8?B?aXREbjg0R2lnWXVQa29zTSszSVg2T2dhVU4yQ2ZUOStmcjl0S0FCT091L3RJ?= =?utf-8?Q?BD7Fl888UqXmiHiDMQuNNxjqaCJT7ZXZ+8DVT?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d828b987-38aa-4a5b-58b7-08df0710944b X-MS-Exchange-CrossTenant-AuthSource: GV1PR04MB11513.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2026 03:33:10.2011 (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: TUxpcPEd5nJrDLGqTM1WGmT4mRPM4NoKRwMI9ENvOIW6QkSPRjLKF8ihbz+RYWIBy1HnfUiBPEji4dT/fLIwJUQ/dSW6f2R+fFwPQLdeDTs3Yz73MHEnolqwSFBaLOFI X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8772 The ISI output format field width differs across SoC generations: i.MX8 series (MN/MP/QM/QXP) use a 6-bit field (bits 29:24), while from i.MX8ULP onwards (including i.MX91/93/95/952) the field is extended to 7 bits (bits 30:24) to support RAW32 and RAW14 formats. Replace the static CHNL_IMG_CTRL_FORMAT_MASK with a per-platform format_mask in mxc_isi_plat_data to correctly match the hardware format field width for each SoC. Reviewed-by: Frank Li Signed-off-by: Guoniu Zhou --- Changes in v2: - Add Reviewed-by tag from Frank Li --- drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c | 8 ++++++++ drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h | 1 + drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c | 3 ++- drivers/media/platform/nxp/imx8-isi/imx8-isi-regs.h | 1 - 4 files changed, 11 insertions(+), 2 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 f2a8eb82fbfd..c1c16dbc1539 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c @@ -297,6 +297,7 @@ static const struct mxc_isi_plat_data mxc_imx8mn_data = =3D { .reg_offset =3D 0, .ier_reg =3D &mxc_imx8_isi_ier_v1, .set_thd =3D &mxc_imx8_isi_thd_v1, + .format_mask =3D GENMASK(29, 24), .buf_active_reverse =3D false, .gasket_ops =3D &mxc_imx8_gasket_ops, .has_36bit_dma =3D false, @@ -309,6 +310,7 @@ static const struct mxc_isi_plat_data mxc_imx8mp_data = =3D { .reg_offset =3D 0x2000, .ier_reg =3D &mxc_imx8_isi_ier_v2, .set_thd =3D &mxc_imx8_isi_thd_v1, + .format_mask =3D GENMASK(29, 24), .buf_active_reverse =3D true, .gasket_ops =3D &mxc_imx8_gasket_ops, .has_36bit_dma =3D true, @@ -322,6 +324,7 @@ static const struct mxc_isi_plat_data mxc_imx8qm_data = =3D { .reg_offset =3D 0x10000, .ier_reg =3D &mxc_imx8_isi_ier_qm, .set_thd =3D &mxc_imx8_isi_thd_v1, + .format_mask =3D GENMASK(29, 24), .buf_active_reverse =3D true, .has_36bit_dma =3D false, }; @@ -334,6 +337,7 @@ static const struct mxc_isi_plat_data mxc_imx8qxp_data = =3D { .reg_offset =3D 0x10000, .ier_reg =3D &mxc_imx8_isi_ier_v2, .set_thd =3D &mxc_imx8_isi_thd_v1, + .format_mask =3D GENMASK(29, 24), .buf_active_reverse =3D true, .has_36bit_dma =3D false, }; @@ -345,6 +349,7 @@ static const struct mxc_isi_plat_data mxc_imx8ulp_data = =3D { .reg_offset =3D 0x0, .ier_reg =3D &mxc_imx8_isi_ier_v2, .set_thd =3D &mxc_imx8_isi_thd_v1, + .format_mask =3D GENMASK(30, 24), .buf_active_reverse =3D true, .has_36bit_dma =3D false, }; @@ -356,6 +361,7 @@ static const struct mxc_isi_plat_data mxc_imx91_data = =3D { .reg_offset =3D 0, .ier_reg =3D &mxc_imx8_isi_ier_v2, .set_thd =3D &mxc_imx8_isi_thd_v1, + .format_mask =3D GENMASK(30, 24), .buf_active_reverse =3D true, .has_36bit_dma =3D false, }; @@ -367,6 +373,7 @@ static const struct mxc_isi_plat_data mxc_imx93_data = =3D { .reg_offset =3D 0, .ier_reg =3D &mxc_imx8_isi_ier_v2, .set_thd =3D &mxc_imx8_isi_thd_v1, + .format_mask =3D GENMASK(30, 24), .buf_active_reverse =3D true, .gasket_ops =3D &mxc_imx93_gasket_ops, .has_36bit_dma =3D false, @@ -380,6 +387,7 @@ static const struct mxc_isi_plat_data mxc_imx95_data = =3D { .reg_offset =3D 0x10000, .ier_reg =3D &mxc_imx8_isi_ier_v2, .set_thd =3D &mxc_imx8_isi_thd_v1, + .format_mask =3D GENMASK(30, 24), .buf_active_reverse =3D true, .has_36bit_dma =3D true, }; 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 58b47335afc7..05c21c448b93 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h @@ -175,6 +175,7 @@ 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; + u32 format_mask; bool buf_active_reverse; bool has_36bit_dma; }; diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c b/drivers/me= dia/platform/nxp/imx8-isi/imx8-isi-hw.c index 6aa760ce3605..2405f7d33d0a 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c @@ -410,13 +410,14 @@ void mxc_isi_channel_set_output_format(struct mxc_isi= _pipe *pipe, const struct mxc_isi_format_info *info, struct v4l2_pix_format_mplane *format) { + const struct mxc_isi_plat_data *pdata =3D pipe->isi->pdata; u32 val; =20 /* set outbuf format */ dev_dbg(pipe->isi->dev, "output format %p4cc", &format->pixelformat); =20 val =3D mxc_isi_read(pipe, CHNL_IMG_CTRL); - val &=3D ~CHNL_IMG_CTRL_FORMAT_MASK; + val &=3D ~pdata->format_mask; val |=3D CHNL_IMG_CTRL_FORMAT(info->isi_out_format); mxc_isi_write(pipe, CHNL_IMG_CTRL, val); =20 diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-regs.h b/drivers/= media/platform/nxp/imx8-isi/imx8-isi-regs.h index e795f4daf3ff..7c4e736f4651 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-regs.h +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-regs.h @@ -39,7 +39,6 @@ /* Channel Image Control Register */ #define CHNL_IMG_CTRL 0x0004 #define CHNL_IMG_CTRL_FORMAT(n) ((n) << 24) -#define CHNL_IMG_CTRL_FORMAT_MASK GENMASK(29, 24) #define CHNL_IMG_CTRL_FORMAT_RGBA8888 0x00 #define CHNL_IMG_CTRL_FORMAT_ABGR8888 0x01 #define CHNL_IMG_CTRL_FORMAT_ARGB8888 0x02 --=20 2.34.1 From nobody Sat Sep 26 20:31:34 2026 Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11011036.outbound.protection.outlook.com [52.101.65.36]) (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 E75ED3B3894; Mon, 31 Aug 2026 03:33:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.65.36 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788147218; cv=fail; b=uxHr4OuIkp/r7zHomJU+ZUYYmXO9qnTlKVvrpY0zj0DmtoV3w8Us1ceSe6RY6C0XtuMXIRCt7lCYoI95nkMshsoqszEwCW/phIDX6+2NtZoWZ0F8HtefVkg9ZNjjDc0M16LhRFQgkzTynIYN+W5ZB920uNlffmSBAOH9CCYUHWM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788147218; c=relaxed/simple; bh=FOKqaZJxGIieArzKhvy3LP2dz30ymSlrTy6i17nUCik=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=JE1WzAnftNw/xiW71Ae3zRqLY0VZtiBgAjiJk2+XFPB9DDxnIGArJe1mnZcFO8qzEe/2qmOk9nxhBjg2pKmMZOeKB+utwMZGWDFrUzrwpbF840VzbyGfcJPja9PaUMZBTLnfAqqpERZxp84HwRx6v6uCCIXrvSXlJHL4KL/mzxc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=eKuizXSr; arc=fail smtp.client-ip=52.101.65.36 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="eKuizXSr" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=f8jWD0t53n0yow5FUDrAYey0sFgJLJ6ytv8kWRtWffWtOf3XoOfKrgPA7ZF/KrAzCrMa3V7Xq+TJhCRi/1kx4iaeLh4gRTZVcqmjwNzxEioUWQaGVgz4drgOPqwG6cc5y5oiol4ILjrmbJ3bSJE1z/v6Vdk8PurJ0Ixvrr80rgP/8GbqMYnlVvIEkMD544eFd+6I6kk4aiAsvpV2Efp7b6fwUX3GeSdoVPaJYVkHBEDq2MgPWhmw4+dFJQ3i3u6qKpSm2C5FH+cr2vJZ2NV5laHccuNsMD/CqbRqO6P+XA+IQWMbP6tuY6C95PxyaILnxndnhNf61oHbJVk0fHfpDw== 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=gCFIcrFi9uaEdjESOLj67Zi1KK3gW8QJUn0lPTAmtgo=; b=n3h/LAsNsSKOuJBTSzirtgLQNL+RI3nsja2+JeJU52tYv/qeaPWLFvrruf1kV1x6dpMUFpQkC/I53FDrjtrIH37hVKNJ5G3xxcX8Ye/k2VUpePYVi8TUwPvOv8MVz41DSH2OwfzswHBYwKGEJJgNOuIFzqOoOeiRb/S1I0pJvJ+0T8iAJzd0hUHHcfNa2Ls7QIpl5StrCKcroEBmCW8x1sjr5oiXTEKBnltuNyQiSaFKdb8LEf7pMGzBdWt9LCgoCrol/cM1UtUMNYvgBB3A3AYk4jpx8bHQLRdAZPaFIva1akZJPlakHBDrp0Cx1CbdszUXHVVOhO93ygnxWJIEsg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gCFIcrFi9uaEdjESOLj67Zi1KK3gW8QJUn0lPTAmtgo=; b=eKuizXSr3D0KBYQeRVNRxk4mPJz+Zvh634Ep8LMEgBrYaw1tDzCWGYx+6up1xeLBpaP9dnWNYEtEOU6BTv+88n/3Nl2jUWHQulVU0wjwcxwmf88GGr+uMmk1KNprRVez43McbTA/45LHJbW57nk6HgHsxPaU1NSSP1nLLv3GBDMHS2kbbNalduSKobVsu6gzUHsx3+SL9wzoteE9NeJ3hJHwWqUV97VUYHaTc+EFsqJAjUckBwF19DuMCfFd+2aWVVx04gBNE64a39YbfQnxQ24cEkmw83r7YHS+iq9ceJKWZgTjtGu38Rp5L34/IJmxc0vljljhoZkgQAw+R5ARuQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from GV1PR04MB11513.eurprd04.prod.outlook.com (2603:10a6:150:284::9) by AS8PR04MB8772.eurprd04.prod.outlook.com (2603:10a6:20b:42f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.13; Mon, 31 Aug 2026 03:33:17 +0000 Received: from GV1PR04MB11513.eurprd04.prod.outlook.com ([fe80::29e0:98a1:4577:2cc7]) by GV1PR04MB11513.eurprd04.prod.outlook.com ([fe80::29e0:98a1:4577:2cc7%3]) with mapi id 15.21.0360.008; Mon, 31 Aug 2026 03:33:16 +0000 From: Guoniu Zhou Date: Mon, 31 Aug 2026 11:36:58 +0800 Subject: [PATCH v2 3/6] media: imx8-isi: Remove unused model field from platform data Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260831-isi_imx952-v2-3-fafdb4b446d4@oss.nxp.com> References: <20260831-isi_imx952-v2-0-fafdb4b446d4@oss.nxp.com> In-Reply-To: <20260831-isi_imx952-v2-0-fafdb4b446d4@oss.nxp.com> To: Laurent Pinchart , Frank Li , Mauro Carvalho Chehab , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Loic Poulain Cc: linux-media@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Guoniu Zhou X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788147422; l=3430; i=guoniu.zhou@oss.nxp.com; s=20250815; h=from:subject:message-id; bh=FOKqaZJxGIieArzKhvy3LP2dz30ymSlrTy6i17nUCik=; b=+A2+O4A9KyAvS1sEGdNp+WeS9z+Qbt1IdxCk7elgQuVFYf1JA+GELBA7ifAnd80S7IdrkI1h/ aLEzidjrPWUBHLNiEtlPAn4xI4lQm285HCbpKG8Xvtsgp8vO1hzmN0p X-Developer-Key: i=guoniu.zhou@oss.nxp.com; a=ed25519; pk=MM+/XICg5S78/gs+f9wtGP6yIvkyjTdZwfaxXeu5rlo= X-ClientProxiedBy: SI2PR02CA0036.apcprd02.prod.outlook.com (2603:1096:4:195::15) To GV1PR04MB11513.eurprd04.prod.outlook.com (2603:10a6:150:284::9) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR04MB11513:EE_|AS8PR04MB8772:EE_ X-MS-Office365-Filtering-Correlation-Id: 04c4048f-356f-4b5f-0489-08df0710984b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|19092799006|23010399003|376014|7416014|18002099003|22082099003|56012099006|11063799006|10067099003|921020; X-Microsoft-Antispam-Message-Info: g2gAa4feuYvR6CUJ/finwLwmN3WBydUUnIVRf+JYRO06EU+TZZlgGPD+MExsEXGmDgXEy2rO9i5uS6KUhahmY96EpOPxnfqTL/5IUg3dAXiFoas4zCl9QrA4ioxVWos2EIVK6sb88zJYb3HdhLTvjTrNgm56TdHPSYCKMfcIsso6ZJ2gK35HKK3Fhgj0z9b2iTsS1wwM5CvnMafT1JC9rt0QHOONaLaaPWV+pzMYWATkgyeiWjeXeNN7BMabYQVDGwPXIJuOadtHEum+ejaWnmdNQhgY1isclLJ9CIKDUrW4UYa0ej52D8p/zaNdJONn9MliUv8liXN5dsb0z1skhEqduiblKhS2sQHNfM/J8TFN/+UeEC4jt7/phsa1DHBWrIrcDgbIbexxIuZxciOojV6zc83rzpwtW53qY1RVCNcZYcZ9lhcrMMfJVqR78j/KMjWXol43uOnSRM9EA/emevmaFlSU9BtHLfebaZL1iG13BBi1yi6QCTGATMnb4OFS545nTI2VsW5lh1qsPtgLtAYj0KU1Kj2qWCm4ajnb/BV+9u5A0mfLwp6Y626bWGP7tQk2cRGvDQUIpDEuKDIPsKO8Cc59asirCqOe/fHIzbRZMSAO5wN1yIMn4G7kAhH4BBK7SoBMX3z6CtQtyWI8/Vxv0xJJtg0GT3do8i5zpU1WEmGIR/RpqLNAWmlQqavZWNFYApnGrEY6+nQglvXPiA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR04MB11513.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(19092799006)(23010399003)(376014)(7416014)(18002099003)(22082099003)(56012099006)(11063799006)(10067099003)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?KzE1RnJVQmVxVG9VRjFWOFFQejhic3FoT1ZFVEF4T1Rkc0x4eWZYS1pBVFI3?= =?utf-8?B?WHNKT1M2YVZQY3VJSU1rdTdBQitwd3UwTUNBK1BlSCtMOGNhOUdQOHRWL3g0?= =?utf-8?B?V01tcWliWUlhRURTQldpUkNmNVNYNXdTVWhCOXBkSVhUMkRxVVhBc25MQWln?= =?utf-8?B?YWVwMStrSWY5RDZhY2ZhTkNZbXJHRG80M0hYYmR4MVkrZHV4UU5FMFN3Tnc5?= =?utf-8?B?K3FORGpKbytjUUEyNVpyRlJuMjd0ZndKZE1VUndJMW9XS1BsVlo0dVVQeXgx?= =?utf-8?B?OExTVXArS2szZlZKRWFYd2RQSEp3cGlzU2RDOEkwRFFSRlN6RmFzbDBMbXhU?= =?utf-8?B?b0Rta2FZZDJUQmovWFJuSkxEckw3L3kzRWxoWHhXaGhxN2xveXRpQXR5RXgz?= =?utf-8?B?c21ueFZXM3l3SDNzMUozc2prd1lpdkMvYjNkMkxsT3h0OGh3MXdieXFZbWY1?= =?utf-8?B?L1dWOVd1ZVRSN1psOFNiVzdKQ2NYM1BjeHRqMGQ4TzRwZ2tWR0wvL004TkhD?= =?utf-8?B?SWY3bnV5bWlFWnpvQ3M2VFJNeHFIeEJCZ2hHclVKWDlvZXFsZUl4YTdtSkJu?= =?utf-8?B?M2V1eFB0bFJ2TWE1Zk5OL1hXK2pxay9UQUJRUkhrbjdvK3luN0pPVzljbUtC?= =?utf-8?B?UVFvak15dDlDK2ZvRGxXOVl2dFdaTTY4M2hqRTJGa1hQeCs2R2RCeS9NU0Jt?= =?utf-8?B?dGlSTjA4cnlmRmVKVXpTN2tHWUM0dzN4QmNqOUJnVzBMTnRNVWVpanJYWXlw?= =?utf-8?B?WVBaVjFmTjNmTzE4WXpUQVBmMnlOYm9KTEdzRU0rejAvSml6YituZ1VUOFFK?= =?utf-8?B?RERLTnZuTEtyRzF5QStwMi82dTZuS1ZCVW1aaHZKcENyR3c3Zk1qeXhBZ3k3?= =?utf-8?B?Rll2RnkwUCtSR24xUzZnN2s1TmRzcVJNRnFXWVpDbWk4cWMxOHppSFVZbDk5?= =?utf-8?B?TVQxZ3ozZTZJREMwbkZLcXJtZVdCbUROcjNVa3BFUlRlbVVMaW5YRmtJVGhT?= =?utf-8?B?M3hNTUVYRW56dDA1NFZVNWZ2VlVQQ2dBQVFJWFY3M0pTaG5JUWpqNDlMQi9a?= =?utf-8?B?NlVIK0ZaNlhXOWlteUZZQ3o5U0JRWHU1VFQ3TjVUOThWckhxL1l1V0hUcW1m?= =?utf-8?B?WDMxTFdPd3NXM1Z0RVg1ZlFqMDV4a2ZjejlvSThxRzJHM2NmcGh5Y0MyZ1U0?= =?utf-8?B?OElzcWtRMXI3d0hEMVZzQ0RKQ2pBbXBoeEVBbnMzSGxhSDdtemNMck5jRE5X?= =?utf-8?B?cmtLYmhYQkpJUG82WWszYjRZWEs5SGxodjVkZjFlaVgvdFRxT1ZkcHZQaTJl?= =?utf-8?B?dGtOZUJsejY5VUdTUGMwcklzTkxicnl0VTYwQWxVc0xkb0J5QnhoMnBUazFu?= =?utf-8?B?ajlZMW5wNmhlM1RtZWRRV3cralJmOWFPT3lPU0ZYVFhXdGlKZm14WW9USGZ6?= =?utf-8?B?NkkwWDU0S08rYVMzSUU3YzNrRTQ3YmptSWZRRkRoajNLZjNrR3FRQW9ZbXB3?= =?utf-8?B?RTF1NWthRmNjUlRoaUhQNWt2cXJCeVB4K29ycWJURlV2cmwzVzhUNThqUDNY?= =?utf-8?B?Mm8veW9wYVhTcWNDcHFtVkdlRkVJbHpWUGl0anFwSkY1Z2dJM2tvdC85TlJn?= =?utf-8?B?TEV1dmtES2F5L2lmdUZpK1VYTmRpUFJHRDNGcWhWSFZ6UEREN2Jwbk4vdXFU?= =?utf-8?B?M3hOb3dpOHQxMzIwR21tSmp4S2RIWXBONDFleTJaWFlxM1crYWR1OGVpVlpl?= =?utf-8?B?bmNjaysrUnhvSTdTZ1RzMUlpcU5IWk5WU252Ly9USzJ5ditlRjdyNm9Tamg4?= =?utf-8?B?Vm1mMHh6TnlCRzdhNDFXWmR3NFQybXdsenpSTXNveXhBME9RYlQ0WlhucWZ2?= =?utf-8?B?bjFxbkNpc2hCaTVxc3FGbTR5eThvZlkrcDBGQllPcmZ6SG5TeEhwQW8va2Fw?= =?utf-8?B?TVExYm0rdUJpbVQrM3o0VExxY3l5NW5BOXpLSVFlUG5vT1I0bklxT3BNMW1u?= =?utf-8?B?Z3B5NHVmV2ZaMTZVMDI2Q0tSbXZDMGp3MWtCNVNHSmtxdGFtOHVzOGJrNjAv?= =?utf-8?B?SS8xcXRidmFKU2J0UU9IeTZIbDJHeFBvTTdMalVvZDNRWlI0ODhjNTljWUdN?= =?utf-8?B?VUk0bGdKU3hFdVZCODhGQzhzd1RGRnR1Y2I3TzBxdWdaOHhhM1hlaUxqNllN?= =?utf-8?B?U3AyWExCZ3JuZE4zdDQ5VEhwYzg0blJKczVHc21PNTJwMnpwZTJoTXhhSU1L?= =?utf-8?B?L044NDRORlExRmxnWjJRWi8yK2lvR0VZWVMydis5SXVWVnI5NTM3K2NtUTRz?= =?utf-8?B?R01PWmNLRCsrdzRDcXB2MGZta3hhWGhBRVRMZk5OazVnZFE3OFJ3ZDFqZXJu?= =?utf-8?Q?MHZ+NLlg2fCF9/kjnR0EGuuR+uLakBqsrlB4u?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04c4048f-356f-4b5f-0489-08df0710984b X-MS-Exchange-CrossTenant-AuthSource: GV1PR04MB11513.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2026 03:33:16.9199 (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: taLHwtFl7nzNXETSiCzxQE9S3NcHV7K1q8LwTaM00mB9V33C+0FnWa/TMaaiUZ96595iZoi6tNVrFXmXTMKnSnwYTlRg3hY5TvLkCwrb1n3+9G+h9re3aKYA33J1mb2R X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8772 The model field in struct mxc_isi_plat_data and the corresponding enum model are never referenced in any driver logic. Remove them to simplify the platform data structures. Signed-off-by: Guoniu Zhou Reviewed-by: Frank Li Reviewed-by: Laurent Pinchart --- Changes in v2: - New added in v2 (Frank) --- drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c | 8 -------- drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h | 12 ------------ 2 files changed, 20 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 c1c16dbc1539..e627054bbc8e 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c @@ -291,7 +291,6 @@ static const struct mxc_isi_set_thd mxc_imx8_isi_thd_v1= =3D { }; =20 static const struct mxc_isi_plat_data mxc_imx8mn_data =3D { - .model =3D MXC_ISI_IMX8MN, .num_ports =3D 1, .num_channels =3D 1, .reg_offset =3D 0, @@ -304,7 +303,6 @@ static const struct mxc_isi_plat_data mxc_imx8mn_data = =3D { }; =20 static const struct mxc_isi_plat_data mxc_imx8mp_data =3D { - .model =3D MXC_ISI_IMX8MP, .num_ports =3D 2, .num_channels =3D 2, .reg_offset =3D 0x2000, @@ -317,7 +315,6 @@ static const struct mxc_isi_plat_data mxc_imx8mp_data = =3D { }; =20 static const struct mxc_isi_plat_data mxc_imx8qm_data =3D { - .model =3D MXC_ISI_IMX8QM, .num_ports =3D 5, .num_channels =3D 8, .num_vc =3D 4, @@ -330,7 +327,6 @@ static const struct mxc_isi_plat_data mxc_imx8qm_data = =3D { }; =20 static const struct mxc_isi_plat_data mxc_imx8qxp_data =3D { - .model =3D MXC_ISI_IMX8QXP, .num_ports =3D 5, .num_channels =3D 6, .num_vc =3D 4, @@ -343,7 +339,6 @@ static const struct mxc_isi_plat_data mxc_imx8qxp_data = =3D { }; =20 static const struct mxc_isi_plat_data mxc_imx8ulp_data =3D { - .model =3D MXC_ISI_IMX8ULP, .num_ports =3D 1, .num_channels =3D 1, .reg_offset =3D 0x0, @@ -355,7 +350,6 @@ static const struct mxc_isi_plat_data mxc_imx8ulp_data = =3D { }; =20 static const struct mxc_isi_plat_data mxc_imx91_data =3D { - .model =3D MXC_ISI_IMX91, .num_ports =3D 1, .num_channels =3D 1, .reg_offset =3D 0, @@ -367,7 +361,6 @@ static const struct mxc_isi_plat_data mxc_imx91_data = =3D { }; =20 static const struct mxc_isi_plat_data mxc_imx93_data =3D { - .model =3D MXC_ISI_IMX93, .num_ports =3D 1, .num_channels =3D 1, .reg_offset =3D 0, @@ -380,7 +373,6 @@ static const struct mxc_isi_plat_data mxc_imx93_data = =3D { }; =20 static const struct mxc_isi_plat_data mxc_imx95_data =3D { - .model =3D MXC_ISI_IMX95, .num_ports =3D 4, .num_channels =3D 8, .num_vc =3D 8, 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 05c21c448b93..73f6ea7b0ea1 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h @@ -155,19 +155,7 @@ struct mxc_gasket_ops { void (*disable)(struct mxc_isi_dev *isi, const unsigned int port); }; =20 -enum model { - MXC_ISI_IMX8MN, - MXC_ISI_IMX8MP, - MXC_ISI_IMX8QM, - MXC_ISI_IMX8QXP, - MXC_ISI_IMX8ULP, - MXC_ISI_IMX91, - MXC_ISI_IMX93, - MXC_ISI_IMX95, -}; - struct mxc_isi_plat_data { - enum model model; unsigned int num_ports; unsigned int num_channels; unsigned int num_vc; /* Number of VCs, 0 =3D no VC support */ --=20 2.34.1 From nobody Sat Sep 26 20:31:34 2026 Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11011036.outbound.protection.outlook.com [52.101.65.36]) (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 4BBCB3B1EC6; Mon, 31 Aug 2026 03:33:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.65.36 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788147231; cv=fail; b=jCV/4uVWUxxgGydGhB/3156uwCUfMX1axuMt5yHUU+xE61thhI1hfv+PyUPz0BkhjpZBsk86hgN1UqotOpRRwJ+QYzO+Lgs/xW5GVlJox50pQTFj2biDqU1MmYUR5qMALaf+3A8dx3c1OpQFdyqPtjd2f22TtTAYYrIuQ4LX5QY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788147231; c=relaxed/simple; bh=b2+iFGHfp7pqoZj60gf3HVqmK0WPfmWbeEuzUKZ91mE=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=IcOSDtrQQ3wLXI3u4clB2uwDkbLSLCxp4afTV9zyefRvS37F1qhpYglhuLjeL8K+pn6o45sAd6CF28Z4V/Q9KaLToRFaXv6BWMkC5Gs+c88iqew4YxLIlKOSjcKTFlH1iWcobKZhW0RRgiJOvSBzCtfXr08IrOmlcBu89dvTwDw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=D9hAh4Ys; arc=fail smtp.client-ip=52.101.65.36 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="D9hAh4Ys" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=np/t/+APd1VU6PR3oMeU/sGSpHDKmvSldjDwwVdY+dIcw6FeA+iYVKzuHZlEczyTLmyvl6oeQZVK+f+jij/cENfmcz0lbuLg27pgi3DjO+hSdPRP86ztxGDtlfxY5TiWGSWSiMYCWxDPANYG6nEWOMv22ofjZ4tpHv1NdV7aH+lFyilbu/Xk2ecGOHMb1vU7j43lbk+7qbcp6nPhkCamIRdkuAoKt8/T24c3N/L374EbEb+4xTpzBzqlvNoiZavG8/hPXzVO5fsuYz8j6IMtLzujSJqT5do1PxMjtiGINmIZ2vIJ6j+t1hAeinWXfHQsgacprW4sFhQJSlKhJaZqXw== 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=GIw48S+BPKSfqu1wXSRbqyZ1VBGaoNV+d/21cuLImTc=; b=ceWv2yEIwvG/m3OCzO8AqkoO2xvf+sET3kDrHCpbRyYa5+LX8tMvHm190n96kHZDoZSZN+l3pHgT5Gn1HCNgeDGAKUNKR3h6rhO1j8imXaBGGnRvg/GoLlKeqMeekSpgHO7AQTuD3QZwSDlsW98O5/wiHj0N/Q7X4LRIhPmvxAUEx8c8rRki2BmKhqMQG479gW1P6twMKHDbtR/e9FZWUKgivwdXWG6FUsuxx9h2msmntGMaGjS/Ix1fM1Z2Pe3AP05O8RliR2Ox+iM2b1Jc5LYmC9kDuX3N9d0nN99+UPh+X5YYexNmCYXFRSVygZLnpptRwSTJqA8L+4HSoHmibw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GIw48S+BPKSfqu1wXSRbqyZ1VBGaoNV+d/21cuLImTc=; b=D9hAh4YsKhzwuCOuTCaIhwsKuxvPQiffoipulzDjz0sp2bO9dPxFjLHdajdUKrxOPsvo9y1gzmcdJDk8lZD0x72HdtzqzICjqLBOkf2BlMbL8665gJFYz6hp/02QQ4+8AkVdNiZx3+7ZHC/OEGsTOZx4KTfVbl08Hu/NHo9QihNWrKHiTBzYTGCVKMh1ZS6jMTOnB5b/mv1+6wJJtYklX34UezER9tGV+k7NKzEuUuUbYvgVRAzE5IhLUpC1lScgyg9EgEVqjCKhEz1couFpGio1/u62HQHLRgv8Zdq4OBtHM9pggEQh4L2kWOr+JBlyL8905MBZqwzpI8tEevTTZA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from GV1PR04MB11513.eurprd04.prod.outlook.com (2603:10a6:150:284::9) by AS8PR04MB8772.eurprd04.prod.outlook.com (2603:10a6:20b:42f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.13; Mon, 31 Aug 2026 03:33:23 +0000 Received: from GV1PR04MB11513.eurprd04.prod.outlook.com ([fe80::29e0:98a1:4577:2cc7]) by GV1PR04MB11513.eurprd04.prod.outlook.com ([fe80::29e0:98a1:4577:2cc7%3]) with mapi id 15.21.0360.008; Mon, 31 Aug 2026 03:33:23 +0000 From: Guoniu Zhou Date: Mon, 31 Aug 2026 11:36:59 +0800 Subject: [PATCH v2 4/6] media: dt-bindings: nxp,imx8-isi: Add i.MX952 ISI compatible string Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260831-isi_imx952-v2-4-fafdb4b446d4@oss.nxp.com> References: <20260831-isi_imx952-v2-0-fafdb4b446d4@oss.nxp.com> In-Reply-To: <20260831-isi_imx952-v2-0-fafdb4b446d4@oss.nxp.com> To: Laurent Pinchart , Frank Li , Mauro Carvalho Chehab , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Loic Poulain Cc: linux-media@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Guoniu Zhou X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788147422; l=1377; i=guoniu.zhou@oss.nxp.com; s=20250815; h=from:subject:message-id; bh=b2+iFGHfp7pqoZj60gf3HVqmK0WPfmWbeEuzUKZ91mE=; b=RCZITq/pDYgNvK4z3eg2b3ue+04ylWEBlNP/xaKAq/Q36Pk4A6BuiZblOFK5KrSuBgpD+VKRh oWRGwqrrypFAtkNFmDXX36aCzzwoPsLrbP7YnwQz5fLtFSVha3A/Bq3 X-Developer-Key: i=guoniu.zhou@oss.nxp.com; a=ed25519; pk=MM+/XICg5S78/gs+f9wtGP6yIvkyjTdZwfaxXeu5rlo= X-ClientProxiedBy: SI2P153CA0032.APCP153.PROD.OUTLOOK.COM (2603:1096:4:190::23) To GV1PR04MB11513.eurprd04.prod.outlook.com (2603:10a6:150:284::9) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR04MB11513:EE_|AS8PR04MB8772:EE_ X-MS-Office365-Filtering-Correlation-Id: a56c7f70-2068-43e8-9d6c-08df07109c08 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|19092799006|23010399003|376014|7416014|18002099003|22082099003|56012099006|11063799006|10067099003|921020; X-Microsoft-Antispam-Message-Info: D5dz8WzTnt18rZ9i6iHgwDzeCTuMD4YqSb9hBWUvQoT8nx6BtwhwCwGZm8bm2uEM4oUReXSqitU0sMnh2xUb/b6MEI9rMgQiJHzyuL0S1wwBCOBPov8Nnb33PhLsf6eSP+OjrYUNAwBSiHOHQEnu/JW+Tjd2xTM8FbiuonsgxKU2RKt5107TKxDTlfzWpWylCxugdh9gU/LSB1DvTsHU1+c5EiF7kVt+JD/gkoYY1uwmbRi0T4hoKHPrXEqp5aLcjWQgipaAQ4Ac39tw771qq4uaN2gxP0GCRVabZeQn2FptmrMGVopRGAUUcHiMXiP18OG2+ce9ElYMMZ5JKT02lKnvpUu7KUgJ5gz0gvV2BPV+CIF3kUXi0Mft4M+F2H/n76j9AF0ec9HEn+iZTKuTDlXKmmOTIscBS1esQF9OGwCpRGHr6QThXVkNDQlxq/ESbk4XzF5XL0dXbfujA2gRMmGv8YcbMuu3dk56BgXFwYY3sHCzjMTjkd70Zg5FaysBL3sUznhfz8+YXHuAV7i/Ijp8Lu9kX98+N3PRFUBZAzl6QJVX3iIuHVrb2BAut0wjx6NHpSPTKcKQLcKBbblSDWTLtwuyFGFiwqy3wU6Ox+zRzPb7Dbdy6PuXVvGSUuDtOVrswmZzOi39yNZJkxSE+HPLe9chDsSWpKwTc/RyZdhXO4wt5F8RIASrfqrlplbpAVXGiw/y51Y11kjnxzC2Hg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR04MB11513.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(19092799006)(23010399003)(376014)(7416014)(18002099003)(22082099003)(56012099006)(11063799006)(10067099003)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MXNUMFlEWlhEb2lFYldOTlhuMTAzT2duUklJMTVaYVRvZEdqSHdabXZKRVVF?= =?utf-8?B?a25ySzZBdzhjcFhKNGdXczgxUkt5NDNJam5QTkZkUGZhdFhyRWkwWjFXM3Rn?= =?utf-8?B?WE1CYVllS09uMVVxQlduYUphaWN3ZFYxZjd0RlRWU3NPTnJwajlFcm5MUEpn?= =?utf-8?B?dnpTQTZLMVp3WFFPQ3MvNHZlallkV3dsNklNUERweFdqSmsyay9Ta3lVYkJ3?= =?utf-8?B?ZEhseDJZTzdIMVhCdVdnblg4YWgwTGFoUVRRZjh1b3MzRmxhbDJRRUdGSkdv?= =?utf-8?B?Z2dyTXBiaGQwTlRjK2FUVGxmWEJIS2NuSVR4Zk9CWVI3dHVrMW9IN3pJRExz?= =?utf-8?B?Y0FIa2tCbFZJRDRJeHBybGNYcVRuOFp4U3NBKytyUllTZHFZbXdabVpYdUhn?= =?utf-8?B?N2lXTUdKaHowMU1WMU9hNkpKQmNubThGclBNTWtjOEFEVlZqZWFobFMydWFv?= =?utf-8?B?ZU5iZ1JqQi84dk5MWjhGcnN3dUZTd3loWjZQcEVvRXRGdVg1QmxQc0dkUTNy?= =?utf-8?B?SWxlUmtJQzFlZ3FNcEt4SC9aRkIrQzUzOTZ3SWxuVU9id1FIK3Zqbmh2NDh2?= =?utf-8?B?cTJyUWl6dGZqTnBpTDJrT1ZYSi9aUkVRVng1K29PbjZud3h3R1pNNmttZDRF?= =?utf-8?B?b1dmeGhFMGdtelJFSVBWd0xpZE5PU3NiRkVvd2w5TSt2WjQ2T3RJamVVaS85?= =?utf-8?B?NkpZd1dTYjRJNndzOEpRc2JUWDhTSGhMOWJZS2cyNEYrR3VINWRrbkgxTC9s?= =?utf-8?B?YXlXTHh6d0JMNE5xSzlQV0N5ZGsrZFhpeThwak9NaWdCd3dOLy9BSFhuNjhI?= =?utf-8?B?blNaSk0ydUpZN3B4US9Fa2RsZW1VR2s3Y05sU3Nyd2JpeC9oWjQrTUJqRWlo?= =?utf-8?B?c0NheCs4emdlVFhZYWJoRk0vQysyRFVZOU41djJ6TG0wRnJnV082N3ZPWkRt?= =?utf-8?B?ZGkvWlB3NHcrV0dmakxybnpvUndxL0Q3VEc3ZFZ3SVZqOTJUWjNZdkhzZTZr?= =?utf-8?B?NVhnZkJkN0JpeUNIcDlCbmlSeWg0N0RzWFZRMDloTXkrNERSM3JTeHRONGc0?= =?utf-8?B?dElSaENOUmZaZjNjRDNGTXNpKy9lemhNUnRiTUMvaDViS1hmM0VRbE9DWkxp?= =?utf-8?B?Qm9HZ256Yk1jNGRTOHkwZ0xoSXJtUzJsTkRSdy9TQjdJMCtJcExncFliMzRZ?= =?utf-8?B?dXZ6SjB3d1hxNzRqaXltUDRPNlhZQzNEdVZGMThxdDVyOExXeW12ZEp6aUVp?= =?utf-8?B?NFpKS2ZPVHdlS2o0UFlmaXQyajVrK2xVUjRqbDJEcklmaXR3RDlPbmZXelpj?= =?utf-8?B?UnVNMkhzTlFVcis4QkhGL3I1R29sNWRnUld0bTVaajhiRUtSR09xSnE0eVND?= =?utf-8?B?VnF2eENQWlVEeDRoK01qcDh4MHpjOHU4Q3RUTndlcGJMcWtjalFRYTlWTUlQ?= =?utf-8?B?SlBRNkRGbWEvRkRadGxqTzVVcmdGSDU1VUphTENpcjg3MWs1RWJrUGl4UzRu?= =?utf-8?B?Nm9qaVdQcUZLZ2hReDBGc0RPNm1sRWdqa01qM0ZvcTRxSVJtbTYxTWFocnNa?= =?utf-8?B?YS9pQ2psMjJSdFVrZDNzTVF3UEd6ZGVXWkc5Q01PYmhuRFhoZSt6Tk9kVnlO?= =?utf-8?B?UUp1QUdYM3FDOEE3UXVQWWxIb0hBbkVvVWwzc0lFSGFOTHd3dTRsZEh4WktP?= =?utf-8?B?eE1LNTNDZlRFc2hMUC9PbHBFdmxnZy9iNmUvWW5ZUDBpNXA5UjFIYkM1MlZD?= =?utf-8?B?VkU0dGdSNGI0dDRMUk1ncjdEdkhOUktSRGxQY2x2bVZBajFGY0VZNHFjcVVN?= =?utf-8?B?cnFBYlNLUzk3ZVNUTC9xcXRBbjJ2V0VRQm5tYThpeS96S2NWbUJrM1U5ZVVJ?= =?utf-8?B?TXNxajN2SEhSaHBlZFdaYk01TFVJQW14ck5mUllzektSUDlKdXlCVDZSVzBV?= =?utf-8?B?bWRLcTMyU0NNbE5CUFl4WnoyM0xvOFBqeGxIdHY3MVdMQUV5dllKbThZbmg5?= =?utf-8?B?SkQyOE5KQTJrdWJ2WDUzRy9lT1ZESFRqMmpQcThVU29oT29GUWNQTjFmTnRq?= =?utf-8?B?WnpOK3FPVlZQMXhxZmNrcjVraDJ2TVcxTlF0SDdJOEl5dGp3SmdqaS80WVV2?= =?utf-8?B?Yml5aFJzSmEvcWNHNkxBbEpjb0k0WDBXNTJEYlozVG8zcHgrMVRMcm0xZHUv?= =?utf-8?B?Y2NSN1hEK0RtMXljK3pWcFZZMVpHM1gvMjRXbnFNUHdCcitiYmxKNzFzdmVO?= =?utf-8?B?azNLWXNXejJVUm1ZUHdRSWdER3RubjFpeDg3eStsaWR1MS93Y3NhU2xzUFNv?= =?utf-8?B?OE0wd1BHM1RHTzQwT2ZZWEpCZWJCVkN4L2JVS3IvOUZ1R2VPYm9DRW96YVRF?= =?utf-8?Q?eHHZi4uhROYecqrry0emZIaVBTNE2itJdLxGw?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a56c7f70-2068-43e8-9d6c-08df07109c08 X-MS-Exchange-CrossTenant-AuthSource: GV1PR04MB11513.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2026 03:33:23.1930 (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: Rswv2r97eVft42c+Ye7/WYVnC6nnoMzgmtSEyOu/OdIgLD1dXC8qVb5I4+Hcg7vgmzVvhj8+hKvsrEYY+swZkNYnBSbZAAgtslK+1Pputvc0Tdk88DCvPclBe7Dxaf9W X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8772 The i.MX952 ISI is a minor silicon revision of the i.MX95 ISI, primarily addressing RAW data alignment. The core functionality remains identical, so the i.MX952 ISI uses a fallback compatible string to fsl,imx95-isi. Signed-off-by: Guoniu Zhou Acked-by: Conor Dooley Reviewed-by: Frank Li Reviewed-by: Laurent Pinchart --- Changes in v2: - Use fallback compatible fsl,imx95-isi for imx952 (Frank, Conor Dooley) --- .../devicetree/bindings/media/nxp,imx8-isi.yaml | 18 +++++++++++---= ---- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml b/Do= cumentation/devicetree/bindings/media/nxp,imx8-isi.yaml index 279c9cd3034a..d0a99f00a45e 100644 --- a/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml +++ b/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml @@ -18,13 +18,17 @@ description: | =20 properties: compatible: - enum: - - fsl,imx8mn-isi - - fsl,imx8mp-isi - - fsl,imx8ulp-isi - - fsl,imx91-isi - - fsl,imx93-isi - - fsl,imx95-isi + oneOf: + - enum: + - fsl,imx8mn-isi + - fsl,imx8mp-isi + - fsl,imx8ulp-isi + - fsl,imx91-isi + - fsl,imx93-isi + - fsl,imx95-isi + - items: + - const: fsl,imx952-isi + - const: fsl,imx95-isi =20 reg: maxItems: 1 --=20 2.34.1 From nobody Sat Sep 26 20:31:34 2026 Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11011036.outbound.protection.outlook.com [52.101.65.36]) (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 7E0993B5E19; Mon, 31 Aug 2026 03:33:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.65.36 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788147249; cv=fail; b=Y2p1SKeegVS+Fii7zkZ1DjLHDjlBjwT8yuqBW8qbWK/XY0DYsG6HhDlIaZ3x3aPSJXeP9s4FnX552Jmf5Vox65A4FO/R7pwg/Bhqd8gkMK5JywjeOHNKqMN3YW9os+6yPMvMgdAGyMhctjJTNBHaDnMWG9n1rhj1VBmzxv7QMxo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788147249; c=relaxed/simple; bh=50hUyr+pXxzHsJvnoLfvNlhLPBM0UyOYCHlZsxlKhN4=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=giepaTC7NxkcoUtTz3zXMq+//0a19MBC6G4c+zQ27+QjQmh59Mdj04wQRsenrLMe5JImfVjNw3yjqqw1aoiWxqGms5YHq8JGMgrIA/0k5ker0aSyVTb4avV+4nfSavDlWEQaSkGRUbVjTuQtMFcLVF2rjM/umo5FKt4HPnRbRMw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=hRLy48qZ; arc=fail smtp.client-ip=52.101.65.36 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="hRLy48qZ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hFS7GTnogztre8QK8+JbseALZFC0Ox6SU7/4hJzCeMbqamrENJx9CfjTkdUCCSIeb2vETO0M9sfaNi27HDvwCKno0YwdE783HRGYNaZamUqk2gK72918XKoSQf0f/7QycP7g5nmAMsdYBk9x/ifE/1h+R8Q68pY16HhtILGoVx/dW8rIcIPNKo8/J3W0XBZSZyTypb40M3umxtqd28rpFAyNAZhlxgNjI31cB6n7guEl+9F3APsIQ02bOh5GWjUQSo6DVyBhUk5+ue/iPP55ZUW2xhdpaugiUC3/NdXxj64bO+JcBC/1xr4rrD406XGIAzETYPUBpiXypZYiQzW/3g== 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=zEQjpJEnKW+LzzFEgBFtWQDqxFwqAn8cHv3kqaMTlDs=; b=K2/LF5QX7TWVvXFUqyk+3xpknEWjuX2wxbkRoYsrmG5wwf3m5oU8L+jXxpkZxUPOmHLz3yYPwOEUcxxvPJQhNNDBCWrUVvyYVYrNewLtHppLyeLNUfD4433nylMk5DiLvnIV3GOOJ7frWXJOJLLK7s+yEiTs/r51vHrwbnbEmFjTRtmaRNFFmF6VFXvvK/K9FtmQsTkacre3Md8cvYUAWYdSA7p3HNk8IqpfP66/d8YWzuE339UIeNLWfhmZUIXCbRyHN2DmRxXf67PdLb0YvV3b+OlS9EZtkAKD6Rxvz2Nw6qmjSOsLiGWDQSVioNgnZycu5PdWzI9weY/BEZlqnA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zEQjpJEnKW+LzzFEgBFtWQDqxFwqAn8cHv3kqaMTlDs=; b=hRLy48qZl9bqylO13iPUXwSN7aUD52Z7AqDhaGEFEw2MP7Wb5nUSComfgHsA1M6RJRAIED+6DresC/r/dfuRICMr07vQel2ChGm5J7J8dIqBYMhcdM3hgDOOzxcGuZY+snpkNXq6JjUnQ7X15iiNgXOJQmV/Gp/1ovljT+QvQ/MI1MCpOMNigGIgPviHZq1QbsuNA2RHutig3Cdj9fQ/lV3Xp4TTeuPdCHQ0Xq3v8s3WP7628I6nVuLGG1yIFRzoKqQXMS521zGXmFkyY9yC02L9ZJ6j92gmGJWGDQmTnY+ohbLV4FieKH8WMqTZLLV9nEZrtCAVCh4K1uVIDYaRcg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from GV1PR04MB11513.eurprd04.prod.outlook.com (2603:10a6:150:284::9) by AS8PR04MB8772.eurprd04.prod.outlook.com (2603:10a6:20b:42f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.13; Mon, 31 Aug 2026 03:33:29 +0000 Received: from GV1PR04MB11513.eurprd04.prod.outlook.com ([fe80::29e0:98a1:4577:2cc7]) by GV1PR04MB11513.eurprd04.prod.outlook.com ([fe80::29e0:98a1:4577:2cc7%3]) with mapi id 15.21.0360.008; Mon, 31 Aug 2026 03:33:29 +0000 From: Guoniu Zhou Date: Mon, 31 Aug 2026 11:37:00 +0800 Subject: [PATCH v2 5/6] media: nxp: imx8-isi: Add i.MX952 ISI support Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260831-isi_imx952-v2-5-fafdb4b446d4@oss.nxp.com> References: <20260831-isi_imx952-v2-0-fafdb4b446d4@oss.nxp.com> In-Reply-To: <20260831-isi_imx952-v2-0-fafdb4b446d4@oss.nxp.com> To: Laurent Pinchart , Frank Li , Mauro Carvalho Chehab , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Loic Poulain Cc: linux-media@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Guoniu Zhou X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788147422; l=2332; i=guoniu.zhou@oss.nxp.com; s=20250815; h=from:subject:message-id; bh=50hUyr+pXxzHsJvnoLfvNlhLPBM0UyOYCHlZsxlKhN4=; b=TbVxodxDfkgK/vxMDtViMzQXiBFThkBudtx+GuLPGcUZD3xekSZz9LU2tF6RbtT0SPqcKrO2S dRD/jZkOHuVDIuNN8bVAHULELGJIYakZtY5JVs5Ri97O8x53FN1E9f4 X-Developer-Key: i=guoniu.zhou@oss.nxp.com; a=ed25519; pk=MM+/XICg5S78/gs+f9wtGP6yIvkyjTdZwfaxXeu5rlo= X-ClientProxiedBy: SI2PR02CA0007.apcprd02.prod.outlook.com (2603:1096:4:194::23) To GV1PR04MB11513.eurprd04.prod.outlook.com (2603:10a6:150:284::9) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR04MB11513:EE_|AS8PR04MB8772:EE_ X-MS-Office365-Filtering-Correlation-Id: e42e12b4-17a2-4826-8d2b-08df07109fba X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|19092799006|23010399003|376014|7416014|18002099003|22082099003|56012099006|11063799006|10067099003|921020; X-Microsoft-Antispam-Message-Info: Hums45XvKPcwE2Q6Puzwz8nW6ckBqd2etQddZ52DGfPg2p/KeMumiwulP2aisnkoaN4O6kEC8oxbYa0U6Yh7OptqWv1FX2DCTyZ4OxVzQ7T4JmcvrdI375N2djIDZUSMWRhO2zOF+4LqfHvUK8/lClm6CDU7XGUngmIvEgdC5qfzR4tenqklFOWuVSSnArTwCjAt5Es+AsSVOCqV1B5IQ3HAmCxbS4LIGLs2I6JHozWUPvlSdx4w29/i6QnnJu8wOaZZCTIHdZCS7ER2+L4H5oVhvvMvfV3fAFcKys29bbCU2IcMOo26LxWUnCbvLoDD9YGTA/FioNX3Vz5jW8od8cByfKoNvdx/QRpkXSkW2YmQgbfT0EgBo86aGYHdz6I+5RdZls45SBeilMXLR8iBqM0HuC4SM6ANc7rwLHMBwAD4N2H6CBnHlAGfTK0hslYoZ+h+BcogcegovL1NoRmmysiUCMxV49Mk3O142Cg67hZOW2JU9RSmVT0ueuRKWcTDNEkAQO43Y6QAhrN1XAychIycCTG2DTmKtzuaQ68LH6pH53t7iBEqbgWYd3J7Wbm9W9SY0cxyRJcaLBuY4pNkDEj/UXweLzqLfUravjFM/Fxd6naLa5kK9tppn29jnXzSMoHido1rD+9THSUcuUm2h8vMj6iuY6GSpDEq8oHSpsT5lRJ3kh/WJBLij4moCPWYD89US/uQxdxJj06N88XcPg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR04MB11513.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(19092799006)(23010399003)(376014)(7416014)(18002099003)(22082099003)(56012099006)(11063799006)(10067099003)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RUc4R20vOFptQTg5NFgzcnN6aEFTN2VDY0JSdDJNQU5yTm4vdHFkU0ErYXF3?= =?utf-8?B?TElWTFBJa3pKWE14MEtVRlZlckxJeXI0T0piNkVsNWFUaTZ2SGNGUXV3SXNm?= =?utf-8?B?NXc3YVIyQ09qbnA1NkcrYkRQWW9SQ1ZjdDlpMXV6MjhwcFI0bXZjVm9DNWxu?= =?utf-8?B?WU1xMktlUjBidTBhakpEM0FEaTVzUWRJMXp5NmxpTlg1UG14cmdvbnZvNTUw?= =?utf-8?B?b0VWVkU2cmtNdnpjU2EvdkJlMGd3alcvbTcwZnF4Q0tyZjI4ZGE1VGROakFN?= =?utf-8?B?cmVsbE50VnNFOGVHK0FkS1JDMXJURGdCR1VMQWl5ZVc1S1IwQWhaSDFOWlB6?= =?utf-8?B?bGZxdktYNEVLVmpvbFZobWZkZytEa0c4c2xOMGhXUVV5aGI5aWFXZ1NMRW9Z?= =?utf-8?B?bkVlbFNESTd2MVVwbHZoNEhPWlN5cDFLUWhUejBEYlNtbnA1Y0VPZDJ2cHpG?= =?utf-8?B?TEcrKzBrQnVoTGFJdmh1MmlTRDUxTHFvZ2Z0TEU3dEN1VFQ2QSs5dk1BeGNr?= =?utf-8?B?ZkttdG1BT20yTlBnYVEyQ1lQSEpvUlpFZTUyc2paQ205ZkJ5WmdHeG5ucWt5?= =?utf-8?B?V0tKY2RKRVJTMjlKWENUanltL3VWeUNzZjVjcnNtQ2d4elNRa2o0aGtMNmQw?= =?utf-8?B?K3BhQmc3aVRDM2FtUkhRWXJjTnorN3hTT2VZcUJmR294U2lQUWZ0NmRxZFFq?= =?utf-8?B?bC9vNmQyZmRydWxPbERLTVh5endSbUZUSW5xN3dERzRUdjUxWTFLLzBhN3R1?= =?utf-8?B?OEtTVnNVNnUya0w2Qy9yUThvWTlQU2ZzcGF4aCtMOXUydENjWlpCZEh0VXBR?= =?utf-8?B?ekhQZWlOUS9xZ3NjdEYwY2dnaWU0WVlYb3hsK3NtbTBxVUtqbXRmZytTNGdZ?= =?utf-8?B?VS92RjVSbSttaGRtZ3RXYW9ZOUdhRmJtOHd2a2toOUphVDlkS1dGa0lzaTYz?= =?utf-8?B?dXlKU0hyQ2FMQkxVcEpjSExIZ09lQ0ZRb3NMZW5YcnoyVU5FTHQ3M0htRk1P?= =?utf-8?B?ZE9mb0RDVHA4Y1BGTGVNcDhieW5XaHIwN3cxU2dNb1lFM2NaWXpVbmN1cUxJ?= =?utf-8?B?b2tRUUo1aUZmTm5mejFMK3BPWW9yMXcrS1l1WG1nY1JyR1JhNk5udzBvOTEx?= =?utf-8?B?cGJNejVpQmJ6STdCd0JzM1dlQUkva0dJVkhVdHVCcVI0Q3A0dmc3K3ZnQlhI?= =?utf-8?B?ZjBselJ5cWZqMTlhK0xoZm1tTFhZeHpUdFQ3cGNBdVBjUTlxOHZ5c3N4emJY?= =?utf-8?B?SGRKOEcxZEs3Z0lwZzZlODdRMEFobmRiUHRZMko3eEhldE9yVU1IdlIrYlhH?= =?utf-8?B?djA2bE9WeEpvdU1aY08zRjJzdTFFYVM5OFpPSzBEQ2YvSzkrWVEvQmhFRnZN?= =?utf-8?B?MG9hOS94K01uYk8yZFl0cUhyUTJPNkdWcEFvZThjNEF4VjVGditESmxycktO?= =?utf-8?B?RkdhUGhQaTVRdmlFS0JBUGJDa1JlZWU2VW9xb0NYMVdNYVl3NlA4Z0pOYTNs?= =?utf-8?B?WkxQSlkzMFR0b0taejBNb1hZaXFwVkVrelBsUS95ZloveEJ1OFZZT0JKK240?= =?utf-8?B?OGhZNUNaS0hoMEtMdHREQWdJN1g4V01XYkU0MGVQTHQvMkFBM3hDNlo3MkZ3?= =?utf-8?B?Vy9YeVoyNHVDZjVZVGE1VW81UncxS0hiZ0V1MlpOSnVvdDZ3ZTN1RVdQbHJz?= =?utf-8?B?bTFWOHZGeXYvTHl2ck92aGYrV0JiNGVjQ0YvQ2NEQWpLVTYzSUhRalJycndK?= =?utf-8?B?Q2hGZHlZZUhpOGwyQlpSc2NxYXQrZEN3K1F4Q01ZMC9KUU01dWNOOUU4QWNr?= =?utf-8?B?RU1oR2JXQmhobTdCYzYxRFQ1OXZVZDIrTnB6NVZVTE1raU03aDhVK1hEV3F0?= =?utf-8?B?M05neGd5YlpQZ29VVWJQNGxtbHRsWS9qVEhjdHJCMW1Ua3dMc0ZUd09MUldB?= =?utf-8?B?UjRNN2dEQzU0T0pQUDFEaTI5ZGNTN3A0NHNmT09XYnN4MUkzMk9YVm5zeXZH?= =?utf-8?B?KzkyNHRLemo0OVloZnJ5Vnl1eHVPZjg0MXM5VHM2VU5BdXRGVmVPclcvcE8r?= =?utf-8?B?d1NtaGZIZ1RxZGdSNEo2Snh3ZjE1RzhoanZpaDV1MldhZy9iNTY1ODJEQXZx?= =?utf-8?B?UEFVTVZ1VE9BbUN3OVZyempXOFZhRnBjcHV2RHBEUWR0ZkJVTkl0Yk1nYUh5?= =?utf-8?B?WWdKVHdxRVBML2UwWG9WOWZId3ExMkF1cTNGd0tnajB0SzU0cUw5bWJuYmx5?= =?utf-8?B?TUkxMFlObkU5SkV2b045MEhKTmc3WkZHZWxSeFRxdm5JckxJTFl4aUY4Tmxo?= =?utf-8?B?TGFVYW1FdVJmaHhvMVJuQWZDUmQ0L3pYUGVtMDB2S2pJY0sycTd0WVZiOFh6?= =?utf-8?Q?lCvFwzwJQpvjr48HesnQpm3CZvMWT3GtHdI9Y?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e42e12b4-17a2-4826-8d2b-08df07109fba X-MS-Exchange-CrossTenant-AuthSource: GV1PR04MB11513.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2026 03:33:29.3880 (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: VUu8x5Ldr6irZLETaOidWA8kGD1i/U8emc9B9mm4lesXHUXc8Xe93C8moM+x8kt6NmbDIAk0nTkvYlLorhzLcIMdkhNEAVifv4fAIDU+SqH7VCl9RDqZu74IGh/RAO8S X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8772 The i.MX952 ISI is reused from the i.MX95 ISI with a minor silicon revision. It can process up to 8 image sources simultaneously and obtain image data from up to 4 pixel link sources. Signed-off-by: Guoniu Zhou Reviewed-by: Frank Li --- drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c | 13 +++++++++++++ drivers/media/platform/nxp/imx8-isi/imx8-isi-regs.h | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) 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 e627054bbc8e..d492631dfb6d 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c @@ -384,6 +384,18 @@ static const struct mxc_isi_plat_data mxc_imx95_data = =3D { .has_36bit_dma =3D true, }; =20 +static const struct mxc_isi_plat_data mxc_imx952_data =3D { + .num_ports =3D 4, + .num_channels =3D 8, + .num_vc =3D 8, + .reg_offset =3D 0x10000, + .ier_reg =3D &mxc_imx8_isi_ier_v2, + .set_thd =3D &mxc_imx8_isi_thd_v1, + .format_mask =3D GENMASK(30, 24), + .buf_active_reverse =3D true, + .has_36bit_dma =3D true, +}; + /* -----------------------------------------------------------------------= ------ * Power management */ @@ -574,6 +586,7 @@ static const struct of_device_id mxc_isi_of_match[] =3D= { { .compatible =3D "fsl,imx91-isi", .data =3D &mxc_imx91_data }, { .compatible =3D "fsl,imx93-isi", .data =3D &mxc_imx93_data }, { .compatible =3D "fsl,imx95-isi", .data =3D &mxc_imx95_data }, + { .compatible =3D "fsl,imx952-isi", .data =3D &mxc_imx952_data }, { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, mxc_isi_of_match); diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-regs.h b/drivers/= media/platform/nxp/imx8-isi/imx8-isi-regs.h index 7c4e736f4651..35dec3a650ac 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-regs.h +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-regs.h @@ -22,7 +22,7 @@ #define CHNL_CTRL_SW_RST BIT(24) /* * CHNL_CTRL_BLANK_PXL: i.MX8{QM,QXP} only - * CHNL_CTRL_VC_ID_1, CHNL_CTRL_VC_ID_1_MASK: i.MX95 only + * CHNL_CTRL_VC_ID_1, CHNL_CTRL_VC_ID_1_MASK: i.MX{95,952} only */ #define CHNL_CTRL_BLANK_PXL(n) FIELD_PREP(GENMASK(23, 16), (n)) #define CHNL_CTRL_VC_ID_1(n) FIELD_PREP(BIT(16), (n)) --=20 2.34.1 From nobody Sat Sep 26 20:31:34 2026 Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11011036.outbound.protection.outlook.com [52.101.65.36]) (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 A2E2C3B14B7; Mon, 31 Aug 2026 03:34:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.65.36 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788147265; cv=fail; b=KYfd8BIksxuVAfO7AXdPpORHXCt74flBE3Zjaf8gwYpg7pK3YdaO6AYlLewlCRXEKUcdlktfsaEaL5UUQuJfz+QmbWBnEigWJbT0ayhvNhB40wps+jFZNZUoD5qrTk4WvsBHuppYjh0kKTMH0zzcpapCmkYKiAYzIWvq63kZcmA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788147265; c=relaxed/simple; bh=5xyWWZQd7O01Z/gncoQTkhbSuzLyNt6H1+cWCi68e0I=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=AYpZgJjP6buxhatwKepquYYAB5Jj+YkvuE2h6Vs/l0RUa451GMCCHYaLCt3PDSSbP8oDFuyJMJ1MT6l/6m+xzeOE6xgwcz6xJzyFHwP9pBHyAyJHaOw76GihYIH8OaMXNBr/UxR+erBmOSGoVn/+SzSWOk7V6P4mrlIQ7PTrCAk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=OM/GeCx2; arc=fail smtp.client-ip=52.101.65.36 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="OM/GeCx2" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=etjISixESwbQekGD5zy0Ob5FR6Bmd56+bTj7tcZrGwr5NRx/bQmcWmMddBKYg/EI4+DkJc6wrd/51LLXn6SlFVIDcDoz2fuvKQAWEOTxIFLIV0oNWNC6SihrQOMolvHI1cX7OWOeeK8FB4qcC38Hpbqd94U9G3rAoagePO6Kv6CcnB+BZWvQXAK5PrswhCQ7pzDeXca6tuTs0GKojylXqbXS1i+wVWo8yZ7gvPvj1X1fGRyOHAULuJy9SuQPRT+CpR/YktoEN4VToBqmu2LVql0q+dZPslYKfGgTdBg3Ie7Yok/0FXYArx/2W4Y033nlD+YY6MIAgfF05U71EaAmDA== 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=rjFHTBcsIQ5A1s0AZAPNbXu7fz21KM1MU8Kho/zR7Wo=; b=NiW1XyHGrjcX0Fg8f5ptggvAKZG0zmxUqo2hPdbIQ4Or1XecqbL8jnBPZGlG4BI8YMle7nMkF2ealzia0M2+NxYKSolooDxn0nMVQ4fII1FXTpNppbbExjfPekOByBxH+UvY347vJP0UsJnaoBTy5tE+2A4oIEt1DttnErjo1FgUO2qyJstXGR1mGpmrS+bWpGEzlKBJx7AN9FQj60F7bLMXyBt60w73A+z1z8pwjBu3lhehWCQlssDJ7SKOw558u84GDYt/XjNVzVtCnWoLjRjlZ5wZ7JgNrJP2Rm3qiueVUrAk82QM5TUneQjdTwBlmRAMthChzwPp+BVHGpy8rQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rjFHTBcsIQ5A1s0AZAPNbXu7fz21KM1MU8Kho/zR7Wo=; b=OM/GeCx27eB1MyPFyRwSjOtPt0PzMdxoJIvZ32CgeG8qwEkSViXpGiGlYu0SbZ9ttPXmjyYO2Lmhx77fQl2Sm249zocNDoctBJMjzTNDgB7uTKQuWYus/6Y6fE1E8bQ5OLndrUI1z8YTOEInEVebqp1XuJXIi76/Dc8oUB2qlkNvqGNfIMPZElOYvTw9eg8SSKBr+7i4irfu591/LoAZ24lqnd+xqg8v0gSP6+OYBc6Z8XLRIWmY88GtZvQzcZuEwBgGF5NsZhNtGCdBkv1yy2P6r3CbBN86vzGiPXkDT9sb9UV8f51uCdsPZJ9LJD6TiEKopMaXHJQfXrZcEFXv2g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from GV1PR04MB11513.eurprd04.prod.outlook.com (2603:10a6:150:284::9) by AS8PR04MB8772.eurprd04.prod.outlook.com (2603:10a6:20b:42f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.13; Mon, 31 Aug 2026 03:33:36 +0000 Received: from GV1PR04MB11513.eurprd04.prod.outlook.com ([fe80::29e0:98a1:4577:2cc7]) by GV1PR04MB11513.eurprd04.prod.outlook.com ([fe80::29e0:98a1:4577:2cc7%3]) with mapi id 15.21.0360.008; Mon, 31 Aug 2026 03:33:36 +0000 From: Guoniu Zhou Date: Mon, 31 Aug 2026 11:37:01 +0800 Subject: [PATCH v2 6/6] media: imx8-isi: Enable ISI RAW10/12/14 output LSB alignment Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260831-isi_imx952-v2-6-fafdb4b446d4@oss.nxp.com> References: <20260831-isi_imx952-v2-0-fafdb4b446d4@oss.nxp.com> In-Reply-To: <20260831-isi_imx952-v2-0-fafdb4b446d4@oss.nxp.com> To: Laurent Pinchart , Frank Li , Mauro Carvalho Chehab , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Loic Poulain Cc: linux-media@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Guoniu Zhou X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788147422; l=12206; i=guoniu.zhou@oss.nxp.com; s=20250815; h=from:subject:message-id; bh=5xyWWZQd7O01Z/gncoQTkhbSuzLyNt6H1+cWCi68e0I=; b=k95/hsJjie9XP338IvRVZvHP9R7VDyIs5yg4HxCif1JjPP743/mhBoX+1Gm9kppXAdJbtiE/J 3vm/FH4URMLDAvYp0g1mNm+VxFWz4U8zy188ua2CTERSZtxdqleQgkh X-Developer-Key: i=guoniu.zhou@oss.nxp.com; a=ed25519; pk=MM+/XICg5S78/gs+f9wtGP6yIvkyjTdZwfaxXeu5rlo= X-ClientProxiedBy: SI2PR02CA0002.apcprd02.prod.outlook.com (2603:1096:4:194::22) To GV1PR04MB11513.eurprd04.prod.outlook.com (2603:10a6:150:284::9) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR04MB11513:EE_|AS8PR04MB8772:EE_ X-MS-Office365-Filtering-Correlation-Id: b9ea8338-96b6-490b-6cec-08df0710a3c7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|19092799006|23010399003|376014|7416014|18002099003|22082099003|56012099006|3023799007|11063799006|10067099003|921020; X-Microsoft-Antispam-Message-Info: 3GbLd8YWSzN0qujOJUglUDd0QaFIyXWX+Tin9Nc7L2U9akvNbkk4aNmEOAo/ntx6kEL3hx2yjv5c2SKYTvKhZXZnDTN8SetZxpvMvZJKa6PHXWvmf72StT5hulOmN6AvWWzRtIbLVT/xKGGk5JCTa9HtwMELip6TVoLKeda4irylCSQ9egYSzEkH5tABrg+biguHuCIvVV2w4glN4iN2Py03Y3Ny7sIXzFDwFhMzQcqc5tp1a9UNIZAGTvJBEMy4RZ4CSqxFlHlHyC+fU2euDDQqfwfDTxkkCFImVSNKY4UMoO7U1xvgSQGDF3lrvOr9CZjGa/m8QfrALCPWRiinE/hCf/ty3pyBJ4M51gRZZxDMdUC4owgyth4bAJ/ziFifAHc8nEmrOISyIziwJf4m+IwI5VSHm6QuTQKI57BOzpUEzOgXTRgwjEiMPz65Meks39QAcvy1Sw4cFFbrnzIAGeXjlc/MVLevx1hUoBm1ZXhbwdOZfAGW7YPl1O6AOrIgCY8bLiCakfPD3MRlwqBaRfqOXMUy9fltGypEkfdEnn0/Juv78CHvWMgVamMy/esuiaYK30isPTd8/tXJtQZECJ1I5Uv8TsIXQg5IgOBPrpVNSpys3BKBQtlpjhW9iN4qQLpGzsKDyiZB4leqxG1Fl3M9CZGwpRdz9PJlw5N8T1+HDk6KSPa1QiK3snngL1vQ3e+SVMt6dP1Lv59Y7DdEKw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR04MB11513.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(19092799006)(23010399003)(376014)(7416014)(18002099003)(22082099003)(56012099006)(3023799007)(11063799006)(10067099003)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YURBUXBQYjVHYzhaWUh1NHUwazJrQ21kNk4ycms1cHRVMHNUYnJkQ3V4SGxW?= =?utf-8?B?OVFHMWhVUXZkNkk5UWdsc2t0cUFIdUoyMmhuRFBxWlFTdzJFak1hVjk0aVQ4?= =?utf-8?B?a3pySHpZR3JVUC9BZGtKSVdVQjNKRmIwa01IVmlhdzlqb2d2UExSSkloQ0NR?= =?utf-8?B?a1ZVYUVaOExvbnZSZmhhbFg1ZUZKR01ERzJ2US9HSnF2MDVaNlNHQmdNRWxK?= =?utf-8?B?MnNHenR3VUo3WU9CWU0rU2FXWXQrUTNYeDA0UHhtYlpFTUgwaXo3V3U2UnFR?= =?utf-8?B?NWZpa1loTEZKQzhNb29oUVBVdmpVR0pFbGZKMUVsbTByckttR3IrL1ZKM1F4?= =?utf-8?B?S3dwQk9PV3hBd0xxZk5najY4K3FNMDhDaVRnQlJGZTZqaDlIQVNSZllZa3ZW?= =?utf-8?B?NTdFMDBEOGZETSt3VFEyNWJTYWpKMlNKdy9OdmFJZCtmMlFFcTNwN2U0MEN3?= =?utf-8?B?aFBrUzhjZFg3OUk5WTBLVWhBU1FXb00vcjQ3NUw1Z2ZodUtXWERySko3Qkl6?= =?utf-8?B?S0JJaTM0ZllnZmNOT3A4U0ZiaWFOaGdZak1rWXg4TW1qNVU5Z2VDWUxkTlJ1?= =?utf-8?B?VFBDYVdoZUtRMlV4TWhGYkllVjZucyttQ1kvZUREOWorWTVyWUlGc3NQVHpF?= =?utf-8?B?UHd3WFRoU2lUTGdpd0NLZkFLV1NFRDJHMHVQeU5NajZiTWpxNjZIdWFrMXFs?= =?utf-8?B?ZjVmLzQ4N0FoRFNXN3d2RjBEdWIxNzg4VGhkL1JIMGpWMzhIQzUyNWhKckxu?= =?utf-8?B?U0xIMnFJVVVwMHRpMmxqNzJLbm5IaGZDbjRIeUJsL3paa2JwWnRlaTZBeVR2?= =?utf-8?B?bE1RWHZ2YXFkSVc1UHlSUVMzMnFaakVPRiswN1hyeXN4ZGZibWJMeVJXSHYx?= =?utf-8?B?eXFETTBIZXZuakNKdllrZlFMdjRFYUc3YUNOUksvais4TEYzb2FvdlAyWnFz?= =?utf-8?B?NlZNUnp6RXFTOVFsbFZ6M3lYT1l2UjY5SXViWnpSNlQyOFJIVzVzaXUvTThH?= =?utf-8?B?eWRkYUgreUExaG9xbG5pc21iZm5EZ251TFVBYm00SURqZHhtS0taZXUyL0hM?= =?utf-8?B?R1k3bGVIWW5NUzhBTm5mTkwzRW1ZOC9oSFZxNTRyTU1rbElpbnh2TUt0anpJ?= =?utf-8?B?MmVPeGFpNUxXOVZxeFZrcXVSejFhYlo4VDlPaG9QbWNSZzl6clBLQXNWck1Q?= =?utf-8?B?TyszOFVPbDBZMFVOR1pBYm0zbkt6Uyt2ZHlnR1dqUEdqOXAwYjdod1NWbG8r?= =?utf-8?B?eGx4RllXcmtXcG9SNFRTYVFTZDh1VkV2SktGNDRkNGVDVWU1REJOcmdLY21m?= =?utf-8?B?VFVCQTUwa3VOdE9qVFZDeFpHS1RSUTZFb3VMV25mY0NqcGNaNmE3RE5PWWNM?= =?utf-8?B?eE5jQ1JBdkRhK1drOFNxVTBFNTNXTWNHd0ZsNkRtT29BUmRYdFc2UjY0WFRF?= =?utf-8?B?OUMyK3A1eFlkMGdsT0FKb1pNK3l5MG04TmErWjcrbHU1SFpxVk0yWVNSWlJX?= =?utf-8?B?Y083ZCt1cnN5N1JDeFpVMm05QjJZQjdXeVFkZGtJSVl3OUtzZnk0dDk0YldO?= =?utf-8?B?NXFPdk9yczREdUhEdWIreHNpWVNnQjhZQVlMaW1OL0FKYzY4SnB3TlY2b3Ns?= =?utf-8?B?NlZQYVVyZHdDUkhodUI0Y2JSa3lZU3RsR05QL1VwVzNUM2U5enNEaFZqYUx5?= =?utf-8?B?eWRqQVlGOEYzUE0vNndpNjN0aUthYXAwYzU2cXYwM2RHbzJxYU92VDJrYlF2?= =?utf-8?B?Mmw4YWE1bHFNejlSeU1IcjFIeDVEdDZiMEdrRWJYQ0Znd2dhaUhXYXdRbVlR?= =?utf-8?B?MkJMVjNMZ25VVE56Y3MzeWdVdldQT1VNUm0yUWVXQUlLOWRUVHFhMEtiVG9G?= =?utf-8?B?ckNSVjBma2hUSFlqNituRHVCbjlwTGE4SHR1eFRXbjNneDRuWHg3WHRBMHlo?= =?utf-8?B?Q3dSaThicTZSZTVRcVNMYlpQaDVUcjFicHRYcTRLbE0xeG1jTE1Ga0tvZ2Zr?= =?utf-8?B?SzdrRGhUNCtVcERHV2MyYjkzTFBOaWFzTmt0TmZFSUpQMUFCaUkvcjFDNUZ2?= =?utf-8?B?RWR4SDFxU3MxaFozbkorcG9tMXlkV01HZjVlTmlVQmxtK2hheEJPOHlRcjdU?= =?utf-8?B?anhiNDh0T0xzNUhxM2pxVjIyeGZUeFQ2Qnc2bm9GTDBDWGR0ZG5JMm5QVmxY?= =?utf-8?B?YUVXYzA4a3kyUkVyUDdWUWtCTUxCcnZUczdyNUoxVTJpQmxRTWpqcUVjSER4?= =?utf-8?B?YXlmckpUbURDWU8zOVFPVmlOSUNzZlZNSjJzb2h3N0ovbTJSTkZLTGVGMlpO?= =?utf-8?B?YjFBOVQyeFZ1bDhzNUQ5RTgyVTJvRE1vVStBekU5M3FyOUY3OW1KUVFKd0V0?= =?utf-8?Q?QMv72nagEPfuzoMpm8XX3OpygFhRpCZz2A5Ws?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b9ea8338-96b6-490b-6cec-08df0710a3c7 X-MS-Exchange-CrossTenant-AuthSource: GV1PR04MB11513.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2026 03:33:36.1363 (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: JaOZ6rrLj1N0yrS8kgaUZ/mubMreKU8b3oA0J8s83892cCeLKtGUCcXxkk9bpwwYJfnXFY/dbUVTdWwP8QLDDp/+oMwDddT03tlBWw0/+Ck+4w4XKw1/2TJDO56Py7J/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8772 V4L2 requires RAW formats to be LSB-aligned (right-aligned). Before i.MX952, the ISI shifts RAW10/12/14 output left to MSB, so the driver works around this by using RAW16 format instead. The i.MX952 ISI introduces a RAW output LSB alignment bit. Enable it along with the input MSB alignment on platforms that support this feature, so that RAW10/12/14 output formats can be used directly without the RAW16 workaround. Signed-off-by: Guoniu Zhou --- .../media/platform/nxp/imx8-isi/imx8-isi-core.c | 1 + .../media/platform/nxp/imx8-isi/imx8-isi-core.h | 1 + drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c | 39 ++++++++++++++++++= ++- .../media/platform/nxp/imx8-isi/imx8-isi-regs.h | 3 ++ .../media/platform/nxp/imx8-isi/imx8-isi-video.c | 40 +++++++++++-------= ---- 5 files changed, 63 insertions(+), 21 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 d492631dfb6d..0f776fc8fd7e 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c @@ -394,6 +394,7 @@ static const struct mxc_isi_plat_data mxc_imx952_data = =3D { .format_mask =3D GENMASK(30, 24), .buf_active_reverse =3D true, .has_36bit_dma =3D true, + .raw_out_lsb =3D true, }; =20 /* -----------------------------------------------------------------------= ------ 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 73f6ea7b0ea1..c352bcf8dc47 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h @@ -166,6 +166,7 @@ struct mxc_isi_plat_data { u32 format_mask; bool buf_active_reverse; bool has_36bit_dma; + bool raw_out_lsb; }; =20 struct mxc_isi_dma_buffer { diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c b/drivers/me= dia/platform/nxp/imx8-isi/imx8-isi-hw.c index 2405f7d33d0a..4838b445f279 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c @@ -308,6 +308,7 @@ static void mxc_isi_channel_set_control(struct mxc_isi_= pipe *pipe, unsigned int vc, bool bypass) { + const struct mxc_isi_plat_data *pdata =3D pipe->isi->pdata; u32 val; =20 mutex_lock(&pipe->lock); @@ -357,6 +358,20 @@ static void mxc_isi_channel_set_control(struct mxc_isi= _pipe *pipe, val |=3D CHNL_CTRL_VC_ID_1(vc >> 2); } =20 + if (pdata->raw_out_lsb) { + /* + * Enable RAW10/12/14 output LSB alignment to match the + * V4L2 requirement that RAW formats are LSB-aligned. + */ + val |=3D CHNL_CTRL_RAW_OUT_LSB_ALIGN; + + /* + * Align the data selection from pixel link to MSB to + * avoid data shift since the data from PL is MSB. + */ + val |=3D CHNL_CTRL_RAW_IN_MSB_ALIGN; + } + mxc_isi_write(pipe, CHNL_CTRL, val); =20 mutex_unlock(&pipe->lock); @@ -406,11 +421,19 @@ void mxc_isi_channel_set_input_format(struct mxc_isi_= pipe *pipe, CHNL_IN_BUF_PITCH_LINE_PITCH(bpl)); } =20 +static bool isi_out_raw(u32 format) +{ + return format =3D=3D CHNL_IMG_CTRL_FORMAT_RAW10 || + format =3D=3D CHNL_IMG_CTRL_FORMAT_RAW12 || + format =3D=3D CHNL_IMG_CTRL_FORMAT_RAW14; +} + void mxc_isi_channel_set_output_format(struct mxc_isi_pipe *pipe, const struct mxc_isi_format_info *info, struct v4l2_pix_format_mplane *format) { const struct mxc_isi_plat_data *pdata =3D pipe->isi->pdata; + u32 fmt; u32 val; =20 /* set outbuf format */ @@ -418,7 +441,21 @@ void mxc_isi_channel_set_output_format(struct mxc_isi_= pipe *pipe, =20 val =3D mxc_isi_read(pipe, CHNL_IMG_CTRL); val &=3D ~pdata->format_mask; - val |=3D CHNL_IMG_CTRL_FORMAT(info->isi_out_format); + + /* + * Before i.MX952, the ISI shifts the 10/12/14-bit formats left + * by 6, 4 and 2 bits when using CHNL_IMG_CTRL_FORMAT_RAW10/12/14 + * respectively, to align the bits to the left and pad with zeros in + * the LSBs. The corresponding V4L2 formats are however right-aligned, + * we have to use CHNL_IMG_CTRL_FORMAT_RAW16 to avoid the left shift. + * After i.MX952, ISI add RAW10/12/14 LSB output alignment, so skip + * the above workaround. + */ + fmt =3D !pdata->raw_out_lsb && isi_out_raw(info->isi_out_format) ? + CHNL_IMG_CTRL_FORMAT_RAW16 : + info->isi_out_format; + + val |=3D CHNL_IMG_CTRL_FORMAT(fmt); mxc_isi_write(pipe, CHNL_IMG_CTRL, val); =20 /* line pitch */ diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-regs.h b/drivers/= media/platform/nxp/imx8-isi/imx8-isi-regs.h index 35dec3a650ac..c9c22a3668f9 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-regs.h +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-regs.h @@ -20,6 +20,8 @@ #define CHNL_CTRL_CHAIN_BUF_NO_CHAIN 0 #define CHNL_CTRL_CHAIN_BUF_2_CHAIN 1 #define CHNL_CTRL_SW_RST BIT(24) +#define CHNL_CTRL_RAW_OUT_LSB_ALIGN BIT(23) /* i.MX952 only */ +#define CHNL_CTRL_RAW_IN_MSB_ALIGN BIT(22) /* i.MX{91,93,95,952} only */ /* * CHNL_CTRL_BLANK_PXL: i.MX8{QM,QXP} only * CHNL_CTRL_VC_ID_1, CHNL_CTRL_VC_ID_1_MASK: i.MX{95,952} only @@ -88,6 +90,7 @@ #define CHNL_IMG_CTRL_FORMAT_YUV420_3P10P 0x3a #define CHNL_IMG_CTRL_FORMAT_YUV420_2P12 0x3d #define CHNL_IMG_CTRL_FORMAT_YUV420_3P12 0x3e +#define CHNL_IMG_CTRL_FORMAT_RAW14 0x41 /* i.MX{8ULP,91,93,95,952} only= */ #define CHNL_IMG_CTRL_GBL_ALPHA_VAL(n) ((n) << 16) #define CHNL_IMG_CTRL_GBL_ALPHA_VAL_MASK GENMASK(23, 16) #define CHNL_IMG_CTRL_GBL_ALPHA_EN BIT(15) diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c b/drivers= /media/platform/nxp/imx8-isi/imx8-isi-video.c index f45c2aae59ce..9a6a8302774c 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c @@ -221,11 +221,11 @@ static const struct mxc_isi_format_info mxc_isi_forma= ts[] =3D { /* * RAW formats * - * The ISI shifts the 10-bit and 12-bit formats left by 6 and 4 bits - * when using CHNL_IMG_CTRL_FORMAT_RAW10 or MXC_ISI_OUT_FMT_RAW12 - * respectively, to align the bits to the left and pad with zeros in - * the LSBs. The corresponding V4L2 formats are however right-aligned, - * we have to use CHNL_IMG_CTRL_FORMAT_RAW16 to avoid the left shift. + * The format entries use the native RAW10/12/14 ISI format codes. + * On platforms without hardware LSB alignment, the driver + * substitutes RAW16 at runtime in + * mxc_isi_channel_set_output_format() to avoid the left shift + * that the ISI applies to RAW10/12/14 output. */ { .mbus_code =3D MEDIA_BUS_FMT_Y8_1X8, @@ -240,7 +240,7 @@ static const struct mxc_isi_format_info mxc_isi_formats= [] =3D { .mbus_code =3D MEDIA_BUS_FMT_Y10_1X10, .fourcc =3D V4L2_PIX_FMT_Y10, .type =3D MXC_ISI_VIDEO_CAP, - .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW16, + .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW10, .mem_planes =3D 1, .color_planes =3D 1, .depth =3D { 16 }, @@ -249,7 +249,7 @@ static const struct mxc_isi_format_info mxc_isi_formats= [] =3D { .mbus_code =3D MEDIA_BUS_FMT_Y12_1X12, .fourcc =3D V4L2_PIX_FMT_Y12, .type =3D MXC_ISI_VIDEO_CAP, - .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW16, + .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW12, .mem_planes =3D 1, .color_planes =3D 1, .depth =3D { 16 }, @@ -258,7 +258,7 @@ static const struct mxc_isi_format_info mxc_isi_formats= [] =3D { .mbus_code =3D MEDIA_BUS_FMT_Y14_1X14, .fourcc =3D V4L2_PIX_FMT_Y14, .type =3D MXC_ISI_VIDEO_CAP, - .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW16, + .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW14, .mem_planes =3D 1, .color_planes =3D 1, .depth =3D { 16 }, @@ -312,7 +312,7 @@ static const struct mxc_isi_format_info mxc_isi_formats= [] =3D { .mbus_code =3D MEDIA_BUS_FMT_SBGGR10_1X10, .fourcc =3D V4L2_PIX_FMT_SBGGR10, .type =3D MXC_ISI_VIDEO_CAP, - .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW16, + .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW10, .mem_planes =3D 1, .color_planes =3D 1, .depth =3D { 16 }, @@ -321,7 +321,7 @@ static const struct mxc_isi_format_info mxc_isi_formats= [] =3D { .mbus_code =3D MEDIA_BUS_FMT_SGBRG10_1X10, .fourcc =3D V4L2_PIX_FMT_SGBRG10, .type =3D MXC_ISI_VIDEO_CAP, - .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW16, + .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW10, .mem_planes =3D 1, .color_planes =3D 1, .depth =3D { 16 }, @@ -330,7 +330,7 @@ static const struct mxc_isi_format_info mxc_isi_formats= [] =3D { .mbus_code =3D MEDIA_BUS_FMT_SGRBG10_1X10, .fourcc =3D V4L2_PIX_FMT_SGRBG10, .type =3D MXC_ISI_VIDEO_CAP, - .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW16, + .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW10, .mem_planes =3D 1, .color_planes =3D 1, .depth =3D { 16 }, @@ -339,7 +339,7 @@ static const struct mxc_isi_format_info mxc_isi_formats= [] =3D { .mbus_code =3D MEDIA_BUS_FMT_SRGGB10_1X10, .fourcc =3D V4L2_PIX_FMT_SRGGB10, .type =3D MXC_ISI_VIDEO_CAP, - .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW16, + .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW10, .mem_planes =3D 1, .color_planes =3D 1, .depth =3D { 16 }, @@ -348,7 +348,7 @@ static const struct mxc_isi_format_info mxc_isi_formats= [] =3D { .mbus_code =3D MEDIA_BUS_FMT_SBGGR12_1X12, .fourcc =3D V4L2_PIX_FMT_SBGGR12, .type =3D MXC_ISI_VIDEO_CAP, - .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW16, + .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW12, .mem_planes =3D 1, .color_planes =3D 1, .depth =3D { 16 }, @@ -357,7 +357,7 @@ static const struct mxc_isi_format_info mxc_isi_formats= [] =3D { .mbus_code =3D MEDIA_BUS_FMT_SGBRG12_1X12, .fourcc =3D V4L2_PIX_FMT_SGBRG12, .type =3D MXC_ISI_VIDEO_CAP, - .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW16, + .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW12, .mem_planes =3D 1, .color_planes =3D 1, .depth =3D { 16 }, @@ -366,7 +366,7 @@ static const struct mxc_isi_format_info mxc_isi_formats= [] =3D { .mbus_code =3D MEDIA_BUS_FMT_SGRBG12_1X12, .fourcc =3D V4L2_PIX_FMT_SGRBG12, .type =3D MXC_ISI_VIDEO_CAP, - .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW16, + .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW12, .mem_planes =3D 1, .color_planes =3D 1, .depth =3D { 16 }, @@ -375,7 +375,7 @@ static const struct mxc_isi_format_info mxc_isi_formats= [] =3D { .mbus_code =3D MEDIA_BUS_FMT_SRGGB12_1X12, .fourcc =3D V4L2_PIX_FMT_SRGGB12, .type =3D MXC_ISI_VIDEO_CAP, - .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW16, + .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW12, .mem_planes =3D 1, .color_planes =3D 1, .depth =3D { 16 }, @@ -384,7 +384,7 @@ static const struct mxc_isi_format_info mxc_isi_formats= [] =3D { .mbus_code =3D MEDIA_BUS_FMT_SBGGR14_1X14, .fourcc =3D V4L2_PIX_FMT_SBGGR14, .type =3D MXC_ISI_VIDEO_CAP, - .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW16, + .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW14, .mem_planes =3D 1, .color_planes =3D 1, .depth =3D { 16 }, @@ -393,7 +393,7 @@ static const struct mxc_isi_format_info mxc_isi_formats= [] =3D { .mbus_code =3D MEDIA_BUS_FMT_SGBRG14_1X14, .fourcc =3D V4L2_PIX_FMT_SGBRG14, .type =3D MXC_ISI_VIDEO_CAP, - .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW16, + .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW14, .mem_planes =3D 1, .color_planes =3D 1, .depth =3D { 16 }, @@ -402,7 +402,7 @@ static const struct mxc_isi_format_info mxc_isi_formats= [] =3D { .mbus_code =3D MEDIA_BUS_FMT_SGRBG14_1X14, .fourcc =3D V4L2_PIX_FMT_SGRBG14, .type =3D MXC_ISI_VIDEO_CAP, - .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW16, + .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW14, .mem_planes =3D 1, .color_planes =3D 1, .depth =3D { 16 }, @@ -411,7 +411,7 @@ static const struct mxc_isi_format_info mxc_isi_formats= [] =3D { .mbus_code =3D MEDIA_BUS_FMT_SRGGB14_1X14, .fourcc =3D V4L2_PIX_FMT_SRGGB14, .type =3D MXC_ISI_VIDEO_CAP, - .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW16, + .isi_out_format =3D CHNL_IMG_CTRL_FORMAT_RAW14, .mem_planes =3D 1, .color_planes =3D 1, .depth =3D { 16 }, --=20 2.34.1