From patchwork Mon Mar 3 16:07:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tommaso Merciai X-Patchwork-Id: 870011 Received: from TY3P286CU002.outbound.protection.outlook.com (mail-japaneastazon11010022.outbound.protection.outlook.com [52.101.229.22]) (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 454F5230BD0; Mon, 3 Mar 2025 16:09:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.229.22 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741018162; cv=fail; b=OfYUMAaYP0B2eOLdNX2m1uy+CwttB3C+uYXLBAVPZitjpapQi9NUnWVFNGHX9ZmrOZnzBdVlnPrstl6U++Ia6qk9E/2nzCsXCEYWTP6QPGkMBVjkhytnp/Ou4ptpEDyLP3Ii5O4GccVLZlL+71pEnLgzTda3oQX9x89xGspzvYc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741018162; c=relaxed/simple; bh=TaCvgP5xQ8sp2vFACfu/gZiyIRAm3Fw5HwkIDXpsGOE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=CUapL8/WMv+ORqX++KhsIG9+1t3UXrSfOgKXYNUj1nTaB3DA42som78ontvoCNqMJtiiV5uLXshIi0rL+6vGlztLB0u5BD531w4DCvT6cNrmE8/cgqj7GAewFTI+BO+P7L4HYS6NW8cnQHCrX9svBb/06cD6K8zpu5oIaSjk8uc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; dkim=pass (1024-bit key) header.d=bp.renesas.com header.i=@bp.renesas.com header.b=ZpHNcaNC; arc=fail smtp.client-ip=52.101.229.22 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=bp.renesas.com header.i=@bp.renesas.com header.b="ZpHNcaNC" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=x/fM/BMkdxnk286RIH9q7TroqhoPWjNR/VC906BzulFNofdvKAUeXDqGplnQpUDDT5FTVyaD1L4o47DCVYGTnMsG7bScII73sGhkyKEOazDiZBhw2BGJpzwFltJLGjOYW55bTAI2ZMFeFZu/kY9cekelnBLJCuI5aJScdLk/dSaxfuALG8dVmZshxtwun8GjHZHTvez/fNHN1m6npSsQk9u7J6ixk4CIXKYezksN7F76xPOkGoedIX3qiwytVtzCvz67DWDamxmSmFMuCOED/o29l/y+JrScYJFI2kgY7t05VNC0+oO39aM2yjb6q+Y9HZ9/I8FlS8+7q56p4PO0iQ== 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=5/68r7nlrAN2KRykrPOV+mQNExeJc7+w7krTb2qcMkg=; b=xabr1hgsBp8kyCu5QMd+vOyRYJxTrBsY1fJLEL1bM++5aq4pz1hRKl+nsJXwS729If2F1X2wDyz5R3rDFlegRy9A2yKRJIMfebQeKWdUYKKFHxoiv/K6D5d4SNIgC3sZbQsSeCE3xRjzIyaNER1ytsKhxtGfZA//cJCYoDDINMa1CXxyd+RXMnzftc0kvJT45usMQrzz79cDUeCLTERCte9ujYo4SpcSMFt4CMNT0tPUyVVMHgtqAGacfg6RjfUOfsXwXg3hJiUBwfYr3j9LYpxLlpjk+zEe+You23DvXZpmXOXbSLanvgXsx/rk8JqK8jZjdFz0Zo3/rEhPnD+0pg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bp.renesas.com; dmarc=pass action=none header.from=bp.renesas.com; dkim=pass header.d=bp.renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bp.renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5/68r7nlrAN2KRykrPOV+mQNExeJc7+w7krTb2qcMkg=; b=ZpHNcaNCJcM135RExM39uhL8en8/Dr+onOMm4Vc0+Q9Xc5H6v+/m+Kju80BvtYhVrsaVvVyTLYwVMw3S0IOgTZHAi7iUDsSayh8adkHcu956bZ5xi89ZucKTFIRZRAkwHlfyTPh902NeG7H2Ymx6N0+UD/LU0bmprmMQFMintD0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bp.renesas.com; Received: from OS9PR01MB13950.jpnprd01.prod.outlook.com (2603:1096:604:35e::5) by OS3PR01MB8683.jpnprd01.prod.outlook.com (2603:1096:604:150::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.27; Mon, 3 Mar 2025 16:09:18 +0000 Received: from OS9PR01MB13950.jpnprd01.prod.outlook.com ([fe80::244d:8815:7064:a9f3]) by OS9PR01MB13950.jpnprd01.prod.outlook.com ([fe80::244d:8815:7064:a9f3%5]) with mapi id 15.20.8489.025; Mon, 3 Mar 2025 16:09:18 +0000 From: Tommaso Merciai To: tomm.merciai@gmail.com Cc: linux-renesas-soc@vger.kernel.org, linux-media@vger.kernel.org, biju.das.jz@bp.renesas.com, prabhakar.mahadev-lad.rj@bp.renesas.com, Rob Herring , Laurent Pinchart , Tommaso Merciai , Mauro Carvalho Chehab , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Magnus Damm , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 01/17] media: dt-bindings: renesas,rzg2l-csi2: Document Renesas RZ/V2H(P) SoC Date: Mon, 3 Mar 2025 17:07:41 +0100 Message-ID: <20250303160834.3493507-2-tommaso.merciai.xr@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250303160834.3493507-1-tommaso.merciai.xr@bp.renesas.com> References: <20250303160834.3493507-1-tommaso.merciai.xr@bp.renesas.com> X-ClientProxiedBy: FR5P281CA0032.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f3::6) To OS9PR01MB13950.jpnprd01.prod.outlook.com (2603:1096:604:35e::5) 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: OS9PR01MB13950:EE_|OS3PR01MB8683:EE_ X-MS-Office365-Filtering-Correlation-Id: 78502ec9-d2ab-4dd5-2a79-08dd5a6dc03e X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|7416014|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: N/hE/8oBmAIEl2CWfTLJxEAZ+2Vzd7gqqqoUZeGbRJxIdXLMY9aMFJGxsT0BLuGhCg68S3KBLFDv6bFwq3DG1AEEilS38P0WgQdoeI/7ZrA/ySrqz8S7o0cT01HiMvsTVOw7/0sn8qi/qXmnDCAzfb7ZlL1ptlkYTsERFLnVlYEHJsnF3giJjAA5E8QAGRd4ner8ziPB1o2YRe9Olx/sQK2jcpnSbD6xkygC+cVco2TzX4x1cZJxDHTYduehlYa9F2BcJ2Jh51r9Nx6xk4TTN8x/Baazh1veKDMLnZPFo7xec2fuz0tPGth085mbXb40bynkpYQjCf1GZeB0wBYeNMUDIgAy+lYfNDr3PdF/Fc2Ox6DIsBvZMpoOf0QNiIsgWgHdzylCJpIlrH/Px/aMOwxd+GGwqvi6dANZuBQExmmUf8iF9LZODIbDeti0FBJl62kBTKSyA41HNITuj8aQZfj8l+X4BE1jkL175v4U1Wlk13LtMk7JHk1dH59oVBZufj2gzdALKhQJuE/IMoFV3jnwL5peFr9/h0390iorBgTDL5ruc5DTcR8Y2Qql1aaq+vJA+AGR3+spzzH+LUWDHPB6NnUPptGd8Tx9y1OtGjMccLc8SozJm8Zs1w1XT4dm2ApLR4ps9g2PYZKuKIajEjeIArk7Hw6kItnQJuTaTcoqf8wULJnM3eM8HIgR09pffhaYjrcTDV/jdShZA+UdOjENnybKpo9+21pV7SWQatr7/h6e2py6bpN6lV+9VixZCCM0QqoOWVXlVbXWpDlmrU7Jp1FdRRaYPXXRxwCeYIEdYDDtkTmtFz4ZDETeiS2+q4Ynod7iTszHV+dQLMuDvFY2vrXviHK3EVh30c4wXf2NGFbHGiOMmKYds90pgbAxDB22eShU7kx/MT4HhqP1FxAAAFdz3wDAoyYanIwnb6aEl8oi+Qv3uqwu2ppvYNKTxRVA9rov16URbnfV33Y7dZbUCbsTrGaj9+JN5Iw6UqtRz9jvj9hjxLuX57SX8Yg67W8HfsgVmuvh8+zFSHZONo+OHZkTGh7g9XBJDpsbGuUXRHrEkeLahN4oh+cJDipX71VzlTYix4ZdkxOvrqX+5ai6N/Rj2T9i34Y9a4lLZD9uQFg34jraWFJGtzCo5LwkjuIHqW+LjAou5GAdHRyCkodQAziKzWbnFKL2o9j1ymeL9BCgRylg3+wQUAbDu2tnKkcTz05oM3gqjHtieE5BCi4etHoZWUn4CflI3KmhbuHfvLRr3FwnytWg7d+YZSHAQP0uaVFovzETf2MMwGyBTpmiPC8sEM4gT9JhofioGQ4chuaQlFSCuvV9BAQ4YLNpYPsUDP3Wo29P6ruqvWLsyHNZmUa7qniQXmsUEXDn8MHlAmoNET+K+Cw2az/i1jx7mvdIITR3Vk2+Y9Vn1DGi2eWljYLdTBz9E+leU4B+K8jgasS7yO2/mti3orLOJh8n X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS9PR01MB13950.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(7416014)(52116014)(376014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pYbQ2N3i7Upv+oY5xPrhvMJhZkxK9DabF7s0kSIKYbk1mlfUCjX8MoJA1Ihw8kPTUvonImd0v6BkAWOpQVcEGSV87+kMOLwHlqYCUEpCbZbgHSAYz+H9DrZ5IS+FMo6RCnQjN9ddUD7BRajbWRNsLzVkYmbYg5yHaNnW9Jir5lzbKPxltBE5AtAEiRIggs495NGJ5MS9Ibrm1Y0BZj5YoKBPE2Y+H77EwOjKPxPkCkx8lop6S4y5BnPelCiRybKlKJ5hZzXnROF7+HCO1U0qPmE0wvMYOM7yEZCcTDHLtT2hJ31ddI87gCBKBtmzJ9hqL8TaI1o97PGGsobSrM9Pk3m9i4ehIrQOA3SUGx4ZIqk7vyhPMWj9dMIVeJvsyJ1GiKAVQ+QU2C6KlUyUnIu44V1S5gh0901rkKe6E81za9L3ZKFdXZlRccrqRLh9eoG1BeAnAl6qx0AW37A11ZTK6bydrrcsfJlYRxOOJixm9FavYD0i5aiXqd3cu+phu8MTrzuUGUHGrNbglVhkKpxhpnxJb7LschoLBB/A1U4w8jqYy1JDJkaUdoQKeDcjj+ttiP3OeXhHQTQCwTOGT1XUUoJgmMXqLiVp2HLcaPalKoOvxFsMUcMf4ZmMYJPkgVqhySjkbyKWWuzIXZ2pQ6fesK5/BbJ5P1Nl5W4HihEUqD6tJwVwqGUPWuVdWEjixyhieYSkTjsGG7pzpjtxzaZ4ihAv3u4xYis8/Wv548agwVq3X8JMtZ5WofGGYM+Cv9l/tptFwVqXneqD6RAHgIh6yWNwS/KgMkJ5WnpR7/EZ76AYpJ4unHnneoLSLVorF1h9csNA8IgNv2QnB+3ZJdVVyF9a1VU451mITCjVI4ShppDRQNTkMOjn03bn+XO7/ioEDoLMmV4MxI41Hu9c16AY7rLeBvPKsTi/p7+44rjWAmD8TvqiWYZmZ/5TUVApDltGG11r8Tr+d4whPWt6uAlKi9fNc1gLsKiKlk2/0GlSEyu8fFSeKIAeMLedRcfRj4yJLEDqvEcEPbhl8E60olmhDloZo9FI+s+lfWAI4NkqcKHTkVHmieE4HDYMr80+zFX45XGyrscKCH6pkX30Qls1DtJ4tkEZouHA9gDxUIzpzlbbyXchbl61iYS+cb1N1CzFkFsqO4oY/D980kpN/J1RtpAgm+0utoxxcogm1c3uyEA66m4ig6oE/izYt9zfBngLhBmeQQWKmFDi6U8BX8Fafy8nXOJmEIejZXviDlAYUtSGJITOU8qcJZOXPBwmD91dx5/ypvwjONrJOgIz3Bhh5qzTNBc3o7w9MSO5VsSLR7Jl9GPBC7olRf90wg00KTJM3L27AckIWZ1a+MLWY7GxdUAvAVpIWi83gvHT/VRVzZEHiuqU9KEGOAt83l1ngRKbjE/Azxep5f3bYYm5DDaa3QOST47w5mf62WZR/kYErO+wPNrS5N4MKl7RKZqcEM3pAck5faYQp7q7Lp6u0q3Fl7cK7o7sEZQxAeF57xQ5adGuQZPirpeygVYmEXE6dOcH9AhNyEXh64xYEwU3eqTJso5U8goR8akyJk0CxlYpc6+MKXqoRm3h8WxirUtbi3TxUyCQGHapd6g+YORznBTbHHhMhGiedN8pAIWE5bPDrfU= X-OriginatorOrg: bp.renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 78502ec9-d2ab-4dd5-2a79-08dd5a6dc03e X-MS-Exchange-CrossTenant-AuthSource: OS9PR01MB13950.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2025 16:09:18.3886 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VvzFZR+BuJQgYdGzvBLbcmjzsBWnUoZC8+k56Ik0qmNMgGVDOE2fIvV+yKkTXTIiB+ry3r4665qTRqRwhbybNVP1JK7kfPfO1cY5sAOhdcqXFFYvF3hzxr+r4oTzqjhY X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8683 From: Lad Prabhakar The MIPI CSI-2 block on the Renesas RZ/V2H(P) SoC is similar to the one found on the Renesas RZ/G2L SoC, with the following differences: - A different D-PHY - Additional registers for the MIPI CSI-2 link - Only two clocks Add a new compatible string, `renesas,r9a09g057-csi2`, for the RZ/V2H(P) SoC. Reviewed-by: Rob Herring (Arm) Reviewed-by: Laurent Pinchart Signed-off-by: Lad Prabhakar Signed-off-by: Tommaso Merciai --- Changes since v1: - Dropped empty line as suggested by LPinchart - Fixed minItems into else conditional block as suggested by RHerring Changes since v2: - Collected tags - Fixed CRU_CMN_RSTB description as suggested by LPinchart Changes since v3: - Fixed CRU_CMN_RSTB description as suggested by GUytterhoeven .../bindings/media/renesas,rzg2l-csi2.yaml | 59 ++++++++++++++----- 1 file changed, 44 insertions(+), 15 deletions(-) diff --git a/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml b/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml index 7faa12fecd5b..1f9ee37584b3 100644 --- a/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml +++ b/Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml @@ -17,12 +17,14 @@ description: properties: compatible: - items: - - enum: - - renesas,r9a07g043-csi2 # RZ/G2UL - - renesas,r9a07g044-csi2 # RZ/G2{L,LC} - - renesas,r9a07g054-csi2 # RZ/V2L - - const: renesas,rzg2l-csi2 + oneOf: + - items: + - enum: + - renesas,r9a07g043-csi2 # RZ/G2UL + - renesas,r9a07g044-csi2 # RZ/G2{L,LC} + - renesas,r9a07g054-csi2 # RZ/V2L + - const: renesas,rzg2l-csi2 + - const: renesas,r9a09g057-csi2 # RZ/V2H(P) reg: maxItems: 1 @@ -31,16 +33,24 @@ properties: maxItems: 1 clocks: - items: - - description: Internal clock for connecting CRU and MIPI - - description: CRU Main clock - - description: CRU Register access clock + oneOf: + - items: + - description: Internal clock for connecting CRU and MIPI + - description: CRU Main clock + - description: CRU Register access clock + - items: + - description: CRU Main clock + - description: CRU Register access clock clock-names: - items: - - const: system - - const: video - - const: apb + oneOf: + - items: + - const: system + - const: video + - const: apb + - items: + - const: video + - const: apb power-domains: maxItems: 1 @@ -48,7 +58,7 @@ properties: resets: items: - description: CRU_PRESETN reset terminal - - description: CRU_CMN_RSTB reset terminal + - description: D-PHY reset (CRU_CMN_RSTB or CRU_n_S_RESETN) reset-names: items: @@ -101,6 +111,25 @@ required: - reset-names - ports +allOf: + - if: + properties: + compatible: + contains: + const: renesas,r9a09g057-csi2 + then: + properties: + clocks: + maxItems: 2 + clock-names: + maxItems: 2 + else: + properties: + clocks: + minItems: 3 + clock-names: + minItems: 3 + additionalProperties: false examples: From patchwork Mon Mar 3 16:07:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tommaso Merciai X-Patchwork-Id: 870010 Received: from TY3P286CU002.outbound.protection.outlook.com (mail-japaneastazon11010026.outbound.protection.outlook.com [52.101.229.26]) (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 0845A2356AE; Mon, 3 Mar 2025 16:09:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.229.26 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741018175; cv=fail; b=aBhDNzXzNA8HxaqK2jBA8Yzbf7aNhcEQpdg29eFMKiMqw+VJeQIj+d5hAjop4P8lHQHssB2G5SMqcEsHq619ax9/5ThMbbkYV0SwPtloXx5XNJcLVdjYFBvvQ0d1JXWV/YpSCnnsCcb9rv42eQyqKZHsQvPRF8GWfpRoVRRydHc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741018175; c=relaxed/simple; bh=cF9wpA8XAhmDShSXhU2RlgzRnvv3u+SXE4OSiXkNLPc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=qpeMRohbimTBNXojr/tT44Wz45XpVh11miih6QDiV2JvL7KIEb9DTLKp5RxmXI6wm6dT+d3e62fRcng1x3JEbPO9fJ9XCraNxltfgqwiTp59UXmg7DXjurnbm14tGLH4dwhWZUn2Co2ROJOnpv1Ba8PumkhmDrza8VMmMpvh2ho= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; dkim=pass (1024-bit key) header.d=bp.renesas.com header.i=@bp.renesas.com header.b=qZ4rCcwY; arc=fail smtp.client-ip=52.101.229.26 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=bp.renesas.com header.i=@bp.renesas.com header.b="qZ4rCcwY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eu2Ml8cvSG5IhIW8ahox7zqfVvMklBSEsCqmjo4KpjeAq9rxyJrsz4MNiabxOGcXIhfZgb/l82Lgo4DDRdIxAazWDMgFgVsNVRQe1QTMOcyMevjIbPtr/W0Y1Yh7kc9e4O+SNSKErMDowpGFEcpDFnavEPZOoMZ+KqxGfULChL0SojacNRFoW9n24KBfqgxWsuARseTkn6lgnf6VRny4Q/+XXSj7++awOOO2KxrBR7M02+p09kKgO+RMX9E+pa/C73VCpPlQAbQb/k/m0w7f+2ji9O52YbmhtWI3OwF8IxVWiWs/WSz+cE5xdPLSx1yubF9I4idKJLAnpttKnUaYyw== 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=nUdNFuf+p+rt8Ez7EJQNxigIcs88ficfH2BK/x1Kdm8=; b=WHp3e/cwH/FB46Bq+jqYu+QIihkF7QSaZY0iY1xMwosBK9CSozsNjXikl1xGR3VVSLpIaNXfnLIu4b0HxgJSa749ZcSJgUT4A7n38X91EOVBy2dDoSFAxOv9qyUjrfHlHTMdIp1cfbZEgCT955XgPcJLe7zptDi7anqvDAc2XKYqeVmsVR2z5eR+/7imvT5ty0wOfCePg4FLPFLK/hYJrH3/bRVS+7xEqh5F8ew5arYFTTYwZB8zF8p9vKd0Gs33XPOa14+hTrKPRvrx4n6s2CzzSt1VN0mzQ2fikivoDExac7cegjsdUxJmINEw6djOh47zN2naLhkmgAjxaVz0ng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bp.renesas.com; dmarc=pass action=none header.from=bp.renesas.com; dkim=pass header.d=bp.renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bp.renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nUdNFuf+p+rt8Ez7EJQNxigIcs88ficfH2BK/x1Kdm8=; b=qZ4rCcwYfSJVZSGyjyCQqxJuvAYVSVdXqexo0/u76niJT9U0sErwSgsgEJcXKm/2yrzgH32+5o6o6DwdJekr6BBgnH7QPSbcpfWtaX7EglDq+ggweL8HTHxtEZCLNmBYSO565YdmdBMfgbS8cElv6f2fnQ8cQbWqvPta/6i36ik= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bp.renesas.com; Received: from OS9PR01MB13950.jpnprd01.prod.outlook.com (2603:1096:604:35e::5) by OS3PR01MB8683.jpnprd01.prod.outlook.com (2603:1096:604:150::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.27; Mon, 3 Mar 2025 16:09:31 +0000 Received: from OS9PR01MB13950.jpnprd01.prod.outlook.com ([fe80::244d:8815:7064:a9f3]) by OS9PR01MB13950.jpnprd01.prod.outlook.com ([fe80::244d:8815:7064:a9f3%5]) with mapi id 15.20.8489.025; Mon, 3 Mar 2025 16:09:31 +0000 From: Tommaso Merciai To: tomm.merciai@gmail.com Cc: linux-renesas-soc@vger.kernel.org, linux-media@vger.kernel.org, biju.das.jz@bp.renesas.com, prabhakar.mahadev-lad.rj@bp.renesas.com, Tommaso Merciai , Rob Herring , Mauro Carvalho Chehab , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Magnus Damm , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 03/17] media: dt-bindings: renesas,rzg2l-cru: Document Renesas RZ/G3E SoC Date: Mon, 3 Mar 2025 17:07:43 +0100 Message-ID: <20250303160834.3493507-4-tommaso.merciai.xr@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250303160834.3493507-1-tommaso.merciai.xr@bp.renesas.com> References: <20250303160834.3493507-1-tommaso.merciai.xr@bp.renesas.com> X-ClientProxiedBy: FR5P281CA0032.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f3::6) To OS9PR01MB13950.jpnprd01.prod.outlook.com (2603:1096:604:35e::5) 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: OS9PR01MB13950:EE_|OS3PR01MB8683:EE_ X-MS-Office365-Filtering-Correlation-Id: 340fb3ef-88f1-45b6-9db6-08dd5a6dc7c3 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|7416014|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: mM3Ewk265BN6IgfG1a9ogVNGpnBZAGQEr+neVFSZDBuJL5Hk6NUHZzgY4B+U3q8yCqQG981Qmzfek+0U1f+fiElr8ZzOuv14jSzDvVBPguqj/ZMJmo68dQfJblxNxz9FbSO/8daDVpNK9EED+fMjYbBpWxVJbQduO4mgU1+YTVZfGoqhSimuSrLBPZekYq7YAL28Vp3vZ6dRtnIXsXksHX3swWcVMrz1gjRdZRDMZQs261leuEL+hFAbPhbr4H4zGp029RMshJsI8It+VudSEz9XVHtw1rZ1zQOACj/aHMdMP6eUBJSz5p596Ssj+cXPBxVWhcov2yUZkvUA6L3fnxE8DG3qg/Uu6lyl4/HUWZZe+g1yJageQUzdyC9iIOAStNSGjyFgGs9IT/ieH7LX3v89ux/rX2AydZ6gaMtAoho9kn0RD6UY5ofYBVw5q0UB+nvTmD+68kXVQex7neRd9DC356m92QXakPv6R0Lgl91c1NCO39q/zhX/ynDq8is9UtuBZs8b4gzx4/fbjqPN8RHZNb2NNsLz/ZzFQeF/cYnaFpDMk9bcVvujTHR4PJZA72ACz+C8dTLhOjz9reWlXxougvCJFi3VzSgfm5gBRio/SRY2DAc/08oburanMm7LBXOaaiJe2VOD2qMrwaKuGM4Q2i5uLWWmjwYccfmUwT8QXrDd5CctEV07tt+iEz0k5mz1nzIa8cw+6ZdrFF+jmnW3AjceDEbLKALcECuAdPVs2EL3Ef5FGaKmnAFaMYscsRssOK59ClJ3GjqsPkO6CWhM9JFVEDfWU3LJkuoixeh5tk9R9exkr4vpy2kPix6VUiVxBreIBuGR9BMq5AOZktY06X1Tv7UAC/8yWPHQOW9tqctbNmnVw4zl6VuBFBSGA16hmOXmjfek6cISnHNsa1Cgth58QD6YsRLqMFbxr1Qm7Y3H46nOApR9ZTY30FN0jAErMqYGKnFdRq01iwApqXyu/fLW8F9aLt4qZ34KlA90CkIs8BhP1QiQgJiWZfQRGZY0W1mIhWzg3006R9KlRta/hwe282o8xmpXD9s1qKv2UA8DxC9XRFhrjKTQijdZP5XFKD+0qR7wQxSKErjdLFq+XmC6hZEcRLC8r4If3rhWQR9B4oTvpf4pVadIaeJSD47sG1i+n336vHG145lNAz31jUBdEJIiJbt947i3rVzfdl0wDtvbOOquv1QPqP2YAMD2sGFvCjx1V2FRv5Y2X7LhHLm/pENAV4Cgm5XwfBkikX4rzxF8NcTLSHxHbfp0niRURruuFRzo6anMEwSgF4Hl0Yfeu+XyfSelXo7nL1p+rNYCox+OK2oDKL7oN0KsrV1A9dz7WeA87oWdKN6c1/hUOsONixKC8bu9iAlkSa5GrSCOd1JFDeFOsmDlqse5Dg9RN4B1rxr/ACY0Q9o/N8Pxr4lCjPeYe+nvEkwFl8XjcQEba19HBzjG+n3l2sYK X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS9PR01MB13950.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(7416014)(52116014)(376014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BKtDmSAycziH+imGHsSdp1bt4tWQf8sJ+bUNwh+75OovZryeoRmanyRPiToTseaa+CsI5RTAKzVk7r5rqCApucuaBwP//hwNNFa6XJG+7uduwMemfQHiITUI6X8xvRcdnRSwcvFQE2R41D4Ed+tDcnmyIQk/XPCHYQI4MidAZJ+OW7kpx+24eZ6ktSDymhuADYBMolEIOlaoAnoOMCtoNC9pjqaY2+2kQfRD4QuxzqjretFhfMgz9yeGpM+AIgL6OJLUVvB+orAIMLMABwHmVPAvILGD+l76IRlmxePhn52/sruXXY+nvPN5QJ/qKMeVwp8spQYztNI3TUjBGfDVaWdpQE6Qh/DNlpkk4+KsmcjJXFmnIZcPMqO2+HzS+XHf5H4Ruhm3kb+d6yu2UzYeH3CB0IFUuEyXj2ptnYCqI6KBpY6SpPNetsn82de8k25VzXaRq3byzqg5EPt0ktERFwnRJribMgr31DGNjX3op0hTyMDzNmNfFiUTU0055xV67WbZUSVJmMlkPFUAj4G+HGDCAXlqUpQ2B2qKXLIu6pk8jzc8EqOdlHR11WHzOnxx+Vg8g1f+x/hfbUGfspLZwMXhsQE13rriGD36n0oSK3S2csAsganYtyQz6K9VNy8c2vvcMIFRgg8IJbi2PGU6DX1yRQHx1qLr1XHGmGghfltjjMrflDE/Epgro/cZNcu+U+uEIFIhD43f97Pqr0+bq7QqCWFyCCCx+5vrOZzxlxm495GVyR+HxsgD4gmtMwAp08dnYQUNLEnxBUY4nH2BxDRjVPNs0jeBYfIWWZwTeLjgCWLkfjh3NOZZUhuXR1zp0GNwdJmHm8wGc8459pXKbZTbesWi6oqxvNdqeXUAT0m9Qo623/kAV5maqHp32+RWfAxJEFTNjQThBHpa+wYOMn0SS0BnH6na25I2koTNPus9yCeNDoa5XCIi+f7rwrgvvcWU5KLMdYNLd1Jj8JjNqwZ6FGW7CtUQja1sqNgNe9qo+xJ8lHKuST/tph5vx3kmSrWsIRXCbLTrdjx5URVBhNgZPrSs84FSpES4eD3UnwD1qiC6rVno95gooBx0HUKXxzy5JxUJahTrnM1utDjk1zYmBqIArrVC5jPccGxlIsZn9In6UyvJdCiNSRIk7O6qJ+cCy7a6Jn5i6i4IzxnnJE2IwxDn7AJdp6gKDvGewdl9RPEXZ6w1A9I9S5WB0Hr2mwXPBvPXvFAhqV2Qtexb4KKKRsBU5C+67lsjg2DFL48WDawnJ+DltfzIzZAkj8JLdhdouXyIvxxhx2oz0V50ciFGJ9nNdclF6wK4YJJ5IxaU+8XQcds0yefdTJmeFXCLGMmEOys0kE31J0Eiqwh97a2akCX38+wDjLZ3C/DfFY0oPNy//EW33M6ZmY1Q43O9tlip3VI5szwpbjSbSSW0rVYFpdx4LOMN3sFH6aAsaXNC1/WxiRqnCupcekuvRskt1FdGlnAkou3eGYZBz9C/Cj5h/9ElkwKG0XkuEB0q3mmDjsDq+rBG3p0fM5YrEXfujs7pWMLB0JdH0P75L0W+M8fNKyXsQ4/Jir0hAa2jbEBgmnbxbGr63Q6mFOweo6lASwvK/tGdTC8EuSNOOQo6cly0NvYjsU7iZPd55NY2O/U= X-OriginatorOrg: bp.renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 340fb3ef-88f1-45b6-9db6-08dd5a6dc7c3 X-MS-Exchange-CrossTenant-AuthSource: OS9PR01MB13950.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2025 16:09:30.9157 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bTNU8nSlc+KaEwEuNamfFYD3uQJmhxt0sUZhU81ZjuiDM41cqiO4S65PMSO1JUJnu/0wPftjywxf1VeoMq4tuBcZtmSlZiaWCEyvmB5J0hErYU9UH2NVwxARfcqVBka7 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8683 The CRU block found on the Renesas RZ/G3E ("R9A09G047") SoC has five interrupts: - image_conv: image_conv irq - axi_mst_err: AXI master error level irq - vd_addr_wend: Video data AXI master addr 0 write end irq - sd_addr_wend: Statistics data AXI master addr 0 write end irq - vsd_addr_wend: Video statistics data AXI master addr 0 write end irq This IP has only one input port 'port@1' similar to the RZ/G2UL CRU. Document the CRU block found on the Renesas RZ/G3E ("R9A09G047") SoC. Reviewed-by: Rob Herring (Arm) Signed-off-by: Tommaso Merciai --- Changes since v1: - Use oneOf for interrupts and interrupt-names - Handle interrupts and interrupt names base on soc variants Changes since v2: - Collected tag. .../bindings/media/renesas,rzg2l-cru.yaml | 65 +++++++++++++++---- 1 file changed, 54 insertions(+), 11 deletions(-) diff --git a/Documentation/devicetree/bindings/media/renesas,rzg2l-cru.yaml b/Documentation/devicetree/bindings/media/renesas,rzg2l-cru.yaml index bc1245127025..47e18690fa57 100644 --- a/Documentation/devicetree/bindings/media/renesas,rzg2l-cru.yaml +++ b/Documentation/devicetree/bindings/media/renesas,rzg2l-cru.yaml @@ -17,24 +17,43 @@ description: properties: compatible: - items: - - enum: - - renesas,r9a07g043-cru # RZ/G2UL - - renesas,r9a07g044-cru # RZ/G2{L,LC} - - renesas,r9a07g054-cru # RZ/V2L - - const: renesas,rzg2l-cru + oneOf: + - items: + - enum: + - renesas,r9a07g043-cru # RZ/G2UL + - renesas,r9a07g044-cru # RZ/G2{L,LC} + - renesas,r9a07g054-cru # RZ/V2L + - const: renesas,rzg2l-cru + - const: renesas,r9a09g047-cru # RZ/G3E reg: maxItems: 1 interrupts: - maxItems: 3 + oneOf: + - items: + - description: CRU Interrupt for image_conv + - description: CRU Interrupt for image_conv_err + - description: CRU AXI master error interrupt + - items: + - description: CRU Interrupt for image_conv + - description: CRU AXI master error interrupt + - description: CRU Video Data AXI Master Address 0 Write End interrupt + - description: CRU Statistics data AXI master addr 0 write end interrupt + - description: CRU Video statistics data AXI master addr 0 write end interrupt interrupt-names: - items: - - const: image_conv - - const: image_conv_err - - const: axi_mst_err + oneOf: + - items: + - const: image_conv + - const: image_conv_err + - const: axi_mst_err + - items: + - const: image_conv + - const: axi_mst_err + - const: vd_addr_wend + - const: sd_addr_wend + - const: vsd_addr_wend clocks: items: @@ -109,6 +128,10 @@ allOf: - renesas,r9a07g054-cru then: properties: + interrupts: + maxItems: 3 + interrupt-names: + maxItems: 3 ports: required: - port@0 @@ -122,10 +145,30 @@ allOf: - renesas,r9a07g043-cru then: properties: + interrupts: + maxItems: 3 + interrupt-names: + maxItems: 3 ports: properties: port@0: false + required: + - port@1 + - if: + properties: + compatible: + contains: + const: renesas,r9a09g047-cru + then: + properties: + interrupts: + minItems: 5 + interrupt-names: + minItems: 5 + ports: + properties: + port@0: false required: - port@1 From patchwork Mon Mar 3 16:07:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tommaso Merciai X-Patchwork-Id: 870009 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010008.outbound.protection.outlook.com [52.101.228.8]) (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 E01CA2376F5; Mon, 3 Mar 2025 16:09:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.8 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741018192; cv=fail; b=bmz1bO1kmbtltHKuG5W6tDcWeAkQJsUsH+jqrw7lsiBk3v4P21wSnAmt5yHeDK52CPQLSTaP9yq/EW/ueFEqw0bYp/nnvCEmLtpvxpiMpFwvdDPMTRgALMDv1AqUvtw04AGfkH0yJlBVvnTu45ctDegXNNsrJN606bYpkwH8/es= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741018192; c=relaxed/simple; bh=9j4nPijH4a1+cIb9R/wA4gjImTTmMrJZfHI4NuQOBVM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Ki3uKUUgQeUxgpSp9UXZ4oy11trJL51cvvrpAUpqrmflN5HCPFIQ8s8eJRWBDaPKnmn/Tt4XFQKkcjAtNNszlCdx+H1230Z+XV035uWKLaQ9vOg1SS1ghdQjNdwuFS7/gEozTkQfjRFVYlfvpbIVi/DLzyrNUnxDnfEXI8SdfJM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; dkim=pass (1024-bit key) header.d=bp.renesas.com header.i=@bp.renesas.com header.b=jwxgmQ/1; arc=fail smtp.client-ip=52.101.228.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=bp.renesas.com header.i=@bp.renesas.com header.b="jwxgmQ/1" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LSB3e1O0HXKdk4gJC/Vf8WcjNE8r/gpP4bwdrjucT6yI8qOJAnjAFOheq1hLN68Qczd7g6bhV3bsT55ZSeEFviPDzy6g4vFh1RLnxAvB8CELxryTgY1GQUZn5h/Dgk5/FQelkRmdKXvTCdQZ8VnZKziTumERfpQgLIC9/cAlHjosfy9hoJLjM7wMxUQwUwOKUKbKo7XO52O11aqud/+844O6vdxjQwowLGvamey64as7OAWZqrZOF0QU5RLXvAPnsBpG7uUGm3sRPcP22UN3izybIGw5Z7K9rsH1AbeAD+OqX/jpZJk2adr6v0zkFXU6BhBm2IKjyDWRK1/abOyufA== 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=4QqV2NgZjXgYjDJN6Evb6jvF0zTwv9S7UT5OmB6zxDc=; b=uGQaSfnBEoO8aFr+0vuGnTMK/J1G3ipVFBQzfMrax1pFWO0YvhoYuNzWg4ZqhssS/3gId/VmRsjy/dqTgIAeTiiBEpkal6OXsueQENGuapOl620WgBwcYMA9YxBfwaNaIWmyR7ycN3/VZb0uKFQw02aK+rZp+ZyshR5Rs/9K5d+//J60sXdRz+Y4ycIRa9tBvr2aGG9iABvKe1VQOp4JktlK3UskoWum29M+44d+rXmzBiEaO6Y2RiW2kPfd6WTPlib4sgzCNFSSH/myHuNPHAsTobTUBxDOxSrrT4KdUYrLG1TpAg8eRHhjA1XKd5ej4PcHNu948e9qUio6MtpTGg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bp.renesas.com; dmarc=pass action=none header.from=bp.renesas.com; dkim=pass header.d=bp.renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bp.renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4QqV2NgZjXgYjDJN6Evb6jvF0zTwv9S7UT5OmB6zxDc=; b=jwxgmQ/1qjOr7O0KsqT8WrlA093RR89GFmzGQZ7w4kplHESkx1Dw9MvHrbDMc4Btag5xN3MXlDfB6LAxYjL4BKcR0nWWP2/7/VnZuq90ZbLFPzLw67Zlnnlv2aeVXpBq9FoU+Fk+sYh+Mxy4aox+dVxvdHPk9T0QJRiC4p0Ghlc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bp.renesas.com; Received: from OS9PR01MB13950.jpnprd01.prod.outlook.com (2603:1096:604:35e::5) by OS3PR01MB8683.jpnprd01.prod.outlook.com (2603:1096:604:150::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.27; Mon, 3 Mar 2025 16:09:48 +0000 Received: from OS9PR01MB13950.jpnprd01.prod.outlook.com ([fe80::244d:8815:7064:a9f3]) by OS9PR01MB13950.jpnprd01.prod.outlook.com ([fe80::244d:8815:7064:a9f3%5]) with mapi id 15.20.8489.025; Mon, 3 Mar 2025 16:09:48 +0000 From: Tommaso Merciai To: tomm.merciai@gmail.com Cc: linux-renesas-soc@vger.kernel.org, linux-media@vger.kernel.org, biju.das.jz@bp.renesas.com, prabhakar.mahadev-lad.rj@bp.renesas.com, Tommaso Merciai , Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Magnus Damm , Hans Verkuil , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 05/17] media: rzg2l-cru: csi2: Use devm_pm_runtime_enable() Date: Mon, 3 Mar 2025 17:07:45 +0100 Message-ID: <20250303160834.3493507-6-tommaso.merciai.xr@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250303160834.3493507-1-tommaso.merciai.xr@bp.renesas.com> References: <20250303160834.3493507-1-tommaso.merciai.xr@bp.renesas.com> X-ClientProxiedBy: FR5P281CA0032.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f3::6) To OS9PR01MB13950.jpnprd01.prod.outlook.com (2603:1096:604:35e::5) 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: OS9PR01MB13950:EE_|OS3PR01MB8683:EE_ X-MS-Office365-Filtering-Correlation-Id: 45db0559-a9f7-48a6-1899-08dd5a6dd227 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|7416014|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: VRl3L9q7E09q7WjqZWLhjNwUL/iTdAKZ9Svb53sHAehC83OpKU2NxWoRD0qlolUXCEQokqYvBtwHzL0sJqv03KstOtqQTbv4LS9OzYls1BBoljg7aIkIrPhfdJI2NzJ4Z8mCIexCSaG6mZFk8CTrq788POzUf1G3iIA+DN3g92JfUJZzKW8pSPG4uymzYB23O/330iZ593TNOt2Pl6mbUm76UU9JjiE52XTtfD9j0utJtfIBg2jEzJ7RutSmuOVqHz0YPQjEo4Ykn+vylkv1m99XO5y24vGpM7TjMNv0hH2oXhEeYgQGqvweiuaBvhjfsuOApx+mxWXE3Da65TyxHCbInEqAucKmakfsQOzWSLqmG54A9zIOahdCPjAIILNTit2ZP7uXBBvwSzabHzcsXhj5FnD1nvNAdC5zGYjjsBrEeRvcJuZ+UlI8M6nM5Gi7sFbzRX8PoKpiE0Tj06mLpU+F/LTmdnFkQJpIecrxIZRwjtnlr3HQSJnIaNepZwjyNDGuzDazz+2L+j/dj4UFJKL5dQc2iePEBUki7PrTMXouHvFqpsXAVfVrykw+cSWw5HOxsycc80V1m2LYsOuPpmulM3Xgx3ulHBbq3Le5fj4nfBpV3OwyHwyO2TzwJBLz36twDi/EF+r538UpVKLhp5xqrOmyr7Fm3Qtvp18/qjM1xEkgkeWeTvgeM8sNmP8KgY4GuIX7B+eQy9XKoO1wXGJVyOQ07lho6eBGxyrT5vVWwR9q0IDmay6z0TDcXKzVFnpq/IAK8bxqEpSI6gP9JOZ13kt111cU6L1DYBTY9c0walEPD8klMRY7ZPKb8dpskx8/aOilPvDU1zLefXKiZ4zD+3PqfNL6ehzhnIcdvAHFrJQix2t9irF18umru+QAuFCcBdBnQN+aya6m4AIeIc7HAWP+urd9bzrrs+FeDOruqws+TNZM3fzkMQtbs0AgdXIYgvS5L3MX11CxYK82E6iL+OkEpjjL2tR5+3Id16yVsoZxA8S+Obmq2056EQBr5G+zCCDyrQNzdXtZ03NsI3Iy54U0pfrQyuX4rvAQRokkqSlNLaq8oiOwyQqEhY1JTbLwjQ3PZzK7Z4TllxNPbUrp+MrQyXkH5B+alfmBjTdU3zEKvVhu6FCWJ3pvt/iDWU9JwQ7glNbXhV57A8kgBBZK8msvO9vFbFAteeEBEx0o6vt0TVj0mT+DQ4xh+QsC3AvvW7GUnuKcuq+rj/NzONRNHxHFlhaa5n9gxQ9+1vaOrHRc5xQsg6XAEIuD//3sXZC8zX+E/q5B4GsX+VgCn6IP0JFGWXyCDXN7bXPCfobjEx1Qlicffvo7biE4vVaQ79KJ8TEeXu8dQTymxkkBY7jymIWfALfRQFPAq8ydkO2NumP5cRaYRol6eKk2A1VK4RnNEol3G6bdelhGJG1YUi7+JJcPmVnFfNNaIrprCdwRfBZHoOzJKJkUnMgJ/DA3 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS9PR01MB13950.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(7416014)(52116014)(376014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WhtHkSMRHNFMonk1hvoz4Y5pq0bN4vih58QniJDmHv08gSQQyHUuZ+papdlHc+x4jmq7ebo9cQnxctHAYiOUOSLWJD2TwoQEXZuq+0WPcsFtXlJhY/ORYcPbMZsuVt3JRXmzXo5AJwgLKXLXlHqyaPoHlm2IKOkEMnCUMGbQ+UFr/lJijQLx/unZL4lhLt0wfvXt3GXGmbjYp1+ulTdYxZMqnchkcM1MOjKG6/8Oe6BdajgO+ZXqO1a8J5i5jxRaKLu8pPt0Hd41sqXqwydVh9HGrzxzIgOBLpmd1qg6T+SJwf6aZn3NvDnlDwL5Du8WtROCogWmapq/Nf2kzmyXTH4xRBG4YJb05WPhOm5QPlu41YXqEH2zDJULXA2OySXCq2IRRq0aH4/+xvxE8bjmE29s3lVlxPKInwufYt4XKKbUr/aFtvFmB5JWqwB/i16ZVfnAMcMCuw802YWYfLlMx2NeflIxFyPU5jbFG4ANthMMOmdmQ68zXiJUfQyzLIolfhNws6E8qYrSZjhW+mvdGSz0KO6/oBWaK1qQ/PT2T1BNL0Z6Sh6lk1il6UEz8BX+NIPW+hW9qaIgfhJDwypdqQZWyjrESq+fJGwK3nt19DWE4tZGqIS9SEKRa7CNgHLQ65/JlSL9EQOQ2YVgJhpYF2euOgZBbgyV2GSWYjeyCaLJmcVyRa4wQpjcxI0FxICgHQ4QLI+dma91zeiaPWOxX0bFwlTtSV8+3mKqoQ+1JypLHajnvxeLaaxl7iWDdBP22VthLNdX/bE5fgvTwbPmcyzDRD3sO1x/cJxu8IL+aZb53+8BugA1APcV9rEpdT/0g13zve4H1gxlpt4LQnkjeKzuuxL22NrnRZ290Fr2YgdS9r6zCCw8Nh+zmtZn3RlrCOe+xZ0QvnNFstSIIWKzw/VN4N92hYcxgHYG0nauGsH+13A9g982YOOOuNvNGcFeK1fxSHObdOdthXh1ULLSQQf/cIOobl+ydlZgnziCgIVeFHMqDmMbvDzjQfjYBgGxNLk/ZwuJqo5us7q4CW94p+uBSDDyEofVHCdRw/iyGdPbzj8XQeqqxB/AipdkmoJCiRRvpkPg/t15TCKqLH0/2yxsmJLwVjYn4R39AOw/KLG0/t4ogHRrRmRCZ7B3QEVPgFox1y8S4tyJGANlKD03oa6YJwuJVPQflyDnSzsDsfwkEePP2tCr2GfP+4zj2scMSTJTTYJKeI2dZo3o/eda+ST9BhUOLWMgCw9oQmJXnMK3ep3P60R6d7CYsbMKyd1T2x0H0Pv5aI1e9QO2cX7ynFIMCFQ+0ODSkyrGGz8NMno0Auy9UylRRaq16CBQmGvG/FjMOsAshM10+16H6QcqjOaQTtZwOgKZGnBq+xCbBvBtGBj8RLP+lvxGdY2A3ZDpPeSZG5UQR8i9xT0vO2s+J5Ev7qd/j/UffGj4dv25lT0DXk8vWNF2fI78v/7sQM9HI2d2QbPh/leq3KJeIxytU5D4c1rQMzt4LxhL2jk7HAo58NlHaNZIHRx1Qu3l1IGcwbJf7QzlO4R/FNlgz0fxgkV0rRzSyFvz79mQqIVirut42/P9YuIssz+ymG7+k9NKuIbceg0X0UqSpQcrzJzJf+1/Q4AzEScmo9ttZA2YXI0= X-OriginatorOrg: bp.renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 45db0559-a9f7-48a6-1899-08dd5a6dd227 X-MS-Exchange-CrossTenant-AuthSource: OS9PR01MB13950.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2025 16:09:48.3416 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: H+O+ZxhpkkqRXPSnp+2A6PHIDsyfy3uDnuewDeRBqU6uHhR6mddCh4nOzXMHStU0S5Gq1I5iFzumazOIXZu8VwRMOtZ+0niU5KskyvZFIRK4FN6Zdpip4d7F9QmM9j9B X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8683 Use newly added devm_pm_runtime_enable() into rzg2l_csi2_probe() and drop error path accordingly. Drop also unnecessary pm_runtime_disable() from rzg2l_csi2_remove(). Reviewed-by: Lad Prabhakar Reviewed-by: Laurent Pinchart Reviewed-by: Biju Das Signed-off-by: Tommaso Merciai --- Changes since v1: - Collected tags Changes since v2: - Collected tags drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c index 948f1917b830..4ccf7c5ea58b 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c @@ -805,11 +805,13 @@ static int rzg2l_csi2_probe(struct platform_device *pdev) if (ret) return ret; - pm_runtime_enable(dev); + ret = devm_pm_runtime_enable(dev); + if (ret) + return ret; ret = rzg2l_validate_csi2_lanes(csi2); if (ret) - goto error_pm; + return ret; csi2->subdev.dev = dev; v4l2_subdev_init(&csi2->subdev, &rzg2l_csi2_subdev_ops); @@ -834,7 +836,7 @@ static int rzg2l_csi2_probe(struct platform_device *pdev) ret = media_entity_pads_init(&csi2->subdev.entity, ARRAY_SIZE(csi2->pads), csi2->pads); if (ret) - goto error_pm; + return ret; ret = v4l2_subdev_init_finalize(&csi2->subdev); if (ret < 0) @@ -852,8 +854,6 @@ static int rzg2l_csi2_probe(struct platform_device *pdev) v4l2_async_nf_unregister(&csi2->notifier); v4l2_async_nf_cleanup(&csi2->notifier); media_entity_cleanup(&csi2->subdev.entity); -error_pm: - pm_runtime_disable(dev); return ret; } @@ -867,7 +867,6 @@ static void rzg2l_csi2_remove(struct platform_device *pdev) v4l2_async_unregister_subdev(&csi2->subdev); v4l2_subdev_cleanup(&csi2->subdev); media_entity_cleanup(&csi2->subdev.entity); - pm_runtime_disable(&pdev->dev); } static int rzg2l_csi2_pm_runtime_suspend(struct device *dev) From patchwork Mon Mar 3 16:07:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tommaso Merciai X-Patchwork-Id: 870008 Received: from TY3P286CU002.outbound.protection.outlook.com (mail-japaneastazon11010050.outbound.protection.outlook.com [52.101.229.50]) (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 85968211261; Mon, 3 Mar 2025 16:10:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.229.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741018208; cv=fail; b=dFiyPx1uCYmIInx9Rejri+vTu6eXi9/8h4gGIn4pffNu/Y9cNTRDSeTiJ9swc/1f2uZQGiX5mwb0+KBCIzbLVNGcwVD+un9ZVWSl8GgAMJd8HqolMZtjPNumVo00GxWEQ97DVtVKFg19ZhjRTOYXbL/HKR94pXrZUWuBhogCdE0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741018208; c=relaxed/simple; bh=HsfbftITW5fd4UAh+3xyB67wD6ITcjCaKdzsXSBD5XY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=vFNTCMmXwlV0Aq64jeGeLpDMoSyEpv63mAj1eRL4tYKEHnG7rMM2IBA4FefNlleDuQfoRLl8OvzBFw5AE7Vr+znRLsQWgPRnh7CBj1okDlKnz2tixvlETTbUmq+D+ZrOX+A0Sf2C5N+hzQIzdA7EMcF+12POTgh9rUb3zSgZzVA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; dkim=pass (1024-bit key) header.d=bp.renesas.com header.i=@bp.renesas.com header.b=o+oSIfHs; arc=fail smtp.client-ip=52.101.229.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=bp.renesas.com header.i=@bp.renesas.com header.b="o+oSIfHs" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Y6kO/1cKjNKOXv7zyf+1mYaHZ38xJno5P0jSz0HZAM55S8QB+6kQY7TDB8XqTlzD3Rz6xFfhyAbnm9EsKr0jSlD6AHYlmS8VBKLgOCZL0XoahMT0QxFCGPEzxVNOmy4dMaYH1vliGslg8FvQmCXLneipEzVVD1eELaY7LgXwijRBacxXOUgvHG4UFQqZxLgXHzjGzfmdSpCeRJKjmMtgWYPDgJZv/E7GapePWY1bJbK3pM0y7x1p5cwoq3XClzyK4Tye7j5KCNCkg5XsY5DarNMoTsY7UbHh08bzahoaW+CjpsfekexxBEzM2Gmp3dguKLw1SbIvg9xunWIi8YebuA== 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=pxD99Mokwvg6veNRRvfJy1z0QYpISgAvXyQloHsmRL4=; b=OyuYSxeqsUa38rGAi6ZRpE4hM1dq9JUPlrnnBQOmFoK3Syk3eKkuqfuQq91187dS7BL2+bv9Ie7Wkvm5AqTOz0n1mbyyZAPiKagz/fSxPkNx6hZjLFP2la+akCQ/wN2NdqlDSQ84jSzGGjmAS3HSuC/4cox95y6kmAA7pYq1vcyPgmbYZP2o5EMGqbCMaK/7B5ltPHbKx042f0GdWSvAh2tebDK7PgYUFtVgFSbMb6gaIpE3zb8JaJjN7/BHHJukDRQf1SLyT2w9dbXIbkVEPcMdUFiEUucrkf4qeOzORjv11KRKFcxrD28WJeWGZiMqccyU18tXyvEI0V0UWXqFcw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bp.renesas.com; dmarc=pass action=none header.from=bp.renesas.com; dkim=pass header.d=bp.renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bp.renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pxD99Mokwvg6veNRRvfJy1z0QYpISgAvXyQloHsmRL4=; b=o+oSIfHstPrUKccTEt5hbNgfZUtPKKYTICTgYjWawMXcR4eTyvGo+5hWGvBhQceiE6QdFH783v6UNWSVLLvVkpOKnS5N0aVoqqqcGCAirCZAanHFvmevZ7VMmd6zxGy4EWAES1r1ZQxABUOlS6VvdAQsFwajIe+fhVcTJl7YARc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bp.renesas.com; Received: from OS9PR01MB13950.jpnprd01.prod.outlook.com (2603:1096:604:35e::5) by OS3PR01MB8683.jpnprd01.prod.outlook.com (2603:1096:604:150::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.27; Mon, 3 Mar 2025 16:10:04 +0000 Received: from OS9PR01MB13950.jpnprd01.prod.outlook.com ([fe80::244d:8815:7064:a9f3]) by OS9PR01MB13950.jpnprd01.prod.outlook.com ([fe80::244d:8815:7064:a9f3%5]) with mapi id 15.20.8489.025; Mon, 3 Mar 2025 16:10:04 +0000 From: Tommaso Merciai To: tomm.merciai@gmail.com Cc: linux-renesas-soc@vger.kernel.org, linux-media@vger.kernel.org, biju.das.jz@bp.renesas.com, prabhakar.mahadev-lad.rj@bp.renesas.com, Tommaso Merciai , Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Magnus Damm , Hans Verkuil , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 07/17] media: rzg2l-cru: rzg2l-core: Use devm_pm_runtime_enable() Date: Mon, 3 Mar 2025 17:07:47 +0100 Message-ID: <20250303160834.3493507-8-tommaso.merciai.xr@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250303160834.3493507-1-tommaso.merciai.xr@bp.renesas.com> References: <20250303160834.3493507-1-tommaso.merciai.xr@bp.renesas.com> X-ClientProxiedBy: FR5P281CA0032.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f3::6) To OS9PR01MB13950.jpnprd01.prod.outlook.com (2603:1096:604:35e::5) 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: OS9PR01MB13950:EE_|OS3PR01MB8683:EE_ X-MS-Office365-Filtering-Correlation-Id: 70f5a4eb-90aa-4d1d-f8ec-08dd5a6ddbd3 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|7416014|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: Qhqs9D9/77hSKq81Bs/FPn7HE6D6VbMRMiN9Vf4QICB87ZTyvYJGgfi28n/0kr/d2vHYBDmxVVTrxwN56+4Kb5lLvOlNnWqZzQMDKstuk6O7sIOo00hf049BF01Nml8hxP9vhBStFHldHevYFiLKu5Uj8nduzMJB8L0Ns50r7MTnksQOEyvwoJHE0Cf25bgAswgjJwer2dtTuYCdjHuCoBLqOFclPqJaLHNy+rV6xhAQWNloWssLrPJTUMHO+AlB3L6HWstFcgqOpTx9JKoOeKMcMWb2QfpUgx1yw1KsGt1tRw3ynXPvoXpmT57BKhS7qkCnrBKPWN2VhZ+j9veKbUjFXommKxNz1n29zCvSwTas8dfsgWHHBSoMgV7ROgE9cWfs7aD8zW+iqUe5YP4wIqUdraL1LlCRotAiZjXVIcm5K9WD5V/jzxMVvs4N3yNUp7BFAaWPdTFn1oaVwapxN9oiPVKfK1Cy2wH0oXPSE1BATwiFv/TXaJiN5c/BT8296Nm/Vvh+0FGN3HJ4blfZwLQ6cwpBaEVhyRsW/KLG3Mzz+Sz6x2kiMyBVyrGjEWn73bL6JXbP/+9pqjalw+NUAIpMlwWLJqhGTFaNsUaTkDYsFrVBr6rUqSf9X0/yyYv1lok9E44rbJu4WoNcpkhzR269PjmyJ28CviBOT6wfXvpvcZCROytDboFFgj6DPgoaBouYxCOaP66+OQ88V4fGLpce8PZqvM1Nh6Vlb1AHP9zpnHoFKIFV67G3W9/Iu8EELld6WAYGujIH1pKz8hCBA/yi1iP3kQKohOhsvm/o5rlTlTuvpQfMf5UmVZMxv57KpSkQzZsuh3yjG+0KfnBq/BOT5vbX0eETAygSWuYbLjX/ZIwJRcwDELgC8eyvtir1d/zHfV79xphlLguheZISWucz9RZp4VZZbiAnA6Xz2Y5b9DD7Lcvu7f01PG8KxoTCRuLzF6vBnAKaOy51U1Y8pG3K+NBjwqpjFVnOwKuwszoLp9+KPPHpC1qbgDmrNeehyTcatuv9IBEMdrTeK5g5DgidIrLiCgaWbEYKVby7m/77ASPEzVqtn6io9oR2TFWF/ayuVSfuRQtSeELErUxU6i0Kh7+wglQ+lMiTGUGB2kIvA3iBp1gcqKxLLj1f+wT+Pr0FczckmZQxpNkcSpS21tFzxUjjTuRjsKA5pKvaeQMiCBk7KkhroJWQgd3GMv9mTUj35EvKdW9dQAQTYpiZuUGFeuAofhpF1kYfAt3GOWHPZUKa+n8ptTHfjnEpqRWJQUm9TT8UVd6V2wywABsl2RzwzRPkFtArIMf6AN7KVEAKr9x+EDkS++PbfB88X8kWr2JJrxjZZ1PAe0eLnGz0g0pD2BujTen9YPtYm2bQ++8CUWvMuhS0TmqvgbD/CjuiaEPigamJm+nxDrdI4oR/NFwDABwiYEWIlH72p3HbR56riz5NejkiDdUqh7CpjMHb X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS9PR01MB13950.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(7416014)(52116014)(376014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KRBRBxU3O9RSJDJC9tVMW+5OjX9cPO1UvUZIb7oyYs2A6iB75sHFhCzu+W+L26HCdZ50P7Hho77jivSAuB8DKlYKpb+ZAV/Oa03h7CbBrukoCUyUwe/VSxxJ2Vhgcjl6oFm5aXzq98IITFBudcK4u2RfZv/dC8o0y+iVSe0z56rmLZ9lipDu3XTnUIUnivGEb9hJelxdQsJXWBwgtaSS+mGTRNXMHR2o52aE11f/qcfM+sNSETS2aGO8sQUgBov1bpiCyDD7c1YZrz+vxWs5JxMSvNIoE4HYS9TBfVr6LiXFkWP5g+7mv/n5v6vqXufvWb9NDhVldW/HfvalXVkB/SLpwCAK/pjSzGa+GD1N87P4CcR0SGVP1/oFNjft4Q2Yw2M4E/DaqkrjCpDOZ79wXOqk23rMvZOXcVJHQkqe1QuJCNVIv5dQWV/XnRjUYzauY/S/ADwm8os/IP5ZZCJcnt/MuSxNpApNaO60WOw0z5WscZ7aq1T1EEgPdhB0przotzBnCgyaI0VAn4qf6cFYYv0MIIVulzRBOoRZYLXvC6HseSy2c9NH/YZufQS1UfpIHTX3YDyDIRonn8JYI6M/Ct3AYfOx3G9A46Qx/fsQqrYB+PYUOKNccjRQb3Gsawy4fJhsz/M4DDRcebU5TzCSrzfOuRhrS4T1Qz+zf1AUmbxcyH7LYfUq6RV8DhxJaOFVlVWGskuMwnZo28Dc+/27nKeo64IZoPDRnSB+0/gC35CQeQbchf6koNy1k39YhXEM4zUIqspP9KVCnuPQ7dL+7hopKYELyvZc1+iDdCvmvr3j3wUgzcBzz+S0TBJij6yIWcs8Ttha5MpkD3UUvYxZ52BRmeHAB7Vf1UEwVVXYjoajgn9/+jkdVzcWpAKE/dhIp+bhWE6UuRWQQatZ1P5goY1XjGvY6DBC63NmV77S5D4JxOes0x22A8v43Efo+XUYog6vfiJ84fv9cNKfQjYPQWd+4YTbi2A8Tyeev6y/YL6PqdDQu3rA8rLvmk1yxdz2BaLhXWBWLi6y1Q70yLAdAsBZwUog1dMtT3KJ+FOqoftEFMCDZDM7oT9grApzyNfUXRJIFj+bEmNL+1KNvFIKe1gEe+UVkSqTHoDb5q9SH7MjiqZtx+IvF5opkSqbDP0QIf7OaGdbudVg7drqmUqyWGG3fOfCX0ewUQetwiH5vL8Bbm2p7e8n3StelBD5U7wqwIJcgQtvPl37vCg96FAryqn26BfC2lpHAYnZFy7k58mMdkQ9CahZN+sh5D916wUnPg6NEGWwA3yLNFKfaEh3U9l5ac33AOKM/ibGp5UFMjdjjxrHRrbkpi2N+rl1oaFjH/hCesf+dDGt788M31cB3fy6WuIW4uqBCNAQmq0zPoKZgQ5NhnlGJcTxUCUYC7iCHM1p40n8sX6nYDLG5cXV3L6jn/bqZq3s3c4V0pKJ9BpVM7eiCD4oF7/A4/a/8zsn9ICXfyYzV/h8j1rA9CXnK2aVt9Svh1yFsgjXWGvo+BSp5gbTfKzzqPunpKZ+gX4ecEvhrqAYQQf6S/HKfIACV/cAXki2kpxafBmn/rL21VZy4tGTXN4IqiTczvnHRNd3CVo+dEVsBm35Cktuwq85DryLehltQzuhn/T8MRFLFbo= X-OriginatorOrg: bp.renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 70f5a4eb-90aa-4d1d-f8ec-08dd5a6ddbd3 X-MS-Exchange-CrossTenant-AuthSource: OS9PR01MB13950.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2025 16:10:04.5955 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: YKZQ81JCw3rM0l5F7SqfCtxFv89LNXwlISeB1GwGvHIMe2HQydj000/5GqzVom/Cp1oHA/uGSZKgGH8nmkDkO/u+ItNXHFb2lfAgaThRZs+uw7pte5733SIMxpQDHJWm X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8683 Use newly added devm_pm_runtime_enable() into rzg2l_cru_probe() and drop unnecessary pm_runtime_disable() from rzg2l_cru_probe() and rzg2l_csi2_remove(). Reviewed-by: Lad Prabhakar Reviewed-by: Laurent Pinchart Reviewed-by: Biju Das Signed-off-by: Tommaso Merciai --- Changes since v1: - Fixed DMA leak as suggested by LPinchart - Collected tags Changes since v2: - Collected tags drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c index 70fed0ce45ea..eed9d2bd0841 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c @@ -287,7 +287,9 @@ static int rzg2l_cru_probe(struct platform_device *pdev) cru->num_buf = RZG2L_CRU_HW_BUFFER_DEFAULT; pm_suspend_ignore_children(dev, true); - pm_runtime_enable(dev); + ret = devm_pm_runtime_enable(dev); + if (ret) + goto error_dma_unregister; ret = rzg2l_cru_media_init(cru); if (ret) @@ -297,7 +299,6 @@ static int rzg2l_cru_probe(struct platform_device *pdev) error_dma_unregister: rzg2l_cru_dma_unregister(cru); - pm_runtime_disable(dev); return ret; } @@ -306,8 +307,6 @@ static void rzg2l_cru_remove(struct platform_device *pdev) { struct rzg2l_cru_dev *cru = platform_get_drvdata(pdev); - pm_runtime_disable(&pdev->dev); - v4l2_async_nf_unregister(&cru->notifier); v4l2_async_nf_cleanup(&cru->notifier); From patchwork Mon Mar 3 16:07:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tommaso Merciai X-Patchwork-Id: 870007 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010044.outbound.protection.outlook.com [52.101.228.44]) (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 D4DFB21B9DC; Mon, 3 Mar 2025 16:10:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.44 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741018224; cv=fail; b=EKiTHuDR6MFaA/OKzPNw3yw64yyCwbAGc+YZbGXAh7rcAu0GVa/uwsOX5AHSI7DXEDDcrM7ulId7OKkiBwoLgx7gVzl7pbmrYltI2TfKGQaVvWSLJn2dKAcz7KOOIg0ot1KoZKCNPgCB9j2vWLK++nI2fM+B3PnQobkBZyKpGi8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741018224; c=relaxed/simple; bh=64UM6fkOuHAU7eNNKixZni2Q8U8k9E1uHxCnW7dmHTU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=YixtE/QNQTxyi/e8mFlvKD1K8QyT1SesiuI+cXH4r1YceHziAN7Mk6Gp2VmrsHpB05UZ8Vq/ucY4rw6lJxJ/Z32VvmIu5cTK6V+OR5aC9TDgTlFXqVXvbWQVIJNS8zZF/LgC7e22i5L3G/k57QdaUczP1mwVzo/F2Ou14kUKH7g= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; dkim=pass (1024-bit key) header.d=bp.renesas.com header.i=@bp.renesas.com header.b=jSu9+whv; arc=fail smtp.client-ip=52.101.228.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=bp.renesas.com header.i=@bp.renesas.com header.b="jSu9+whv" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PwngJ6NnUM6bQZ61ztbB4jrBE/FRAJa1uO/JkZN9uTFnvwkmoHrjrKc+grDwE2gmjgVMCFUdK6P36lfo95VyM81MW0/6FgU8CILBQcuJYtpg8Lj1XTv3rCsjHyUGH195L2LBLsEp4BANgRlWp3fbjQioHUV0uZc05qD/tH5G69I/a68WgwreCd8KQm4QzS0W32aGYpTIZyOI/b6WVBdcxn774d8asYusy/i5d4McOtvrFjjHo1hPF0N41xynLPwSjYEpZXtU47p962Lkr3kR4QmvpXxcDKC0fvBuYI+cQFhG3e0xGdh6iWiv6HkHGcXf42nJcYDxuQAkOpn0KuprAQ== 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=fy7n4PKBO6cWSpSVqQV7RaACCwuH//pMEbcPtRekwd4=; b=ZCDC2SABhizwXqqJMdONoEdw4S2IMTQ+fWWHe7WUaMgLDXWyH/FHUi3I6UEJIzl52UqW1NOHd4Y/RGVfzvqKQgBx9MgoIqS9/nFxVhjpIkUFYjyxvPQrmFpyBWaVH+bPDfUnzDUQhkZt0ipIisYq3wtWua1VcvdtK8pN/SXoUxHkHtSWkp6Jii8UhIeXp82957HNqEFdkm23JJeGxeyZYy+m6j5bkhLD8p/bTnWv8Jj2ttzUXTJqoxkZ25b783PvQnJB7pH7fFooMIX810Bhr9hSO7BYlWhzZWwmK/AgCvur3rqxlqtz3O/U4caeYRyWg6fUH5AWu63RJYeyCOym5w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bp.renesas.com; dmarc=pass action=none header.from=bp.renesas.com; dkim=pass header.d=bp.renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bp.renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fy7n4PKBO6cWSpSVqQV7RaACCwuH//pMEbcPtRekwd4=; b=jSu9+whvRi5kWBSQCQQ2si9nowRhTwhaMbUpNOlBlSE8whhU32CqLoWnAX36vZ6kr4LDqIDBFKD25rPNsnGWiub4VM76TSkdghFrcZMU8bPUnC59q+M5TxTj54mfUICIU6GAdqFpl79XhHtDH04FWyuoL8RtYEW5EL83hQEOjHg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bp.renesas.com; Received: from OS9PR01MB13950.jpnprd01.prod.outlook.com (2603:1096:604:35e::5) by OS3PR01MB8683.jpnprd01.prod.outlook.com (2603:1096:604:150::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.27; Mon, 3 Mar 2025 16:10:20 +0000 Received: from OS9PR01MB13950.jpnprd01.prod.outlook.com ([fe80::244d:8815:7064:a9f3]) by OS9PR01MB13950.jpnprd01.prod.outlook.com ([fe80::244d:8815:7064:a9f3%5]) with mapi id 15.20.8489.025; Mon, 3 Mar 2025 16:10:20 +0000 From: Tommaso Merciai To: tomm.merciai@gmail.com Cc: linux-renesas-soc@vger.kernel.org, linux-media@vger.kernel.org, biju.das.jz@bp.renesas.com, prabhakar.mahadev-lad.rj@bp.renesas.com, Tommaso Merciai , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Magnus Damm , Laurent Pinchart , Hans Verkuil , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 09/17] media: rzg2l-cru: csi2: Skip system clock for RZ/V2H(P) SoC Date: Mon, 3 Mar 2025 17:07:49 +0100 Message-ID: <20250303160834.3493507-10-tommaso.merciai.xr@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250303160834.3493507-1-tommaso.merciai.xr@bp.renesas.com> References: <20250303160834.3493507-1-tommaso.merciai.xr@bp.renesas.com> X-ClientProxiedBy: FR5P281CA0032.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f3::6) To OS9PR01MB13950.jpnprd01.prod.outlook.com (2603:1096:604:35e::5) 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: OS9PR01MB13950:EE_|OS3PR01MB8683:EE_ X-MS-Office365-Filtering-Correlation-Id: a6dcf5cf-cfea-41dd-756d-08dd5a6de570 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|7416014|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: gEnygJOBaoKeiMYPL/QYo94aIBtptTWmk3jPsYEtT+oxmuCgYWTsDyyaf9cJgzk2zhhmUEu5HHx7jWHjg4TA5kDD7VIkIPThuPMb4BAC3iusnY38EiLpIITAxDmS25RAuMYRC9gt7fRFfr4Jo52tCzg58pT6KQyzgUrLcrtdskEUdXl55r29SSNUxOlcjryDHrZyCE6q5/OH9mR48dKTRiVxbigoInOPxo/aUVJbmnj3D/O9Ck/Il50S/ShYcDeFxDdvjZ5ouI1jXB11MRpB3H8a/FjDxaAAJqav8TCLHx5hmjkiMb4AAe3kPUzxPtnUPtXcx1LJoT8mz9cQtsiwfA9oqNfR4QZyOA2gNBibbNHZk8t4jl2dsM+QzlASZ4OqSo1R45uT+VOKX+F9VbZ90dDTl9MfhvopKIsl3mXjnaMozaNd3zNycp/Nx5Pi4xur7nZNp2DHhy4axdWffVch1xOaGLpZ6Y68IByQXZ0NaMdUe+SCxN+UzbThmSQpfDfG9IsLi7mYwWFSgEgTCj5Lnh9sHs49m09WlfS1FYpZ9S+9iYB/SXuLi9UDLijg9Q0y5Me8YlS4TrJptLScIjDdIHuwF/7ljl/pVIrKuhweHRuWg55CNOJlqbABd+XmH1Oq9OVgDf3QdzUkHRLh20KMXC7LLCYsUaUkVoMWlVVUhveH0J4oqD0+KGDU1mMCD1v5jRKcKeQRofiFdrgzDfm9DVLJSSLKIrmKu/EfFcc1iSQTMmjmKem6GSMN9bccEFDQgKJoXWt+jax+5FqgwQv+eygFVcsehWGhDRdKEfbqD9dAkgUyyebikOFtKACNwgK24to54K3371pUnOw0k8pYnLLyKozbX3sxTUzLNUgroHCUlEm90cmZ14yZLN5xupv3F84+KQpatNAc7dTUGOj4B/29wKBHYvjB6tXLvVs5nxEGeTTSIrW2dyA2UrdKJTlwERybW3Yld9oSf6KSqo+Nj919R4Z2ychMNHtj+xKXrCQhtkhkyIMGsfOFvCF5E6FZPKISuJcZj+FvvklhX27Imna6TVHUeie9p4ktuTOGbHTFL0xZx+w8ZCLu93i7A9iZnMclvJUZzs6Aoz+ws66UfWxqVvRmaHEzGTe7pu5ouVQpjuKhLoBHDnHRUj8LSDraxjmxpveYCNdOaRCg7qkmNhik+PGad7HButXyWlAYPnfZe4pdF29v+4EFt2SI7LSQbO8uXiVLA85V4mJk2uCy+t6yP2CWo99OmcacRp+8mdyzStKIwyt4qDjK+LHRxa1CC5liKif9jzLF6WnZsJqOtvn6eAU+8vpsmwjVLg+97i2gK/BLYemtRGvL18LSFnrQFJubLVkTs3eNcCe1Aa2cxFU643MBd8XLHyUt90v7phIi0NJOLQcFTsfabnA2vCFG0E+X/MNXtGlmWq+zB8AeK2a4+Duqb6FmkpT8RzuyK8k2MWIrV4OZPG42TZkXk9JY X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS9PR01MB13950.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(7416014)(52116014)(376014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SyPTP534tuc6e/58aLbD27XhkAV4NT6B2FIKpa/vz0ggfUetIKZ/CBnHrbh16TDcnm1eqi2lVHzsQZQRf130x5gjirXUTHe/c6ouI7nsvC1HWQd+4vaJoZfS4cNKtGr6bg0VvPp1YriJ3FGFiN4+UDGLAeRTBYAyHUnvNR7ePSdHI6E26G9FaEBBksFVZGxFxRiJvD8KmUxJHUBL92E3oU671n80aQjhrFYiP9ptUgO9aWx5AA27LjIoWtUPXzon0zkFUd9T8idsOUpD1+TX/xSzbCV7c7RouLjjyPVUGmBKTSt/Udg4kIxcQLWewk5EJMLDDfDzHd3EuiglkY9wYxjv9faLvXNJVQVjyGWbmZtEpEhfEAZM/CkA67UqZyrE5S2IbqEMS8hCqTD1X588dk9HMxugDKCOHaiRBqo+g3gBQdakYaM6VrWv+yf/wMLm+MBli5drT9FPIhSTpMyNflf8GUIdaYEezfGvyELbROsx/18772PZJtpaNAqPvO8zAgQv7wO1iU0oLnnjedHKdM6TL28l6uohXl9SQJ0crLYGHnZQexdjA9SFXIueFgLZS3CcbkNckF4dQNXrSaLaOzcy/fJZSd1MeUyqgwbEZPI4cOe1jSWTvyhWxzo3QrqA6duOGKYPI14elrgtM7coSgrjAaRreBXuAI2s22DQwEuS6KEuAc60BseKp1Cc9FGxPBihdskr0pSL0SR9ajSCLYvr9NLoC3L1DU2FzN7PlHjPJs1RR2cpZm5Qw/Ok+YoLhAUVzPKvXav1PFIUEblgvTM7RjSHO6LnT9rWGslGO51KDF9aZySGMJ5vzJrFRgpzbg3JpXEcCCklqgv8WXTE+PC6xxbAIjGfIG+FHsKv8kRNgxGbeUL4siv0nGH0KMG3RnHiK5k0AEcujsHLOpN1iE4TbgMy9PjtVSrSrNm94hrzaSfRmRyXNFm8NkPCVFLWXOESoEBHWtqkmln3sRmPYm9sV//W5pTpzxp/a2HiV1vVBxbbvMUZhjv547WjOQQQRYLpbuRHcxBtE9de5mtQlixii2A7veyvwqWSHIsBPNz6jRJFytcX9sQCKKhlNJj/ldwbFcwpOo2PcL5bElCJscYbcU6+0kWxTAKvmbHZcv94n4hh3g/7GNZ+R0ewv+XabD8XSnPukaAMJhO2cLYt3Lgo3EMAIxTcQJ3er6EGVsgmA8YgvIcS7Kzs+OObKTXFTMAB+Dr4b9WaMS0tqe8GZZ0dvODBc03Sk0tDO/+oxjfwzAHrueGCzsGss3uAwHAqkVGx06C4HYOU9b5zLcOPWni2X2MVb1itMaLZdipeggaBbQFUUKO5ouNZJkAEVTOmq+Hs0odlpwONxJPCqIwipCMBL/6MvHYODRqj4pI/FvMryj0YvldISeArhwa7wtPVfSf52t8ISyJP3mZjxkbbJeOgSEp3EN1CwbZrg1os+mKKRRPvDjiDu70lWnwM227MDF19SLrXFBdUJdNDBC4YOO03K8vxA0B2N10d1f1DPCH/IenCxVojjIMaPwin2HAdJS6KLASLrL2tMtnB5FP4R2oRtBJfFewyaGQA9AZDRkM1d90/XIydChEekVTpjRbkPX1qpT3xSegN75XpxDj1XYIJgbyr9/TIbSXr5CfGdvE= X-OriginatorOrg: bp.renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6dcf5cf-cfea-41dd-756d-08dd5a6de570 X-MS-Exchange-CrossTenant-AuthSource: OS9PR01MB13950.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2025 16:10:20.6955 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: c3ybdttiMPZjuRMUSypjd0u+wwpj5XhsFKol9T2qj+8TilGAaE5OdhYcRlYjFsgehgN+raYOwOvXKzr7bGvj5lJS06NFpsXEI+p7oopW6C8DW3QoQIOV1S19Ylrt6TwA X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8683 The RZ/V2H(P) SoC does not require a `system` clock for the CSI-2 interface. To accommodate this, introduce a `has_system_clk` bool flag in the `rzg2l_csi2_info` structure and update the rzg2l_csi2_probe() to conditionally request the clock only when needed. This patch is in preparation for adding support for RZ/V2H(P) SoC. Signed-off-by: Tommaso Merciai --- Changes since v2: - Added has_system_clk bool flag to the rzg2l_csi2_info structure to handle case where system clock is not required as suggested by LPinchart. - Fixed commit body and msg .../media/platform/renesas/rzg2l-cru/rzg2l-csi2.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c index 4aa5d58dde5b..e4781105eadc 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c @@ -127,6 +127,7 @@ struct rzg2l_csi2 { struct rzg2l_csi2_info { int (*dphy_enable)(struct rzg2l_csi2 *csi2); int (*dphy_disable)(struct rzg2l_csi2 *csi2); + bool has_system_clk; }; struct rzg2l_csi2_timings { @@ -364,6 +365,7 @@ static int rzg2l_csi2_dphy_enable(struct rzg2l_csi2 *csi2) static const struct rzg2l_csi2_info rzg2l_csi2_info = { .dphy_enable = rzg2l_csi2_dphy_enable, .dphy_disable = rzg2l_csi2_dphy_disable, + .has_system_clk = true, }; static int rzg2l_csi2_dphy_setting(struct v4l2_subdev *sd, bool on) @@ -801,10 +803,12 @@ static int rzg2l_csi2_probe(struct platform_device *pdev) return dev_err_probe(dev, PTR_ERR(csi2->presetn), "Failed to get cpg presetn\n"); - csi2->sysclk = devm_clk_get(dev, "system"); - if (IS_ERR(csi2->sysclk)) - return dev_err_probe(dev, PTR_ERR(csi2->sysclk), - "Failed to get system clk\n"); + if (csi2->info->has_system_clk) { + csi2->sysclk = devm_clk_get(dev, "system"); + if (IS_ERR(csi2->sysclk)) + return dev_err_probe(dev, PTR_ERR(csi2->sysclk), + "Failed to get system clk\n"); + } csi2->vclk = devm_clk_get(dev, "video"); if (IS_ERR(csi2->vclk)) From patchwork Mon Mar 3 16:07:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tommaso Merciai X-Patchwork-Id: 870006 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010044.outbound.protection.outlook.com [52.101.228.44]) (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 632BB21B9DC; Mon, 3 Mar 2025 16:10:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.44 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741018245; cv=fail; b=c7lcFi0+gnNf5Rf080ZnSuUbUbc6YoKRqBbLVHYbq+EVo1Ntk36F01N2qqz8DkRXoW5MBsYT5iK0/br3ly+t0slZJs1vgN0XG1fNupdQs7MmRV6r+vYd2DG4enGc8IbG05Sp1hvrW1+ZbTw+jXZmrqvIIPFpKrW4sG+DfIOwCyA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741018245; c=relaxed/simple; bh=RF13DkM6Q9CQ/7QlEkmWIR4ZREIFuwHvU3wNJOpyi+Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=DayTES741eNMqDN7D+fouRkYWg8eMmhB2+c1kh1xI+bc3diUJMAaPejCb+RRHlgRqvzK1MTV3nLAUbph12kuuMptozcuIZZD14bGTsDd7SoAYzdf7tf7DqS8/EFzwDuiB+fXpOPgD9j82vHVoorI+ZqGK/HvLWGXpN+IqtBA2iE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; dkim=pass (1024-bit key) header.d=bp.renesas.com header.i=@bp.renesas.com header.b=Kx8MhguT; arc=fail smtp.client-ip=52.101.228.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=bp.renesas.com header.i=@bp.renesas.com header.b="Kx8MhguT" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UHQuKoiNUuSTkJsRIYSDnBkNGJLCafWrDHMsiRpHNMl7agwns2Fgqa6x66NPQMF1dE56mEbgLJj92VTe+XnEJ7N/jZO6DWB5BMetjmrU7XUPs+iDLXA63zNfJRlBXFdS/lz8QoKUzid7F1AjwqXzWwzkCkxM7gZG8/AOI3YT/FyZAljErdfB+88+4YWF5SCwvF9LGHrqehKUHtUS5LjriA69Nc8S2/a6BpUvxvxSJLuxPXWJV7tgwl46nwaZCaWJ4ocaJ/tjqypalqmSiSePS8x/lQ+6Cn8wbvCCMEA4oCMS1g9G4Rjd/Wo08+LyPGV05a0xMMXFCRIDD/HE5rZfzQ== 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=XLKpxNsBF5xTXAIuDGy5THwATi5YWhLTwHjytEbsHYE=; b=T/BPuv6wVpkJSSzb1VqJXd3Qp4XNJCmtF+p2QaeDs5PtE6DvkQpuALNq+wvOQl2V9BLbQ4x1iyoolG475w5jOgRmBfTIPa+qR9DPAEXVfGWq17yXo6Lddh2is7h/rEroqTKOkanf8SacvzgHnC5FlwNKX+ZqxaWE7/eh2Qu/AZVU7vhtU6bWq3r2ECXVWWtVRaQX0WrXiX8DzgulI+3y0roAIjfCW0NWz3lB8N2D5ZLCIUOBpqmm7Er0mbG+IV0fr7MNq8YUrQkoUOUxK0ga/THEM9+sNC/292pRMpJOOqbS+sLCC+sqknsHv9XqSA+RLSULnU4MXw4rpu4jbUt4hA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bp.renesas.com; dmarc=pass action=none header.from=bp.renesas.com; dkim=pass header.d=bp.renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bp.renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XLKpxNsBF5xTXAIuDGy5THwATi5YWhLTwHjytEbsHYE=; b=Kx8MhguTfkbvakokSRu8LcBTjSaSNzlz4oCAq+5yC3g0fr96LmETuiTNh9pZOQcSROPL+g3OOtWyVjkapE5hbEKD+34BoB3yWkzZDBxXDbWNBqsYpKnL5hZR/tfWr3Bgc4UHxvFNswWSWDJyldDZqg9wCRl+zAMDVQzLY1vpAHw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bp.renesas.com; Received: from OS9PR01MB13950.jpnprd01.prod.outlook.com (2603:1096:604:35e::5) by OS3PR01MB8683.jpnprd01.prod.outlook.com (2603:1096:604:150::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.27; Mon, 3 Mar 2025 16:10:41 +0000 Received: from OS9PR01MB13950.jpnprd01.prod.outlook.com ([fe80::244d:8815:7064:a9f3]) by OS9PR01MB13950.jpnprd01.prod.outlook.com ([fe80::244d:8815:7064:a9f3%5]) with mapi id 15.20.8489.025; Mon, 3 Mar 2025 16:10:41 +0000 From: Tommaso Merciai To: tomm.merciai@gmail.com Cc: linux-renesas-soc@vger.kernel.org, linux-media@vger.kernel.org, biju.das.jz@bp.renesas.com, prabhakar.mahadev-lad.rj@bp.renesas.com, Tommaso Merciai , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Magnus Damm , Laurent Pinchart , Hans Verkuil , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 11/17] media: rzg2l-cru: Add register mapping support Date: Mon, 3 Mar 2025 17:07:51 +0100 Message-ID: <20250303160834.3493507-12-tommaso.merciai.xr@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250303160834.3493507-1-tommaso.merciai.xr@bp.renesas.com> References: <20250303160834.3493507-1-tommaso.merciai.xr@bp.renesas.com> X-ClientProxiedBy: FR5P281CA0032.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f3::6) To OS9PR01MB13950.jpnprd01.prod.outlook.com (2603:1096:604:35e::5) 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: OS9PR01MB13950:EE_|OS3PR01MB8683:EE_ X-MS-Office365-Filtering-Correlation-Id: 9f1caa50-72a5-4652-134d-08dd5a6df1cb X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|7416014|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: TC2guJC4eXdbYL+VE5x6RYv3WAP+9kQhNelDDjgjRp50PQKXIZRtSNuzJrryqO9Yji5OSfVkscKi+XASgehDkHVmy8yR+DBCGYdDcH/q1H6HhCl9OgFtxABfVHCLmvkbgYHMVy0iY0xPo7G9JQ23zcU8VYQGdLs8M5lldka/J4SCx29rBlAHLutF6Mn8XXsyusseyZeIhrosZQIisDyDriBo2w4nujmtg0LAAyc0PnaJAbJ3rJh0QqJkam54TyyhvUoyOB/9eqbzXHnGFePCJEJsqhi85e3ykXpU+VSyaGokYURe2NvBrd6zTo5UiEg5vthof2jVAvl9UgfsbcyjtN21pdgGgDLYWQO/Hajz6aAscpPeKVh1jr1c382q3g5YJCiaFYl+RUJH8yJcZQVQqUu9Xig7B6/qIMVbl+oPYMOaRSS0QtYixH7IupeTfmD+p1cMXWaQLDnQlIGONrFQHiPaYQ4T3EUAp2ZQ1qe9c/DgwHvF6ote9Zv+rbgne6VslRCSIlGkB7JhZk0qNp8E4Ost0KtPXmdx6tFaX5y69VWb02LZxvEzT+nTpCVZ+UhTGPHV9NoJQBdgMAaJYn7iIwBsjdjB+3YVaQxji1SNbZ855Pifw/KQfOcRSYHlO9g3r/EAxE7xd2pI9W8B6q4qpBvKXrHJHtsvVg6/TGmmHTj/sjewpPGTF79vDSg+ijonrrEhLdnXgg9icHMx+6eeB9TY6GAERcW/BAzns9A6V7CXvssrA/8zy21ty10qkpHeuT7jtIse60yze8dgo1+KWNEdrGsrxIuuZeL3RhG4+UD1vCokx3Eb2iVoo9unF4SbmFi/48zxMY1qoFk/25qmWXZRN9735O+hphXDqHjKBYRSKvuAlOHTWqbq7//3xFUPqZX+6P+yOhxYO+WVdKSXlqmJ4PSBROnTqdOqFVk7JOKsjNNajCg4L0+1tjgE97cZ0QaSpNTN/lsmJoVwrImhzHomjcBNtlgVd/wb+NK1jKfYn5WoBa05C/CYfkjN+C5fQhkSWo4e9RgDEYP9V4EAoemKZZPNHo6G/w0JjyiJtrh8OTBkV4VZ3Kg8m9RRaI2XX8XyFAXgKkam3D3f+CNvgFBy810ZZqj676FW8CfL15DYXJve72DZWmnFjHWAf6SCxzIymvR+JgQTHnxVJWhMIuvXt/+8gg1V0TvbxRQQ1VSbOwEbq6FmMNH7jPzaA2bo8to23a7Vnb/BFvHhNPqMXm9QTcjx5jCX3hZknHwftru2TEuvLI0dRXFpT9wjyQH/zCe2/CIfz3/UXHDAt0csSzrY/+ldQiFrUjL3sKPyioghwAWWP2ArLkv9PZ0/P/ogxi/qkjMSed5Vmgbuw5fIeC5iOFMRlBTJCfYi4/91Uwd2hAJ+FkXE+/PaSrvRtHlsSkIOrwf/8ssVzAQxlosTtdKAYyWxW0reWb7teVsxW8RYqwIaFrLEf7bNUW6/n7rF X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS9PR01MB13950.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(7416014)(52116014)(376014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2HSjXqxzBjkXBxUcPGXyqMgMgWplkf2fNt754uyX0pfvGgbhcueTQfHU8Dt0vS6IZpsPvcHLaMjxi6Rg1fyi2xufGfl3g1w8xADcFATqjYlr9mxzfrdKyhDXswStb6DuEKKYlgMr2SGxbBgYTRCBe/JCHfULFpj9jYaGsaDIZJHZbPw3FwJT92NTMUgiLgHN3hIUT0AK/GPW+JWipnPF1y2Kw8qaLTEP/EHiUZRNEkGaGopEAymBQvJHlo8YtiLOCb/bDCELtoZWNJh51w6gZChEpfz9cuMVUNfgEUmCfIjuMhKfVb0JXKIidOTzWz1bliaf+aQiUlvr3AtzCUQmkJQVD0GsClnp+vltHKNGYnetehxZqeZKBRrgXCWxXF681Tl0YWUqglodviYb1Aaeai8ALY9ujZuXOQUSrU8lDnZaQKqWQnl64TA9QtwdVqbYA3DR8xtrEvXoOGK0KBgph4/tH2D0dMo9JdKK85QOv45EEhi6jLY6aQdXhs6AM6pLq72obLjMnJa0UaI/SFPGbVB4RV2+UZii4qzIkZ64J3fMapl40MFOBGo9DxlLBkHGSU9heA9xfCrCJ4xspkmXcjjUEQlO0Oni9kwGoORhkU25Vsx3Nfdz9UiIU/IihSPslpQFTJTl6SNsBmR9g35A2o/4HCEvL30u79DUVYvc5cxsHs5QT/mO9scgkIqCO5ZMW5Kuo5DNjLc9l0UPClWCRhQXz+zodxHnVVmkqwMJqXjDozIrG2dkXR/r2VYbO908cY5n3dgraoSGuaxf5E6NYWK9cPrMNN3Je/STghOGll8bMRu4WcjAJtyNjwROdwK0pYdONzmGBvS64TWTDFwlCh1+MHuAvv+I3SxT4DFQSy+TpHgrbM58vB+mNdfZDTteQZiU4XZXI465qL7INQF3sZ6jZKQ0Pa/gBfFiPx8RP5xVGFesX4bbLcrlBDAvUYQfVShNygG8h9Z+HYTQ53gZxXh+3XG1QgZnk6Q7Z4Hjfez8rDtiBIJ9u09D5exXR6S9O5jqIJN6ISsGTroczXx38FqZzIxQ8TgCa5C1hqlSUFqmNyx23dREQiSOGoxIzeJAyc2zM72zzi1F8XFi9f1HhuwapPNfXDV5bWq9KOdjHGmY2Vw7i8JUjs1jIUrgXCFw25sVEkul/e+DZQKN3IMfVkFbzpt2ET6WVaTcNsdXkCfhUvvpQY3opFFPsdHtfiNfPaTfieTtCtNkcYsL/F5ZqKWahdEKLsolkObzDJ9YKNzIC8bEOXAahMdDbeO+JcgefZe6N+xkkTqUqN6Sm2LX7ODksoH3RQAWnK+k7oWIGe2p3nitWxKGHiMPFFXqNgBu7BaO/dXukPqY/Z+d5z0Wy6MVbN/Ds1aJaP7fq+Qtt4Mz9De0IUC4g0hFdo/pfqNw6xAtnwc+8u+1RPjYqREMljRanb56Yc9bcaAGuhmFsFkqWOyarlqGZa/aNCK2oUMMQpYP8L5PsrEDKuLsyP0PuhI7Y/NWGaUnsog+eOPNTKOCEs1+kUMTST9Ifa/ORnb9fu3E2QmxEIknLMUGA1/I41bgAgVEQGb0gQoKNYZhBdDj04LnmD6mI+W27G4ns0nnb39ld9hEAcgedCigFRlJzoj5DxXMkYolYcvugn8yQA0= X-OriginatorOrg: bp.renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f1caa50-72a5-4652-134d-08dd5a6df1cb X-MS-Exchange-CrossTenant-AuthSource: OS9PR01MB13950.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2025 16:10:41.2103 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: RJ71aruaz9tRpyANQwrda/GSE7QM0QW9N8z2VYS15lN4kN3CIUd+yxRZVG+er9Z6u/EdnnYKEhYpY3oKSYJi+FEDdgTHKnPLNTpUThPpfchraah2wJHNGjsrgmaIItiC X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8683 From: Lad Prabhakar Prepare for adding support for RZ/G3E and RZ/V2HP SoCs, which have a CRU-IP that is mostly identical to RZ/G2L but with different register offsets and additional registers. Introduce a flexible register mapping mechanism to handle these variations. Define the `rzg2l_cru_info` structure to store register mappings and pass it as part of the OF match data. Update the read/write functions to check out-of-bound accesses and use indexed register offsets from `rzg2l_cru_info`, ensuring compatibility across different SoC variants. Signed-off-by: Lad Prabhakar Signed-off-by: Tommaso Merciai --- Changes since v2: - Implemented new rzg2l_cru_write/read() that now are checking out-of-bound accesses as suggested by LPinchart. - Fixed AMnMBxADDRL() and AMnMBxADDRH() as suggested by LPinchart. - Update commit body .../platform/renesas/rzg2l-cru/rzg2l-core.c | 46 ++++++++++++- .../renesas/rzg2l-cru/rzg2l-cru-regs.h | 66 ++++++++++--------- .../platform/renesas/rzg2l-cru/rzg2l-cru.h | 4 ++ .../platform/renesas/rzg2l-cru/rzg2l-video.c | 58 ++++++++++++++-- 4 files changed, 139 insertions(+), 35 deletions(-) diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c index eed9d2bd0841..abc2a979833a 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c @@ -22,6 +22,7 @@ #include #include "rzg2l-cru.h" +#include "rzg2l-cru-regs.h" static inline struct rzg2l_cru_dev *notifier_to_cru(struct v4l2_async_notifier *n) { @@ -269,6 +270,9 @@ static int rzg2l_cru_probe(struct platform_device *pdev) cru->dev = dev; cru->info = of_device_get_match_data(dev); + if (!cru->info) + return dev_err_probe(dev, -EINVAL, + "Failed to get OF match data\n"); irq = platform_get_irq(pdev, 0); if (irq < 0) @@ -317,8 +321,48 @@ static void rzg2l_cru_remove(struct platform_device *pdev) rzg2l_cru_dma_unregister(cru); } +static const u16 rzg2l_cru_regs[] = { + [CRUnCTRL] = 0x0, + [CRUnIE] = 0x4, + [CRUnINTS] = 0x8, + [CRUnRST] = 0xc, + [AMnMB1ADDRL] = 0x100, + [AMnMB1ADDRH] = 0x104, + [AMnMB2ADDRL] = 0x108, + [AMnMB2ADDRH] = 0x10c, + [AMnMB3ADDRL] = 0x110, + [AMnMB3ADDRH] = 0x114, + [AMnMB4ADDRL] = 0x118, + [AMnMB4ADDRH] = 0x11c, + [AMnMB5ADDRL] = 0x120, + [AMnMB5ADDRH] = 0x124, + [AMnMB6ADDRL] = 0x128, + [AMnMB6ADDRH] = 0x12c, + [AMnMB7ADDRL] = 0x130, + [AMnMB7ADDRH] = 0x134, + [AMnMB8ADDRL] = 0x138, + [AMnMB8ADDRH] = 0x13c, + [AMnMBVALID] = 0x148, + [AMnMBS] = 0x14c, + [AMnAXIATTR] = 0x158, + [AMnFIFOPNTR] = 0x168, + [AMnAXISTP] = 0x174, + [AMnAXISTPACK] = 0x178, + [ICnEN] = 0x200, + [ICnMC] = 0x208, + [ICnMS] = 0x254, + [ICnDMR] = 0x26c, +}; + +static const struct rzg2l_cru_info rzgl2_cru_info = { + .regs = rzg2l_cru_regs, +}; + static const struct of_device_id rzg2l_cru_of_id_table[] = { - { .compatible = "renesas,rzg2l-cru", }, + { + .compatible = "renesas,rzg2l-cru", + .data = &rzgl2_cru_info, + }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, rzg2l_cru_of_id_table); diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru-regs.h b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru-regs.h index 1c9f22118a5d..86c320286246 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru-regs.h +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru-regs.h @@ -10,71 +10,77 @@ /* HW CRU Registers Definition */ -/* CRU Control Register */ -#define CRUnCTRL 0x0 #define CRUnCTRL_VINSEL(x) ((x) << 0) -/* CRU Interrupt Enable Register */ -#define CRUnIE 0x4 #define CRUnIE_EFE BIT(17) -/* CRU Interrupt Status Register */ -#define CRUnINTS 0x8 #define CRUnINTS_SFS BIT(16) -/* CRU Reset Register */ -#define CRUnRST 0xc #define CRUnRST_VRESETN BIT(0) /* Memory Bank Base Address (Lower) Register for CRU Image Data */ -#define AMnMBxADDRL(x) (0x100 + ((x) * 8)) +#define AMnMBxADDRL(x) (AMnMB1ADDRL + (x) * 2) /* Memory Bank Base Address (Higher) Register for CRU Image Data */ -#define AMnMBxADDRH(x) (0x104 + ((x) * 8)) +#define AMnMBxADDRH(x) (AMnMB1ADDRH + (x) * 2) -/* Memory Bank Enable Register for CRU Image Data */ -#define AMnMBVALID 0x148 #define AMnMBVALID_MBVALID(x) GENMASK(x, 0) -/* Memory Bank Status Register for CRU Image Data */ -#define AMnMBS 0x14c #define AMnMBS_MBSTS 0x7 -/* AXI Master Transfer Setting Register for CRU Image Data */ -#define AMnAXIATTR 0x158 #define AMnAXIATTR_AXILEN_MASK GENMASK(3, 0) #define AMnAXIATTR_AXILEN (0xf) -/* AXI Master FIFO Pointer Register for CRU Image Data */ -#define AMnFIFOPNTR 0x168 #define AMnFIFOPNTR_FIFOWPNTR GENMASK(7, 0) #define AMnFIFOPNTR_FIFORPNTR_Y GENMASK(23, 16) -/* AXI Master Transfer Stop Register for CRU Image Data */ -#define AMnAXISTP 0x174 #define AMnAXISTP_AXI_STOP BIT(0) -/* AXI Master Transfer Stop Status Register for CRU Image Data */ -#define AMnAXISTPACK 0x178 #define AMnAXISTPACK_AXI_STOP_ACK BIT(0) -/* CRU Image Processing Enable Register */ -#define ICnEN 0x200 #define ICnEN_ICEN BIT(0) -/* CRU Image Processing Main Control Register */ -#define ICnMC 0x208 #define ICnMC_CSCTHR BIT(5) #define ICnMC_INF(x) ((x) << 16) #define ICnMC_VCSEL(x) ((x) << 22) #define ICnMC_INF_MASK GENMASK(21, 16) -/* CRU Module Status Register */ -#define ICnMS 0x254 #define ICnMS_IA BIT(2) -/* CRU Data Output Mode Register */ -#define ICnDMR 0x26c #define ICnDMR_YCMODE_UYVY (1 << 4) +enum rzg2l_cru_common_regs { + CRUnCTRL, /* CRU Control */ + CRUnIE, /* CRU Interrupt Enable */ + CRUnINTS, /* CRU Interrupt Status */ + CRUnRST, /* CRU Reset */ + AMnMB1ADDRL, /* Bank 1 Address (Lower) for CRU Image Data */ + AMnMB1ADDRH, /* Bank 1 Address (Higher) for CRU Image Data */ + AMnMB2ADDRL, /* Bank 2 Address (Lower) for CRU Image Data */ + AMnMB2ADDRH, /* Bank 2 Address (Higher) for CRU Image Data */ + AMnMB3ADDRL, /* Bank 3 Address (Lower) for CRU Image Data */ + AMnMB3ADDRH, /* Bank 3 Address (Higher) for CRU Image Data */ + AMnMB4ADDRL, /* Bank 4 Address (Lower) for CRU Image Data */ + AMnMB4ADDRH, /* Bank 4 Address (Higher) for CRU Image Data */ + AMnMB5ADDRL, /* Bank 5 Address (Lower) for CRU Image Data */ + AMnMB5ADDRH, /* Bank 5 Address (Higher) for CRU Image Data */ + AMnMB6ADDRL, /* Bank 6 Address (Lower) for CRU Image Data */ + AMnMB6ADDRH, /* Bank 6 Address (Higher) for CRU Image Data */ + AMnMB7ADDRL, /* Bank 7 Address (Lower) for CRU Image Data */ + AMnMB7ADDRH, /* Bank 7 Address (Higher) for CRU Image Data */ + AMnMB8ADDRL, /* Bank 8 Address (Lower) for CRU Image Data */ + AMnMB8ADDRH, /* Bank 8 Address (Higher) for CRU Image Data */ + AMnMBVALID, /* Memory Bank Enable for CRU Image Data */ + AMnMBS, /* Memory Bank Status for CRU Image Data */ + AMnAXIATTR, /* AXI Master Transfer Setting Register for CRU Image Data */ + AMnFIFOPNTR, /* AXI Master FIFO Pointer for CRU Image Data */ + AMnAXISTP, /* AXI Master Transfer Stop for CRU Image Data */ + AMnAXISTPACK, /* AXI Master Transfer Stop Status for CRU Image Data */ + ICnEN, /* CRU Image Processing Enable */ + ICnMC, /* CRU Image Processing Main Control */ + ICnMS, /* CRU Module Status */ + ICnDMR, /* CRU Data Output Mode */ + RZG2L_CRU_MAX_REG, +}; + #endif /* __RZG2L_CRU_REGS_H__ */ diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h index 8b898ce05b84..00c3f7458e20 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h @@ -80,6 +80,10 @@ struct rzg2l_cru_ip_format { bool yuv; }; +struct rzg2l_cru_info { + const u16 *regs; +}; + /** * struct rzg2l_cru_dev - Renesas CRU device structure * @dev: (OF) device diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c index cd69c8a686d3..792f0df51a4b 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c @@ -42,16 +42,66 @@ struct rzg2l_cru_buffer { /* ----------------------------------------------------------------------------- * DMA operations */ -static void rzg2l_cru_write(struct rzg2l_cru_dev *cru, u32 offset, u32 value) +static void __rzg2l_cru_write(struct rzg2l_cru_dev *cru, u32 offset, u32 value) { - iowrite32(value, cru->base + offset); + const u16 *regs = cru->info->regs; + + /* + * CRUnCTRL is a first register on all CRU supported SoCs so validate + * rest of the registers have valid offset being set in cru->info->regs. + */ + if (WARN_ON(offset >= RZG2L_CRU_MAX_REG) || + WARN_ON(offset != CRUnCTRL && regs[offset] == 0)) + return; + + iowrite32(value, cru->base + regs[offset]); +} + +static u32 __rzg2l_cru_read(struct rzg2l_cru_dev *cru, u32 offset) +{ + const u16 *regs = cru->info->regs; + + /* + * CRUnCTRL is a first register on all CRU supported SoCs so validate + * rest of the registers have valid offset being set in cru->info->regs. + */ + if (WARN_ON(offset >= RZG2L_CRU_MAX_REG) || + WARN_ON(offset != CRUnCTRL && regs[offset] == 0)) + return 0; + + return ioread32(cru->base + regs[offset]); } -static u32 rzg2l_cru_read(struct rzg2l_cru_dev *cru, u32 offset) +static inline void +__rzg2l_cru_write_constant(struct rzg2l_cru_dev *cru, u32 offset, u32 value) { - return ioread32(cru->base + offset); + const u16 *regs = cru->info->regs; + + BUILD_BUG_ON(offset >= RZG2L_CRU_MAX_REG); + + iowrite32(value, cru->base + regs[offset]); } +static inline u32 +__rzg2l_cru_read_constant(struct rzg2l_cru_dev *cru, u32 offset) +{ + const u16 *regs = cru->info->regs; + + BUILD_BUG_ON(offset >= RZG2L_CRU_MAX_REG); + + return ioread32(cru->base + regs[offset]); +} + +#define rzg2l_cru_write(cru, offset, value) \ + (__builtin_constant_p(offset) ? \ + __rzg2l_cru_write_constant(cru, offset, value) : \ + __rzg2l_cru_write(cru, offset, value)) + +#define rzg2l_cru_read(cru, offset) \ + (__builtin_constant_p(offset) ? \ + __rzg2l_cru_read_constant(cru, offset) : \ + __rzg2l_cru_read(cru, offset)) + /* Need to hold qlock before calling */ static void return_unused_buffers(struct rzg2l_cru_dev *cru, enum vb2_buffer_state state) From patchwork Mon Mar 3 16:07:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tommaso Merciai X-Patchwork-Id: 870005 Received: from TYVP286CU001.outbound.protection.outlook.com (mail-japaneastazon11011046.outbound.protection.outlook.com [52.101.125.46]) (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 7C0D81DA31D; Mon, 3 Mar 2025 16:11:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.125.46 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741018265; cv=fail; b=dZ0xZJNLqEcGqE58qriCutBh/MqxjgUQQQU2gAG3oR6fJbZ7AQZQaI7eWlT+6tssh3w6ZZJSRwo7Px+VuYSqBZ5Scoj2PZT71KZ8Zj3s0wdC1/0lLzjQLaZ86rgqWRALsFBpKmlStYMlIYgsZwKuc+TfDlD6mwYROdkGdj835/c= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741018265; c=relaxed/simple; bh=5uvchA5nH03kiGbMXqq3m8CbWhBlFahJRNj26wjaNJo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=d75NP1AWZojzCuPfRDBBSutXfcBIphUh4Mor3/1SfOoFwiXPsfA9LK9fYGEFjI8XfdXjrZm+kYKotv/ipptT1Gx4W+CnLRzQxRFJmBWhE9CgY42vq6i7N0XDFw4TECIqSQ96+xFfOK+IRqmT4rdo1kfA3zkOqUB+y1ulEujr6hY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; dkim=pass (1024-bit key) header.d=bp.renesas.com header.i=@bp.renesas.com header.b=NKXKaIgc; arc=fail smtp.client-ip=52.101.125.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=bp.renesas.com header.i=@bp.renesas.com header.b="NKXKaIgc" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ypcSES3qqZnc23VslonRtTMrxj5R9WiyyhnAAzK8onZcl5o5BnRRULx8fhMfMOv0wUo2io7ERt0LDdLqwUuJRt5UFhPoIW/gDjT4sDWyzqpYlL7iMqnn/QIGBgU1ioTs5JEWVsCBFrZ9KwMqvd/Bu5ds6/p2DqSWM2aNo1dgzngD9P8aaThJDb5zEfLAk+X5Ab13fnwUynYHlUtb57N022cJ/ziLJ8RSmXebzor6qfuhlwwOQCNtGv7C69AuQ1Wz+LBR+3JeGxGldU8AEk3DwgxoHALPxgdIfB1TejWfo3V7DAdkVuuL/OW/vXkd+ix98JPWD0H2e4PZucVnUfR/MA== 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=2MiP5/sRjKZ1lKqYtzwX6HFn7IU/Os8AGNJYk9K2eF0=; b=WeA1jVfkaEs9b6JNONl8uva7m6CtfVx0Zg0PNc/WGHe1l4cHMlFBGjA+FGLu+kHskgRmvAlzCCcUGm+rrq00gZZmqV9AF6I8Nk3NhnJNxUiaOivqQaZBK6Ha2sd8ihvsftbpZ4F1Vj5rzTIHaToRc6YEsic7wC3nSQS/pYbrpuS2A/S7kYmk5uQfcCTC9GnSRV91t+FTvi3fc5hcUI7LkpT3U+a4vsrzRA98M3AL5SVDWGg1jHXBfFzLLuORWF/tzhGaTYAaQE0aK7uIBAgBrPz8HU6gMKOKNW43a0A+Zdq7oJ/nkNXSit87P2mXxosdvMTwFI+KaDyPXd8zOEL2zg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bp.renesas.com; dmarc=pass action=none header.from=bp.renesas.com; dkim=pass header.d=bp.renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bp.renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2MiP5/sRjKZ1lKqYtzwX6HFn7IU/Os8AGNJYk9K2eF0=; b=NKXKaIgc0kYPyZJVx1a6qZOvLg39QO099dguRwIhrLLGmbLN1zgnYB8Ma2EnsFtGR0BMPgqq8ym+gWalzmVkU6zn0rBTYrRvGxsorW+fRpawZls7nRP+Xq5+Nu4Q35jjQn7N7aotoUiqT+zEXCuUDT+NOwDsBZak1kbRwZim3ig= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bp.renesas.com; Received: from OS9PR01MB13950.jpnprd01.prod.outlook.com (2603:1096:604:35e::5) by OS3PR01MB8683.jpnprd01.prod.outlook.com (2603:1096:604:150::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.27; Mon, 3 Mar 2025 16:11:01 +0000 Received: from OS9PR01MB13950.jpnprd01.prod.outlook.com ([fe80::244d:8815:7064:a9f3]) by OS9PR01MB13950.jpnprd01.prod.outlook.com ([fe80::244d:8815:7064:a9f3%5]) with mapi id 15.20.8489.025; Mon, 3 Mar 2025 16:11:01 +0000 From: Tommaso Merciai To: tomm.merciai@gmail.com Cc: linux-renesas-soc@vger.kernel.org, linux-media@vger.kernel.org, biju.das.jz@bp.renesas.com, prabhakar.mahadev-lad.rj@bp.renesas.com, Tommaso Merciai , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Magnus Damm , Laurent Pinchart , Hans Verkuil , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Sakari Ailus , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 13/17] media: rzg2l-cru: Add image_conv offset to OF data Date: Mon, 3 Mar 2025 17:07:53 +0100 Message-ID: <20250303160834.3493507-14-tommaso.merciai.xr@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250303160834.3493507-1-tommaso.merciai.xr@bp.renesas.com> References: <20250303160834.3493507-1-tommaso.merciai.xr@bp.renesas.com> X-ClientProxiedBy: FR5P281CA0032.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f3::6) To OS9PR01MB13950.jpnprd01.prod.outlook.com (2603:1096:604:35e::5) 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: OS9PR01MB13950:EE_|OS3PR01MB8683:EE_ X-MS-Office365-Filtering-Correlation-Id: 98e1bef8-a4cc-46eb-c999-08dd5a6dfde6 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|7416014|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: Y4IN3E2Z+NaNL3CiXN9LCxr67pwoT41CEf5afJMav7I3FSxbyvwLV5rxjmNvqYuulivrcbDSwfNd5Nh65nNalQwedv3hDTsSr+pcXwS47aC8qin8E+T8vO36A+xL1DBvDeUDQdqOyWWovdEungp33i5JfVRT42xBKL4ioRccAlvSV4e2gGYIE69F5C7xfFZ4UEneMmWBa+61wJkgMc6ibfu0SJROdV0KAMTKh8gW0vmGsYHG1AzEuf5PuFvkCJS2LV5KK+PFmtvmyzD9v1NLi7Xa2vZ8xOEmW12HefCfume6/PlTEX4qxiOQGTG4nmGpg5A8Iw50b0p0SuH+MyqfFKEMxM4CmQbO3KK/bifjdJcnIl7rys2lKyOisie3mFSEDHiw4JUmNPegVQFnJL32GRISdnSpULy6fqmk7+UZ7czYyNaN2spCFtv3oI5QiVRAHIZE/cZPnfi2sTWSDE2JiqLGbqfN+x2vKyhCNBtKkkPkUy7P4QFjolpp2dNNJbHn8SpMKKv6xqQQ6KYCgVX3dDzOGeWh8eFmC1oB9rTIiY61AwdozYifjjKIwrJ5oBdIweQ1UEzQaqEFoB7semfVnlskMcArFXvbRJnUZdcXn28dl8Acuw/aNEL2EGtmRcg27jiyHlm11ZUHj8V8wrVCx88cbLo8360HziVidJPkpvI2QH0Ia12ykiwfrz7m2zNAMcaF4vrxYF7ruqfmROzx4lsSuFr6VQ+VvUHIr+7zF6Zy9Xsx/QsLbuy5w7MPMB2jZKmJFXQdm/Mrvw46VBfGXPOZS+HRU8UiBcR+4a5p1LKgj8BsSoyeRquczpnNtRpujgWj6LccRbBqXhcOS7Q/FTH7Ez7VMB+EV39p13lR9U02qUaWUcPQuWwokDz+RAAoCIl096znw16wnMzWk82ZxEzC5900Syb37xD4/Hxw+gtsIeQ96yb6mByAAvb8Is23zIlsF5yJhFwh+qJkdgRWNxffsTN+NxGh4Li/aIAIoQhOabcEkN9kCUE4WHecpgeUSBm5C7Ct4bPyHwBnnGSV7GnuwR2GniysFlQ+1U8VkDcS5thVJiU/2Mo2Fxwkzn+vh4Xo3o6drqRtFUA29DMqPxh4gANAnv621R3tGbvqpIz2kwRU9pShBuZsq5ytuhGc6EzTIavabr+mrp8aUdUO+kwRZaGNznTANe4XFSzE0eSyfw2JDfG/qTQYycTDZ4YAOr8cCQuVOxLdnrpmzs3TbYdEt/fsbBRvl7roch6VbZ+kqmixdSWYXeppeNBSwonSE6wixclK1oxusCT9lD340ThcUWRaNZib/h+XXkTJI1j37qSW8r26STRMa+6NsbXA12C8Qt6i7uAuvSu0XNBq2Rd3QNikGz9AhRIVdRDlutbf9Xt5XGQtiGh6qbiw1gj08w9vfSBd7bZVdRqwrGF0CZXoiXv8ruJNhWrFwIQNwTL7zau8vVfgUnmtquxKnhQU X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS9PR01MB13950.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(7416014)(52116014)(376014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PL9s8EaDLU+nQscxfKymwfez8U8RmE15bak1GFwb0yIzs6wM+A9SJL08Z0nTXQYEnMcPs9EjtD3mGsn48LQdlUY+eN68fx/8bOSI/uu99k6H6j6LybcdGF5dkIE2kcR8IJ4UPBoH6qdrPboJ0Zys7YXs+tu8GpBQs1Gdq7fzdwslvCLuuTpuC3jFsry2aZUuX/P+n0g4/LzFvADnLNvJNEkV/jqHwujIIxfnaGJ8hc5WGVd23rUxkpTqfm+xAbf36/vkNSu+MUaee1GN1Gz+DnPZIJvkCwiiDk96In2pZRr3PYeW6luLC9z6GQIf3oo/Lp/fvjitVnyRaix7TCcoqP4qaCTPMChSiJGMHADEz9RZzCcIVPtDwkZ+k+r2N0rrLVkTzyfcT4GlzJwoS08IbM/KKRn7HyD2lWfn8Wn9REJvBUGQM2a2u2eLL8xhZtlbCfrLkGZq+QznIFhSfjZrrrxRBhcKlKF/SXpB6v/YrX8tMIX/BIzdX1UhjabIxHWQe+JnmS7oQJAlEd6YjbKHBfUtpyc4bW6r0yY85o3eg/UkXvK2upYOvP6k0IlCV1xr+g8fxFsxfV1xWkkk3xkg5e18bJW5N1JJYpDHOjr9nHFGpbmLGxYZKMpDzyXyFIcMuFr8JCDaNBYVHzq3Q7skfpvNQrmJByMj3F8tiWre/xLocpIAMOYyee+O5s1O0pPAubRvtAi79/uSWUnVrXi7r0njJGo1ojUledMxvODYN0QfU28ziXrfNMX2elYKHyguBmnnyYyp48LNn71NMRlkuAcNMy48QD101CkewAOAMl9KoOPbi9oFwCp45i/mKHjzXWbrec6JXMkZLwS+ica526MhAKUAvI3FD5HuIZwJecleRg01HdP2Wv6fl9MC2PnsqHJGaONZTu6QU0CLhzMMHworq90MtTx8Dw25FAYZL2d5VkVJiF2Bk5nnhk5dsFEjG70XrE3YuCW4SciGBGTujTMVQGrIQ20zCw5fw4yFrWVwDCrYdtf6MbEHPE72vyrEI96JynmYB6ZNqoShPwyrqK7PNBv9ETsajog5h3T2zh2boz7FsusXz3A3ZgX+VzifX5/vHe+N5+riFTsZRwrbHeypKduJsmhNS6A5Ug9HRbkvKpli2m5uJsiGm3Gm9VtzxcOAv+kRBBt8J3sniC+XUqIhzDeKqtiDXolO5sMD8uwlscX6yG2kKNvq8yQwd1FQWkMAmt9Gvw1ODiGt9v/AW5h5RCDKa5Qqxqr1I0eu4vx+TYt05x/zW92Dq3+2obg/+08WHWrUotV2oHYPQTGQmE0fwRtqQqfTxjgXSzKog4ISZdhHIGN4O816oOWOfyD7aq7hdqxEI1t8ViLZslmoNUSObmiuTNayBjDMZK0vozSQTScK1vhxfCA6OkEwaav7o8AMJEwcGCb5qQrjczkseh81FZhxWEFc/2ioTm3DSELE36gwhJB6anSx2B4/+hx0gWW93aN2lF/sftg6+djLyTJPqh2qfXk+KPBAaTJagK3SMhv5q8pSN031IGEf7vcB03yRxxbf/nKINyiUKrD0A7sf7n1ibotzfPzMHSsSo3yJhH+0qjFBO7rgXbU64NvP+rvfqMTC51pyYB/c+ddHMC4p/Kmp9MZSlvx8JFNYWKk= X-OriginatorOrg: bp.renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 98e1bef8-a4cc-46eb-c999-08dd5a6dfde6 X-MS-Exchange-CrossTenant-AuthSource: OS9PR01MB13950.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2025 16:11:01.4984 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: DQy/My87tHifR73CToR3cbCfUAcFRU1Nx4kRA81RTIcfM7Avd6KJwsWq2LvW4GK4H/M+99lkCJdQ9lklEcCeMwHRp+NVjBAUU2d7orNsJyLz1t8ClISy6fEzDKGjs2rg X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB8683 From: Lad Prabhakar Add `image_conv` field to the `rzg2l_cru_info` structure to store the register offset for image conversion control. RZ/G2L uses `ICnMC`, while RZ/G3E and RZ/V2H(P) use `ICnIPMC_C0`. Update `rzg2l_cru_initialize_image_conv()` and `rzg2l_cru_csi2_setup()` to use this `image_conv` offset from the OF data, facilitating future support for RZ/G3E and RZ/V2H(P) SoCs. Signed-off-by: Lad Prabhakar Signed-off-by: Tommaso Merciai --- .../media/platform/renesas/rzg2l-cru/rzg2l-core.c | 1 + .../media/platform/renesas/rzg2l-cru/rzg2l-cru.h | 1 + .../media/platform/renesas/rzg2l-cru/rzg2l-video.c | 14 ++++++++------ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c index 19f93b7fe6fb..7e94ae803967 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c @@ -357,6 +357,7 @@ static const u16 rzg2l_cru_regs[] = { static const struct rzg2l_cru_info rzgl2_cru_info = { .max_width = 2800, .max_height = 4095, + .image_conv = ICnMC, .regs = rzg2l_cru_regs, }; diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h index 6a621073948a..ca156772b949 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h @@ -81,6 +81,7 @@ struct rzg2l_cru_ip_format { struct rzg2l_cru_info { unsigned int max_width; unsigned int max_height; + u16 image_conv; const u16 *regs; }; diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c index 93a105dec8f1..5033c8d98639 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c @@ -246,20 +246,22 @@ static void rzg2l_cru_csi2_setup(struct rzg2l_cru_dev *cru, const struct rzg2l_cru_ip_format *ip_fmt, u8 csi_vc) { + const struct rzg2l_cru_info *info = cru->info; u32 icnmc = ICnMC_INF(ip_fmt->datatype); - icnmc |= (rzg2l_cru_read(cru, ICnMC) & ~ICnMC_INF_MASK); + icnmc |= (rzg2l_cru_read(cru, info->image_conv) & ~ICnMC_INF_MASK); /* Set virtual channel CSI2 */ icnmc |= ICnMC_VCSEL(csi_vc); - rzg2l_cru_write(cru, ICnMC, icnmc); + rzg2l_cru_write(cru, info->image_conv, icnmc); } static int rzg2l_cru_initialize_image_conv(struct rzg2l_cru_dev *cru, struct v4l2_mbus_framefmt *ip_sd_fmt, u8 csi_vc) { + const struct rzg2l_cru_info *info = cru->info; const struct rzg2l_cru_ip_format *cru_video_fmt; const struct rzg2l_cru_ip_format *cru_ip_fmt; @@ -276,11 +278,11 @@ static int rzg2l_cru_initialize_image_conv(struct rzg2l_cru_dev *cru, /* If input and output use same colorspace, do bypass mode */ if (cru_ip_fmt->yuv == cru_video_fmt->yuv) - rzg2l_cru_write(cru, ICnMC, - rzg2l_cru_read(cru, ICnMC) | ICnMC_CSCTHR); + rzg2l_cru_write(cru, info->image_conv, + rzg2l_cru_read(cru, info->image_conv) | ICnMC_CSCTHR); else - rzg2l_cru_write(cru, ICnMC, - rzg2l_cru_read(cru, ICnMC) & (~ICnMC_CSCTHR)); + rzg2l_cru_write(cru, info->image_conv, + rzg2l_cru_read(cru, info->image_conv) & (~ICnMC_CSCTHR)); /* Set output data format */ rzg2l_cru_write(cru, ICnDMR, cru_video_fmt->icndmr); From patchwork Mon Mar 3 16:07:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tommaso Merciai X-Patchwork-Id: 870004 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010006.outbound.protection.outlook.com [52.101.228.6]) (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 4809422ACF2; Mon, 3 Mar 2025 16:11:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.6 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741018295; cv=fail; b=evfkM6/YbMj5e94s/zGrJF39qZXcaa6d8GU3GBtMcF0oIaObhuyxScZ+G773OggBp2Ryc0Mnlp5o0xc7NG+rkdVqIQaW9btzOMHnzE0Q3X7558TdqYXM+ZXWMb3ESX9wREtjdlba2okGyrWTGsveYfHAswDBltJigTuzqyN2V9I= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741018295; c=relaxed/simple; bh=9DWDlHAmyd0VJNycd3ZXUthqysKNwhsejI1DQdf3ELM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=ClWHTrF6WebEIhKKTQ3GAUIl7vdb7ZI9aXvwr9il6IKYjR4NLPjlF6DmE2z5XCzuov22lKFudp23kpIOOn9bltZfcK7o8KxqcGIHOOQUKOteN3od6N9r0kwwPYPCPGckKmdM0xoDp/4Xv1inS4OxVUXQfnSvz+P+Hcd7vEEsu8o= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; dkim=pass (1024-bit key) header.d=bp.renesas.com header.i=@bp.renesas.com header.b=W54dXZCg; arc=fail smtp.client-ip=52.101.228.6 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=bp.renesas.com header.i=@bp.renesas.com header.b="W54dXZCg" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=EjDBsTt8B6I6P7iP5uxLfn/t6scXvZzljI7MJFb5xjFiCAEVtHwwFMPYKnicpIdBRx1xW/4WD3DbKVY5DkZ4ptD1xUONFVVWQ628gdfxjk/XbFBVF9iL6KOEm2lEL8jmjY/gKwMZ5BP3B+yGlHDEbbGUmVxHhAvRyLkozZhb1U+nepU8OgEVC3hiSXJ/GyPV3YHKa0KnRuDU5pDd1WZEcpHfqzXMGCwKK3lOrbHVTFujhtV/Wub9ZDbEbgkn3ZEh7IMOo5UTPTmvsx3Q2M0LCETzUxW+d9zFN89KrqmkLjpIBwntvcLfGC1xRq+x4YluQ5QTrYxfa5TMJu5bQjBWmA== 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=9shOnHi2lLf0mwVZQ0UKci5a3+D8SHoLbf0tvXU/1es=; b=nJW5sL2rMCBMvqbQeAr/fRKlfg/zSu8YERTXT0Yj/RzJXBMzNe6r2WlKMbTePKo/7Zc3ANRH2wAtVmYloXHdN+ZXAPXwhoV3K4f/cDA9d+utnBjokTzVpb+/pK0LFuY119nqk54M00cQT3DUquUSKWCRk5pV26GPi4lgb+CeFio6NGQu1D2A7pj2cjhcTsohXu2/whD08d5pR24JLsAMJ1oWNfD2KzfdNw7eKJKLmFyqhhJmoX3AS2ZSwS4Bu1SoBpHqX52Q/ME8AMafbtBceWU6X3oZdG/diB155rEVKJiwCvBViA0WTLYfonF1HxhzCXV+DR2CX95veeRsHh2qSA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bp.renesas.com; dmarc=pass action=none header.from=bp.renesas.com; dkim=pass header.d=bp.renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bp.renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9shOnHi2lLf0mwVZQ0UKci5a3+D8SHoLbf0tvXU/1es=; b=W54dXZCgtDNYP0kVk4Clqwa3NFcXVQMC165ZvWWczGPW06Ukro39qcXulMekw2B+Ubo6xmf9ied09XaChktiYcXncHgrihgXR7HHNWAlZ2vXf2odMvCCMm14ywxqbS5UOYvtzax0lKc7vm8Cw0ld+6JqqfxnLa7dbYjCQyuM1Gk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bp.renesas.com; Received: from OS9PR01MB13950.jpnprd01.prod.outlook.com (2603:1096:604:35e::5) by TY1PR01MB10752.jpnprd01.prod.outlook.com (2603:1096:400:321::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.28; Mon, 3 Mar 2025 16:11:31 +0000 Received: from OS9PR01MB13950.jpnprd01.prod.outlook.com ([fe80::244d:8815:7064:a9f3]) by OS9PR01MB13950.jpnprd01.prod.outlook.com ([fe80::244d:8815:7064:a9f3%5]) with mapi id 15.20.8489.025; Mon, 3 Mar 2025 16:11:31 +0000 From: Tommaso Merciai To: tomm.merciai@gmail.com Cc: linux-renesas-soc@vger.kernel.org, linux-media@vger.kernel.org, biju.das.jz@bp.renesas.com, prabhakar.mahadev-lad.rj@bp.renesas.com, Laurent Pinchart , Tommaso Merciai , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Magnus Damm , Hans Verkuil , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Sakari Ailus , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 16/17] media: rzg2l-cru: Add function pointer to configure CSI Date: Mon, 3 Mar 2025 17:07:56 +0100 Message-ID: <20250303160834.3493507-17-tommaso.merciai.xr@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250303160834.3493507-1-tommaso.merciai.xr@bp.renesas.com> References: <20250303160834.3493507-1-tommaso.merciai.xr@bp.renesas.com> X-ClientProxiedBy: FR5P281CA0032.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f3::6) To OS9PR01MB13950.jpnprd01.prod.outlook.com (2603:1096:604:35e::5) 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: OS9PR01MB13950:EE_|TY1PR01MB10752:EE_ X-MS-Office365-Filtering-Correlation-Id: d75fad9d-f3b3-4a55-31cb-08dd5a6e0f95 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|7416014|376014|52116014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: /IzTtqluz/2O9W2W1yiEX1tpaFdfFYdawnx2N5jtPT3qLQ+pa2sqvY2lQARN83X7QXdzUD2pXZvFW5WPFVv138qJF+XYstFFChreCO8oYVvy9rgprhqEYQNmJpSmDLhHithxS0G57cvhMa4dLLjTlT0GMaF1E92Ppx87nayRcxvQa1g7QrMGvQM0mjiRV7ZIpKguRVG130gRBOLsYCVGFssqirVCgIfyWU17MzJRXWe0iGw8YyOYfV5wcG9eV0bK7k4EIRTsd2i8KoR+E828cUS/57QCbCX5fbgoYM4uWf4lmmI6fJ36NNkrbdqrd3iNzC+9ARPb0vpAv57U+YyPqnCC3rlUttamiVHZjFJ/+XZzHlIAGfjcCIMYTDl+FXf3jSyQdCgFhni/kXCfpPVh94pMB8tUNTjKmZkz4DHm/za83pr2IEqRrHc46EfaSPnfEegLxYP0D/pVLGMIcglQfYDNcX2g2mw/DM7s6QZDHODqZtIlC1z15MjmeCUUh2QqWg/LnfSQJG/bXKdPHB4OSsjs+lxVjG0//Y5ml/nnn8nVwycVq+g4Br5ar9sz6Y4nBYHxPqwZGv/dMrn01Yy43DzEm8P4lgrGduuubfcv8d/RJsx+tN9kjs7srO8QFZFuifzdMO/GkzxxGz7RNPRp7H2mgf5TvKP5KX7dySZjUZO/pCufQngf6dIFaQ/GKUdJVmfKjIY4LzEE0cCENJn/IopmShFsSC0vD+8I2iDCX+iPwkWV8aum1YDKalwjWag6BFOgEwj4PwLuQHjmJs9IGkUpgVu54tRm0HGOaaYfEuud64OVn4GLNJtp5nNfY27btfKhlqWXOjsLyyMsIRS8lWqx3DeKnssP5UFDntrTiiuMKFT+yJoH7azd4M2jvXu4jIOKcUQxXHlzSbajLIQZlcI+G2uPorJvaQ6NTjzkiqCg5a7yCgU0ryPzv5S+OmtgQJDNp/puSvDzwRuNUF6N6s5SK18LOpHXUi7t5RIvJqhXDYpEEo4tmG2rzaOFTrKkDswQ/AUr33CaAkDXyfqhe/r/+FoVQ4xe0xu+WgCAqSbjCkxjci8wgotXCAx3G6sVDt2Q+5XnaYDBMFIgQTOX7aq6rgJwFiy5//yVPHKtN9r2lh/1Oa3s/RtGQ3wyMcMC22nUB1OwSK3lngBDJkJUoSj6HuiAr1Q9knlvI0X/O0DV065WTSqlkzN7+2M9CqagnLzbMEDNs0SHEXv52ypAptfGfPaq3I1QLNwHgTnHofpciJffXDPFSsArQBTcSD2vsrEM34OJmghztzmYwkH2w4bZt44IgDAFSMImWA5wpd5Ki77f6b0c4tawWbikm/zdm5zK3wnFckVdc3YYs19A63eeAwCPz8zAtkAoAeSu4tWrr6giGxDYIsiO9AHXWIOl/cOgvV2kePNzxXJRCmrBc3zLMTzXt8kplRBuCSqp6nkDefoeb6XBNdN30sOx+IVG X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS9PR01MB13950.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(7416014)(376014)(52116014)(1800799024)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HMOjYb7oflQVW5eNZXUhmaAYHteKOtBLcQJq9wdSebSTsiJkYIjWvqrfHqBe7PVpzetWqw4W8Pif3SGdqVicvf68DaXyWzmM0/eFHStHoLx6k6+AD70nnSW4YiwwEEdE8YQFGW9elwQISe53Ua1UKfS1npYf/mok2xt4AY9w8zSQd1mCzij7OgbIUUqKVgav/mmKWc7DrDKktmbl8wakbupEjIPTF2rszimwhPiDHa+J2YGU58PC+HQ1TPnbm/8PDTdhdsELlF/N4iQodnHUAJtbSiXVJi26nxxVEGbQc0cSQpyg98bWyxrLTj+s1SO+GWKz3LrWe+qAYx7v1qYDuVUijeFGViBR4aPQJd907le38BIHX4gQuqN7ogTu48Jd91AU8Zuuj7ZHF4/yPmSdw6n7UWB41k0sqlSqmubDXi50B7v6GqQGXASMrfXa96e5uP6Peu/0Rc30O+2ZwFTKVTGMUsJF1QuVLUEo1vLgZU4B3RTywFcbgyo7+p/a7Q0hSFgVT3qTLMp/yFj08YojodXc5F+szU0GemuqW+55x8b9PKHasKwity05hH/YTKGYu8vjMsfzgBYgDU6zSdp5k/8TxYE0AWclGZlbMQ5ofEVY9j4SfOZx6VHcZiJX5QuSyvIY2xPSo7kd0E+AnP7z0pvCIXpWa56cF3fMKtTh6ZSjh3hnfuRHm2H4Drf83feD6Es9hjakIuVsfrBeQw3rn+WvAKrAZMh+b14rNGrOFw/Q0LM5K0tq6tmXeipNKrU8L6937A38uTzbm1hEfj5IF7QMJIi4M+WB6TYP48RVAp2CeJOf7KLqW9xw7Wu3ouQc7gRMVhuxvNYJiubuO64eVv0pGusCisM9dop5v4J40x/QSJsdF2UM012Z5UkB50KY+oQj0p1eEUaWxb8uUfdIUbYVUVV9PhCrvlgvjHJe2pUPrt7LsQQBMlUk5dj1EkHYoM83xkHpQ8FMJpyaEyADi+OoYeb69lUBAweRKEBAHvZNG4118AHnDu1fDONPhar0rOhv7mFWWfKhkjZo9iGPOWLl4yaEOo8gvEnHxDIipL5k0JNN2eb3OkU6k43vVyvWw6U69WsxSb+xNPDdPaLAj0UhAQqiqYDlbKdxTyNKPdmFPWHbgIxhJ05fCwRnPXf2x/8ziOuoT6xrvf5ebSrKg0+LNdro5SmRc1BD2t+zVSuCkhN5FvyDIwv4jMVywSRIhWQfOuuPrfQsHAa+kvOr6oId0kWXfVEIEsVGOCHJhID+w/ibx4YYY1M0pjkbPNFzWByJNNeaAdN8XKP2zfsug5R799SgltFRtPMiXBuekvLCPR8b3oF0MopSpHsyIzPngkrrD+XX4oWTGYp7+vxtbgog5nPv1d6DKljj2fVdM9pzbRYUz1q9CfWmhCtUASHTYjURduxN9X5jXFZVG/MgxpqTOLB/T309tZbkEaa3AcXKzGoEkSLEAHvOma0M4G8gmW0NRO0qdTUERdpF0J72gq8qCo5BH4yMCpEHJtHi/7MIRgD6TEU4g5teM6ZYAgl1ntjuhsBl3iu+oAC2U9j2+oTpb/01wxUWXtEl6rEWmKz3WPWTUOvGh8GY/qFf+dPkUo+Lia79J4azs/BbmnpYdAcjrTwmUU02swijgIrGGS0= X-OriginatorOrg: bp.renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: d75fad9d-f3b3-4a55-31cb-08dd5a6e0f95 X-MS-Exchange-CrossTenant-AuthSource: OS9PR01MB13950.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2025 16:11:31.1733 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: d/lZdROAtCeOv71v1/5tKPN7xt0igKskOL8Nb7AfuH+kjEKAKjnYYqzoFLO7bvZl0KeJGFH1Q8EAWzA1yqr8DG6ulPif1SxmQkEMHCzNdpxJG3n8OfsBuTSkJUAlI/4/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY1PR01MB10752 From: Lad Prabhakar Add a `csi_setup` function pointer to the `rzg2l_cru_info` structure and pass it as part of the OF data. On RZ/G3E and RZ/V2H(P) SoCs, additional register configurations are required compared to the RZ/G2L SoC. Modify `rzg2l_cru_csi2_setup()` to be referenced through this function pointer and update the code to use it accordingly. This change is in preparation for adding support for RZ/G3E and RZ/V2H(P) SoCs. Reviewed-by: Laurent Pinchart Signed-off-by: Lad Prabhakar Signed-off-by: Tommaso Merciai --- Changes since v2: - Collected tag drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c | 1 + drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h | 6 ++++++ drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c | 8 ++++---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c index e4fb3e12d6bf..3ae0cd83af16 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c @@ -363,6 +363,7 @@ static const struct rzg2l_cru_info rzgl2_cru_info = { .enable_interrupts = rzg2l_cru_enable_interrupts, .disable_interrupts = rzg2l_cru_disable_interrupts, .fifo_empty = rzg2l_fifo_empty, + .csi_setup = rzg2l_cru_csi2_setup, }; static const struct of_device_id rzg2l_cru_of_id_table[] = { diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h index 2e17bfef43ce..ccaba5220f1c 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h @@ -89,6 +89,9 @@ struct rzg2l_cru_info { void (*enable_interrupts)(struct rzg2l_cru_dev *cru); void (*disable_interrupts)(struct rzg2l_cru_dev *cru); bool (*fifo_empty)(struct rzg2l_cru_dev *cru); + void (*csi_setup)(struct rzg2l_cru_dev *cru, + const struct rzg2l_cru_ip_format *ip_fmt, + u8 csi_vc); }; /** @@ -187,5 +190,8 @@ void rzg2l_cru_enable_interrupts(struct rzg2l_cru_dev *cru); void rzg2l_cru_disable_interrupts(struct rzg2l_cru_dev *cru); bool rzg2l_fifo_empty(struct rzg2l_cru_dev *cru); +void rzg2l_cru_csi2_setup(struct rzg2l_cru_dev *cru, + const struct rzg2l_cru_ip_format *ip_fmt, + u8 csi_vc); #endif diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c index 83d7baa07dc7..a3c4e2a0bef6 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c @@ -242,9 +242,9 @@ static void rzg2l_cru_initialize_axi(struct rzg2l_cru_dev *cru) rzg2l_cru_write(cru, AMnAXIATTR, amnaxiattr); } -static void rzg2l_cru_csi2_setup(struct rzg2l_cru_dev *cru, - const struct rzg2l_cru_ip_format *ip_fmt, - u8 csi_vc) +void rzg2l_cru_csi2_setup(struct rzg2l_cru_dev *cru, + const struct rzg2l_cru_ip_format *ip_fmt, + u8 csi_vc) { const struct rzg2l_cru_info *info = cru->info; u32 icnmc = ICnMC_INF(ip_fmt->datatype); @@ -266,7 +266,7 @@ static int rzg2l_cru_initialize_image_conv(struct rzg2l_cru_dev *cru, const struct rzg2l_cru_ip_format *cru_ip_fmt; cru_ip_fmt = rzg2l_cru_ip_code_to_fmt(ip_sd_fmt->code); - rzg2l_cru_csi2_setup(cru, cru_ip_fmt, csi_vc); + info->csi_setup(cru, cru_ip_fmt, csi_vc); /* Output format */ cru_video_fmt = rzg2l_cru_ip_format_to_fmt(cru->format.pixelformat);