From patchwork Tue Apr 8 21:53:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 879235 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2086.outbound.protection.outlook.com [40.107.249.86]) (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 4B42E2580CA; Tue, 8 Apr 2025 21:54:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.249.86 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744149276; cv=fail; b=RmE3d7oDkTf72FSCzhQC2q/UOK1RjqkRvRr1hsL2bv651fjRE5uFIa86LDGeZ3R8D2o30Bn9QcTlCyea9Zpnc298XP+H4V4w5AEaIhbZ1BPffu1/C/u00pZwiVWUt2aHZmNC+QI7q8mVL66T653ivbIcZxSzRybC+ESLzdNEb2M= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744149276; c=relaxed/simple; bh=FaDfGMR3swA8QXQAar4w069jozmRmSBM+fQOBalUW/w=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=Ku+yp12yA0mkEOMs8UWi15f5VphGxMQalzcfeSdLluU3wgFZEdcIt8NzGED1iqs2JbhDjTYAPLEkv3nvJNjHpXvymW8Y7BqW1cx/n7ZqiqZDWD/u7jJAXAFmE4reaBiIeMtEJGg3AYqxNU05hps7nGedzh3nW5DJL5C/s44+uxU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=ZgHAf8lP; arc=fail smtp.client-ip=40.107.249.86 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="ZgHAf8lP" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jCrM5s6PZ34RWY3iRGQiAFW3UTeOjZg8efSr1XvDbAeRs1IeqjAsr6YIn34pLZauJLQTC59/aS62V90XN6EI/HxCFV4174cRFy+Ni8GDgOoo79zeIA11z68iaY3ElHVYq64BisPgbfaQi6vNqDpS3V4tJNtGZiNV1w6XHha7a3wPrvb+dRIAcxBW9OFSgzG2Oz1/6M4J88JpSXCwPp/rTSyERyVIkUXMTO5HXhyIsZnxX93JyZjfvlIlWPBVuA6GX8GaYkFiU33ynXNXno5O7K0RtW5CH+OePaqIOQLhG4/Qw9xY8ROd0kzC7Io7r2mQp95rV8JBiWbUpPMTZy1bag== 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=Dffwg9LBBpZq8rLz4RzxC3+OKWjjHLRSiKIlT1Q/7dM=; b=LcOUSHFwacTRqnXI6aD5bozI4BaVIgTunT7CxUqRfGcHlLoCRqs0K8Dik+cW4ctYBD5ylj4hfOCFzh/aeibO2fJgSiyMFgjnNjWPbRzb0Hr7+8umZ7FFJxn3JdcExAuCB+7jicrgpdP1IlNLR+sJybC9DBPqtoUy8LTW0RZ4MZ43KOxTV2WbH8ApLSJyM63eNQQBQDsVqG/hqBUoD+IAo/s33zrvCBOdIfjn5D9q5tgTh3RpdZ79Jz2wVur+U40Zt94oO0tjs1M8J1i/ASTeHrw69inbiFJ5nOfrNdXpIQm5u1Xi4OOncJXLnmZakVC3x8vKyOSD/JU3M8XPU4PSXQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Dffwg9LBBpZq8rLz4RzxC3+OKWjjHLRSiKIlT1Q/7dM=; b=ZgHAf8lPsFtorEZ5VVxQx5uVXLQqIN/NLaVRaZs+IUdc9D9HlQzGDSIJWTVnJdXhiD/ve/ukBQesKMqGTAzvLUYLfD7jNMA5xWWVU3S5N/Kx0WoBi9FNEoqQ2170j0DXfdmIX8Qgt6Wh2UONz0YyV+2t3n3Kxzy6LUK+3AiZ7AscaOWuO4eRKxBU767ti6YdtIEXa4doo6V0n6ydu6fZVOLe3FuKYCgkxQNTWbnFTd3NsinXJnJZ03S5UujxiWZvi9Fwfr/H2Cp/ZTtEQZEVcilpYSYHfkDB936xbKH0xOup5kEyXBl7wzrOnqbNociQ/Q4GVq9grzD0v3rqcwi0mg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by AM0PR04MB6993.eurprd04.prod.outlook.com (2603:10a6:208:17d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.34; Tue, 8 Apr 2025 21:54:31 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%2]) with mapi id 15.20.8606.029; Tue, 8 Apr 2025 21:54:31 +0000 From: Frank Li Date: Tue, 08 Apr 2025 17:53:07 -0400 Subject: [PATCH v4 09/13] media: imx8mq-mipi-csi2: Add imx8mq_plat_data for different compatible strings Message-Id: <20250408-8qxp_camera-v4-9-ef695f1b47c4@nxp.com> References: <20250408-8qxp_camera-v4-0-ef695f1b47c4@nxp.com> In-Reply-To: <20250408-8qxp_camera-v4-0-ef695f1b47c4@nxp.com> To: Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Frank Li , Rui Miguel Silva , Martin Kepplinger , Purism Kernel Team Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Robert Chiras , "Guoniu.zhou" X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1744149229; l=4412; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=LyukIx+1tiwYPq19TZRYdEvx1H1hK9TvpLaUo0+Fvmk=; b=vHENDKGEwBW/ntMVYAp+FdXOA6MiKjLxelVgNP4IFgF9xmYs26DkEATEo7COZS0JLeacX9oeb FoB7TuPBkdkCJPsRSYdiu5DbjWfpiVwvDZXR51OPM7Yp00j5J8AMdfK X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: PH8PR02CA0047.namprd02.prod.outlook.com (2603:10b6:510:2da::8) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|AM0PR04MB6993:EE_ X-MS-Office365-Filtering-Correlation-Id: 469c45c5-cefc-4548-9b90-08dd76e7f148 X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|7416014|52116014|376014|366016|1800799024|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?rt6H9gjuOgdqF2PFSix7jRoHyY7UfDG?= =?utf-8?q?UOvNSfl0lwSjdFHr1HilSGQ7KxsWnYfIH79SFRXhqFjwnINlXcYZjrrvdOWUJLRYw?= =?utf-8?q?zKPnmgp7wh9WL30VbQyymEwFTJ1L8lHf3gwY6meqbPHkkGGJLhQY22XreC8UgqBu1?= =?utf-8?q?PGJpHri8fT1pVltCOltasVp6oNJAZzQiFkTV6iEKKXrT+sSf4VlwXpZALJtIMuhdL?= =?utf-8?q?RHohm62a9sFKIWDnHvd2ojorjFj9QLzC6HEUQkHz2VutaDQx+P6jqyBlIojfZLIDm?= =?utf-8?q?AMxEi8ZqjD2sM4wzbpDRBTTG/tth5cibihqNswM+0P4GXYQ14eD+zmmU0wjZEkaeP?= =?utf-8?q?O9jLOBRS/g9wfTJ9NNYAj+38YABmTbKUfsL6wrN1IrEu9PdUXvdIkpOhfp2jTfKWK?= =?utf-8?q?INaQLkmlM7rdOTFANxWXkXzxWtReUgl8R+MIkSUdfcv0jZ+e3QWofjn46cC4ymzmV?= =?utf-8?q?TkE3VxFnOcmZGpWngYdOvy5om+yN87fXNhLD1oGb4KpAwVZD+YeieqCjRHz8YD8Tm?= =?utf-8?q?YIYlOLvQuI1TrXotNBhEHEke6bUupx0Nlh73WA+kLLb3tCDZUYQuySOyhfUe7PhuF?= =?utf-8?q?6MxYahLjTLJe689mWfmnyKtFkm14O90s1KLU1oquUnp7GEjw/Absu2/NHkaSqFSIw?= =?utf-8?q?+LnAtZuH4b2Gp1kB1E6lHeK2vLy3x3+s0SNFAD4dNjNFZGSmSIAn9O89XK2GeFyhf?= =?utf-8?q?P6o/BPgPy3oAcMVcCy2rhJz7SSKeq3673PyE2X2peVg7Nl135sbGIRJvh6k6HlkxK?= =?utf-8?q?V5/YGuRLUpwtEV55J8uOshUT/43aRY52l2BbWU5OxlIR0PpCLH3FxxhOt1I0GbVeC?= =?utf-8?q?mV1TSKkGwneF+uIU02w9Y0qP65a6rS+DAcZOWKWCSm57u2j4w7ZpsV6pw5UCL3odX?= =?utf-8?q?S2D51QKgP7dlwRApsE4LWm3iFFY3x4PUJBdEqa/OP7+A2/fj+aBta+ndVuBX/X2Nb?= =?utf-8?q?3Vu3z3Do8WBJuwGxNiP9LhRmQqq0XEySysKBRWcCckScTz1yrST2HvDxS2oOFU7FO?= =?utf-8?q?v7baq4iE8g1QofGFRgxSYKmE6MfTtD6VtpRhx5xc56QuAFGer7BGR00/YCWH/kUOy?= =?utf-8?q?vbjwUx/ruthY5HAsdhGzcmGhKNmZFOYM9IyO9kobD+JDG7ZD2ivZnLY3wV6ZLOEpl?= =?utf-8?q?+AGE7ruISpZPSHFSl7Hbe/pcHBGXSkXnZX55DWLlxyyY6xNDsWGDfU0R2lMnaoLjx?= =?utf-8?q?4n1DuDYdpsycR1i70Ee7j9QFOVn+NaDxZ7G+5s8g589N03s4TsbSlQ+4BxZKdDYOk?= =?utf-8?q?QX3TsCOgcUJnkvBVlK8i+aYZMpixutcFd3lb4lRbUnah5Ajve6pHLG5O+JLN6W7zl?= =?utf-8?q?t0UpGCNAa4RwoNHurWriTjaaDyKKbgSy7aYBE1LV7fk5jx2TmIXeOs9f7X99hSjgm?= =?utf-8?q?ojbfBqFdlS9g7UsojjPk4TcT8emKfoB7Q=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR04MB9642.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(7416014)(52116014)(376014)(366016)(1800799024)(921020)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?w1iuhgAvqBVbgw8isFp6NA4eM9Rt?= =?utf-8?q?EsD10fJ6R7Rf4p6SjJApoOEKc4jSZiX8Sq/I3jCaNab/ivkZ9yDwUxUNL4O+g4LNE?= =?utf-8?q?TcoGVdKmfeJPK8cU1EGkE2/zzGjZUSV24yzX/LaBWDgxS8b4J0a51kfRbXMrgaaGR?= =?utf-8?q?lix7L9Dm6AdsuQLclkbfeQbGYNS4/pddURdmRnmoQeJCkryiKZRxtoKMO73eF4+0r?= =?utf-8?q?+7YMIVCe1LPMmx6J8QricDspKGLgxSXYUy/kxrH3Vla2hGv0g//YQt00lZ/xeH4AF?= =?utf-8?q?J1KnyN4Oqe/j2cXpFMUkl+SQt2xP/4PyXBFAN183qYKZQ8jdMsww1GD74RjGBSMkO?= =?utf-8?q?wDqqYF22K0CsyR3x0/zh3yH43ZuV8OMkkYR4GQlO4jDrYmJpzq5rskndiXJWU48Hq?= =?utf-8?q?fZCpleTrou5B2mQBaSqqXeMjRjk/8SHKNAkin9bbeQSLEkp4WeODRTIS/+7nCaIdw?= =?utf-8?q?D3sTRdSUJsGaYrsP9FdBXO+T4/ww/X05Rffwb45j0qkjpzlLf7DZ6dd42uFGiA3wm?= =?utf-8?q?e5zHBYWL+dMSx/GncGqHIzhYaWbZh/bcgpA40pzQQgtF/JjCZcXvXM4sfLWhqMBV0?= =?utf-8?q?823lSiQVA8cvj4bcFZcGU5w6HYgaIik1+PTAr6TDlrDg+f10JyPnWAEN1nF+XYSQ6?= =?utf-8?q?GVqgcYJidpaQfsdzfJwn5iisx5a1HoiHwwuufGoiHhlfWJl+WCS9K85vz01SRILvL?= =?utf-8?q?xGMpevOj/m+p+Hwrf09n6OjbFif2A6eXRqrL6QO5/N7vk+LiCs+ep2goYqoIpChe5?= =?utf-8?q?3T2q/whGSDmXTtwW/cTvOlB5wT08kectXIs7XZFdxJlYweDwuL2nLO85xAeF2nYrT?= =?utf-8?q?hg/aR+vpLaRnqnOVgnGszNcuJO0Fo5Rs6nbpqCC46I5MXl+5jD9B5ohnPwWNlLU44?= =?utf-8?q?5WRC8NGY6kfoaMunFhgRxT7dU/O6CyFyzMHPUMFQsvTX7iMvTm8HaxDN7XBc/yRub?= =?utf-8?q?4EsnSg9s29/w72rGFy/FsvkjO+k5EL+ODeDidpWwZ04ZkjBX3lIU4gRngJGnpjmmT?= =?utf-8?q?HkOykVrJ6F9BfHQL8NcrMwH2t5YfNm3lil175jPRYUvKnrGYk6ycGuc3zC0OfpvnD?= =?utf-8?q?jo94/aUHFyhXcnrrMRtWGPGiapXgwJiuWVj47l3cMyDwdd/OMDEx3VscZ/QDn0hDn?= =?utf-8?q?KEKYBrqHQFEWmx8buFKQyQ6+CdrJ3wCsoxvNvgyfwNGWVk2xPKh+by1rPK+/dw17D?= =?utf-8?q?96mi7OX0G5yFRK2h7Hd71foFfn864Ex0tDTmuKXguQn3AgxH9F7tm+G7lciIBMXP4?= =?utf-8?q?lEPce0ruV3b4b4dIE2BgfukkcfraajZ3e1Sv8EHFYpSpZjiDqtRKAsV87Jzt+mtCm?= =?utf-8?q?rLcc41p61yLB4ArxqEjskSEIrB/IV4rDFkk61hNk0H9dohJAyzEAvRLZWcT9s52Jq?= =?utf-8?q?EiOfEDPCpgD3z/tsGAahfGRoCOb2tTb55YBRfB7XFKodbxgM13ERq2S8uFVMy4ITC?= =?utf-8?q?Zw0XE/Hkx2vdM8vp4oug3uipLvoSvh0P7DKSo7G1DgeqIbng6oj4U1sdCkXjai0PJ?= =?utf-8?q?opHYdT/QqKff?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 469c45c5-cefc-4548-9b90-08dd76e7f148 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2025 21:54:31.5734 (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: SoAlEm6fGJT3pSKxxwhwFxO8sAWBPe1tRlzfr4n9MR+0MIitMGs29JUExffJXASP8CzYcWGY0P87P5SE6qQN5w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6993 From: "Guoniu.zhou" Introduce `imx8mq_plat_data` along with enable/disable callback operations to facilitate support for new chips. No functional changes. Signed-off-by: Guoniu.zhou Reviewed-by: Laurent Pinchart Signed-off-by: Frank Li --- Change from v3 to v4 - Add Laurent Pinchart review tags - remove unused 'names' Change from v2 to v3 - none change from v1 to v2 - remove internal review tags --- drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 58 ++++++++++++++++++++------- 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c index a8bcf60e2f37d..59ec7107b4508 100644 --- a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c +++ b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c @@ -62,6 +62,8 @@ #define CSI2RX_CFG_VID_P_FIFO_SEND_LEVEL 0x188 #define CSI2RX_CFG_DISABLE_PAYLOAD_1 0x130 +struct csi_state; + enum { ST_POWERED = 1, ST_STREAMING = 2, @@ -83,11 +85,10 @@ static const char * const imx8mq_mipi_csi_clk_id[CSI2_NUM_CLKS] = { #define CSI2_NUM_CLKS ARRAY_SIZE(imx8mq_mipi_csi_clk_id) -#define GPR_CSI2_1_RX_ENABLE BIT(13) -#define GPR_CSI2_1_VID_INTFC_ENB BIT(12) -#define GPR_CSI2_1_HSEL BIT(10) -#define GPR_CSI2_1_CONT_CLK_MODE BIT(8) -#define GPR_CSI2_1_S_PRG_RXHS_SETTLE(x) (((x) & 0x3f) << 2) +struct imx8mq_plat_data { + int (*enable)(struct csi_state *state, u32 hs_settle); + void (*disable)(struct csi_state *state); +}; /* * The send level configures the number of entries that must accumulate in @@ -106,6 +107,7 @@ static const char * const imx8mq_mipi_csi_clk_id[CSI2_NUM_CLKS] = { struct csi_state { struct device *dev; + const struct imx8mq_plat_data *pdata; void __iomem *regs; struct clk_bulk_data clks[CSI2_NUM_CLKS]; struct reset_control *rst; @@ -137,6 +139,34 @@ struct csi2_pix_format { u8 width; }; +/* ----------------------------------------------------------------------------- + * i.MX8MQ GPR + */ + +#define GPR_CSI2_1_RX_ENABLE BIT(13) +#define GPR_CSI2_1_VID_INTFC_ENB BIT(12) +#define GPR_CSI2_1_HSEL BIT(10) +#define GPR_CSI2_1_CONT_CLK_MODE BIT(8) +#define GPR_CSI2_1_S_PRG_RXHS_SETTLE(x) (((x) & 0x3f) << 2) + +static int imx8mq_gpr_enable(struct csi_state *state, u32 hs_settle) +{ + regmap_update_bits(state->phy_gpr, + state->phy_gpr_reg, + 0x3fff, + GPR_CSI2_1_RX_ENABLE | + GPR_CSI2_1_VID_INTFC_ENB | + GPR_CSI2_1_HSEL | + GPR_CSI2_1_CONT_CLK_MODE | + GPR_CSI2_1_S_PRG_RXHS_SETTLE(hs_settle)); + + return 0; +} + +static const struct imx8mq_plat_data imx8mq_data = { + .enable = imx8mq_gpr_enable, +}; + static const struct csi2_pix_format imx8mq_mipi_csi_formats[] = { /* RAW (Bayer and greyscale) formats. */ { @@ -371,14 +401,9 @@ static int imx8mq_mipi_csi_start_stream(struct csi_state *state, if (ret) return ret; - regmap_update_bits(state->phy_gpr, - state->phy_gpr_reg, - 0x3fff, - GPR_CSI2_1_RX_ENABLE | - GPR_CSI2_1_VID_INTFC_ENB | - GPR_CSI2_1_HSEL | - GPR_CSI2_1_CONT_CLK_MODE | - GPR_CSI2_1_S_PRG_RXHS_SETTLE(hs_settle)); + ret = state->pdata->enable(state, hs_settle); + if (ret) + return ret; return 0; } @@ -386,6 +411,9 @@ static int imx8mq_mipi_csi_start_stream(struct csi_state *state, static void imx8mq_mipi_csi_stop_stream(struct csi_state *state) { imx8mq_mipi_csi_write(state, CSI2RX_CFG_DISABLE_DATA_LANES, 0xf); + + if (state->pdata->disable) + state->pdata->disable(state); } /* ----------------------------------------------------------------------------- @@ -876,6 +904,8 @@ static int imx8mq_mipi_csi_probe(struct platform_device *pdev) state->dev = dev; + state->pdata = of_device_get_match_data(dev); + ret = imx8mq_mipi_csi_parse_dt(state); if (ret < 0) { dev_err(dev, "Failed to parse device tree: %d\n", ret); @@ -953,7 +983,7 @@ static void imx8mq_mipi_csi_remove(struct platform_device *pdev) } static const struct of_device_id imx8mq_mipi_csi_of_match[] = { - { .compatible = "fsl,imx8mq-mipi-csi2", }, + { .compatible = "fsl,imx8mq-mipi-csi2", .data = &imx8mq_data }, { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, imx8mq_mipi_csi_of_match);