Received-SPF: pass (google.com: domain of linux-kernel+bounces-72712-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Michael Riesch <michael.riesch@wolfvision.net>
Date: Tue, 20 Feb 2024 10:39:14 +0100
Subject: [PATCH 04/14] media: dt-bindings: media: rockchip,px30-vip: allow
 for different variants
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240220-v6-8-topic-rk3568-vicap-v1-4-2680a1fa640b@wolfvision.net>
References: <20240220-v6-8-topic-rk3568-vicap-v1-0-2680a1fa640b@wolfvision.net>
In-Reply-To: <20240220-v6-8-topic-rk3568-vicap-v1-0-2680a1fa640b@wolfvision.net>
To: Mehdi Djait <mehdi.djait.k@gmail.com>, 
 =?utf-8?q?Th=C3=A9o_Lebrun?= <theo.lebrun@bootlin.com>, 
 Thomas Petazzoni <thomas.petazzoni@bootlin.com>, 
 Laurent Pinchart <laurent.pinchart@ideasonboard.com>, 
 Mauro Carvalho Chehab <mchehab@kernel.org>, 
 Rob Herring <robh+dt@kernel.org>, 
 Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, 
 Conor Dooley <conor+dt@kernel.org>, Heiko Stuebner <heiko@sntech.de>, 
 Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, 
 linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, 
 linux-rockchip@lists.infradead.org, 
 Michael Riesch <michael.riesch@wolfvision.net>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?TUkyZVNsM29JbmFFckdsT0tZWGc0OG5EZUNiWmhqd0ROcE42VkV0dlpvMmtF?=
 =?utf-8?B?WCthQWtvNzFEeVR4NENiMHRtOTZaSFRVSWZkd0U5MFRFNHFlQTVmSFR2U2hX?=
 =?utf-8?B?UkNIRHhBcnVFUW9scDhMeklmWk5FZExHN0lsbFYvbTc0Uno2dWNUdlFuTGh4?=
 =?utf-8?B?LzVtTzducC9jWHBYRm80NDR3dGxVT3dKTUxGZEFoSUZxSm1KNXc3b01vM204?=
 =?utf-8?B?V0o2SWI2TXdLMGZrb3dueE9WRkVlSTVhaHVVY1RjanFDVURUVThFMlZyRENE?=
 =?utf-8?B?WnM3U1FiWlg4cVdvbXNLZjBQWjlMelZuZkRCN3l0Y0FmNndiNGpNRlpzRS9J?=
 =?utf-8?B?NHRjZG5WSWc1K2pkb0xoblJmd3NwRlJROXAzeDQzUTlWbEpkVjBhTnRjRTRS?=
 =?utf-8?B?NDZ1MjQraExGV0VHWm04dldlSVdsYVZYc2tveEVqbU5WeDFuWStLWU5JZC9U?=
 =?utf-8?B?OVEyNzZDMkplV21GTXEzNndnZC9ORklKc1pSbllSZ2ZFcjdFTmYrZEJyZWNJ?=
 =?utf-8?B?ZnpSRmZxRVRvbGlEUW1oUjhTaWE3a2ZZaW1BeUVGZmJwaktIaVI4QllNVDVa?=
 =?utf-8?B?bVdCaTFzSjlqLzA3QUlLZFZOajNXYkgxemdPZG84Vk5Hb1NwN2VvSFIxV0FK?=
 =?utf-8?B?RHV4Q1BqelBpWW5XaG5rTC94Mnc5Mk9XUWc3c0hETVVJWlRyQ2NOMmlaMEpt?=
 =?utf-8?B?b3B4OU84T2pnWmVTUkprdXhHZVF3QXk2OVFvQWVEUnRyZ3hqOEpENjZTb3k4?=
 =?utf-8?B?dVdnWFduTDNkeHJ6dmxGZWt4Mk1mMWV1MSt2QVhmbEgrZ0dSQ2M5cW1kZ0hV?=
 =?utf-8?B?MnVPdGRIZ3VqaXgwZVh0Y3J5Z3dJMXAyK1JHN2QvWGFaSkNVd3ozSWtBOGZQ?=
 =?utf-8?B?bUFDdnZpZVAyaEU1VUI1YkVvcHRXQVVhejdzTVd6dUs0TVRqcHlaeDFhM294?=
 =?utf-8?B?azZRd3N0NW9QZi82NHhMejlxWE9qQkFPN3JjREFaZUc1TC92NFNJYVE5cENh?=
 =?utf-8?B?Znk1djVwNkVNWXFCQWRra21wdWZIUTcxSjYrWkRaSnQxNVBtTE51dUNwTkZ6?=
 =?utf-8?B?aGtRV3YxdFN3VzdnYmtpSUh6b1RnSjc1UUIvZ3FlSjB1WHZwUEIxOFBHcTBH?=
 =?utf-8?B?VnVObEVVdFdaYmtudEREWkhsTGNjSjg1QmVwbExYQnFBd1E4Qi9KclJXbGpq?=
 =?utf-8?B?cHpYQ0xPVVZ2MGp0bFZGV1ZjYldwRFR5Wm1mZmdjcUh3R2N0NDc1dm1vc2JO?=
 =?utf-8?B?aG9aZzd3SG5oa1M4REtaODVIUWgxT2pEWVpZQUxmQ1B0RE5SNm9oTWFsNEtT?=
 =?utf-8?B?dkNVd2dPbWQ1b1UwRi9FT1lZWUZJVXBYVzg1ZGY0RnZtZzJhdDZWKzh3ZmF6?=
 =?utf-8?B?S2MycVRTL1l2TXBzVzhBbzlWUTRIamNqcnhQTXZWYjMzTDVYejVpUEIrRW9u?=
 =?utf-8?B?VXQ3UHUrNUZUd2hsOXU1Qmg4Ylh6aGNYa0Rrdmp2K2o4TzRkU1VrRnJlNVZo?=
 =?utf-8?B?b0RiKzZ3TEtlV1ZGZkh0NGtYemQ4UG8rUk9HYnJTRGpPN05Ib3c3U1JNK1di?=
 =?utf-8?B?WVBiOFdFcVlaSGdBY3k2V3hCOVdPTkplcWt3akV4amZhUUFINitMUDBZeUov?=
 =?utf-8?B?YUduNmwwQmN5cnlYQUxaR1dyUkNNUVhjbW9wV0VXZHJKTmJ6WUZNQ1M5aTl1?=
 =?utf-8?B?dzVKWFVkWnF6V2ZSM1hySWQ2dVVDei9MM3liVEtBTnE1dzhoa0k2bEkvYkZ5?=
 =?utf-8?B?Ym9kbzAwSnE3R1ZsWkNDSURLc0wwaWJZWUNQMEdmOEtpWkNoSy9ZalphT0Na?=
 =?utf-8?B?YXo4OUR4VkR1SkJjOTgxRkN6d0RNL2JMSHFZQjZOZjhwWjBzMitpd1ZqckxN?=
 =?utf-8?B?QmRoQmthcStwUktTUXlMVk1aL21mZWFaUlN6MXZTTWNEVjMxbmhOTmNUQzhU?=
 =?utf-8?B?UjNSUUpiZlhhNFRPSHc2Y1BzV1VRcXg0bGtzMjI2SENxUUdxOVVYYm5Wdm81?=
 =?utf-8?B?THNRVjEyMEdHelArSUZTOWxHTUlrS3B2cytkaXFCL2RzOGRsQmM4ZjRWdjMx?=
 =?utf-8?B?UlRHTFJNYm9oRFl3QXNJZEV5ZzgxTjYyVndzWlI5WlB3RGJzTGJVMHFzRTRV?=
 =?utf-8?B?bnpsUFR3ckluS29vWVZ6aWdUZHdjWHAreHBvT0lyNVVSWksrRWJ2RVJaSU43?=
 =?utf-8?B?TUE9PQ==?=
X-OriginatorOrg: wolfvision.net
X-MS-Exchange-CrossTenant-Network-Message-Id: 567bdf4d-b39b-455f-eb06-08dc31f7ea78
X-MS-Exchange-CrossTenant-AuthSource: DU0PR08MB9155.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2024 09:40:04.1094
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: e94ec9da-9183-471e-83b3-51baa8eb804f
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Vu5ZFPPsNjbahvXDAx943VHUxAe/by6S56F1nvdjV4ZRPy53M8ZPt7mfxMVvIE4H9qXut8OPIHnuRnN56J2CFrc+6ackZFliRIuKYYUVyGU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6763

Move the documentation of clocks and resets to a allOf: structure in order
to allow for different variants of the IP block.

Signed-off-by: Michael Riesch <michael.riesch@wolfvision.net>
---
 .../bindings/media/rockchip,px30-vip.yaml          | 58 ++++++++++++++--------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/Documentation/devicetree/bindings/media/rockchip,px30-vip.yaml b/Documentation/devicetree/bindings/media/rockchip,px30-vip.yaml
index 675a1ea47210..7168f166798c 100644
--- a/Documentation/devicetree/bindings/media/rockchip,px30-vip.yaml
+++ b/Documentation/devicetree/bindings/media/rockchip,px30-vip.yaml
@@ -24,32 +24,16 @@ properties:
   interrupts:
     maxItems: 1
 
-  clocks:
-    items:
-      - description: ACLK
-      - description: HCLK
-      - description: PCLK
-
-  clock-names:
-    items:
-      - const: aclk
-      - const: hclk
-      - const: pclk
+  clocks: true
+
+  clock-names: true
 
   iommus:
     maxItems: 1
 
-  resets:
-    items:
-      - description: AXI
-      - description: AHB
-      - description: PCLK IN
+  resets: true
 
-  reset-names:
-    items:
-      - const: axi
-      - const: ahb
-      - const: pclkin
+  reset-names: true
 
   power-domains:
     maxItems: 1
@@ -85,6 +69,38 @@ required:
   - clocks
   - ports
 
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: rockchip,px30-vip
+    then:
+      properties:
+        clocks:
+          items:
+            - description: ACLK
+            - description: HCLK
+            - description: PCLK
+
+        clock-names:
+          items:
+            - const: aclk
+            - const: hclk
+            - const: pclk
+
+        resets:
+          items:
+            - description: AXI
+            - description: AHB
+            - description: PCLK IN
+
+        reset-names:
+          items:
+            - const: axi
+            - const: ahb
+            - const: pclkin
+
 additionalProperties: false
 
 examples:

-- 
2.30.2