From nobody Mon Sep 28 05:45:35 2026 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011018.outbound.protection.outlook.com [52.101.70.18]) (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 BE73633032B; Wed, 26 Aug 2026 04:52:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.18 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787719924; cv=fail; b=GBlMiDvdCmqjd6yaaIUgpUnAndR3z2yGFXq0fIIvAm4gPjHCvukK6ff2wX88OHHzivGSFieaq/T/56nuFKyCNPyXEoNoTDlJysGx570pDzpMQN/ilEPNCoqBPhY8d8+6cDccMAxUCFsx72dnKbJthiL0hO3YNe189UIqDR3PbrE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787719924; c=relaxed/simple; bh=CZHcA+G8Zi5cjyZeZB7xgJAE7Ac1skbVfZn3GwxTYqs=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=dI4B4SacTe1Yvf/Fdu9QaoyUwHFhuMLKITjThWhPgdvZavR8xKmhJ8BM+37/EjSfIs/8HdRuu2XKomzUePb8Zbve2Pgc43DEvw8t987dYMvBU7q2wI49NWGhl9ukzDTS1W/lyOa5FSLzT29zoeB5GROEl9ZA3dRFaMNbmBYT8nw= 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=vNe1MMm8; arc=fail smtp.client-ip=52.101.70.18 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="vNe1MMm8" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FOWwiim5TR7NTh97XI5SzmtRvFmrpHXZilj2Bxy1PkAW/odeEPVwRC/fR2VA4M6J3aeWcRYOAZlYAAgwp7Bty3aEa7zeXGjWQ14TUkxuc6rkzNfH8NGsjPuv63VS/4eV0AW1HYkMAt9tafwvv1s+JFkzZF7uGNIbv1xmhDc5HrQj3NDPote4IpHLe/33M7HMbiurPJKQKoi60tW1HASip6gUKsTJzI7L9fCR8s6ynxDEmvUeUdS9KIFs9WDZ4nt1HovtQjENLbCnKaPJOHvddJNwgw2tu4UWqk8dCvCuU1grNehXR554o7bwYQBzbrDMbmVwUIC6OGpiHL3HQjTZ1w== 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=m9UeT+CM4CZqq12XtLi+fHvm7EzrlDbjnPaROPNsxgQ=; b=q2xm3qDieZFdg2TvFUXCHZbo0+GqC+XF4HHnK5r+JP2UJllW5xmFWfL6ykYp2OzsXUyVPs2THc1oJJD8BfSI7S5Rk5xJrPZTzUuFyP+SsFS/0+J0PnRzKbu/psDQDSXiCVpQikCejlUFl1uGy9bsgWqX0RvWHq162vfxb21yfpt0M4gPaH8iusISzxuPRcDjGsAtcfQpEuvsSGdqM0sOeXw2ddtNGoeVoCVp+/+ILcjnLBMts6efOZIKBcIRVBkpshb+7JarvLstPNzHOn1mPSqSS4QZI1XMtZ2VC2XFzuqVslzt4cNNzCVVbVisxCKZ75SHrxKn0+frCvCPp+QP9Q== 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=m9UeT+CM4CZqq12XtLi+fHvm7EzrlDbjnPaROPNsxgQ=; b=vNe1MMm8TmuiVEw5LNCXRWCYT4GyhlCSeuRHeirUnjASyGbu5vAPMh+68WH3BMTWAFOA0aR+EfhVCM6EDn6aqi/zRnC2Lm/8K1JRRSHOsBFiRS0IgodBIrz3AGh7tITEYDD3qDD5HVvF4m7qJhgY2k5VuyUDdSLzBHqaz5Sx4q5fzSROFvEdI3a2ijlMLoz4Iz4RkiyCdTk4c3TTbsRS1GX1BC8RsPmPNtgrJ66wlAc6xtgANOt9uGUeJN6QvBlMWNN0E9skODXX2rqStjFx3vA1nxvAKU1bUIepEl7LK6JK9LsQbqB6m6GzJ0rBs1eK++axY6JEtsv9t6hvoh7pfw== 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 DU2PR04MB8853.eurprd04.prod.outlook.com (2603:10a6:10:2e0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.8; Wed, 26 Aug 2026 04:51:59 +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.006; Wed, 26 Aug 2026 04:51:59 +0000 From: Guoniu Zhou Date: Wed, 26 Aug 2026 12:55:42 +0800 Subject: [PATCH 1/5] 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: <20260826-isi_imx952-v1-1-cbfaaa3f0000@oss.nxp.com> References: <20260826-isi_imx952-v1-0-cbfaaa3f0000@oss.nxp.com> In-Reply-To: <20260826-isi_imx952-v1-0-cbfaaa3f0000@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=1787720155; l=1677; i=guoniu.zhou@oss.nxp.com; s=20250815; h=from:subject:message-id; bh=CZHcA+G8Zi5cjyZeZB7xgJAE7Ac1skbVfZn3GwxTYqs=; b=Tq8dr3FCbd8GrAo2mH0gJKA6fPY4OuXDfEAWKcNUq9NZqeO49hKUMafLj9AOUxZCzYeq64cK4 tFlnVL02bu+BKoZAG5lQ/ekAcZk3Cv4xPKo69Mx3zarxHfvXfJmjsUA X-Developer-Key: i=guoniu.zhou@oss.nxp.com; a=ed25519; pk=MM+/XICg5S78/gs+f9wtGP6yIvkyjTdZwfaxXeu5rlo= X-ClientProxiedBy: SI1PR02CA0031.apcprd02.prod.outlook.com (2603:1096:4:1f6::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_|DU2PR04MB8853:EE_ X-MS-Office365-Filtering-Correlation-Id: 2938e3e3-f133-4896-fb8c-08df032dc358 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|376014|7416014|19092799006|1800799024|366016|10067099003|56012099006|11063799006|18002099003|22082099003|921020; X-Microsoft-Antispam-Message-Info: O33bXLx+n6R2Olo/P+MbJCNTAagxD+lBeG+ySbw/4mKpVnNiCSQxhGV9TEahdcdNk8oIW62UNpeJANZjJmRSSyOiSVlSPyR8mIOWzQaZ9H69DgxKWKBuWkn8GTmf4Z5YcY5dFlgn5GBtJ1m5pcj2L9em5xi+xiSatHhCgLkYHwyWQ7V1eXb3hJgkmSQCNfn1LucSq0VZjb0XByW2aP0cukKAbh/vy8BLzYsxuyXXEf1JlDmsNZGHfThgmgOD1XqqK8KkuXrrwIRkdsuZM9srHwufN/HBCJ6QTot+troa/fm8JjhTeu/W//g/PchpBo/L0UDxm1U8Gzz96PMPZDWKchvWSP0OLzS6l9F90NZEFQEu08aj16TTtP3Kx8XccWYUSt3x2v6a3PfvRivHaDXdwzI9w5OdJhlnckOSdaepzPNgDCSvXu04wtZ7YCzyhjkUsv6Xrj77a6+K6GyzaOpD2TtL7dZQypW6CAQSk7JacK+D5hWMdQ+v1W1aRetldW1xNEjywC99PrimVhjoJuKqohVNM9jz3doP7nEZOgciRaBuQJPbFT0kHakxZeh7m7ktHrYQoStunumyuzeJddEJ9zC2XOP95OhIna8JhCuMmEdnpPDReWDaGOrGTKNMaXQR59gDkvKwcBomBJ8lnAsUcCVRNSTILOzdCNcxEfmxBRqCVKqnLEUv1TILgcagxICTcAILplcQjIIZ5pW77blmew== 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)(23010399003)(376014)(7416014)(19092799006)(1800799024)(366016)(10067099003)(56012099006)(11063799006)(18002099003)(22082099003)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SlhWVUQ0NXZycVhXZll6bHVoZzhKMWloN2cvd0U5Q2NKdTdTQ2xKczlPeGlN?= =?utf-8?B?R2tid25uUnE3WGFMdDB5ektDMStFMFEzYVd0M1ZyRTVJWFlMMDlKeVd0WGZZ?= =?utf-8?B?WFFPWXBCaUhzSjVPNllPYzV2V01Lc3JjWEdYeHo2MTZjTTFZT2FGQXNqQXpI?= =?utf-8?B?R0lZZWg1aFJiSFhpaTRINGZ4MXVLMmxCTHVrOXlNeEV4YU1SNnQ5dXZIYnRG?= =?utf-8?B?QktWcjhnMEhaaWVjL2V6Ni9CTDZDWjFGVUN3RVJuc1phNXZGdlY3YUV0THVK?= =?utf-8?B?RTBCTXJnU0VOM3Q2MURjVzB2UGhRSm9BYmcrNjBhWDJBMXRWcFhBMGJNaWNY?= =?utf-8?B?V2FiZks4bGdqN2pGUXVIb01EUEtGMEtmU1VMM1RUQUNSeUtCUEhXUERvaWtL?= =?utf-8?B?ZmYxTExrQVFyLzluZnp5T0xzalk3dSswZjJITWpRVSt1SHpESTIxTmVvaGF4?= =?utf-8?B?K09KeXBZajlCRFhhbG5YRHJRd2ZxenBCT3RKdDhxb2tlbWhDSUd0VW5SYnJX?= =?utf-8?B?cituVkZ2cko2WWJaN2k2Y0tUQ2kzcEhsU0dObXVsRjFFbzFLTW5zYW9KQTJy?= =?utf-8?B?RXFRbmxLengxSlRSNFdZbUtYejlNZHhKRmYycmFVN2F0RUxJeU1oeFRGUlhH?= =?utf-8?B?TjNpWk92NlYzU2VCQkxrTnpzRkJQdHlHOWJncDgvR0pnbnJ2WGtqMHZXMytl?= =?utf-8?B?NFVJNVYrbHVIY0pKOXk4a0VjZCtPZ0xoMm9XdElVVk8rblZhd2J1T01KQ3pQ?= =?utf-8?B?VlFoZmRaSUZTOFdhUGRWSEI5RjFzekY0dHA5RDZ6TWNsVzRlYU1CZTRLcHdD?= =?utf-8?B?K0UvMGkzOXJ3NEZLb0ZaazI0YkpCUUNKdVRZeWhDM3B6TVNHR0tRZTNMR0lX?= =?utf-8?B?Q3NkS1pDQzFoWWVIaTBFb2V1NWRya3FaWStla0JOZXd2S0pXUmphelk3MXNx?= =?utf-8?B?Z3NTNkdURWZ2V2FRcmR2d2Rxcmk0dHdVZ2RIT2U3QkNMM0N5TWhoSC9YY3RO?= =?utf-8?B?MTg1a0NaampJblluYk4wSndDSGNWM0hUL29mdmIwdXBzUVY4bGcwSVNTVSt5?= =?utf-8?B?MFNOb292ajJCUTQ1T3BhSGRUbEh1dWpQOUJsbGNVZEh4NnF2M3E1UzRiQS9W?= =?utf-8?B?ZFNFVWFhVHZpV0FSclhsVk54bUlsZUFPSkpmZnJmVnZyeE9IQkdHM2V3ZEVn?= =?utf-8?B?WmdjZ3NlelkzcW8zOGMxTzVpSFBvWmk1TVVVVEVyOTJYZ2QvSHhGN0l5VUR1?= =?utf-8?B?UHQ4NnFXdUZLZmxpdWk4ZElkUkt5ejFyaVJjNDhUUmVsa1RXc2phNnRNWTJr?= =?utf-8?B?Y0pETlNLWlBMdVBNaTJKUGNpck91K1B0MzlZUXNwOXpnYkxJbzUzZzRoNzVF?= =?utf-8?B?QnVRN1BYS2dMYWd3dzdmMFRuWEJBVTQrQ1RyRzk5NjRsYlZrTk9xaVFzSDhz?= =?utf-8?B?Q0w4OE93OTg1dFRYOHNqMEFjRTdZK2VVQjRQcUI2WFBXNmxKU0dTSU9qbnJk?= =?utf-8?B?Zk9TVHJhdDVzOUZ6VTJQKzNBYnU5c2VEQ3RKOUFENVQ0Q0dXb2hUMm4vVDNU?= =?utf-8?B?MUNwalBJQ2UzMzgwb0VMUnBZWkE4ODZlejZSQ1ZMSFFtYWdXbm53MkptM25S?= =?utf-8?B?emZHRXdzdWRmejg3UUVEQ1k4VEZ0Q28zRTFLUmJnTW1OM2YyWk5sQVhtMmMr?= =?utf-8?B?K3pLcUc4emZpNWNZM3c3L29JQmdmWFV0Q0hqNjNBZXZhWmVNbmhvZ1JYaVV4?= =?utf-8?B?Qk1ncU9wU2RGS3ZMa3hIZkVSc1FiOG5IMDQ3TGtwakxJSDJlVnlCUHpxWmZm?= =?utf-8?B?SVJIdGNrcXFVcjRJUUplN21GemozaitBdyswb09wcGRzZUdseVM1UE1ScklW?= =?utf-8?B?OHc1M3lWV1NVUGVydkVXdzZBdkQyUFhPV2lzTlUzd3BrcUNiV3hWMUFXSlhI?= =?utf-8?B?LzhtbThTQUI1WHVzOVczblltNk1JNVd5bUg1V0FZd21BTXZESElNR0JMQXNl?= =?utf-8?B?MUo0VTFLUWJDcGw4UTBjRlVYdTVia093TnpFWXY5TnNORWFJMThQWjNGNTVC?= =?utf-8?B?OE9hblMrT1UyQ2gvRnFOVjB6L1JkRU9iQXkrd3BmUnlIRUUwR1pZZG16UXVI?= =?utf-8?B?SkhIbjVPcnhPQkJJa1V3Qk44bjdVMVpyNEJPcUUzb3VCYmFWY3pybHhkNGs3?= =?utf-8?B?Z09RTUlnT2cvSzFCZms0cEtaREFTT3NFSktNSDk2My9vTkZRQnlnOW1NOUNh?= =?utf-8?B?UnNPcWpsNFdmdVZzb2ZNMnllMHBCdDVSUHl2c0hRSVlWVGZrN3RYcFFjWkNZ?= =?utf-8?B?SGlOMkhmdnR4ekxlVS92MmowQnRSVjVma0oyQ3pmTU5KVXhza3J3YVVpSFFu?= =?utf-8?Q?8Y8rqQ/WEqhSriMv1s4NNIyYtZpBWA6FNFOuK?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2938e3e3-f133-4896-fb8c-08df032dc358 X-MS-Exchange-CrossTenant-AuthSource: GV1PR04MB11513.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 04:51:59.7014 (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: u98hrSaFmPPee9xc1Zhbr57FoL1LAZIHHJIK39rODNTaPU6Kj2ptg7rwclIRSzMjMWAYt51xUb7zT5D03dd6rpWqz+Sh5Vb9m+Jya0B04nKNjZlI94Q9l36JCGh2CaTL X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8853 Move mxc_imx95_data definition after mxc_imx93_data to match the order defined in the of_match array. Signed-off-by: Guoniu Zhou Reviewed-by: 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 Mon Sep 28 05:45:35 2026 Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11012049.outbound.protection.outlook.com [52.101.66.49]) (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 91249353A85; Wed, 26 Aug 2026 04:52:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.66.49 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787719934; cv=fail; b=nLFIQ4EfTG6VV+BG8e6HJ+bBXg7Ke4VzhmHG6zh87nWyVr2hxn1SiW6O1XRZ1BKMDIWJ3sWHXDtJ1f12McnhNKpT/n3EvE+QLtP8yvDHMcrD3SGILOC476XDj4arF79mWXpWeRHNiKNuIwmbm7XVyx9zMPmuhDJP5KuM9HbCWmA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787719934; c=relaxed/simple; bh=sw5zLgbSYX/gtEkKiY+YdPnR9UlO6GT5C+xjtjawSHc=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=eZA8A3XHdPsBxjVSYja0eHySAzuF1i8U+1K8nAnbTUA6IU65VVm062N/hXyAGcDdyGqPtGLJulgiqJdBWaHz4TnRKAFkEGkSH8yCt6zPB50r0atIiCptt6R+rvY8A1piQEeZnPZ1Ufiowz18pfv2ubLGKIap4cxIdckS0pVXzkM= 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=oLK7ur7X; arc=fail smtp.client-ip=52.101.66.49 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="oLK7ur7X" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YbbZr/G4glBBySEpt98FpzxO4ZVcZKq/5fKEnY7nCjAPH+tTNvJKvVfBTvqGsXRgK1B9Z7D431/5rSbg+Sm1xLjCNvW23LjpHCJrlGn0qutuslQ4L7W6nuUJSEYndYKbalOqYKkoKTl8wylfwX/iaghnG8tiv0nyr9D2rPl8pDN1B9O7Fn+OyCfGEf0MeVUkTN1ZTs9X/+iynEVbDA8ovOG/IpGjOtVTzr7PBIJfXp5VFgvpP5EmrxqJzAMuKGEoGXn8cCmdEAJdYWS3KwrbpqVrjjOQZKjsk5wJmugIAg0rZ6v2Rkx3pXfq1rgdaalpqq/5yyvOjBryKcHW9NAwyQ== 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=sIeKHTeN8gdcgZEIJQosT0NLyodXfam9Jg64Bjq0hNk=; b=h7vT5QIEq90QlHNLRmjpemNlqH/+uebFcFlsA9hVol+ggoSV0Ve298uZq3Xfa9eMntR8OXQiQGUG0ORw8YvzXbv/vHHgzHr0nEk3orbQ9rog4wXneOS5/tuJOGs0ecyOMHlE3J1+BMtonRe9WLO7IySS2vNwoPno9jaB+see8q0XfhAz+79apDHwdavLPOZK5exeCJxM3Ej70VIX+RAfufg4jYsfjxYH1jsXPmwmc1kwaKfOl62XFZb0TCRG75JZYP7066+6P7eFbSSVYNeihEABxr+j3np4NO1xQGx3fqygLd3zJU10sqnmyEuG4L23Jv3dLXJ/pjXw++gLnl4Rcw== 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=sIeKHTeN8gdcgZEIJQosT0NLyodXfam9Jg64Bjq0hNk=; b=oLK7ur7XvxjRWbeijmjODcwCJM+SPFahxqPT5lSwkcoq/mo4+rouioHknyoIZXuAjZIs8l6UrP8SXJiBF69ADaL0BS9UvaFdJyvAQV23i7FoJCfnKcjZPglHBkiOZKDmcUWqlUpfLARKYsMypO35vR4fcZNRX/maDTa5Z3CLoN3hc4gO+BWL8iuEQN7M/n2/1tmgvMDbBok4QkPBoWQNh9Usbdp6OTww+CROmEtSdjjdkt000PIEjffZdDg7WkLfB9nqusvMpTB9VxJI0/YO8hxHZxD8mOUmosjRYe65SoKN41vMk9rI2zvRV07K0RkXtc6vEpP8Sshu3wrh6kEAjw== 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 DU2PR04MB8853.eurprd04.prod.outlook.com (2603:10a6:10:2e0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.8; Wed, 26 Aug 2026 04:52:06 +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.006; Wed, 26 Aug 2026 04:52:06 +0000 From: Guoniu Zhou Date: Wed, 26 Aug 2026 12:55:43 +0800 Subject: [PATCH 2/5] 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: <20260826-isi_imx952-v1-2-cbfaaa3f0000@oss.nxp.com> References: <20260826-isi_imx952-v1-0-cbfaaa3f0000@oss.nxp.com> In-Reply-To: <20260826-isi_imx952-v1-0-cbfaaa3f0000@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=1787720155; l=5431; i=guoniu.zhou@oss.nxp.com; s=20250815; h=from:subject:message-id; bh=sw5zLgbSYX/gtEkKiY+YdPnR9UlO6GT5C+xjtjawSHc=; b=yNweCjK04oNlAybkNHVtjEg+MmUBzXXnlqAy5LWRqhR/17eUH3gmN0gZjsT+L2A7BSuOKWL7y gOyv6Fmbly/Ab/XzAdQspyHnsZlyJUoaMv6tA0lf19w3oYOLB0u4ZsU X-Developer-Key: i=guoniu.zhou@oss.nxp.com; a=ed25519; pk=MM+/XICg5S78/gs+f9wtGP6yIvkyjTdZwfaxXeu5rlo= X-ClientProxiedBy: SI3PR02CA0002.apcprd02.prod.outlook.com (2603:1096:4:295::12) 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_|DU2PR04MB8853:EE_ X-MS-Office365-Filtering-Correlation-Id: 8778e523-f853-4060-c805-08df032dc724 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|376014|7416014|19092799006|1800799024|366016|3023799007|10067099003|56012099006|11063799006|18002099003|22082099003|921020; X-Microsoft-Antispam-Message-Info: 41sNp7XKfhQt5D9JLrBp/pf0RliOfsJeaLaCLUwQy1a4KbxhGY5hVE7fWYVMRu+JkjE8FHtwB3NAoX81E+ZnjnNjVzmnc33adC22E/LO9xgii7yQtZ2w1h257sjbx29LItYIqJPNc/fRNHdBVp4elMwvDoUFWMXTOZXK56IVDhbfXZlD5stUK+mxYuZhGwQQFxLo3mvQs6lDPdFEaqZLW/ocW6zJMfYDmugum2wO7iBXguwWg6YdpHD1I2umok5mK4Hyg+ERM+5mPXH2gwW35aXZazKyXub8mmadCeD0Ctfvf1vnNJe7MD90CqwKf29LZem7opFLFxO0ncD/AXVIknNvoXfy3airylvANKYp/6dqZmje+L5VjRK06QAVfEb3dXegmEmJMl0bgZQBuWknw/iVDeAfRcc8nStnx8njrC7nxQ9ZTo2ixPvxEcDWfhEZZ/98MdctiRwmCxvawDqpG3v6/YzX+qM/jpZ4mSF835sz3eXphYdl87HP5QEPt2zlHZaExSkfHyMJ4UyWitbo+9EJol749OrFiefpiHx4pbC4ziNYqoqN/94aij1dr57U/Vnqwsj+X802r9UtzlW6zPABskwlZ271wncSKx8vCii7UKMaxTZRB/3dgIYFVRbTU8H6IcuIFL7vVgMr6KFam0BwNIGhBQkBrNOEqX47JRhgPL14erEjX5B5snsJogkcALWm4+BdwWzYBf/QHo8/bw== 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)(23010399003)(376014)(7416014)(19092799006)(1800799024)(366016)(3023799007)(10067099003)(56012099006)(11063799006)(18002099003)(22082099003)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TXVlSVdpTGtWdEdhZVVNMnJBTE1sWEpxLzM1WEZxMmVUK1k1UGhCcTZhVWdX?= =?utf-8?B?ZFhIQ2VKMm45bDJSZEdhOENQYUlUbnJRRER5dnJmSTUxUGhFd0p2UXdYVVZx?= =?utf-8?B?NlRFTjdCdXBUY3kwTXZxbUQ5R2Npdm0vNTdYZXVBS2NLZ2xRbk1SazhraDhr?= =?utf-8?B?V0orQzlBajd4NjViU3BlbkNrL3lCaVIvL01jTmtucWNGekpLeWs1V3VNNnlJ?= =?utf-8?B?aGpScGFYNE5nTDJxRElacEwzRFFUa3UxZ1N5THNvdnoyeVRzdWlwSGJNTkhS?= =?utf-8?B?U3dwN2l2K0NKdkNVYUl3S3loL2FMUzY5VTdBRWRQNTZlaytNQlNWTDlLOXhh?= =?utf-8?B?KzZ5NGFsVkYybGQ5Q0E1cEg3Rm1KQzdFWWxIYU1NK0ZscWt5UmFVS0lhYlFY?= =?utf-8?B?UWRsSXBFZTY0eHJ1T2dGSFgyWkRPditYSHZocUVRcFlHUXp6b0d1MFR4NnJ4?= =?utf-8?B?bnh5Um9IOFNiRVk3N25RdmdZSkxEN0Y1V3FGYlFCQ1diUFpCalFIUnptR0Z6?= =?utf-8?B?clF6RERrYVdLNVRzV2U4YThFZUVsT2puUVJPVU8rUFFtV2JGNW5pVWdydGQ5?= =?utf-8?B?MXBVUDRIVFVvbHBwWEhXNm1PekpOSlZFa2tpL013R1YzRzQ0Rm9mN1BtVzVr?= =?utf-8?B?N3VGSUYvOHk4UDVoTkUvMkFLenltaGFNSFBQMkNxem9MWk4vbDVkUzhneFB4?= =?utf-8?B?aml3QWh6QVdXRVIzeTlhRmNmcm92enJhcjV4Vm43Tms3UldOMHVuSTRrUWor?= =?utf-8?B?Y0ZPR2lQSmM0ajFmdHZ5dEt3QkJTWWlselAyQjVLbVlXSFh5U0tiM2VIRHRW?= =?utf-8?B?Q1Z2YUxQRDlWbG9hcGE5TVI4NVJ2bFhlU3JzZTJVWkVEenV1R3lNQTlMN09x?= =?utf-8?B?SWd1cEdic0RMY1pydW56TUROWGpJQjhobi83VkI2VW9LYnVMR29TdXF2THdo?= =?utf-8?B?ZlVrb3lzUnF0V1hOMWFQeU9sZ0JzdlVNQlQ2VEtwTFdVK1VFd2FsQUJWaURB?= =?utf-8?B?Q3QxNkpCbEE4aHdQMFRrQlFzeE5FNE1FdVZHK3hPb0V1eGZyY290UW02bDNv?= =?utf-8?B?VXNpbjVoZE9ITXFZb2M0OFFCaDdTbnNUMzIyM3ZlSnlldkc1cTJlNjRuaGRB?= =?utf-8?B?czU1cmN1NHlwSXl6VHdrU2JHKzZMOU84cWozMG96YnRSa0kzOS9mV1ZlT2RH?= =?utf-8?B?NmNzTDZ6MDVBTllaWnZwR01kQWE5SlAwZEhIV1ZyVno3V1hoT1RxVEg4OGtF?= =?utf-8?B?T3F5dGp5YjlJU1JZS1RLNklyZnZaMFgvU3ZIN0l2YjJVS2ZzcDhDYWFNQWZH?= =?utf-8?B?TWIyYldKaFJiREwyNG0zc3M1eFZHc2p1VWtsL2dWYVVMaWpFNXExRjNSWUFm?= =?utf-8?B?aUxyWXRaUDNONEd6WmUrYkVqRTE0WFI3d2RJQ3FnVGdkVnVoVXk4SzQrMUIy?= =?utf-8?B?eHpqR09HVncyVDlrVXRhN0ViRjdHS1NyY3d5VEhBTE1Zam84WmJaT1V0Zm8v?= =?utf-8?B?OGNuQjRnS3RHaEhmSVZVZVN5cnU0RThJdU1qNWoyWUp1aG1ERXhMUDR2dSsr?= =?utf-8?B?T0dGOS9JODNyMlVCcjJLbERaRlRtdnpQSzYyMlFzUTZrQ1hHS2ZObFNoeFc3?= =?utf-8?B?TEN5SnQzMUJWdkJnUm0wd0JLeUswRi9wOC9ZcFVkOFg1TG1vYjg1c0ZEMFBr?= =?utf-8?B?RkFRcEcwZVZHUEN5L1J6bGZIbzBUSjhPSXFIRG1lQWZDNkxFdHY4MFQ1azU0?= =?utf-8?B?bVNzbXFoT08yeG9oYThRZDlkVTZ6Zk1kbm1YSzRWVnErNEZVcTh2V0FubzNH?= =?utf-8?B?OFN1bElrdDZFdm1SUlN2SXBrZlN0RzVaZG1XY1dyTXRQaE1uOWdKV0MzaUN3?= =?utf-8?B?dGxjdnE1a1hPU1dqVEcwbUxuTy9odE85eWE0bitGY3BOZzl5YVZMci9qK0Z3?= =?utf-8?B?dEJlMkFZZW0wUWQ0YXZKS21udWV1VEpka2NSR1krZjBEczdiQ29mWHFjSXJw?= =?utf-8?B?eTB0eVVTemVXVDF0eVF5emlIMDZuVG9KQU5wRGZ6RkZQcjRTS0ZIbDJENXlX?= =?utf-8?B?OWJFN2ZUdjdJZldSalF0U1U0QXNpL3JCSnJqY3BEdy95TTBoMHdna2orbmY4?= =?utf-8?B?Y05WYlFxaTlGdzBGS3ZZN01jZytjamFEZHlzck1CdVNLeEtuS3lyRWZhbXJy?= =?utf-8?B?ZDdNOFlCL0o1L2FUdm04ajZ5N2dacnJ2MGIvanN4d0dpOTZLVWdJRjdnNGxm?= =?utf-8?B?VDh3eUpJcDF2b2Mxdm1ONTdvZ09QNW5PaEtKVUpYVGtGa2UwMnZwVnZEUVFI?= =?utf-8?B?YjJmekk2ZmhzTVNBYnp5MUZwbVhSbFd3RXV5Y201dlByQTFTUFF0SnN1MUU1?= =?utf-8?Q?PUu4LyWNorVMLlWiAu8+BTM+cOdMPXo28YgqT?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8778e523-f853-4060-c805-08df032dc724 X-MS-Exchange-CrossTenant-AuthSource: GV1PR04MB11513.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 04:52:06.0888 (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: o2Hm110a6/4FVwrUBHHH43jaXjaP4DwE71uTlOLlsc/BbkpmZmIXHlPHfgNVxTE10hdt9qKih9HCh5V2iWb/RITeghz03/Ey5ZK4bPZBHuHgOJNrxdPaVIaMqwoNXGBm X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8853 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. Signed-off-by: Guoniu Zhou Reviewed-by: 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 Mon Sep 28 05:45:35 2026 Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11012049.outbound.protection.outlook.com [52.101.66.49]) (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 EF6363546F7; Wed, 26 Aug 2026 04:52:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.66.49 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787719947; cv=fail; b=YFHaB92qVIbVvKInuqXEcu40vHDRTx1axY1xH2Mxh4VO+xcwZT5ifFxFc7+cyk7vHcJRsEE7r+vPS83Bvbe6/A3EnDIZzl4t8ffKyDYdhOusLg5ZGsEqJ2X4xMFXxffoVZ+kcEL6Ph0LDMEKNFlKfb0nCKTxhj8dfd2r/BQLNIc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787719947; c=relaxed/simple; bh=LVnVtKOSdRb5BW1G0BYM6val/Nb/ngVB7R7RjVl3vgc=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=a/+xGbDnHFNOOyGsknWSMRJiV6oscUU3DIKqqr2TQdmZmBQNs59Ck4n6Uq+BRztZ76whsgTPcBPkpWf0MzT+eQKB3mTAyao72XxeWbD0O/rqA2XsGEXfZzUiTIEzwuhyAck7x7j67sdlQECIezJSAYo4VzumQKioFVTnFb0RqRA= 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=LHWjcDxr; arc=fail smtp.client-ip=52.101.66.49 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="LHWjcDxr" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wcIhgWCBpjTXwzceCU3ylG+A9zl/OkFSM+vdxpZQ0cygeAk8tKgxY3zBASBsumhnWf82ux+wfWp7lX/NX78NVkHTHDRZdu1nF0pqjeXB7i4Y434ZjvVtp7uzBUCoICYqyc3a4csZ60f4TEXadt7PJGIHVVd4HKTQ4wBpnB5qxIMPsfEw+MpWF9bj7Lz0SQ/vaCsOJ7AOYjpFHTEpJUanW0F8OM0MH0pGSqnGXUpwjjGTH3PRxq4mq1z4bV0IAOY9wSBIFUhFqbQlwCym3IpcO28c8+ukTFidtvMV3y+9atsMsFBVsmrvH7HIjsFjXioyy/kl/hGQ4BsKuP32/BiJ2w== 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=gbt5W9hxSgjwtiIXPqmkzNtnxrm5QLtqKYqFQx7L7lQ=; b=Fx1DJkz8s6zdEOoyj3txGTUafp/Ds1gFB80wMLKaMKf96hDLcCCO1BsBrdKw4i2IK1D5Hv5+aO8Jj1sErphh07T+BygautV5nPwU8hQPI43KJFf4no2nkx7ODH/VwpTB7Me+SrqajcVvte7efKe6gFQOBnU9vXPA3n4PGuI9CZTmkaFFErcuxjL8IcOAKFLFT2RIqgTHLksK9Zn6sCvdaV1ajelb/EL4WI5m2QSuh7nuxMxEZbHvBOWAWtUHPr3xHZXI4nnvywFrhnMh6HJ3xNcQeLppmQp4g9OEjPqSvCPxzGDxWPQYfJn69gtDlSuzOmTLKFQtpfp5F2QqDnUL2A== 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=gbt5W9hxSgjwtiIXPqmkzNtnxrm5QLtqKYqFQx7L7lQ=; b=LHWjcDxri0cYcNroi8kc1G7mp7fNu0crWHNT6nWqnpu7SPAr830Z/kFd7M+DdwMfisllH4VNh6FuzLnkUJOJyKqsDbpDn+UHInmoWmPcQEMd19fmMYsnXh50FBxWADuQ83fdE0XBqLtKD2lnTYhGmAS0A3zOPxRa8olVNSttIw3LEz0uzxx+fZaW5vhGJcANOChY3y3d9HXAn5ScI9zfEe6oNyI3hqIyDw1Bj4+4bAM9ptv9Whs2RCOXurKZxpTPOMIafO39Hcl+R+48QracazuxCxUWyzPZEyKZiEBbc4QozsW2cXZKio76oPmVBsg58KsOiB4aDmXR8spXa71Tvw== 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 DU2PR04MB8853.eurprd04.prod.outlook.com (2603:10a6:10:2e0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.8; Wed, 26 Aug 2026 04:52:12 +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.006; Wed, 26 Aug 2026 04:52:12 +0000 From: Guoniu Zhou Date: Wed, 26 Aug 2026 12:55:44 +0800 Subject: [PATCH 3/5] 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: <20260826-isi_imx952-v1-3-cbfaaa3f0000@oss.nxp.com> References: <20260826-isi_imx952-v1-0-cbfaaa3f0000@oss.nxp.com> In-Reply-To: <20260826-isi_imx952-v1-0-cbfaaa3f0000@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=1787720155; l=1151; i=guoniu.zhou@oss.nxp.com; s=20250815; h=from:subject:message-id; bh=LVnVtKOSdRb5BW1G0BYM6val/Nb/ngVB7R7RjVl3vgc=; b=EpKI2UB6/cGu76hZSvSvQr2oneKJtwe/19jwQslCI1XCoL5kLCm94PJ68+/dbxHa829nkB+04 OQrymm3cleWDwANJiqdb8JO0HVZRJN2NvMN0kAke4RXm4rvH7VArn4p X-Developer-Key: i=guoniu.zhou@oss.nxp.com; a=ed25519; pk=MM+/XICg5S78/gs+f9wtGP6yIvkyjTdZwfaxXeu5rlo= X-ClientProxiedBy: SI1PR02CA0046.apcprd02.prod.outlook.com (2603:1096:4:1f5::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_|DU2PR04MB8853:EE_ X-MS-Office365-Filtering-Correlation-Id: c308bb01-6fd0-4b85-db1d-08df032dcaca X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|376014|7416014|19092799006|1800799024|366016|3023799007|10067099003|56012099006|11063799006|18002099003|22082099003|921020; X-Microsoft-Antispam-Message-Info: JY5WW9j+7KM+V0iMYIqmCeW/0jwZqMS48C54F/9RA5/alY8Ecx6E9EeLDSEcP0Pd/zkJ8L37ybErdZ6ipRkJgtO3SEszkcuUWwvWuD5xGRtilPBqp61dhbw2Ys0td3JOzND1Suylm6IGg3EIqrnk0/hpTX5D9oElgh5F094AVojUDroaMF4V2KC9YNCKcarRnplYpzq1rACfYCwHZDRrFOUECKiyEjMOBivCJ3lKlCmU/XE0V8fTlN5YsrDaY+2x4o4pbTmFMxYIOdv9kNNekmdAk/ApkcG5Sse6gEmlm1DCzEWlXAT1JoevHM8Dxkkd6iTAfNoRoBLP0bFu6wEwU6TPOGlb/+ZaLdk45KECaZNlTiWvuZTvGsmTN2sBZm++Ii5IiGabxUKph3+JLqKpNy8cQ2//H4LlNZeg3hw8Rjn0R2TfDkOwESvGMEcQVE3xpDxR+7LSo/teNwcIlgIfrYZMeVvLjo3KY63IN4ztehp6td+xV0ZP9QokUtoL15bqqVaYbNpR1nxe+MzjieuqW5OT7Bz0lJyvcF9TrVubS+2o+c5HsJo+KxDKXk+pW0n1Mpmx/9Eyj0e7gJ+ErxXyHKZvRLeYjKOGIe8QuinxZQMosd8FMuRlGTCMZ/bh+UXsPZfJCmj2eaUjKs5CNftkWMcr4dQNC62yC0/0aa3tPgCl8B1iPlxezWyXsCOGmxtmF/U2NQbv1+05oZ9RsWPCAQ== 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)(23010399003)(376014)(7416014)(19092799006)(1800799024)(366016)(3023799007)(10067099003)(56012099006)(11063799006)(18002099003)(22082099003)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aWxGT0NSbWhFczh2VTJKRGtsSWEzNVc2WkJjRnhERlNpNkphVnZuQWJBMkp6?= =?utf-8?B?TXltV2QyNG9Pc1ZIcXdQd0ZlZmptL0tkVG9vL3pWYXo0SzVhMDNNdEpWYXdI?= =?utf-8?B?MEJ6b1JSSlNTR0ptZGNrYWJqcWZNTXBIb3VHcHBhQ0NwMkFydHhkMmpIc3Jt?= =?utf-8?B?WDNMNVRKTW9CUzVCNk5Ld2swOHNnWUt2dVBWNzQybjFONXZEd0lXN0ViNURX?= =?utf-8?B?K09JaXQ1dGhVZkRwc3cxa1hhS0dBVWFkNTVHbHdUcTU2VXk4R3ArQlltTFpI?= =?utf-8?B?T1JxMkJFQ1JFMUN2SThidzVhU2k2K1prWXA0QlB3eXFLYjFtcWIvdHdUaHhv?= =?utf-8?B?N0V3eUVzaVdmd1FkcW9scUxFaEFjbWxydjJjVEVFbnlCRExFRWtrdWsrd2hj?= =?utf-8?B?dDFZd2pFb1NxMVJSYStNMEh3eS9SUkE3T3o4NFgvWDZZam5iMmg0Um1TeHM5?= =?utf-8?B?Wm1QVitsL24wRzcyYW1PNkp6d281RzQzb0ZoRS9rdnpOTHRBQlh1T1BYVHNV?= =?utf-8?B?U0ZYZHFJNE9WSGlGbzlJRVNYYjNUWmdZRFlDbnBGb3IrS3Jna0NNWjlUV0ls?= =?utf-8?B?SHljZmY2THh3NHkxNERpcmdNUmE3Mzc0bmpndm1ab3RoS2lWWDdUSXJZQk9P?= =?utf-8?B?aG5saEd1S09qYVk5d1J0M05NdXJVdEtGaEg2NjBpcXZneHRxWEZJZW1nYmVl?= =?utf-8?B?MXZLUnJURjRtcGxvOFVMRlB6blpOTFdBWmJnSGJMT0dqNWRXeTRwdEJndUll?= =?utf-8?B?NkJtdnRQQm9TeUFNSk1yY00waVlRNUxRc3dwSFV2bHNlSHAvKzBPOS9wekUz?= =?utf-8?B?MS96bzg4S2s2L1JwNm5DTy9US3RCSUlCNGNUV1ljT1BWRGNSZENhMlY5Tko5?= =?utf-8?B?ZmNNZy9lZklLZnp1VFBsdytKMmhaSFBJRnBrZ3FJcC95Q0xsRWxGZVg2OE9i?= =?utf-8?B?Q2NKSUt4ZjhrSGdkWFNwUXRNUUxsOHMwdFNNM2luenRUUDZLMzVoOTR1TU1k?= =?utf-8?B?UHZaa01DejFnMWI5a2RkQ3ZSR0F5cTA1Ukt2Q3p1OTdwN2E3Mnowd29NcGdW?= =?utf-8?B?UDRhQTBKUkpyWDFUSi9vb0dYT0puUGVQQldrRVNFeGZyeXZuUGFnU1JRMjEy?= =?utf-8?B?NjhaYVc0VU5TN0FJUWVhdm1mTGpwcGo3NUVYYXdVaTA0blZLYU00UHFwdmxZ?= =?utf-8?B?MUVoOUpGUDh1YWMydUlhSHU4NVd3dHVnYnR1d21sZzR0cE4zaWFDeWsrYUk3?= =?utf-8?B?aWRaWmlkQW9RNFBQZ2puN3RSSTRVUGh6UTBuWnc3OStxR3RLZTI4aGVMWCt4?= =?utf-8?B?MzZQZHNuUXBHNUMxRmJWRnkyejQ1UzhQWlljWld6eWl6dzd1R1czRm5ZbzlY?= =?utf-8?B?ZjNjNDVnYjYycTFTYU9VRjV3eGx6aU5mMlpnb3lyZ2RRV1JId2thTm1SUVhT?= =?utf-8?B?Y1pDWllBUTA0ajNtWUU4eXhQZHFCQThSQmhjR1NTNjhrcklmUUtlR291WUlu?= =?utf-8?B?OUhYdmllNDdZdFhjM0xhVDBySG5zbnMyYldnajRzL3NBUms2WWV6eFBtMHZ0?= =?utf-8?B?dXNRNmcvc283NU5hYWVKY0RqNk1DcklUZktoRDhMTmx1cmVMS3ZORE9iT2JF?= =?utf-8?B?V29tSHM3dThnaUVuVHQ5Ny9lbTRBdjlkb3E5dTJEVTFRL1lZK21nL3JTUnJx?= =?utf-8?B?ZzExL21zci9jVWlPYXBGWnpsam1rMi9YUWp6RjlTR0s5QUYrVzVncHF5aml0?= =?utf-8?B?Z2YrMmJsTENZLy9sUlA3NXY2Z0xOQWFIeDF6V1VJVytkTk83dms0QkZVOW9z?= =?utf-8?B?ZnpGTEE0SWgyUEdMb2N0TW53RWpINnhvcXBaeVVLMW92emFtWTlUZUdjZFdF?= =?utf-8?B?aklEeFMxNlhtYXc5VjlGOFJMeXA4YjFFWGY2eU9Sa20yMlZBNGVFZ3FwU2Rz?= =?utf-8?B?eTVqTXNNb0VOa0d0Zm16SXpLelI0Z29EZXRNeVNTTGc4azc5VTR6TE5kWDFM?= =?utf-8?B?S0ZoQkN4VmRTK3IzZE5lakdYcy8xajY3VXNaaDVpdEl4ZDNaTUJjdUJ6L3VP?= =?utf-8?B?cm1LcTZndGYzRDZucXYxQUx4RC9VQ0VzQ0NHUGVSWXBRYlhLMm56elJRSC9z?= =?utf-8?B?OU9xNFkxdFNncmpHeFptancvc0FnNHAvV1FmTUVHVytFMjlXY2lZWmlLc1o0?= =?utf-8?B?MzVuMzNrVjY4aUovT1Y4ZzZZa255TWFEZU9nMkFibStXdGdKUWdOOHBOOWt3?= =?utf-8?B?aUdLY2tXQk9QWkNUc3BKRlpsTjZjTzBMZGZpZ01ydlFyWkFxNFJoSGt4Rkp2?= =?utf-8?B?akpPd3lzK0lkRzhaMklxTklHby9ocGR1QnJ6bnpQaHl5cEU3dVorR0FKMS9x?= =?utf-8?Q?YKuu2mVviH/d0z2k4r3k++uarwXiVdsE84AU0?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c308bb01-6fd0-4b85-db1d-08df032dcaca X-MS-Exchange-CrossTenant-AuthSource: GV1PR04MB11513.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 04:52:12.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: naniAzN4G3VW857C5xTMeNtgj3S8Bq8TN3hyb1apbkJPEPrP6jAYRY/arfEXVuoDFKcHx9kL4Qv3zDTciEzPLk4OIdQ6WwmxV+LUGl1U9PfywNsneTFQKonlGJfvUdI3 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8853 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 shares the same DT binding constraints as the i.MX95 ISI. Signed-off-by: Guoniu Zhou --- Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml b/Do= cumentation/devicetree/bindings/media/nxp,imx8-isi.yaml index 279c9cd3034a..313e27d2b039 100644 --- a/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml +++ b/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml @@ -25,6 +25,7 @@ properties: - fsl,imx91-isi - fsl,imx93-isi - fsl,imx95-isi + - fsl,imx952-isi =20 reg: maxItems: 1 @@ -128,7 +129,9 @@ allOf: properties: compatible: contains: - const: fsl,imx95-isi + enum: + - fsl,imx95-isi + - fsl,imx952-isi then: properties: interrupts: --=20 2.34.1 From nobody Mon Sep 28 05:45:35 2026 Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11012049.outbound.protection.outlook.com [52.101.66.49]) (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 BF9B335C68B; Wed, 26 Aug 2026 04:52:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.66.49 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787719954; cv=fail; b=iAT46ums3Gm5CxpG3esaJDRoVriV19GCQM5LikzlSNlasZxf3sBKtgz6opwqrrYelK1g8ahIOv2Q9TXgfYShlUEaAJ5nRfEJIuINt/p9+YLkQ/GjFBsU6XzpUSpp/qhk4HVjRGKHved0p0Q6/xIef7wKqjzNWcMmgPnNCe5QUeg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787719954; c=relaxed/simple; bh=a+df/G8PrzFYSGvaXxHSCwcQgCUHn5O8PMCGfGqqbys=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=uSE8lZN8lnX1mB2JiZXST1HZEy1eIN/OtumrCga8K3XlHtJPvi0SWCc2r7xRyn956M1QKLlj91oSSABCThRZok0royP5H9xYz3oD38s08yQb9QhhxuYccxudL5JIi65qwcSSxGqs4yGT0wKgBiGbu2xb13oE+2I9JxJgCV1Ivxw= 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=SsI7KFFF; arc=fail smtp.client-ip=52.101.66.49 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="SsI7KFFF" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=a6RSadVMv7tHxINj6Vo0VzMtxX3FIuVviD996Isl6l/oIKo4NJm+UrhuuG3aKjX/oAkqGDuUaIImB+9JY5mMLuADbUduo1e6j1aK6PMUlj0j7ySQHF8nvLTp24mKLq0shCcs6wDfd+Gz9TjqW+Z63L/l2WLvqCKhFJLqbSJupReVAaiIQPkxXOst5ouwOx2DvfNhU9zTDBpy7TpZGe4UuOkMsz/Bro0EKetLiySdC+jE8EwdhMFzuXp7jv4m6ggYpAcTFPucvvpHtXP/pBuGXdv84WglvK1/rt2kHgu3Y5kqNW6DcY3AMeapv01MSF/enidiKWwqN5Pi5p+tmPJr8A== 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=rBJQ5KqirSBPtKuOXLmUqpskGmZsCP8N806ZFpMzNyA=; b=CC6D6P0ocXkCMFzcWJhOHRo+MmNsVF5O7Z0D3J2YFPreW2C36W6mmkoA+TID1c8W2mMsZYZ8QQrOR3sO5S+BrM9YfLGrG1bOXHSJMPNm64Yz7pI2nouvC0ORlO7hZROmS4LhwKb50NYtpu+dBUxSda7quIaWnuklEDcJpUc0GfgYuLHuAOJQ02iRRoycnbuSNW0GXL2dxAP/p0LJk3nm8ICJ6jDImOp3pL7vP/+uOTKxBHlDZE6WNt8VXifz6yUYBURel8Tr1Won+ni1Gf+xCslP6bwHiWASZtNm5+KlczYH4FMOPkV/A9ddQirZL5zwk9m9xEPu9Gi5R7irkWJMeA== 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=rBJQ5KqirSBPtKuOXLmUqpskGmZsCP8N806ZFpMzNyA=; b=SsI7KFFFEDSXH/5buV8zgl19z/3OyOKo/Ic41vI+bMlV2Z/RRHzNRPxMade6dA9VfEB18pRTEO0aCHKKhiXxbMVeOAmJOH5r+sk1SQRf9S57cply+ckpAHZUuXmo8wlEexc2kDyzqsjYCrXIraYyFIxHzUlSOTbK56Ikb8l9ikNdTmPdaeisEq1KwkOztOG9x/MA56os5/6pRzeOeJbmaYQY+uVYpYyD/RWxky2WeSe9W5acykjBmOwvTAnpvu5oAhB67mTe33r1M+aq4TCgvm7NVKflrT+n2aXEh4a9qUPuQVGd7tQfJTkhVTGNwGHKlwXop6PP1xgY8FDeSfwtRw== 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 DU2PR04MB8853.eurprd04.prod.outlook.com (2603:10a6:10:2e0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.8; Wed, 26 Aug 2026 04:52:18 +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.006; Wed, 26 Aug 2026 04:52:18 +0000 From: Guoniu Zhou Date: Wed, 26 Aug 2026 12:55:45 +0800 Subject: [PATCH 4/5] media: nxp: imx8-isi: Add i.MX952 ISI support Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260826-isi_imx952-v1-4-cbfaaa3f0000@oss.nxp.com> References: <20260826-isi_imx952-v1-0-cbfaaa3f0000@oss.nxp.com> In-Reply-To: <20260826-isi_imx952-v1-0-cbfaaa3f0000@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=1787720155; l=2847; i=guoniu.zhou@oss.nxp.com; s=20250815; h=from:subject:message-id; bh=a+df/G8PrzFYSGvaXxHSCwcQgCUHn5O8PMCGfGqqbys=; b=UX0qat94sWhIz9qTVk1B4s9vJMZiI/XAMOYVyEzT0JVufiWtT6CmZYrOFWhfJwdP4lcO56Vxp oZd5Nhk6zx8AnG3UWaCEcuKajXz4eiit2gcefErW2veC9RXqiLBxwZ2 X-Developer-Key: i=guoniu.zhou@oss.nxp.com; a=ed25519; pk=MM+/XICg5S78/gs+f9wtGP6yIvkyjTdZwfaxXeu5rlo= X-ClientProxiedBy: SI2PR06CA0004.apcprd06.prod.outlook.com (2603:1096:4:186::20) 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_|DU2PR04MB8853:EE_ X-MS-Office365-Filtering-Correlation-Id: 121fefb7-fb27-439e-d9e3-08df032dce53 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|376014|7416014|19092799006|1800799024|366016|10067099003|56012099006|11063799006|18002099003|22082099003|921020; X-Microsoft-Antispam-Message-Info: 3KmaZ5h8EV1KHbsHTw0Rs1Rgi97dQywAg4sZC4Ytp46i3Z6HHORN71alRQf4zNnVQmDwfyXId0Qek9LZM+4IwecVJoGyZLjFGl2TSzi/oFMd+dnhqMRAPnq3gGfBoMskfi/KZbijVtBbBC0LcSKKoxRjF8h24ciQ4h7MMx96riWTWEke0hvtBqp03zBrhbaEVbEgu86B7h+wJfxmQtCZTTYBNIjLBUTOdCnmsgFFYABDLXfnnj1SP2HHdNeQaT8I73PnLBwgzl1J5jbU42SwUCEo4H9bG2adQacADFm1sEMEGiUlKupT79Ydf4qK9vscm3MiNKARXi3m6aetU+e90YklKgMe57lvhW6TWgZcvwhOBlsQyD5ADXq7bkmhUpCzkPCuJLxfULLf+UkTy1L5ByFcLHBaGj5Yt/ckF+Su2zXbJvTEaR7Rzuhp0OT2KTgwpBRAXxVMa8Iai0MVCj6gElJMLrANeuRD34fy+SAovnKT+zV3L2MDNITwq+BbE4UGacUjdV3P2KYGr7cEHN1adP82S1cbd3Nqg2vkIrByYaH0Ic8HlKbl9l1e3NURJpgkGlcZr7RzBXpHge3hM8qxL0Dpgg2AXHPFt7jjGqjhCk6YVVzHQx8zbGKtIefiRhvtkpLctUXDlvqRqXvRIXSlCY5oEN/zeW16U026LcEGT/QK9t7wv3brkW6jevIleCzrbsf9oPqOQCHANzP2q8jH+g== 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)(23010399003)(376014)(7416014)(19092799006)(1800799024)(366016)(10067099003)(56012099006)(11063799006)(18002099003)(22082099003)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?alJ3YTNDQ0M3TVFvWFZtMEZ1RjlFSk9tdFNxTzM1czRZd0lFUW44cExQRHZx?= =?utf-8?B?SkVTOU9OazdLTldNYXllWVVzMnhzUnVRR0trUWlEeTRxZlpMN0NZUDk3R3FT?= =?utf-8?B?MXFKOTBsV3RpNkVoQXdRT01zU05tVTdzbndCZHo0UW5xRUlHTkIxdDdEV3NK?= =?utf-8?B?NzQ1UHdKUzhGVFFYaCs4SnpyMjVRRVFoeXZoUXA5NitLYldwTHl5TkxmdU5H?= =?utf-8?B?cTNGSnRzaThQU0R2azZlZlBkYlRSRldER0FOR3QvM01NNEorbXgreW9Db251?= =?utf-8?B?amcxNDBKZVBhM2plaVlkOHRrT0JaMGVGKzd4SnZKZi9QWThPZDR3OVltdisz?= =?utf-8?B?YlJGZHF4b0JIMTk2QzB2Z0NuOHlqOERaVzQyaytkVzR0ZjlQTDVNVUxqOG1W?= =?utf-8?B?VTk4SWhMWWlneGpMdUo0VVNVQ0tSc3RIVjBCZmVMZnZGTlhkR1RrOFM1YVlZ?= =?utf-8?B?SjdJNG90SHJ1YzBRcXFoR0FmelRCTW9DRlh2MHhnaHhDSk9PVzQ5dXhyWEVr?= =?utf-8?B?WlR2RHNjL2IxeHBleUFMTFBuNkkzaDBtcjlXRWFYU3VkMUJBbnorYnBicTV5?= =?utf-8?B?UW1jci9PREtzdzhMbktPNDBDSkpGak9YblVJbHEySkZ0cEpYZktiMjBVNEhj?= =?utf-8?B?aVNKUmI5QXdxRGd0UFhYMEFvQmltWW5Sb05DV3VkbFR6c2dVVmp6b1JiUVlQ?= =?utf-8?B?UXZ4V1F3dTlKTHJYOTBzTUdUeUhvbThEOHJIdUtEWDIwN20wbWlCaFpZWGxh?= =?utf-8?B?UHY5TXBDUnAvY1B1SVcxb3lQYkJIWUh2OVJ1ZHIva3d1UkJBcFA3eUtYRFlR?= =?utf-8?B?VWxLOHRjMWJCVGcwYUJMajBxUzhMYzZLanNSZUpwdUdRNlBNNDE1YU9IeC9a?= =?utf-8?B?dFZqN2NjTHNQdy9TMUpvdS9PUkJJNWdqKzVPM1EvMlk3N3plcVRybEpRWVFj?= =?utf-8?B?SWs5allNaEgxUy92Z0p6R0YvcXVpZlRXTkRuRGpnRTF3cmFaK0d1UEpUNmh0?= =?utf-8?B?a1JtNk1ySG5EbmRvMTlGTGRMSGtCQ05La1hyejRsSjZjR3N4L2dDSVExakk0?= =?utf-8?B?d3EwNGQvRVo4aE9RbDR3UkNkRnF4WkRnVkRNWWlNQXdzNW1FZmJ0eDd4WlJY?= =?utf-8?B?QjBzbTdrRzVPZkphL0NHNGFjQm1IcnpUZTE4Z0RZYmpRbWRubjV5ZWtaTUUw?= =?utf-8?B?emVWcnBkN1c5bmdrUkpnazMyaVNENlVZc1ZhbnE1dytJV1R2b09CQ2JyMVda?= =?utf-8?B?aWU0aGZaWlFKeWdaQVF2d0pkSTgvU2t6MFlWTDRqQ1dldVBMS285Yk9vdlIr?= =?utf-8?B?V3RWSGVxWFU4RFJQWVV0bkZYeDNpZUk5cktwZ2FRWkRUYzZaZFRWUHR6RDJu?= =?utf-8?B?YkNjQWtlcC9BSzlBQzVMdDBBNUJiVnJGYnBDTmdkaWJsUXFWRFJxUll0YXJX?= =?utf-8?B?ZzhkM3VxWDh6Qk5wSFdHM3d5KytTaHpteklzT2VKMDNKVFZZUGZvcURSSzkx?= =?utf-8?B?OURRMXVPYmRhUThJZ3QzOHZkdTdqSmVhWVZjQ3FOVFBJYlRJaXJ5QkhkVU5l?= =?utf-8?B?TldhV0hYUDRPdzFjL0FycWMvcTEwaDhlNTVGRXI4WkRqYUU0R0xLRjJLaFIy?= =?utf-8?B?MFRwR0F0dEs1M2JnOXpRSFA0aEdqOWlHS3ByOHFEN1BnM0ZTbGd1ZzdIcWd6?= =?utf-8?B?WXcvdGpRMFlPc2NGdG9Cajh5bG9JK1Yxcm9aWTdFWVh6ZTVyR2VxMTRiK1Vl?= =?utf-8?B?WnZFVjdibng5aFAxcFEzTDVuYXNFM1pOWSszQ3czTlJiUjZkenQxaEhHVE1u?= =?utf-8?B?ekQwcUNIY29SV0xoUHZ0b1lwYndrelFqRXROWGhEbWdKeG1Kb3g1U3pYN2R4?= =?utf-8?B?NGRkMytuVHk2ZjdzdytlcC9RdTlZUzI4c0gvZ01HM0dTSjNRYUJXMmQ4L1ZV?= =?utf-8?B?SGNEMG1kc3BpRUJlTktqQXBXUllNRTRHMXlDY2hoUEtLRlBsWENMMkFndlF2?= =?utf-8?B?d3VmL2xzdHBwWjFQUHpXSkF6empUWEFDU3ZFRVJZUG9jNytRdU1BU3RUc05I?= =?utf-8?B?TlhRalc1SGFkUmNWT0NxYlZLZkpVcFVvK3YrNi9qUDlOWjMrQVl5SDJtWUFL?= =?utf-8?B?cUw0eTliQXNMN0kwTVh5UXRsd2NXcU10OG0za2ZYTHNaQ2NIcDdlby9hNHRL?= =?utf-8?B?WjFBa0EvUDhYclNLOUpXSjlGaXZWYXV3WGw5Rlc4RlkwSXY0Tkh2L0tNUUY2?= =?utf-8?B?TWdsTGF5WEUrZEtXWlU4cXA4bkVxWFRYT056YjJEYjNFdWYrNWZ6UkNzZWtO?= =?utf-8?B?T2krUVN2MUlZWlVacUtLNnNhMU1kWVhjUmVsM3JhamhWaVB5dDNYQ2E4V3ZS?= =?utf-8?Q?EmG0ToBE2H3y9+NCvuAbXFRt7wZAmRjP2HGvP?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 121fefb7-fb27-439e-d9e3-08df032dce53 X-MS-Exchange-CrossTenant-AuthSource: GV1PR04MB11513.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 04:52:18.1309 (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: +eYbm/XCqh/1RVKO2EwC1K0/NBEfMw9mYWTf7GuAJzhxk2C6WJp0w/7YjfdFFGaYdUcqnaO8nl0R1pxUO0Ri5iZBzfcR6Y+J5iSWU2339A+THUTeNQU0Mw7iE6/o3DRz X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8853 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 --- drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c | 14 ++++++++++++++ drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h | 1 + drivers/media/platform/nxp/imx8-isi/imx8-isi-regs.h | 2 +- 3 files changed, 16 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 c1c16dbc1539..5b19b581b38e 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c @@ -392,6 +392,19 @@ 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 { + .model =3D MXC_ISI_IMX952, + .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 */ @@ -582,6 +595,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-core.h b/drivers/= media/platform/nxp/imx8-isi/imx8-isi-core.h index 05c21c448b93..a4b638508522 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h @@ -164,6 +164,7 @@ enum model { MXC_ISI_IMX91, MXC_ISI_IMX93, MXC_ISI_IMX95, + MXC_ISI_IMX952, }; =20 struct mxc_isi_plat_data { 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 Mon Sep 28 05:45:35 2026 Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11012049.outbound.protection.outlook.com [52.101.66.49]) (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 D0AE3372EF5; Wed, 26 Aug 2026 04:52:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.66.49 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787719963; cv=fail; b=EcR1r9KY+jlwB8GMa7uKxkJ756lV2PIOWu4Ec8Sup2xtK1st3kNJNvk5XYd6K5LbSMVOA1CPHWXtTuCvrd15Je6Yk8+2OVnUFq8Yox6p9T9RKzprwgJTGVxeFtCL0RV4Wc3GI1wNUU4RU6UGi1mPpgPNI+T5sUY/BsnwJ7N1Ob4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787719963; c=relaxed/simple; bh=hkjb6P38Bm6OpNtUTjJtCJfkOw7GQGZbEOsSWRRPlbc=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=F0mMciaOATvE5KU+X0P68MaRRmLapRpnMVGQ8tVwMTMAVLzuv8lSaK014grcLrtQKkoexMxsONylY5n2NJCO0Bw/cXoi/03+rCb0fTfQJmx2rYnAgrEO98IVgAKUX5KRDOxpckoc3uJfkevzenlVK+THYIWklaj0RTyZbouerqw= 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=sKfltz/9; arc=fail smtp.client-ip=52.101.66.49 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="sKfltz/9" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AbugL9n5tc0NFtQBQ7R0chMnaFBrgt6PLRCM5hEqJRwI/CwP3LICyAZiYK4jLWinX6bF1qFzdPtjywGiumFZk+PjWg0oSejU9J9ZQ61YeTUxPNQj7+0sEnNhOvTdaFV9Hzoq6QvK8em/7cA9yKJheZt12/oIyEVPmQrnjmHkSJOQP3gYN1AaRzxjBkJyCJl2C9vPhIjoUIHC3NDE/blQJw6b8YU7Cp08LJthBIHMlx4A9pfLSXZ+E7BXp7nH1qxpvbfNVrWtud9av33c7mhfpQaKmStiXWlQdfgK/At4ie2nCDWkPW2Yb1pQkzjJG2IkB7jnFNw0MVJy2vO4h7IUDw== 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=XfQPXvVwZ1cK7B9byDcDDre3mOgfoQuWibVJPpcXY1M=; b=Mo2gcsrvXadGodf1fU5EiHvL8qZj8ZLqfZblj4Sl45736PE4we01n7a6aqB/pXsqszFG11bMOVQAH2d6Zp0+lVN1V8HG1JcwipEjM+8GP/jJPiydrzlvbkF1xQvQFCSLWgv+IxXRWkP8qtN8XdKRPUliPL6xnS4YDSIMmmgzM5sKQ0GGF3SsQ1LYkZ73TT4NvhR4Bu+0WL8D8NXaVx55Q0L5E3doR0R5eN6+AwVBmEOy6MZoRNjTQGv9QZT2F8CnGhqSFwAEUJ4fQBSbkoPengfRIbHkko4MP39v2eCWIc/Lzbh6y9Bu9cw8pAcef9jKZSJzssgBbpfTJ/yd5QpF3A== 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=XfQPXvVwZ1cK7B9byDcDDre3mOgfoQuWibVJPpcXY1M=; b=sKfltz/9AU0ZXVVPfeMHMdbMci6x5RsJdbTVTbVhaDl1mji6wDCIMspkJwpeEJcwx0Pm+OhsldolGjb1oUjcMkw+c+0V7tJzEbLTcPyicNQZ+BTeaXhv95TmO8rA2nTJgJG70FX4uKpc0e7Gc4ywjSOruImg9ZFMC6JFwbxNpwOFDPM2IXeqEV1eAvMcnazzMi3GasmwaObdm1+yIWfDEh+XrCc+4JjdNyJLY/Qi1YnMrZHKxQTmGl6WJepFQ6TOdGOHeSYUv/KtFSi6CoiX71wLVCr7vfh/y7f9yrO4u7lq5e9aMtkXfq9tj4YzHhBAyyuveSJK6rR3ujKo4eYi4A== 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 DU2PR04MB8853.eurprd04.prod.outlook.com (2603:10a6:10:2e0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.8; Wed, 26 Aug 2026 04:52:24 +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.006; Wed, 26 Aug 2026 04:52:24 +0000 From: Guoniu Zhou Date: Wed, 26 Aug 2026 12:55:46 +0800 Subject: [PATCH 5/5] 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: <20260826-isi_imx952-v1-5-cbfaaa3f0000@oss.nxp.com> References: <20260826-isi_imx952-v1-0-cbfaaa3f0000@oss.nxp.com> In-Reply-To: <20260826-isi_imx952-v1-0-cbfaaa3f0000@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=1787720155; l=12206; i=guoniu.zhou@oss.nxp.com; s=20250815; h=from:subject:message-id; bh=hkjb6P38Bm6OpNtUTjJtCJfkOw7GQGZbEOsSWRRPlbc=; b=AIUxUOBftntoyhUOk2GRTpieUu+0eQT4akfBIeEm+zgTy9/8fPwIRC3xT5pF+p38DsvDGnwZf /G7PHW0SodDCkvY9QQXJQHtwrKv1TnQSyEdqznUiJJqT96dO4FGcLSE X-Developer-Key: i=guoniu.zhou@oss.nxp.com; a=ed25519; pk=MM+/XICg5S78/gs+f9wtGP6yIvkyjTdZwfaxXeu5rlo= X-ClientProxiedBy: SI2PR06CA0008.apcprd06.prod.outlook.com (2603:1096:4:186::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_|DU2PR04MB8853:EE_ X-MS-Office365-Filtering-Correlation-Id: b1847178-4df0-4f76-3f04-08df032dd1fe X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|376014|7416014|19092799006|1800799024|366016|3023799007|10067099003|56012099006|11063799006|18002099003|22082099003|921020; X-Microsoft-Antispam-Message-Info: 8pfc+XbQvVp/Aswnnyaf6aD/HgoDDzkZ5MKOBbtEPjahxiLDUBbk1WXD/gdWiwX4A4WGFdZvKZ0gaRhGRDFz2nVxuWwgBnmIRJGNDPojvO6E4HA1ivnHQwMngfxkENZHbZBlNWpiiYPtI79uTT7wHivLftuUrNVjAO3rdMgnLJZaTsbVqcpaBP+MUV7jENdt6vkE4/bmKIuizgeeCClcNfZ8de4v5Ef5eMjYxUw0PkxONjSwFmUWSF90TJvS0/RpFRZpZBq9DO6DeJepXubYEDPvXZ+dKC2fTHNF4GyMG/fq2CbliHl6jUG5M4xCmVUhUQxZXG3BoM0cWsOEZ//00+lJRT/J0GKehz1T5AgXtrf9EW5qfKBmvHEwKGZIXBDLI/rZXym+Hf5lEBq6OKbYAK6nW3z71eELYodET9jgT3UCdmpijitghUre6chfe1lRwJzHCvg3SeVFkpMu4bjhOrEXO8wd5qsl04Da8o/h+Y9ovFUghzRWYjGaTmLb4tFMR9V/QY9YEoaCAYiDPsQFuzUajMY5Yl4Xr9RmE9CvYdNEHS+tt3AYGxt9tMo21uqbA9/cYF3XPWjJyfhwXuAMyw5EsxVjXnMMM/5MomsCABbZs8WUVJeV9DPQE1JTqGWKvfwij8osW515Y0e7o38gS2frHZta6Ogl1dgqcYDqo3lpJoZFz162MQk+3YGzRuh+2JY4v5c0tHctKzxpMxxniw== 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)(23010399003)(376014)(7416014)(19092799006)(1800799024)(366016)(3023799007)(10067099003)(56012099006)(11063799006)(18002099003)(22082099003)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TG5MaExZZjhjdlNqYi9TY05iYlhGQzR2dHV5LzlhSlovaXMzNkJObVdZTHp4?= =?utf-8?B?QVdwWW1pK0txVzFUbDc1YUFsM3hHVGNPTjNSbEdncVFEWFY5SWE3bTlNTVBp?= =?utf-8?B?M3h1WU42MHpJclNSSDQvVHUyemxiNHlWc0VzelpQdVd2SWtiZkxNTmtXNlFm?= =?utf-8?B?Vlp0SDMzeTAwY0lObGlIaUdTc0RpczBLMS9BaExXMUtVbTgzMTF3d1lFNkFV?= =?utf-8?B?cldOaU50THRvcnVBVGI1MWRhbk9BK20vRElXdldkSmF1WjQ5RWZpNmpQcTZs?= =?utf-8?B?dGd1bGs4NlBxWEhSMVpnTU1LbzRJS0s0VXA3Yk1MT0trRUg1MFJ1QWtOU0Fp?= =?utf-8?B?NEZ0ZGVtUnFPYkdoZklmcHBSUjJwaVR3TXVZZFVZT2haVWdHY3cwMkNoa1lr?= =?utf-8?B?T0l1TWxDaTJGQmE1c3JxSHJTbi9VVGdqQmhVYzNUZS9ULzB3ZjBheE9ndmlP?= =?utf-8?B?NUY1YytFSk5SUExZUmo4RXRsWFQ0SmpqNjNQaC9lcU80eXIreGd3bTR5eHRV?= =?utf-8?B?TVpTV0trSGtSSFlJYVhvc1ExU3ZWeDRoZTJoUVhpZFhlancvZ1VUWC9GUEJv?= =?utf-8?B?L2o0aUFOa091dEMyeXRsMjBxcTdvaHRxb2FlSGptNEdIbGFXZlRRNlFrR3Ix?= =?utf-8?B?MFRwbjRYRklMSjFWRG9YNEdWSE1WL1lFcUVIenhaQ0xhQkdFYzROcUdKMDFB?= =?utf-8?B?TEFZd203MTQyTyt5bkFzQUVhc1dHOWw1UkFURmVCTCtpT01iNlIzZXA3OFJO?= =?utf-8?B?L3hETFg0UmllOUJsS25xRGJ5QU5mSUNsWWxDOW5PZ2FMSXFzaHVQQ3hmR0Zi?= =?utf-8?B?cklGRHJBTno5dzVxdzdjcG4yV1RQOFA4cFc1eXlkaU83Q2E2T0IyUmR5cXFY?= =?utf-8?B?K0ErczJkemViUmExTjVSdm9sekE5aTQwak1tTUJnUllQYVpiUmFmYjJyUldH?= =?utf-8?B?WGVQM056WGl3QWRZdWFhMEoySWlMMFh2UzZVaTJzcXZJSUlQTTAyUHNIUEI2?= =?utf-8?B?RS9iRVZtdk50Z0ZBcitQQXlHVlJFUDA2VGh4eEp4R3JFVUIxNjVxWUZFSFd0?= =?utf-8?B?bU1SbGVMWU5OVW1HVEpNNFdOb3llblBqUzJIVXVFRGlJbFphS0RORmlvUFY1?= =?utf-8?B?YWhBalN6a2JDQWw5aDJxRWdHb1A2MDF6TUM2T2NyWFVWVjEzamhDd0YzWi9x?= =?utf-8?B?cjB2bmZhVzFTd3daQ1o5M2Q2b2s5N3c2ZCtmMEVPa04rcWlKRkZiREsyNUVP?= =?utf-8?B?QmY4eTdHRWdCWktoMExnN3lZMmZEeC9KMXV3dGlJeUJ2R3FuRTlOYlVUZ3FE?= =?utf-8?B?WXNKOUxHQW9SRzUvdmdIQm82K3d2KzYwdlk0eG1XK3hTVDB3bHIyRXZZalhL?= =?utf-8?B?WVJOazB2RTEzWFhGclRuemZQYWpOOUVoUHNMN0dxeWNscEZYYkZ5cGN6bDla?= =?utf-8?B?bXp1NjNyZEthZTlRMUUrNjlxejlqSXZnTjdsQ1pIb3FzMkR5UTNubDZCMkxC?= =?utf-8?B?TWpIWDR4Q3Q2MzVWMlRpcXVaa3BNVWFRWUlrQS9mR05MaVVTQ2txUDc1RGVP?= =?utf-8?B?RGRIaWIveWVacGdsYjMyL0lXaEI3b1hrYVY5WU1xSzBpdHNPd0VpTVFGREN3?= =?utf-8?B?VGhyUzhsVjcxQWJQcitSaGh1WFlaSVV5NWQzUVFWMi8xSlJCbWZ5alZqZ1gx?= =?utf-8?B?aVFGMDkwcUkxRXVnZWQvY3N3SHNzdHdTVzJpQjUwaXo2MXZrbHdPSlBPUEN3?= =?utf-8?B?eTJ5alByWlN4QVNXS1ZMajAvd2JiTFQybjhTQWNWaFplN21OR1pSTlU2b0hY?= =?utf-8?B?MjFYS1RrUm9TUjdPWkdRTnEwMVdUT2xvVVBDQTc0QmhnaWFQd3lSdndGNWVQ?= =?utf-8?B?cUNMbTVKM0ZpQk53aHUxcVVhQlNML1M2MUQwZFhUeUYzOEQ5R0tGaWI2NWE1?= =?utf-8?B?azgwaGlMVlplR2Zsalg5OVRRc1N0SDFwUzNGbnl1dXFOYzVmLy9mTHBZWXB2?= =?utf-8?B?TFVBWlQyVkdGdWswMkdxay9rZFhRMXZUQ095MGdHclBpS1IrSWFlanhpbWdM?= =?utf-8?B?emVLbnExWk5ZTmFER0Y2aFdTQkZtT3U3V0ZSckIwOGNlMTBKQ2k3eCtaZnJS?= =?utf-8?B?M2xMZ2VSdVNpTGttZHQraFdOWXh3aDVtU0dBWlhTTVB3RElVMjdwN2NYcTR4?= =?utf-8?B?emJxRDJWemp5VFcyU1Z3RHRQYnVtTFpUNE9IQ3M0QjRjN244cUFSblpvamdh?= =?utf-8?B?QUJsaFk2TmpWNkpyRVBWUElYZmFibC9LNEYvc25LRzMybEl5WENQdEx3d3lN?= =?utf-8?B?NVJNNEtVNXNtZ3pQajBpbStNUm93d0NNKzJvZmFBTTRwS1ZRWDlKWUw2Q1hW?= =?utf-8?Q?B5nbBCioCN1bvfdqREvdjdSy4xC/B0jZzbe+6?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b1847178-4df0-4f76-3f04-08df032dd1fe X-MS-Exchange-CrossTenant-AuthSource: GV1PR04MB11513.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 04:52:24.3442 (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: 5BHbQJ2H/POi0InVX2DCwi3pcRDTawgMwozfCILHVGFmuvg++IXVl9YiwgghJh9gjgvJVlsviXq33SubEhAVT6VyRB06fiU1g7v3UEORLtmm1jNGlPbAn/u4wBtW3zCv X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8853 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 5b19b581b38e..439c7bdecfa8 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c @@ -403,6 +403,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 a4b638508522..39dbb35bc4cc 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h @@ -179,6 +179,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