From patchwork Tue Feb 20 09:39:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Riesch X-Patchwork-Id: 13563766 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8EED2C54787 for ; Tue, 20 Feb 2024 09:40:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Cc:To:In-Reply-To: References:Message-Id:Subject:Date:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=WksFL2yOLUYYe/BC7p2DLHiv5c+X78mfLFCgBZK1AMg=; b=YuZfSXH3Z7XuenSynjDO+fpwAu 6TBEkMNpqEdkgIt0uOiDmCH0LCVcKUFLAL4XAN9VfZaYSavCv04SmcNSLppZFaKitDzUkNJXitaTA YHyirXjsuMGiW2dvSMk6gjRKftxALEXOzMq3WZuDjMVuh09KdEfNHIo5/MZCRB3J6/zw0iGcdzymA o5Og3cr1Ndq5vEsel6WooS3VGwxpcY5FNeKtbT/pfPBZlcMvzk+LyLBB86BMj6qgT7AJ4wxm4R3sm qi6nJ19WrK5U+tNcB7GJ1I139qh7RxPZISOrjH5yHCFvD+uf6sS/nTut/r04+ElmnYGrSA40w+6c0 prdajipA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMbo-0000000E2C2-3JIC; Tue, 20 Feb 2024 09:40:16 +0000 Received: from mail-he1eur04on20700.outbound.protection.outlook.com ([2a01:111:f403:260f::700] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMbd-0000000E230-3YK5; Tue, 20 Feb 2024 09:40:07 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KfAu055tAsp8sfxI4kcrem5FW6+/IGwdEf+929ltcw63ihUjYgluJ42nS0+Kxt9eP+eCTwY6r9um/V3E9ZI1n9qN8yej3l/GTNjGAyKVRMYZi1Z6FLSD9Yw0I3496e6npDQtQWHv+IZqEIMO7Lm853DX0jXG0/useeyuNOJBkP/o4vNwDllx7B5xVvl167pCIKThwG8CtQQ7p1hsvcur98IQezrgplH/Tr9sF9BQDHFVDmVnlOZ8AJqZkyGM4rFS54PhfUV4CAX7qmc2fArZHiQ6zarg6qZiG20CQUr4V4oNSKxgmTLKi7X/P7HZLpjLyAEA56dos7EVAZs0xD+H/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=AOSCNarQTpOdBKiNefCuvX+0wyQgOdzu7JqDndPX6r4=; b=dCc0RJgPx6jpZFbKl9dE0Tf4UKN0hQckekSxma564tdKQXiGnzZpOH6rCTDIeNULobRx9NHLZi7l+aplJcgbLsH9b3dpJbVGjOVPY+OkQydj3GGExoMVEsZkiQ1gl3GhEL31T9fUddswB858uWGqY6+SV7e0t3buM9+jFDMyTFOsgI6IWjzHzXoWhV2Z6QylfnA7rPVBHlVVHhSmp22h7XcvQhU8JvxMnPfUHd5S4F3/BPZVpux50wYD6S/QiP1HgGkgPsTOM3M6Jw5Hly912Oi8zcqYzQb89vx2e9Ysfy4DMDwy0nW1vMmAmDAsM5bQbA+EuKKUg3dQibLEB+sJvQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wolfvision.net; dmarc=pass action=none header.from=wolfvision.net; dkim=pass header.d=wolfvision.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfvision.net; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AOSCNarQTpOdBKiNefCuvX+0wyQgOdzu7JqDndPX6r4=; b=aRJgwo/r875Lkb/ZmCJErYvl8sfel+8TKB2jg8J68TbuUAZy3AY3rqdqsdIXM6DyQJF1A60LuwglF9vxMG9q8OxVTBDcn/RcVb35wBZ/HTW8/bOfVLmb0tE98LFAxJy3n0rYbFeyQ7H5e0Rnxt93bZlWuSme5Z0nalx6dnktR8w= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wolfvision.net; Received: from DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) by DB9PR08MB6763.eurprd08.prod.outlook.com (2603:10a6:10:2af::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.39; Tue, 20 Feb 2024 09:39:58 +0000 Received: from DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4]) by DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4%6]) with mapi id 15.20.7270.043; Tue, 20 Feb 2024 09:39:58 +0000 From: Michael Riesch Date: Tue, 20 Feb 2024 10:39:11 +0100 Subject: [PATCH 01/14] media: dt-bindings: media: video-interfaces: add defines for sampling modes Message-Id: <20240220-v6-8-topic-rk3568-vicap-v1-1-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 , =?utf-8?q?Th=C3=A9o_Lebrun?= , Thomas Petazzoni , Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Sakari Ailus 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 X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708421995; l=886; i=michael.riesch@wolfvision.net; s=20230803; h=from:subject:message-id; bh=nB3d9Wukx0QT9PG4kX8prjqM/bzHZfdj1+aQXraSAJ8=; b=0X0GGjrZHjccolAvDaoMWfrKn676ioVpkeFb68k1ItAKvQoI4tfJHkWcDM/xlszwus+g4/SNx YK7Z565wy+SBf/c1lPh0NYNoyZdp+NWMU3oqC8ag3cQAmpf68AHX2Jr X-Developer-Key: i=michael.riesch@wolfvision.net; a=ed25519; pk=9ral3sulLe95bLcbaiNXTgUTRiBayRBEFZ5OVIEHp+0= X-ClientProxiedBy: VI1PR04CA0128.eurprd04.prod.outlook.com (2603:10a6:803:f0::26) To DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR08MB9155:EE_|DB9PR08MB6763:EE_ X-MS-Office365-Filtering-Correlation-Id: f80ab7ed-dc8b-4647-8697-08dc31f7e6ea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OQoZujETFA0W8sMaQE7l7zrlz9bOOKTkOk/cV1SpUVJuFiruzljMbz8EzzKErxFWCGREdqhesJZq+SULVmyDzPjEKXq2c0tC6+TE0MEOqLTAMojqFSNC/7WjVQd834SM7eWw/decUgAWpgx8YoAw/YN5vtVcXQ88XYukF1ikK7Ahlag6ZeQ21bI8SNsReRNFmcfi/17Bw5Rt13pqKDuyuWu4OzM2ft5KT6L8rOlDBROaqhEkHmjxPWZXYTPRe3CqRxggRatWufakHh5alzD7K53wm7gIPQVqMNlM6Hke/emXkb5nHTcAo+J8QKGSiXptu3GxhwyDrhKXVA8aZD4g5q8II4WA8ar/xzERdu/vtGJcw6Wjo+TeqqDynWBTv/2ZIZH1qdb+56pvRFcKCnyIP/usS+oKr8MzuRit+cTxFNr3xJR1iyUNZ08kUNlbe/+Kz3dJaumMYtteWtGSPzNOeBYuzHcqcncGjjCneN7usVeGo+DUFOjaeuDQviBXUoDqTitN0NBuyWguub09i1SR4GLLxMuH84df41s4h8C/P5VB7TH14Pyaa8rfpaqnx6HW90t1I7A5jmq8HsOTsLvynt3GdJLUy2VvuZk6ITCIv7FjOycvYOX6mQQyndI7/uk8FQ8BZ1n8BioTr0N6Kj4ykg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR08MB9155.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(921011)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?mVRvYyI8Ra/pAXTs1Wq+uFNFvsFV?= =?utf-8?q?NtnmpWINZe+CINpi46f5EzEnMzEYW+UdIwUwYGO4HURaIO31MGrOxXYLb94/6SL02?= =?utf-8?q?gRNBFWEjzLXjJTFF+dCR/YPoVPj1izS6O4x3ObT+kiVEKxJcMj3m2S37CGsKcoExT?= =?utf-8?q?tjgE6+uhQUo7cixcqIP0WXPMXQ64ZZKXUA+jAhbnbi1CLiqwcfe58WuLlW7fbUJf2?= =?utf-8?q?SxLMs63/9lPMLrBRkl3q65Echzx4Vpxz44O3NXQXItzqh+9/QmLfPkdXBz+XFTA0Y?= =?utf-8?q?5tgrm5nfvsa18y9my2LV3ZJk0GpmklVYE07zzCwSIA4/1zPRol/QXeAfv+ux6Ny5i?= =?utf-8?q?TxUyScEu3MrK3+WK4nPPYyix/iW69yMjyUD04BiFbsI5g4X8UKuBN9Eu9UQYxXsNn?= =?utf-8?q?kPaHjXyNgAGdlgl0Cmo8phLQL/fVB7kogQRZk6O57U/wKhjHnlA15qjeWKUXow5xw?= =?utf-8?q?xI90jaUBlGjDN4kbshoIvG8A0tnNqhVR9SNlhAxDwHPGlVkSyjUIEayJ+UH59KdTW?= =?utf-8?q?cKHUeogEyzHUUDCEOfuBR0bi1aoZgZD/RTYNZOEKwdBbkzLEB9ajNIel3corG9MZx?= =?utf-8?q?OojSmSVkHKLtW/QR8qoTTN/T5rNySSEr/FOZbce0nYgiZx2uZS2GnCqNvrR7JW52a?= =?utf-8?q?ourSCdxXpUSBguho/ZiNhe5ny/WBaW1QKgy7PxnI+aObiYgluPZGj6NRDyNi7ul3i?= =?utf-8?q?siTmACoa0AQaX16j+YSdwPanibysTGCj5EFqMgtASn2FaI5YV2laKtQzOWFF7lZYK?= =?utf-8?q?CbtyvEr8nDL+oZH6kIcod1JHwJod9UvegLp6mtZKYg+iAccIUmJPNVu63oMAQzJp0?= =?utf-8?q?JWgt6XhmtnL94+tUgVdsNOHBzx0Q1/x0C7oUtNJoNrPRCTXAO4jO1JKQt7aEhe1p+?= =?utf-8?q?1ZFPk99lI8gajGyDnIkAKKkaY+yZg0dSh9W90cenVgKPEL387I+fekUqkKegQJWms?= =?utf-8?q?fLq6FO/1eK3nzBdNjFeMHStJwfp6wnDJc6zVDAVcHCWnQh8BQuIq1vB1KCLcbZY09?= =?utf-8?q?HUFQStAlMXtBt34gaiX6CuPyLkbwOrQ3/JtS+Y6wiBWPuXl0BkrTmp5LM/ZV1MX8S?= =?utf-8?q?ZR21UNC+J5hMRu4mCHIOBnrmRWLCyVkFH4QGnpSbZ9j6HEpU25sf6GT7U4d4J4OyO?= =?utf-8?q?Rbq4aAlQW044lOs1Qk8UIrrX0FRaHAv0qSLb8gvWgjC9Ncz2DEsLHfB6VK7zZkwFe?= =?utf-8?q?SMBjcsC4KtUjPcgiIHLWT95datT7MWqhzgM8OSJ5G/wBbe4nli47fUFPYcQEz4qkr?= =?utf-8?q?tspHqIMk/Mcxy9lksygBY1wrf+PV8mhn4C5ZOsLScjTl+FiT62N/gNrdaEl0nxNKd?= =?utf-8?q?O++VQdzmSnM6j9bSkSMSZS7W7UOXWBAnStIU9y/NQ2dOPtT9qvZKa+AlvxpHTyC1z?= =?utf-8?q?B0/oTwUntxPeNeVxMrh07M9zuKqg1rY4b00pD9xsfXqWtFi7jIszvOgVadUuGpxFf?= =?utf-8?q?oxYcyzu7OxrPdnNH4UvbLKnkhEylUCpMrusbdTcbQHgQfuyW0HdRvhKT65mzECcxR?= =?utf-8?q?ELDccTnBW4eq6E5c4AeG//dRCgE+rdEq8Q=3D=3D?= X-OriginatorOrg: wolfvision.net X-MS-Exchange-CrossTenant-Network-Message-Id: f80ab7ed-dc8b-4647-8697-08dc31f7e6ea 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:39:58.1212 (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: UeTGeer2+0eyI0EzktxER089Q989OWb29OdR7foK4PZ4VNMZhSa24wI4ygR2I9joAQhM8ynx1HSti74ZntVVwCsyS0AVNLog/s1doGgRW4M= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6763 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240220_014005_897799_765C7E6B X-CRM114-Status: UNSURE ( 9.56 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Add defines for the pixel clock sampling modes (rising edge, falling edge, dual edge) for parallel video interfaces. This avoids hardcoded constants in device tree sources. Signed-off-by: Michael Riesch Acked-by: Rob Herring --- include/dt-bindings/media/video-interfaces.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/dt-bindings/media/video-interfaces.h b/include/dt-bindings/media/video-interfaces.h index 68ac4e05e37f..02d8239c2038 100644 --- a/include/dt-bindings/media/video-interfaces.h +++ b/include/dt-bindings/media/video-interfaces.h @@ -13,4 +13,8 @@ #define MEDIA_BUS_TYPE_PARALLEL 5 #define MEDIA_BUS_TYPE_BT656 6 +#define MEDIA_PCLK_SAMPLE_FALLING_EDGE 0 +#define MEDIA_PCLK_SAMPLE_RISING_EDGE 1 +#define MEDIA_PCLK_SAMPLE_DUAL_EDGE 2 + #endif /* __DT_BINDINGS_MEDIA_VIDEO_INTERFACES_H__ */ From patchwork Tue Feb 20 09:39:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Riesch X-Patchwork-Id: 13563767 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 16D76C48BC4 for ; Tue, 20 Feb 2024 09:40:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Cc:To:In-Reply-To: References:Message-Id:Subject:Date:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Ykhl/g1Neeu7wAiSPwuiOiP2JzXNJ7JMacKX++Hhk8k=; b=mjVRGHzroi3giKgYQDxStj/QyZ p+q8W3cbjL0k+3SKDr2KdswipK+sNmkE8Mvx+ipp+rsslQJtG3H0+6+kRAZmlHRqJGyOXmDcx6S7m EcIpBm09t9ID5kLP6Q43jhMF31+tAzW8Dz5lI9iGBcvvSYUZ6A7HYu5K8QOGEIFd8DrKqMwd7BNde RhBmUtFItndZ9XWBpoMWSaoJ4+PL0Bbge6d7jN7e/ansra9oSkSU+9FU1biosLCyYaSWTs4YUek6D cE0NIIjKgcSi0mT5B3t8XJl/vM9uU/UWoFLwXhbTPCZPPbO1Fv5I2W2xi5p7Q22cWV+mZlFqGGs+i JSo0Oydg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMbr-0000000E2FV-3ulo; Tue, 20 Feb 2024 09:40:19 +0000 Received: from mail-he1eur04on20700.outbound.protection.outlook.com ([2a01:111:f403:260f::700] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMbf-0000000E230-2cO1; Tue, 20 Feb 2024 09:40:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aXE4Dt3+bmMAArFu5kenpvRtqHnL+4s6csulZejYRwHWK0ODabX6vYq7ug+pjIlhBFU4/2c2SA/i1fkuzxZANdK+Z0xvUoI2DdooOHTo6wo1DA9K8qQ4XK/LHKsKDGWQWwsyKh+vI7mP6obliv7i3wuHokMaoU2sjqgRGOYTMv+Eg8JwPW6f5oKK6SZHWd/KFYV35impDLVdITRpG2UOIorAZAoPfr15tYy2qBNe93TShb/YHgUDq8K/pH2EFYyaPTEvG+xYCGvikpfGF8jYuSFyb8Z3qaDLxDokD9kq7mBtzflRT3B4POiMHGdGUWgoKuMLF+2odi8TIpvQHNzRtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=EJiyoLkx+GSJIhcmsGPp8UszJ+R+TIOL9T4nCd+hCJs=; b=XSi/OaST+c0HRgfS8ycEWGd/RtZV6EXMPBu9+RjKtRZoMmGrTvKCVvpGwoGd3Kr+UKvcwEy3xooDwYlSKmUyh0/2P7JXnzikqIDidPRgFv038/wFGMX2KvJndUCNbT13r3gZI2pSI5+dNRnMZOPleH2w5q8NWzkzDuxRUnxB7HD1bzW8McVnx885XaqFgY9WuHp3TRwbkdJu6OO0pQWKuy+lYK6u8o9idxdzwxAGU+H1rmONjDdTnhtYPmzjmH7lmvoGPM3lH4syah1Qw2XPfsMibBFiWq7mJydtCqF4E7MKT9coyNVfiQmS0AdMBGIn4kdPm4GOMhCQ6Q0TCgB1Yg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wolfvision.net; dmarc=pass action=none header.from=wolfvision.net; dkim=pass header.d=wolfvision.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfvision.net; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EJiyoLkx+GSJIhcmsGPp8UszJ+R+TIOL9T4nCd+hCJs=; b=QZ8b+tbuR86Eclg7imEpuDcANyuC0/MCt8M8XM+b8qKVlp5bEFDVPO7EvNbx4QyPLpVgJtP2mNkxhfDvkje7JuVbg/wE3p1PmooubN45kmGCFgCCwbzNg1y5WebeeF/S+Xoy5LfxFZNfp1dErOnI0ewe9n8U4v1PXraSC8imLmI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wolfvision.net; Received: from DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) by DB9PR08MB6763.eurprd08.prod.outlook.com (2603:10a6:10:2af::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.39; Tue, 20 Feb 2024 09:40:00 +0000 Received: from DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4]) by DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4%6]) with mapi id 15.20.7270.043; Tue, 20 Feb 2024 09:40:00 +0000 From: Michael Riesch Date: Tue, 20 Feb 2024 10:39:12 +0100 Subject: [PATCH 02/14] media: dt-bindings: media: rockchip-cif: add port definitions Message-Id: <20240220-v6-8-topic-rk3568-vicap-v1-2-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 , =?utf-8?q?Th=C3=A9o_Lebrun?= , Thomas Petazzoni , Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Sakari Ailus 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 X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708421995; l=966; i=michael.riesch@wolfvision.net; s=20230803; h=from:subject:message-id; bh=KRt6XgSyUvhtp8Ghvt6RHsXRYoKWFtOPfVBibS3LrA4=; b=N3pM82BnsWC5yhoqHJWS1SFa71OQXTVnuEs4obf1tU730Pq39QD4v/CFZuAyNAyKJUX15otvT Fn3NJ5aK+gqAQd7/3qDtWcFPVw/f4LTXYTS9HSCSMBkuU5IhHbIT4hk X-Developer-Key: i=michael.riesch@wolfvision.net; a=ed25519; pk=9ral3sulLe95bLcbaiNXTgUTRiBayRBEFZ5OVIEHp+0= X-ClientProxiedBy: VI1PR04CA0128.eurprd04.prod.outlook.com (2603:10a6:803:f0::26) To DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR08MB9155:EE_|DB9PR08MB6763:EE_ X-MS-Office365-Filtering-Correlation-Id: 8fc60e02-f154-47d8-a8bb-08dc31f7e812 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eaPIm8RN5/NOZ3QrqGegSydFWX68tN/lLBtBcUJBKiehSVeu4MgVAPA03cv42S6TLAXEGNS1raEU7JUFkk5PzkHj29BoBHHs4C5H12wTUvrP4reSC72Aayd2vtFgaEvZdMaJcBCgIBBnP5c8bi8FElYfL6VZAEQuBUDSlqi8obB9dkpgO4N+oOQqAfkvkSKqbixNK3XoLnoYEcNiWoaS+Z/6hHLpDVQqLovEzjKhCujbGb0kWFruRQtb41qfxX0+CvYF9jtrEAu2+Af3Z8zxzUlFoRfkEeT3EDz2NKfsJgyOv9vxtrTx2HC3WRQpGbr0IGokO3lJpcOouSBvTuH4zHpLq+eXDpGOWadNEQQMm/GSuFnQrCSyQwEHglCF63LOO3KVMdLOSPA5NSuKfRSNfFHTDVaBrPJU920paCVxOmA8+XjqYbfJynVYHhcXWEw3vCggMr03TPh4Am3psq8e2nsrpniks15sBagCrpnuPTMUegry6hnG1ulWc/kvRf2dTX0dRDjAW4BGwhz+8lFeAaD1dZwbPDc5u1aW5zIfNGykXJ3EYCo/CIGUZjKZGf1NBUBbydIqC2vvr+AnAWCenutfstTT29YU/TXVVluRYbdSEnwLegkEx5zdrqmoKRBeItLXat35/arBnoy2jsf7UQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR08MB9155.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(921011)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?8aKdcLFP30MPVzrtwqvsIO0MH2Qc?= =?utf-8?q?ykaZydCoePOn/M0KG2LHGn4OiNi6PsvSLfFaq72GhWKCud0ZIRwgck/74H7Phhnh8?= =?utf-8?q?g0FEMsequ1agrXLFJvCuvOJ/20Izx6kH5ZRTuAgI7BQ7MGhfz+aLJ7At+ZD4qyBhT?= =?utf-8?q?Sqg8RibfvvRMA8DHSJ/45K2+lsVm+ULe3CAbHcHzVeeRDF6HV742wF+PeOZ+6lTfS?= =?utf-8?q?HakX3M7xev9cZIceI8nssrh2/QLvMPDMkGX7zbokZCiAD2YJ8YXpgHjtrIyoTo8Vq?= =?utf-8?q?a3YG1Iz7+uOG/eOd72UWfY62Ru5VOCXnfod9rt+R0rvw2CocZxtN3chUT3CBD2kV+?= =?utf-8?q?PhPKBczyOb0hcS/TEyyFsMTg8IdpwmP3eu+JCfASNPUtoxePFq7QW6T890nAd1c0E?= =?utf-8?q?jX8heUZFcN+oeKLbZhTKJZqw6h4cEiAkqp0cPLAA7AjZFKJf54Cxn+qRKvnbr9uro?= =?utf-8?q?9D1AAUJAWj2V9IEkUTGYz8a5mH4q3y1jCJk53TGmwj+QOHr0C/HQOaqYEqW933XAX?= =?utf-8?q?x7eMuruOQdA/GRD2UmH8zWMBc3NifLuzhu7LWCgezmN91bF+S7co61g03kDWSneC+?= =?utf-8?q?gRec2nqhFMR0G57EOOdsn1iaYjdK/SjMqbvnNDDvfzKSYTSevsfL/lCR8nY16WsNi?= =?utf-8?q?g2wUtALmN+oOVpzjzrwPJAHaKcpKLTX2FJ6zNa08eN1R9ieekBvMYONMXM3OZuyVI?= =?utf-8?q?k47JlNoVK+bB3HpgzmQ9xiRXiwQZ0/kenyUrm/ALAprQvIn2YZm0fxziOX60x1gMZ?= =?utf-8?q?+9f8S0wrJK7QP/N/qS1Oz5N5LKWDyXPoFWdrsnNGCuTIQ0H+GLUWkCN60atS5hB4M?= =?utf-8?q?nKkhIEAfZ0WBzNpdzHzcSd7hin4hfuTJP6JNZ7utJtrTQqY1/yb/MMudqqlULLJzi?= =?utf-8?q?yZ4T2ZrALvFHeeC0ziMv0WzRivSBEzt0di/MsEnIxfEVarads5AttZkqa3zgWU5kc?= =?utf-8?q?rMi0jouiMOJmkTNlDX0zS48H0BaW/SFP1WharCnc6WhbdPiCRrcWu8fk/VbqxBzlb?= =?utf-8?q?63ebFRYHmRKCDcA0v4uZ5CKCWvfGRuOytulSIgAZ1Iz5yCNsXtkl1yhiijjI212gZ?= =?utf-8?q?riGerwKlDsp43mFYo/AUsN28id5JrXPdn2oq1KAu561Y0Z2qFsa1GH3gpl8PbwE0F?= =?utf-8?q?hMYRODtrr/cmW2aEof7ULClgHE2ync+Q4VcDw3PY7xRammrlc45U7p2oH7TaUQh8l?= =?utf-8?q?iBgP5RHR4CHe9OFqgwBjyydBP+SPTUZIOwLd2s9mRERczXROC28iHI0+EbZdRxo1K?= =?utf-8?q?NNzSc2T+C5+bduT0wQ1Mi0JRBb03tJgAS77UNt5VUcnq7yrNuqntlO1zlr4Hvnhzc?= =?utf-8?q?JDa1LubxJYcNFWRC0ePwZW276sIJtIg2D6dtXQOwcvOkVvDSHIIjE06ThC9K+0k6e?= =?utf-8?q?tUwvhZ2kvTW36ikxI2BDasifzIhOzZu7gvQahDv6jCnY8LzNMK+nGWuUYKKmSld/s?= =?utf-8?q?UX2+mMh2u73O6BeHuy4M2Y0wbpAqh3HsP7FxtC/uSnpSIl7lyvnNbDS06b88+2VSt?= =?utf-8?q?gF5AucOQU9NARG9NQWKLDXpV2B/EwtVsAg=3D=3D?= X-OriginatorOrg: wolfvision.net X-MS-Exchange-CrossTenant-Network-Message-Id: 8fc60e02-f154-47d8-a8bb-08dc31f7e812 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:00.0778 (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: BG3TkoHUU7OxCQAqiMUp+mxR8w31F/b6PUPHrNjwVyNJY6wdQ4vfFOFjW4l8sGOkqxyr3LAg1zvXHUBYZvFki+j3EA4bGOmaUkTI3LNsqrA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6763 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240220_014007_737317_340EFBF6 X-CRM114-Status: GOOD ( 11.09 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org The different variants of the Rockchip Camera Interface may feature various ports. Add a new header file with port definitions to avoid hardcoded constants in device tree sources. Signed-off-by: Michael Riesch --- include/dt-bindings/media/rockchip-cif.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/dt-bindings/media/rockchip-cif.h b/include/dt-bindings/media/rockchip-cif.h new file mode 100644 index 000000000000..37364ee1f7bc --- /dev/null +++ b/include/dt-bindings/media/rockchip-cif.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */ +/* + * Copyright (C) 2023 Michael Riesch + */ + +#ifndef __DT_BINDINGS_MEDIA_ROCKCHIP_CIF_H__ +#define __DT_BINDINGS_MEDIA_ROCKCHIP_CIF_H__ + +#define MEDIA_ROCKCHIP_CIF_DVP 0 +#define MEDIA_ROCKCHIP_CIF_MIPI 1 + +#endif /* __DT_BINDINGS_MEDIA_ROCKCHIP_CIF_H__ */ From patchwork Tue Feb 20 09:39:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Riesch X-Patchwork-Id: 13563768 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4FA4EC54787 for ; Tue, 20 Feb 2024 09:40:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Cc:To:In-Reply-To: References:Message-Id:Subject:Date:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=15xUgAYdUH8R5LUvxLwgqHki7PW63QE81NVaTyaYjTs=; b=Di4uSZB0/OfhYn/kF5u6zwZuMp 8405uKt9xD/PanhS7CYfzp58tyc7m2M1NUua49/na1kK+dHcLTXgkYTuJT4K74IO2+jTBlY52cphq kTDLoTrt9Dq+PTd7yokSNB2LyT0vkXZ6THKqu3aiwgHFM3mYCTisY9txvg9b0y1rjCNJDE4fP3ki+ CSrt51aIt3Uj4zxiyiTQSVFju2Gf43t9tW2uHAwqPVsgg0HRrCyKwskuOE05Mh7c7zIvHWaiQV0BC 3neji1MTq9NaslzFpPRntXt7DPPhIJyj5BHA5hj5tyQXmmHBt8AwVCL67GkPiZ/nXpXCNoE5h2ZdX 4fDrCb+g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMbx-0000000E2KP-1j5p; Tue, 20 Feb 2024 09:40:25 +0000 Received: from mail-he1eur04on20700.outbound.protection.outlook.com ([2a01:111:f403:260f::700] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMbh-0000000E230-2RRS; Tue, 20 Feb 2024 09:40:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HUuMCJOwU0PVKlDaYqpdilXTA2xR235HbGilQWxoZ3PW53ja66V48PQ39AHdyIyMpoldD9PaLVICRD8A//vTym/w2UGKtx20LYHK2JDRVHWom92ElZtp7qVGyLnWntyJ4hJQUuJC/DTbWVsur3EW14wMPC3ZW1SLzhGTq70GpE2AcWMitnSm1gkTF0RoZUrtdWwjkcHz/Ct1t636y2N6KJJvfodwhi7dfsYq3YF184nRfVKFIbPmjSBewdpOru+fmAEHL6TKTkv95QwRZOM58YNSnGmGfMawnCOG6Zibv8ItQSWWte6DiGLKIcQwe0NYOsjTPf2leyG/DPAFMUZNpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=m/nX/bILT83PVtLIh0xWHWAz7HJh+/AX9snArEmeyvo=; b=huIziKs9yswCTuqlWA4EngmLuGCFeWQwoGEPklb5jUX7KKMcuN6UYokEULStxws4nP/n5S+/tGRESVdnEoiFCvFD2nmBHPYpQGJSXXMB797c8tOJSTNJahFTqTCUV4RAjU4l1PjMslE77lPwMOYgwW+0I13BXaTJ4D8FNfP27c597XBL6Dahp/lZnb2vHUAgl8CwisKZ6m/rpvSct1QZwldLtiPa0CsJcwc0p+z1j4JboSyV5CaLIkuoHCjEx934UP2u6JzH7Q5qMcA7Omz5H1gGSHrmvvgqsY0OkO/f3UpBhw6c8gwrVCCVKM1oM77Mkb6E1Dgb85KNsyzNTbn4NA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wolfvision.net; dmarc=pass action=none header.from=wolfvision.net; dkim=pass header.d=wolfvision.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfvision.net; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=m/nX/bILT83PVtLIh0xWHWAz7HJh+/AX9snArEmeyvo=; b=J+4vWEGnLEvJnGJ9VDiOlZ80O4GapjD9r1/csTESpzTRq5AojPCpWymMqdN2mNfg77tdJcaTb+8HHMjCNA50djBG2VbticmIoAcKBJX2RrfMUXK3W8GNrBv4GMjLOeYS0VGubGs8/DeYIp21ZkviJp2+aN9ab2K7pIuCarc/VGU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wolfvision.net; Received: from DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) by DB9PR08MB6763.eurprd08.prod.outlook.com (2603:10a6:10:2af::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.39; Tue, 20 Feb 2024 09:40:02 +0000 Received: from DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4]) by DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4%6]) with mapi id 15.20.7270.043; Tue, 20 Feb 2024 09:40:02 +0000 From: Michael Riesch Date: Tue, 20 Feb 2024 10:39:13 +0100 Subject: [PATCH 03/14] media: dt-bindings: media: rockchip,px30-vip: add optional property iommus Message-Id: <20240220-v6-8-topic-rk3568-vicap-v1-3-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 , =?utf-8?q?Th=C3=A9o_Lebrun?= , Thomas Petazzoni , Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Sakari Ailus 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 X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708421995; l=825; i=michael.riesch@wolfvision.net; s=20230803; h=from:subject:message-id; bh=OvFcZ+e7uc9ytn4TAsS9ijPJDXhvc++fatigeroww1U=; b=idrxsLsAo+9dBMSpGw/tXsFF4RmvU39ze340SH1Wzmea4yw9zbzKxRIrUzeXDyhSz/pGtUAbV hbeMbaXV6yWDV2BIowAkpdlv16Lq+mBbQzU3hdh5ATB6TqFFfaCXwwH X-Developer-Key: i=michael.riesch@wolfvision.net; a=ed25519; pk=9ral3sulLe95bLcbaiNXTgUTRiBayRBEFZ5OVIEHp+0= X-ClientProxiedBy: VI1PR04CA0128.eurprd04.prod.outlook.com (2603:10a6:803:f0::26) To DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR08MB9155:EE_|DB9PR08MB6763:EE_ X-MS-Office365-Filtering-Correlation-Id: 8ad7f312-c598-4511-d81d-08dc31f7e941 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BjC0kiIUC3W5pIeXoZcRxM1vol5oLS6Kk5+iWLmPSJX8CeuFswxOBCZs73tkSgNeqcfcNHGDwKOxbfZkCF44YrUjG3muihruNEJ0dm431d78GxGG5WpFULr9g6rCaqMQEI/2oteI1rhl9zlZOkg5BnpzaJlWU+jPDx4acZDuJLMunyJE8jiXDUpvOFbA4dPjEdyFBYAU2BwLUxpvQlI1KKNCQ51kf+ZX0iiUX0SVYrgVt+QeRj6AGWNoxwH+e3NXplaso5K0bOyISLfMFCCPCdDUhnUy8xbjZsYxZ7wcIKBAVdkssfAjhYr3lOkt/otQJet5Xo4tr3mvxX/e8P6ik5hxB+z2TByAqIi3HFkgXt+D6LgVNGCQZkGh5GlfOlBHvaH4hbTDKUK/eGj8RZNxeHbEkBpPWVpAIg05Mi/DNEp4z1RVz2JerEmTQfiMw5AucM9A2e0HpKXZFhxk+b9vJ66btMVzvTR8J21j7XPTKGRsmvV58azCjjlChFTMFLm9pTbivblLKCeTd6pdSDL45CSCLS4IZZkeajzXRKTmTGcoPB+5aZSSmcJahkZnoqkhOlZiP4QjplP7ISMPm7RnJbmtzXbAu/abmMvTw+dcaNAoEQpvP4Rxe4MwM5m4nf0nREc2N1xk47JM4siFtD5osg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR08MB9155.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(921011)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?0pbGJPlFmp2wj+bufbPwgKyJvtDO?= =?utf-8?q?B4H2uvBhtT4N/UuGv8CFSawPb8hYUbVMyDXsKhGdLwGyloJrNkm40I+BiFpWv8fFU?= =?utf-8?q?esgcVmSrCrm4mxmdVDKsfI7rczozcqFbg14yO2xFyg2s3GFs+oTflrT7zWaMrd/d9?= =?utf-8?q?77jalJHTiPDgK19cS67eEjYsPTKwVcCFR7ykXHW7LN4P338EbCpzscTZJXplGtD08?= =?utf-8?q?g3Am8HTN/lOR9o6hr8QJQa0EoowPZWa18/V4sVTpxJZbsPZIamfZUcLPTAto4Vy3q?= =?utf-8?q?n9guWxLGPVx9KjD6thEtsbTdfHN1tPjfUs5KCf+OGriBl574lBy0Wu1mH7mi70fXT?= =?utf-8?q?EtJFpaQqhOFjdkylNjr9z/KeEODC8e5PQHHKSju6tmAI0rRB6MzLPo2KrgrRxEhvp?= =?utf-8?q?qXAN8uI2V1WnmpfzrKCt73s1iIyQkEgjHBSctjwonD6TkQuQotMzraTG61npoYVne?= =?utf-8?q?F6UNdJrpz35lb1AddJKyaIt16RXyLYLortsJdxdxez4yzviMtJ0JaIjWkVp1qKVXH?= =?utf-8?q?XVS4kM1xmQF6FWjaodmsntEKglzVH3tbfOEcQvNrWkGrr1ubBdVrPO+gSvUF1Hpzq?= =?utf-8?q?otRUDSLg8g95xBbziIZsX4WF0G0/oFCC6RqfYCbprCSJIsLbTN4CPinpyMjzbn8tx?= =?utf-8?q?wXRPzCKm0zwFJWORl8/5ECKTWSB1hexxAL+OcAUx2zBh5lnDb1B8x39fBfwuNNwX4?= =?utf-8?q?k3fuSlfhUEsUk7BcqZ/JrYn5iFQipWt9VJDe1DDmeEZTHj7zQ6p6UylfM6ibJGg7/?= =?utf-8?q?msYoSikH0nCNNDoqYcELzrapzwI2Qw2m1yfRehnz4PYbl2nqjpQMAmH+zmfjdKTAk?= =?utf-8?q?CFbMFlwNh/RUf/9/HtOgh5rHt0EAkb21mzh+Fddq9q5HafnFXITMvhQt7+fqnGFlh?= =?utf-8?q?CeVgOzncFanUxpBPxytH68u4KBfRvq8CfTQ9AhjCo3EBX4i39DHzQL803zzMbabEz?= =?utf-8?q?b/mQDWm6VdxKk2+suewaX7e5hbySt5FF6pNSCZZalH3C5JTs7d7WISRjDsars/Tm5?= =?utf-8?q?WqH4w5QgldOsDBG8Q3+xVG0FaoYrLM4VrIdlKBMXdfTeBFqmwcBZ5TrAkU3qDMBBo?= =?utf-8?q?ViqJc/9IOOjgWrTOMjjvPW6DRAOcuMltHd6SdP6Jt27nZT1KWeuMiR7Xbu05epAKo?= =?utf-8?q?lRipRH2+0w9svQr9gCjbzrLVkqgSw+PgMxC6znA3SQ0YnWs8eBqPf8Qf9RweJJSpR?= =?utf-8?q?WCgWQGfOVAUYxtH1hzmM6fNxAQI5nnQfc3SD+nXHixK/lW/NuxpFGxLT+Y3STp2mE?= =?utf-8?q?tumqCxhcfxnntspy3imM0xhwQMmtvWFita3oiVOx16We+n2TxPfqfoODLBEGvbVyF?= =?utf-8?q?KmOme7mkq4MWZFyGkShHCiF/qLiyBojoTdgja8ddGzhWce6coA5gK4vUFEbWsKdhR?= =?utf-8?q?Q/qyioGtTN8t1qWeZXUz+b9lFj54hODh/QSKzs1T8hO9dk8BKm8rwWBxu1jvk8+w7?= =?utf-8?q?CX+95ld2pg/YoCV/TKJrY/fEM3DePHse6tyFFkOMT4iZwB/eCvTU8bTGwg+l87soY?= =?utf-8?q?6fYldEjHbJ3vc7Hk6N5CMGxJkm95nFGRNw=3D=3D?= X-OriginatorOrg: wolfvision.net X-MS-Exchange-CrossTenant-Network-Message-Id: 8ad7f312-c598-4511-d81d-08dc31f7e941 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:02.1033 (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: 4mTrKUZ4e0B1bT/fVImbFeItp/NqGdnXsUIjNqDc+tlG8euCxG618ze5ftcOXC9gwh2dM2z+RJ4tW/ckNI3Xs5pdft3kQ5NuFwCm99zF3ps= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6763 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240220_014009_794511_8A5F4C81 X-CRM114-Status: UNSURE ( 8.45 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org The PX30 VIP features an IOMMU and can be operated with or without using it. Document the property iommus in order to support the former case. Signed-off-by: Michael Riesch Acked-by: Rob Herring --- Documentation/devicetree/bindings/media/rockchip,px30-vip.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/media/rockchip,px30-vip.yaml b/Documentation/devicetree/bindings/media/rockchip,px30-vip.yaml index 6af4a9b6774a..675a1ea47210 100644 --- a/Documentation/devicetree/bindings/media/rockchip,px30-vip.yaml +++ b/Documentation/devicetree/bindings/media/rockchip,px30-vip.yaml @@ -36,6 +36,9 @@ properties: - const: hclk - const: pclk + iommus: + maxItems: 1 + resets: items: - description: AXI From patchwork Tue Feb 20 09:39:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Riesch X-Patchwork-Id: 13563769 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0C7D1C48BC3 for ; Tue, 20 Feb 2024 09:40:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Cc:To:In-Reply-To: References:Message-Id:Subject:Date:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=0j2ef2vkjOfpDrAckWpAeQ7DJyuj9pvh/GIVDjxavYA=; b=jbOJmrA0DS+GSJ5s/tkC3DDQN+ w2AIFwQB3s1K+mF+3ZMGHw+aW+PQzQ8lFVv68BGIYuRZwnLjB6wQNeYbLppEf+zLn3VHWjZS/GwMg HmL3LMCpp/DRRywx+fyVYape+spQjINAY9ogZd3aV9CVdErIioDm9cxyUwP2NEKyRCNPNAq+lVnR1 S7o4k1F+qqRBHCQXvd3TJuYbvxgEp5c0CYVBVoS9f9BRm0Y7Y8rxWSejvbPuj30IU7yS2s9wyvGBN bWKX4rLlgUvE0Qycg9EksVrIKHdwtK5YruDCJ3hRzgInR76S4Ss+OjuVUgizoRevYZYNegrOnbSyT aES6MlZw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMc2-0000000E2PH-3E79; Tue, 20 Feb 2024 09:40:30 +0000 Received: from mail-he1eur04on20700.outbound.protection.outlook.com ([2a01:111:f403:260f::700] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMbj-0000000E230-452h; Tue, 20 Feb 2024 09:40:13 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iA2sJtgfQI8aDB2GuP0zXn+/PRCUYWws5mDWImRrH1pvczRE2nxQkWVBI/AqAf7YgtmPLIDb35v1fBJokIW7OhKBNlldDK/kuVkEQI9rAXo8kXf2y//dLh9ghBIYlEngASiwPzcDGOJW1Iz18UruSpMGnvoR/BNsDqI6GbBbjNFbfISEz4K40I5VhAudqCd1KBGrrvOhZ783aJYBuwsI55IK8ZsjYFnc9G4Ok9YbjiWfPEif2+8M8dB6yhw0kPkygmfSu0cixSEVYWaH9TRousbIVuvy1ZL4vMRPO0ihONGDZeMg++olkkDzw9PexcXqGowVSe6GivaJ8CYmXWsrJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=F696bODurRIsEO6Q36YUfWm9oNEtoOkg4rcuinT2Fz8=; b=Bp1HFslE1fs7iLntaLXryIQNGc2FFHeSTNhQk+pTFbvCr5Z6W+bbS9ZjIxd8YFo42ycJztp0k1zeRypHhZceab16QBdXUGQ6WIP4lZof8M78eoXl98/GVbDsiuGWBJQDDj72nfs0Wg2gKlqD4mzmAN5UDti4jeRwuI0Esr8RnZYdbJav88Rls2uJh4RUR/Mtnhss494v5yh8p4CTk/phVsFIwbBQGfW5X+GN8lWqrVlAsM85MV3fHr1ztoU0FqWDcF9/UhuH4bZxPLoHQYHOSe9sqbrh8lUQaPBvoRfgG18PkUe5hXoyRa6AmOpvYGd/y3XTzMy7NSBxuKeAP94gzg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wolfvision.net; dmarc=pass action=none header.from=wolfvision.net; dkim=pass header.d=wolfvision.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfvision.net; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=F696bODurRIsEO6Q36YUfWm9oNEtoOkg4rcuinT2Fz8=; b=Kdm6PZhc0zpSJPhkodLeTNxBByHOEjJKza/GqZqKcnx5YbscZZ0E9LOiIOV+e3TlDAU7fU6UOkrj3canXyPBaoPgVhh4zJnH1bczor6JKGJ92dZcNqJnErpuSwb74xx37BXQNl4th3x3/SqkmkoJeTxdyhmKcOyqgAW3MR14/ys= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wolfvision.net; Received: from DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) by DB9PR08MB6763.eurprd08.prod.outlook.com (2603:10a6:10:2af::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.39; Tue, 20 Feb 2024 09:40:04 +0000 Received: from DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4]) by DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4%6]) with mapi id 15.20.7270.043; Tue, 20 Feb 2024 09:40:04 +0000 From: Michael Riesch Date: Tue, 20 Feb 2024 10:39:14 +0100 Subject: [PATCH 04/14] media: dt-bindings: media: rockchip,px30-vip: allow for different variants 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 , =?utf-8?q?Th=C3=A9o_Lebrun?= , Thomas Petazzoni , Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Sakari Ailus 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 X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708421995; l=2113; i=michael.riesch@wolfvision.net; s=20230803; h=from:subject:message-id; bh=jWA7+1kclrLwuXbXKGFkLLKFi93J2hK6Hr0O4t3lISw=; b=setF7uIuzfkyWPxSgTb17x1Ut1ppOeeQRvYd/dEzfgjiUVbWx7Ig2bJ7qkpw9rX7BTRzACZvY iag8MLtvClqCn8ezWW03BgUhErjT2l4srYICmbMUvvfqor7p9eaioYf X-Developer-Key: i=michael.riesch@wolfvision.net; a=ed25519; pk=9ral3sulLe95bLcbaiNXTgUTRiBayRBEFZ5OVIEHp+0= X-ClientProxiedBy: VI1PR04CA0128.eurprd04.prod.outlook.com (2603:10a6:803:f0::26) To DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR08MB9155:EE_|DB9PR08MB6763:EE_ X-MS-Office365-Filtering-Correlation-Id: 567bdf4d-b39b-455f-eb06-08dc31f7ea78 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IEXsw5tLrOCdShCRKN0OC9hNG9LxlRbVaNO8tbnU9pFFKNoUkgES4cL3OQAo8y1/t/HrmhSQ71WG1m+p8UGxZnXaazoCDbsfkfGt2T8X9J7izd4C0BwpG51/z8eesgHQpYmWD+byqTbs8C+HZT6cb03rTLv7lrfU5AqU3HZUslYQgzoPg0jdkbQiER9WZNKzH2WXdgwccSma+r6GpUwVdN+urb8gez3120khxk/K5Wfu7ibOrI2Ewq3sv+/r2LbosTjiKBLveUrA3ZisaXCq120t38qliXWydzNdgxYI3noBQk9pGD1sWHLv1IB6KEmFt4q9Gofr84jyqvYRPezAp6KnXvU5kA/viAYoQLS6sTtoVFtbuSywsRXg9WpY6D7AHRrIPpYmL998LJvvi6PJrgJv4FBFvdaoCheFa4MTglZXc2lYnTotvkJmI2AOf/cxOQlJ3knnqMr3IcB5cJjKS8oBmEQB+tuLQzgmpoLzQ97Xd8lhRapALSBuedmx1pTbf8ZSTFqlN3ZaQaXxOmVGNpWuozQy2jt2C8kNraOVVd8r3GegFa1fXx5c6ANdX8/EXUIziBRNq06iECfj8goBGLRyqJaqphz01nZ3+G2KFEl+O3XQReR3t4Wggu3lxuAIhotlCPDqygjsuPixk2BRKg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR08MB9155.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(921011)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?MI2eSl3oInaErGlOKYXg48nDeCbZ?= =?utf-8?q?hjwDNpN6VEtvZo2kEX+aAko71DyTx4Cb0tm96ZHTUIfdwE90TE4qeA5fHTvShWRCH?= =?utf-8?q?DxAruEQolp8LzIfZNEdLG7IllV/m74Rz6ucTvQnLhx/5mO7np/cXpXFo444wtlUOw?= =?utf-8?q?JMLFdAhIFqJmJ5w7oMo3m8WJ6Ib6MwK0fkownxOVFEeI5ahuUcTcjqCUDTU8E2VrD?= =?utf-8?q?CDZs7SQbZX8qWomsKf0PZ9LzVnfDB7ytcAf6wb4jMFZsE/I4tcdnVIg5+jdoLhnRf?= =?utf-8?q?wspFRQ9p3x43Q9VlJdV0aNtcE4R46u24+hLFWEGZm8vWeIWlaVXskoxEjmNVx1nY+?= =?utf-8?q?KYNId/T9Q276C2JeWmFMq36wgd/NFIJsZRnYRgfEr7ENf+dBrecIfzRFfqEToliDQ?= =?utf-8?q?mhR8Sia7kfYimAyEFfbpjKHiR8BYMT5ZmWBi1sJ9j/07AIKdVNj3WbH1zgOdo8VNG?= =?utf-8?q?oSp7eoHR1WAJDuxCPjzPiYnWhnkL/x2w92OWQg7sHDMUIZTrCcN2iZ0Jmopx9O8Oj?= =?utf-8?q?gZeSRJkuxGeQwAy69QoAeDRtrgxj8JD66Soy8uWgXWnL3dxrzvlFekx2Mf1eu1+vA?= =?utf-8?q?XflH+gGRCc9qmdgHU2uOtdHgujix0eXtcrygwI1p2+RG7d/XaZJCUwz3IkA8fPmAC?= =?utf-8?q?vvieP2hE5UB5bEoptWAUaz7sMWzuK4MTjpyZx1a3oxk6Qwst5oPf/64xLz9qXOjBA?= =?utf-8?q?O7rcDAZeG5L/v4SIaQ9pCafy5v5p6EMYqBAdkkmpufHQ71J6+ZDZJt15PmLNuuCpN?= =?utf-8?q?FzhkQWv1tSwW7gbkiIHzoTgJ75QB/gqeJ0uXvpPB18PGq0GVuNlEUtWZbkntDDZHl?= =?utf-8?q?LccJ85BeplLXBqAwQ8B/JrRWljjpzXCLOUVv0jtlVFWVcbWpDTyZmffgcqHwGct47?= =?utf-8?q?5vmosbNhoZg7wHnhkS8DKZ85HQh1OjDYZYALfCPtDNR6ohMal4KSvCUwgOmd5oU0F?= =?utf-8?q?/EOYYYFIUpXW85df4Fvmg2at6V+8wfazKc2qTS/YvMpsW8Ao9VQ4HjcjrxPMvVb33?= =?utf-8?q?L5Xz5iPB+EonUt7Pu+5FTwhl9u5Bh8bXzhcXkDkvjv+j8O4dSUkFre5VhoDb+6wLK?= =?utf-8?q?eWVFfHt4kXzd8Po+ROGbrSDjO7NHow7SRM+WbYPb8WEqYZHgAcy6WxB9WONJeqkwj?= =?utf-8?q?ExjfaQAH6+LP0YyJ/aGn6l0BcyryXALZGWrRCMQXcmopWEWdrJNbzYFMCS9i9uw5J?= =?utf-8?q?XUdZqzWfR3XrId6uUCz/L3ybTKANq5w8hkI6lI/bFybodo00Jq7GVlZCCIDKsL0ib?= =?utf-8?q?YYCP0Gf8KiZChK/YjZaOCZaz89DxVDuJBc981FCzwDM/bLHqYB6Nf8pZ0s2+iwVjr?= =?utf-8?q?LMBdhBkaq+pRKSQyLVMZ/mfeaZRSz1vSMcDV31nhNNcTC8TR3RQJbfXa4TOHw6cPs?= =?utf-8?q?WUQqx4lks226HCqQGq9UXbnVvo5LsQV120GGzP+IFS9lGMIkKpvs+diqB/ds8dlBc?= =?utf-8?q?8f4Vv31RTGLRMbohDYwAsIdEyg81N62VwsZR9ZPwDbsLbU0qsE4UnzlPTwrInKooY?= =?utf-8?q?VzigTdwcXp+xpoOIr5URZK+EbvERZIN7MA=3D=3D?= 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240220_014012_110257_4A2C4661 X-CRM114-Status: UNSURE ( 8.46 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org 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 --- .../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: From patchwork Tue Feb 20 09:39:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Riesch X-Patchwork-Id: 13563770 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 548B4C48BC3 for ; Tue, 20 Feb 2024 09:40:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Cc:To:In-Reply-To: References:Message-Id:Subject:Date:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=nRaBzxxRNIlBUH71VeAUomgnBnHjyLfXVrtNHR1XbAY=; b=EjftxiQWeXTykbSxhB4GA+Kr5Q VJlc8Y/6JJEcAMuTf/2OWBOat7vt8Xj1Oxk7DO7E5wNpl3if8HQ/bAoolZXE3uGzjFQDUUB/+vM8q aZCiU3lEY7koIo9wpFUp1z15wBbooTqbLClR2+IEmLBgv6Xkg3i8PqrVehsdFMj22CbVUtuV5GdK/ 4NF1vq6++GtfyoWGbqpOP5daVEX2QYwHzfzXyBQzSsU5AzvlRpmh2OytR21cj93F0veYq3lvEnHk8 CLsdKWIJIlK6qlNHez2TZcYpt2o2IvBS9RBal8BHbnr3sY7Ow71do+A8GUQy+O3FPvrPedxqgmIBt LQO7S+bg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMcA-0000000E2Wg-3F1z; Tue, 20 Feb 2024 09:40:38 +0000 Received: from mail-he1eur04on20700.outbound.protection.outlook.com ([2a01:111:f403:260f::700] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMbl-0000000E230-41IK; Tue, 20 Feb 2024 09:40:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TcaghJha+j4HBBXOPUlkOn0bWMEWdxvwMGxrdLkzjLKVd5z9OKnKOu+WHQ0joHfDukSX45qHT4A+YdxVjvHbmV07HK9Clg9zMUSvDLVBwBNxSTDthUlB/ZVDHrGOQja/mHWBVflhcaEjKbdcgYYmHVy4hPYaOcNFuU3Ge0QgdsGpczOfoX+rUBIyCu39mnpdHnoid3JjFEi3kGCgiKPIXO+iXc60mHPXlGgRqE28+OWvo0GHd2Ds71d1wzwOm196Re7YnzekX5l+NMz427dVA1XnqJJJmEBb+2iuNN6eUK1Etji9UNVyMb3rd0tD9a9maEqwnjLbjLqsxUiDeSjoVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=sgxx/BbQP8Rwa0uW6yWMPJGzjK7QlTC2G+7rvNzH78M=; b=b6XO0EcQ0YGT6srL3Ruj3a7i+M/m5MEsJ7vCA4Mx2bW7RP0/0rrie/GmPxeH4QjZUeMfwiNle1K/hVAEDG1SjT8eKGActu8XacsY76KDnmO7DQM0mohepzPGovuVqWbS1uP7HFEsYXEfLD57QmDPBvbfCsR6u/er2/FEKUL8q5X+tAyQjb3E/ZbVMTY1QCUVW2peGR4t/5IAjMl4ojKInzMJ54kUSBmCXMYRB99MdOvSVp+5p+i9eVffWJ5fCqkogaHN8lFFHKsmimOuaqfqHJEtHqsg+AmtC5WA0Wc1Cj1T/PeYLYXk1EoHUt0MWenCIJtdLa4Dn4M69+ZWLICiBQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wolfvision.net; dmarc=pass action=none header.from=wolfvision.net; dkim=pass header.d=wolfvision.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfvision.net; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sgxx/BbQP8Rwa0uW6yWMPJGzjK7QlTC2G+7rvNzH78M=; b=Cjr8MuCoaS/CUohythEdma9p3xVP69wKLpr8UX7zzI375Zmr/JFWpVnNEt839URAPVDp5vbA0r1YtUIpu124lZsXiU0z86OBsVXmrIruYJN8/emBKztlzWjAgV4NRIGqHGggLcMe0pt65qc59Z9oN8vORN1H7Lwwq6htWOT+vd0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wolfvision.net; Received: from DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) by DB9PR08MB6763.eurprd08.prod.outlook.com (2603:10a6:10:2af::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.39; Tue, 20 Feb 2024 09:40:06 +0000 Received: from DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4]) by DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4%6]) with mapi id 15.20.7270.043; Tue, 20 Feb 2024 09:40:06 +0000 From: Michael Riesch Date: Tue, 20 Feb 2024 10:39:15 +0100 Subject: [PATCH 05/14] media: dt-bindings: media: rockchip,px30-vip: add rk3568-vicap compatible Message-Id: <20240220-v6-8-topic-rk3568-vicap-v1-5-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 , =?utf-8?q?Th=C3=A9o_Lebrun?= , Thomas Petazzoni , Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Sakari Ailus 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 X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708421995; l=2097; i=michael.riesch@wolfvision.net; s=20230803; h=from:subject:message-id; bh=jLO5zZr3iqLcHWi2UTNWnW0pIZ89WenifkK9e6MjsWE=; b=eAAciqIRF+rh69n2FNQHR/MURlqw5qOmN0VYe5JZyMHXOYDRCQLfPLBnxxUKoC1NUcrvkginR EKKtLfxJgveAVZiwlWO9MKCTQn9hBirFfvUuip0UxRM7O1E+7DLpdHZ X-Developer-Key: i=michael.riesch@wolfvision.net; a=ed25519; pk=9ral3sulLe95bLcbaiNXTgUTRiBayRBEFZ5OVIEHp+0= X-ClientProxiedBy: VI1PR04CA0128.eurprd04.prod.outlook.com (2603:10a6:803:f0::26) To DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR08MB9155:EE_|DB9PR08MB6763:EE_ X-MS-Office365-Filtering-Correlation-Id: 1ad7360a-a6d8-4b45-56c8-08dc31f7ebbd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cE9Ka2/xCrDBTay3tl7YUoEOE6rmkRXX2H/wX3HAtHQwgSLYAOtJazEuoAhGqKW/PJB6RqWT4Nil6EvPsfAacwAV3ekeq692ENwcsJSL0A/DrTj6OmF4q3IqxH3gxdni39pOGNBxd0PXLE89gkWrGN1Jks6cF2bR7mADZKdO8zrnjP75f4BWzvTFJ6wpxWR5BHpIzKBt6rUTbBZGTxpICocNYBQlwXVjutQiThEtVOl0iQjNEYVvRSuE+v04ha1hYAYvn9UyQaok+TqoXNgbw6HomCZcL1OeSLiIfaMUd+WVhy7m+pF4KFjwPVXozz/Twk39cjo6uqF9Xs0kmJIPhay1pgTPr/jeDBT46HrzLIRVno+42moN2POXcPNb+c5jxG5XX9OVy1QU1u/+cWvsHvzOoYR3nz8gTdlj5AnhIhqJeBObzNHT6PEeexrzps+ZpEVLYx2cy+HN15MwUKcyll7KrG4yhHue0Cvl4HCAjZKbWv89+42hfT9DkgtTWYy+E+j78APWxxjGHJ3zxqWvfyuqetIKhLYELs0KJY1bd6Iu0bbkkkmd6qfAGBi0ptvO8Z+nB/HrmK0zaYx4jMiiEtexGb3OOZPVzvsvBu1x+6z2PvIDsbZu5MH7mBMkBcbJ32WW9V6jXqNEymESgBrnHA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR08MB9155.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(921011)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?SRS7zvi60EEiLUBGFhRR3YFy83i2?= =?utf-8?q?H7WxppG8cWJnff64EnV4BPHVZSRMBmd+yZ1TUwHqbjTw+AYUVvJV6U9wkojjzgAVA?= =?utf-8?q?uW9jMK4/rs1ENjlanoLfW60V0dwiS/fzrvoYeapiwY5T5wmQgbB1LfuReEpKzp+Xi?= =?utf-8?q?tPY6EgJv3KpVmBihMeUfvl9hYLo9RmQY4ktnWf/w+GqV4rasJtoM1bK7U+bWK0uu3?= =?utf-8?q?ASIer+GKn5RV2YchZNPEBPvT6cHC/Nj9QDtwJD7Mamcp0tUbqY5U98R94Bra0O/FN?= =?utf-8?q?0yJjepwdKThqQNucZu6dWCDBv2Ua9iOi1jetF5NQPzjMlaiAzYCf2Zb6mlTjRyCF/?= =?utf-8?q?ygwsyEKjFNajiI720JYl/qdrNF304zJOCpcrHwUDUYYRRObx/nb/iLsqvdaTOW+EP?= =?utf-8?q?/iC74o+IDLT2C60o6hL7zA1TY04LgAhPJtER5aW+XbLcyX76AIrAirz4IrWViH1Dj?= =?utf-8?q?fMRZINeTVp2xFGqjUOAI3sXQk91QFj/ohJzHV0G/c7dI03R4x7TdWolyoBHvtXpKm?= =?utf-8?q?rceBlxeoAwDUr9QzkMfbVBuslPzXWP9hZ9YF6P/CFe2ONcPhCoJLsLGEA93ibyqmM?= =?utf-8?q?6LLhDJsrL3fhnjjR3jvfXgVy1B9l+aUe5TvI3eBuTQGmQMrAQGR3gKv6+PrOTkHVT?= =?utf-8?q?e9V6B3pG2o7Aue3S4/7vXDm4R4eqVFS8zmOy6w+Qoa++RSTHzl4sfDH53+dwSkASs?= =?utf-8?q?3UBsJk8s6pboBrJAKT1qsB6a38TiCirw0t2TjPpvdBhuXzjaG3aMiCb22C4GQ/R/6?= =?utf-8?q?5CirBYEP5JC/d1UHrRq3sMP6zdTbX1Wipcw6b7G5+XvURQPaEYuzmzt99bW9GtO/D?= =?utf-8?q?wYiJmOHKxFzRUGjRQ2K7LIGxW7PK3A+Mcjk+iW5uNilFQDPA9k6aHExxHXEik3mBn?= =?utf-8?q?EQk3xW9esS8e+pGnemLzjxmZbvQxK5aApIRUs0l83/r0DV4xMshU2CLaNMOmG0Ldh?= =?utf-8?q?T0U3VyLZUhTzUJ/rJrGIUDCnqGZ6xkyyt4enH1ndGMgobicsW6GlL8vr/0KuUEUFx?= =?utf-8?q?KA31gjyhC4/vPO/BHIAk6nbBkAqCzRT7zWYEHo8XdO+glgrMbgn539bGTe0k+ASQp?= =?utf-8?q?uNS8JYIH59iI3Z8OCBa2xzebns1KFBsF34GR8+TwoGVr7NfFMq8w+ufTDXoeu6mkI?= =?utf-8?q?7Qb5pu8g+ZqL+faiEeuduwj+vqUg9UhtPS0A1x48ewGVeYKiT/nvPZTuBJxPLv6Rj?= =?utf-8?q?81RFaQ6ubFLYAIO+ofIPzNhlGn0viuDwurdlthIm5kYra4Zn9+LWkNKbbNobaQ7wX?= =?utf-8?q?2JUglIZJRj2xib+eWoeGyYfmwppp4VXnscrTbtN4nUE79qMTl3/quzeASen3ATv55?= =?utf-8?q?9/NJ5BsAxGpnuT4CMbrCVsuPrUKGKjSDA+VLRlj86T8pZXOVQ4MnPpGSk2x2n0O9X?= =?utf-8?q?6t/eREq5xPLSy6sqnAzI+jYENUfP1wujDg4AO9/7PKmkF1DYFQCbuCYJWJrHQyTgM?= =?utf-8?q?1LZEuQoocRtZCxsXIs97Jw9wIzKScvdOX8VHXgBSW2b7rjjYry0rJ88wPdV9GKwpf?= =?utf-8?q?7GJfZ3DGIQsfEezEib8WOxbI49mJuKzo7Q=3D=3D?= X-OriginatorOrg: wolfvision.net X-MS-Exchange-CrossTenant-Network-Message-Id: 1ad7360a-a6d8-4b45-56c8-08dc31f7ebbd 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:06.2233 (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: mHhg2lU3inK96ei/j9BE6cyhrU59MnyEFPPZ/DjmtX90OMd8vRVurCGnfwj/wVqMQXzHa8WasH7XX8cKHOetDsPSYwDccN1CdzZ4Xal2pt0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6763 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240220_014014_029963_7257D2C3 X-CRM114-Status: UNSURE ( 9.35 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Add compatible for the variant found in the Rockchip RK3568 SoC. Signed-off-by: Michael Riesch --- .../bindings/media/rockchip,px30-vip.yaml | 45 +++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/media/rockchip,px30-vip.yaml b/Documentation/devicetree/bindings/media/rockchip,px30-vip.yaml index 7168f166798c..06d49f591efd 100644 --- a/Documentation/devicetree/bindings/media/rockchip,px30-vip.yaml +++ b/Documentation/devicetree/bindings/media/rockchip,px30-vip.yaml @@ -16,7 +16,9 @@ description: properties: compatible: - const: rockchip,px30-vip + enum: + - rockchip,px30-vip + - rockchip,rk3568-vicap reg: maxItems: 1 @@ -35,6 +37,11 @@ properties: reset-names: true + rockchip,grf: + $ref: /schemas/types.yaml#/definitions/phandle + description: + Phandle to general register file used for video input block control. + power-domains: maxItems: 1 @@ -100,6 +107,42 @@ allOf: - const: axi - const: ahb - const: pclkin + - if: + properties: + compatible: + contains: + const: rockchip,rk3568-vicap + then: + properties: + clocks: + items: + - description: ACLK + - description: HCLK + - description: DCLK + - description: ICLK + + clock-names: + items: + - const: aclk + - const: hclk + - const: dclk + - const: iclk + + resets: + items: + - description: ARST + - description: HRST + - description: DRST + - description: PRST + - description: IRST + + reset-names: + items: + - const: arst + - const: hrst + - const: drst + - const: prst + - const: irst additionalProperties: false From patchwork Tue Feb 20 09:39:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Riesch X-Patchwork-Id: 13563771 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 41141C48BC4 for ; Tue, 20 Feb 2024 09:40:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Cc:To:In-Reply-To: References:Message-Id:Subject:Date:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=acVaOX47X2MfGK+Gf3xCSz4pAoKayLwXDK+InZ5N9Cs=; b=lfwLyXutUWrS5pXZveVs+PwVkZ NQkrICH+fzWJumid8nLZ1ZNWnonDEtu9D7DyM3NJrz4at4g2GTy8Q+8WyJr9coUg5AVeUMuTpt6ii K5jWQDWvTuVOdt7ff7hpMb9AFr/Y01oxJKsdSVSE/bpf9SITUw1VxI1GY5jPFCvZtns4pjKd0hD/G hScLYSvVjVCClv3xh3dEIoX2xR3QmFplhnh1h5y8VAvtdg2zIr+MbocdDSpKoEw7vbjkGr2MRFElz eiYkPOoVpFxvMRj0PTbvuBn2F7oUTOMm//63Jm5JS2r4soSsG/KmGKIcYipH4rMaHtU9efzuYMJQG irOitMsg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMcE-0000000E2c0-3jaO; Tue, 20 Feb 2024 09:40:42 +0000 Received: from mail-he1eur04on20700.outbound.protection.outlook.com ([2a01:111:f403:260f::700] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMbn-0000000E230-2fFi; Tue, 20 Feb 2024 09:40:17 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KKWe6bFh9cAH+94w+AbuhM3iFkn20rYxgbdw6xqEhW1ItLO1sA7o/c2/0cQCFzjw2NdHDRpIAgOtRX2/vBhL39HkNUxY0wdlHOtmM430geHlwtQmlivcLsuASDrEbWRqP4jWLEu0g8o/zCC+D5ZqK+c5l4XKpdZlfr6y4wDZ9YD10UwHNvUzLCW+V4hG3vkWyaITOnSN7WbEJX+dVpG/L1CSxPJEws71lvYCLdABxQUntT/f0+L6w9AUwz5kddcJcHrXc0d6e9I0jfJoKMI1vskqH1hpPVwxdbTsEvO8rmhUx6OB+GEcIHu+QpQoscSqzH97a58TNFzh7BoMmo5k+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=ahXRRa2Auy1r3diPOfLqPhufT0OndywK4ZL0NrIqr/M=; b=ezkkFNgGvwEIExv8PjHIRh9x+JoPlt0d0fMPOlY003DzvKMODbxLY4BDf6eXBWg9vaSeGaP89nIAPh6MzhIr4CoIGe/IW/N8DYO1IFXTLp+cxDGAULHQhI/6zYIYzna/EBab/y3yz3efTjU8As378PzhbkDg57Joss5trRPPNUku1shi0bvrGQQb4O2ItXsCxtfEnJCv7VjsuWlwC8JcsUWAPilNRAeVqglzeB9oKTRt5xLwehj1imbrvC8fpVWftXR9DPgOnbSrAk44edCeOXmeUONizv5hJt4H2bZI0ZhcSR8qWEYtpB8jwE5V+gFGrneJ7MvP5u7KmTLwPIUdsQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wolfvision.net; dmarc=pass action=none header.from=wolfvision.net; dkim=pass header.d=wolfvision.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfvision.net; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ahXRRa2Auy1r3diPOfLqPhufT0OndywK4ZL0NrIqr/M=; b=mZMDjyegSuDsL0VxrvHBGksdjzKWRdPliEdfVJZEwSaYd/x0BLd1eJNn51SsCqvOdH7InpmhSCTCIlCKnZL1ssk6HkT+WQIDQqT5up8zXr/WKxpbabA6AInz7S0wyM7IXCkx7d1jk0ZLDKyVMvvJ3LK4n3iqk8zvXrlGKiKAkTY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wolfvision.net; Received: from DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) by DB9PR08MB6763.eurprd08.prod.outlook.com (2603:10a6:10:2af::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.39; Tue, 20 Feb 2024 09:40:08 +0000 Received: from DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4]) by DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4%6]) with mapi id 15.20.7270.043; Tue, 20 Feb 2024 09:40:08 +0000 From: Michael Riesch Date: Tue, 20 Feb 2024 10:39:16 +0100 Subject: [PATCH 06/14] media: rockchip: cif: store endpoint information in private data Message-Id: <20240220-v6-8-topic-rk3568-vicap-v1-6-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 , =?utf-8?q?Th=C3=A9o_Lebrun?= , Thomas Petazzoni , Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Sakari Ailus 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 X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708421995; l=2185; i=michael.riesch@wolfvision.net; s=20230803; h=from:subject:message-id; bh=WQGjonJHv4SJS+dxX3SFBxVGNyfcDP/0ER7RyY5D3Kw=; b=WXoZn0yvOgKVLCymY/AHQSSrbLy6vL0OWA4pStXSuqLRA7xCxgonAdLk1YFJ6mn8szqHh5Mht eoV/bvgzs2DCcbyK5WhbHufMoN5msIqhi51ISghE87RTdhVwjAl4fsm X-Developer-Key: i=michael.riesch@wolfvision.net; a=ed25519; pk=9ral3sulLe95bLcbaiNXTgUTRiBayRBEFZ5OVIEHp+0= X-ClientProxiedBy: VI1PR04CA0128.eurprd04.prod.outlook.com (2603:10a6:803:f0::26) To DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR08MB9155:EE_|DB9PR08MB6763:EE_ X-MS-Office365-Filtering-Correlation-Id: dbde50d9-4ab0-4f8a-8760-08dc31f7ecef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JyteNDqjePRcLM2tjdJTUYUs9/Bep2k9YU2xeIFa9vG4E7/Q+WRqzYGhTwfNmHrgHXfDXyvIrisi9KgNB6IBlWHZUDd5zIdCueZCN9kacHGlo0YgN8fOAhBsKjcWaiUBgXFAlABe0k7GRW9LiPHjKOiUXZNr86tYFedlbkmGk8w8aooeVMCaJfREwWtT4S/eM6zhoDQDlPntcsiQm5D4H8NK0XfozHYixDsnn3MfKIf+Qmb6plYpj0rOYbEUSBklNELEpL0uxmRqH5cycfaLUd0DsviUlLh+Naf3IABZsf/2sAjzYsH20u1SxjxPxxkjKbsGeRA9fQ94Zv9AWkR7ut+rpJ6yajM6kIknekyGcfL5vsMwv6UsZw572K6e83R7if61nt9mY1tnb5a5iEoQ+uZf1XlyfxA9CuJ8GPToSHvBMEM3AXjwGPmrWRM4g1+cIxapQn4SyXW4KkyirU0Y5y2vj+dGTe2vauWJrK2+h7nAsItG3XNoZEtT0gSRlj1/z9YV9RVgJo9Ai7u6epydgWsCgNSUxg+7UQaP2EWLGe4nvdfG9rlwofkSpy+ZdRlw/wEPO6bsLZ4tK9rgdetEswuRxBNF9ZYsHZttxixYvlIActpgOhFjFrHMdIKdNx+t6+p9o6iXWM9t3nqjvuzZ5Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR08MB9155.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(921011)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?dkOWtNTvjZoslsldB7/YmZRkk2ks?= =?utf-8?q?2a8s3ZqJqeQuvdtVgHQoi0GsXHL+Oy+L+cq8pLsMQ367YfdKNyj9Qu2woM4O7Wyvs?= =?utf-8?q?JKg5mc9yGfxB0ziSfqOnuRvjdSbmRdPBY9zOOuSP/oR3lDuNHS3Cfa6UU6KTSeHgm?= =?utf-8?q?ogbrtlfyHfBOeJRyzPnPPGna8KpIP+Zyeis85Z/YXDKGAQSzIr2c/d2/PnIrjdTqI?= =?utf-8?q?bic9UL7eW1bagp7zffM6csAMzUqaFKlKRiFmMCgqJRoP+T3WSnb9D97G2LXE6CayL?= =?utf-8?q?Hz7szW81pRNZrSKaKeNkheGtOh6sklDkHiyr636T1NORTyfvoJh13i+iOhYrpwHFX?= =?utf-8?q?SqRX5klI/xg80ZEob9fHQsSwPKcA0fONq+ysiVGmGmwLHm2ZXkB1xtdpcocO1Yjna?= =?utf-8?q?BLTNvz0Ne6dc1py2oteymdq5VY1/4Ce6iXCpLFBwuHLnzqSewfnJ5nJehZyan9wNO?= =?utf-8?q?/RAYfptDI3qkg4o+IgCEzyw6Q7sGbR6w/dBLyBu2OEdPWWCIQG80uILjow3UeD15R?= =?utf-8?q?Pj+zGy+OZ9xYucPxCHfGk8hJv1jywgbF9e0AjCviY3KIyDcQQUvMtxpKOgGAYhY24?= =?utf-8?q?9/zy9Va5Aw8Rbhx/L1tan+jJG+WZgZCqpjQOd6NB334oJugNr+Hs/RxzB+HhJ+AUb?= =?utf-8?q?WBlM7FPoXHASqwMUz7c6g9Gvseejt+MlejSu4d1PdLybe/QwPFqfAhU463mdGqX+N?= =?utf-8?q?coIGHVNsnBSUetk3bonJOLWTnUc94cxTBS39IPJyCkTyWjiHXUoznP5+kymgzpfF1?= =?utf-8?q?zpDrYjyLM/auo3PuxkL6Iwu8EHAMALHkV5nab5YyWkpzuBeGlJeVgqmlbiDrbEZIu?= =?utf-8?q?M38VWX0eYFU7dNqgj5bo96Wm+9YD0qVgaAtLAfzL5nD1aDMwPY+9c+dG1HeZhjB0Q?= =?utf-8?q?HEQObsCnjbGaYAkNwHQtvdkFMfaAPD4Z6TKFb7tGHfPzy0GUMAknUgM3o90a3M50J?= =?utf-8?q?rbgBQhNd0n0ExnUjgLKrbqUhVsTvs6AYdDXsL8MWyaEewPKXFquj5/2ZiIYDtwUm1?= =?utf-8?q?mjbWPy0xO8rRc4wjqngYWylSHhZbefJwj+8zF9gCeIpGpn2ExLtqctcO0j/XNe3Gh?= =?utf-8?q?j4ma8lEMWL3bOiImriht7sDwtHfXScfTxtzvp/DgDP6hG7drT3iuk3lFMl2OWESzH?= =?utf-8?q?dymp08LtxSgH6ffWRs5jczfPMo2TWSHSpGU6g3/5Ny7Sgri/eQVDBVRmLaqpv5YyI?= =?utf-8?q?MeMub4EmcVRmITNVSyLyQx38Y20Ns9v/gu1UV8ll378WBY9QHvvNvWzTZVdaSHR8+?= =?utf-8?q?h8tq9HuSpJGg9qEF4SdXuseGr5hhl/SqK38S6e8/q8B6WWmaSd27VxymGczXnrpt9?= =?utf-8?q?ELJFNxqJf1/m6LyMRms/GqHM9sCEia3jjzj3AKtdJ0rDCYASgnXKmb3+Nl3OQCYAH?= =?utf-8?q?elq/dk+nYTRzCh44z0eKa3vF4blh4/T2EKB0vDyg17jLqifqUjho/tB7op5JNYQeC?= =?utf-8?q?cfzKJUFoVWw9W90FHJR+FYmvWK0HlU89dKVL5AFOppRqIro6+TC1wTgvWE0Vtc2A5?= =?utf-8?q?OFa+z9e13tzM0mWLR0jX88AbAD6+J9pNMA=3D=3D?= X-OriginatorOrg: wolfvision.net X-MS-Exchange-CrossTenant-Network-Message-Id: dbde50d9-4ab0-4f8a-8760-08dc31f7ecef 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:08.2511 (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: ugH9ifatd4iBYxTgqqOVJ5pN4NNtoDbBYLlR9e4oYswyTWhrOodBuPv+G9umUwm7+oTPDbs49Xm7ZcH4xxsQMbIn2U5X/HZxduViKxWfwbI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6763 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240220_014015_714827_8F350E93 X-CRM114-Status: GOOD ( 14.29 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org The endpoint information such as bus width or flags are required to set CIF (and on certain variants GRF) registers correctly. Store the information in the private data of the driver in order to make it accessible. Signed-off-by: Michael Riesch --- drivers/media/platform/rockchip/cif/cif-common.h | 1 + drivers/media/platform/rockchip/cif/cif-dev.c | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/cif-common.h b/drivers/media/platform/rockchip/cif/cif-common.h index 89ed9dd6f36d..34da800a0504 100644 --- a/drivers/media/platform/rockchip/cif/cif-common.h +++ b/drivers/media/platform/rockchip/cif/cif-common.h @@ -108,6 +108,7 @@ struct cif_device { struct media_device media_dev; struct v4l2_async_notifier notifier; struct v4l2_async_connection asd; + struct v4l2_fwnode_endpoint vep; struct cif_remote remote; struct cif_stream stream; diff --git a/drivers/media/platform/rockchip/cif/cif-dev.c b/drivers/media/platform/rockchip/cif/cif-dev.c index 660e28397916..923831827be4 100644 --- a/drivers/media/platform/rockchip/cif/cif-dev.c +++ b/drivers/media/platform/rockchip/cif/cif-dev.c @@ -79,9 +79,7 @@ static int cif_subdev_notifier(struct cif_device *cif_dev) struct v4l2_async_notifier *ntf = &cif_dev->notifier; struct device *dev = cif_dev->dev; struct v4l2_async_connection *asd; - struct v4l2_fwnode_endpoint vep = { - .bus_type = V4L2_MBUS_UNKNOWN, - }; + struct v4l2_fwnode_endpoint *vep = &cif_dev->vep; struct fwnode_handle *ep; int ret; @@ -92,12 +90,13 @@ static int cif_subdev_notifier(struct cif_device *cif_dev) if (!ep) return -ENODEV; - ret = v4l2_fwnode_endpoint_parse(ep, &vep); + vep->bus_type = V4L2_MBUS_UNKNOWN; + ret = v4l2_fwnode_endpoint_parse(ep, vep); if (ret) goto complete; - if (vep.bus_type != V4L2_MBUS_BT656 && - vep.bus_type != V4L2_MBUS_PARALLEL) { + if (vep->bus_type != V4L2_MBUS_BT656 && + vep->bus_type != V4L2_MBUS_PARALLEL) { v4l2_err(&cif_dev->v4l2_dev, "unsupported bus type\n"); goto complete; } From patchwork Tue Feb 20 09:39:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Riesch X-Patchwork-Id: 13563772 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2A99EC48BC3 for ; Tue, 20 Feb 2024 09:41:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Cc:To:In-Reply-To: References:Message-Id:Subject:Date:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=gMw6372mtnmyEzoq6cguJp3g2Kpff7SibFCEAtXCjmc=; b=Qgi9MP3+kQ6r19Q0TYD1kMO/tH kaRqGQofuKlw6KF85iXyCYTUpiUc1RrlZbONETRscw0ZiOWpJSungYIHsr3iX7FRt/b7TCJJ3E6rd QdAnRSXUy7ofxeVBdQaG9Lpgf4v4Fwqg/x6X5aZJd2Lc2c1+fWIEKMWcSzvsxlKIiRCbV04a9X/5o 3bkXluLbMOuqxha/8FrxSH8JDd+GXZIY6udqU0wVa9PFLnkr2d5eO2hiYZkAIaCumLOt97UNIOyKW v1r2R4W9xjGa1DafobfJUOOGM25EYLnGCzEMkYMLcLvXbZfJxrmYzAINZtcZk+03j4Kf0yjb+LpDm AFihmjYg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMcQ-0000000E2kE-2OKi; Tue, 20 Feb 2024 09:40:54 +0000 Received: from mail-he1eur04on20700.outbound.protection.outlook.com ([2a01:111:f403:260f::700] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMbp-0000000E230-2WeC; Tue, 20 Feb 2024 09:40:19 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jIfSDxBzLOWCBtbDe6766k+Lx1pzXO5DIoXPBtRN85z0Yd+yOpXsvS2NYIpJHkm6F+NCtoy+89VVf3L5edVxWh6gt/mUG6FXz/8IMmWcGC6vgGYQujpdPIbkQL1a0RReOBYUtawomBZalJow/9cjKMriaTedcODhU4F572VCfeRUdjORIEZVRW8TqzR4JSJw/X7t0dCJqFLSyzHlBlbDU49tOdKxuPsLAKtgg25HEtx2wWJ2ax81iQKPZW8hAXGtQmgI1QTYwVreS/DHGRQ40MVzlb/OrjZTU1eBZ7IvvHhNGVLK0xhYkU0sW9G7R4oxD9eXUOGVciz/nAVJxo3foA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=/b/scj7TDuFzyTgp2EBc4VrymUQdWCcY+njb3AuvFto=; b=H5+93IahsYnYUhNu1J8bNrydU6zVuNWXmfk8jZD0bjHrWORjZteoRLkqVn4BAJx9D/AOK2XRFEbO8gUcg7hLy25Ucsl/tpo5VwJ1doeLDd2dJLjpeP3HS3himhBcSMZGoQ9FkZYr4EA/8Wyb1WM5xIPwoKZquGwsl3OohjZGyic9j3Plq9hru0jFqkIJe0z74cQ6SVafQIf1GGCligrn8PrSYnNAj+4xqFYw/ePBvCVMklXGiNrkWhCSOs6n/CmlkGJ9f9bYS9lq9zX1EPxtfTe17wMByw9b2DEi3s1eIULkHYWI77epVI02ZHcUufsbeLXmmaHTAEvEDBqGRMA+Jg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wolfvision.net; dmarc=pass action=none header.from=wolfvision.net; dkim=pass header.d=wolfvision.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfvision.net; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/b/scj7TDuFzyTgp2EBc4VrymUQdWCcY+njb3AuvFto=; b=gNkBQ1sLVRkYTtYpV9rTWhcejoGydpnh/davBk3UN7nZNNkBTJ+jjeLXP+k/vzULqcJhvBw0YEQLVQ/u5/w/3w3xLZtXVvKH1jw6zGJwq4lDzw+Q1tkAr7N5gbYxf/ocLW8zxq8+7AxrAc+jxvZp9g8FZQhpz7KSI6cvYyMq+hM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wolfvision.net; Received: from DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) by DB9PR08MB6763.eurprd08.prod.outlook.com (2603:10a6:10:2af::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.39; Tue, 20 Feb 2024 09:40:10 +0000 Received: from DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4]) by DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4%6]) with mapi id 15.20.7270.043; Tue, 20 Feb 2024 09:40:10 +0000 From: Michael Riesch Date: Tue, 20 Feb 2024 10:39:17 +0100 Subject: [PATCH 07/14] media: rockchip: cif: fix formatting of find_output_fmt Message-Id: <20240220-v6-8-topic-rk3568-vicap-v1-7-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 , =?utf-8?q?Th=C3=A9o_Lebrun?= , Thomas Petazzoni , Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Sakari Ailus 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 X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708421995; l=875; i=michael.riesch@wolfvision.net; s=20230803; h=from:subject:message-id; bh=4RJRvkCsCoRYEJQReuPytGN3PtzSzXkIRPi3skDWcRI=; b=tuK8T28ocU/S3zzvTdEb1nV7usNOYvL3eS7jNVu+V4rZuvU53nlAZTVqw+0Y27WifDdysyRs9 98znDCkKbs6Db+1OyJZjD7BEQp/qmiI/vG1qTWuAcfMXi2a0wzfZEx7 X-Developer-Key: i=michael.riesch@wolfvision.net; a=ed25519; pk=9ral3sulLe95bLcbaiNXTgUTRiBayRBEFZ5OVIEHp+0= X-ClientProxiedBy: VI1PR04CA0128.eurprd04.prod.outlook.com (2603:10a6:803:f0::26) To DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR08MB9155:EE_|DB9PR08MB6763:EE_ X-MS-Office365-Filtering-Correlation-Id: 574213ca-a78e-4c77-2658-08dc31f7ee25 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PKFtCwlr+g7RugIQO7I8cBe9wOVNVkjA9ztT0Inbug2QDaCziwEp04l9au9fjM1xShl77BCWFRkdX69wQxyXI6H3DXcCAZ7XdO2riHg2g0ZlerfCUE0ocoMc/veJt960ORtCaEMmZI9emKXX94nfGXWak0OXpgQ5cUJRiiQcCWi3C0nn4N3rioEJsSlAXR+JbRb+gi5/tTwfJO6yM8Xg1z80oOzXMHZ+RVfmEzQhA2Cxj+CdspUesy2GnSN7e0KmeDddKik4m768rUS1tY1GuYPiYukLBQF2b/Pb146IT9OVRHfn/5+bbF6/uXQ16KhpzrHyhdItA0J/f8D3yUZjqRE29AmXO+MZ5rJH9SjOwHwVpib/2DEHl7bTxgkpiii+zswo7hwVlo3mvZUxGzopgg/UIFpatrdFdxOzrKwH90XVIhd0SyuCnJ37DpckGUAc2J2t2HX3wdDa8mHuSzmgDYgPWqat9gD8WLGzb8Cfha7A9DXiPFgE45Jguw5BKrPOjaOdSnmlN3AhnSkO/9WZoL5EtSWHSsTjsd0KWyZU+7KJ1zeRetg0QzWt5/Ot6pDePxKVvVBz+qvESHqirjTjG4CukBTg+qm5kDkRHRmt9rYXxkZKqQb86hFnVSSc4GfHEEybeSF4F0jvTnzPvgLa3g== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR08MB9155.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(921011)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?FKwKJF0WO+UBSBx68Fe4+n+2q2IF?= =?utf-8?q?F2kU7lurjf/bYmmGaXo8eIXNEV/lki1pB6RTg0GuqJL44/E70LZfOL0/46VNV5PER?= =?utf-8?q?wBFrfXB8u2zmiCIp1HL48ICYyhK6GUDnDJ284CDyr8JPPcfTtlGoP090DbWilx3U3?= =?utf-8?q?L3sjMvbYpzAcz3YqHAmNUU5Vyvm78BT6XdRaQZADReh1NSqUfotndWkSHX9Jjow/o?= =?utf-8?q?BvbyDZYqIsoQTJUHfUk3f4wmIKuGpCTk0/N06MlWPeUqK0x7eypE18gbYH8ZWouwz?= =?utf-8?q?sw6JOmHtAAkSHEDydxY7Zj+cLT9sZBBRx8y2pwNVWrhdLPXkPj24BtzrrmfJ7Ju1Y?= =?utf-8?q?2dpxCG36CLIzWkoE24HRNlofWO825H+q73VM5O2CiO8QwQKX2uGE6VjfzaTka9/nf?= =?utf-8?q?PC9RYv6BNiGv1cvJUVJX+meP2SKWOLwGXHBmGOYsLcf45m90zMBNKHujxy4XShn4j?= =?utf-8?q?97NMvHb/jsBqWhmdGk1xL965rXDBF4sAzeBxKvvxZnXf3XMS0x6qgyHqPu8vUBUsj?= =?utf-8?q?3rhcJCl0iYOSydz9rePSm5cZ0CiSelPxD2zZj+IbtS3GTmyD1IwfWkhtTtPubRB4c?= =?utf-8?q?jwXEKk808uDN1KbZkTf+fws5RW3y0OwcEboTlJuY894Hhsw+DBaH9ZQaMZYJyTlmh?= =?utf-8?q?+JULCKYtZ+yjoRz5VcPP7bgyvDRDVrb878++OCLPoaud7e1dPwxRA8zHX5iD5XSOO?= =?utf-8?q?o1yeG+3MPJkIHB+SOf/NLBZZ9GJbMxRgc6gWZnMPCivuIp8dD1pj4qxh/R9/tp4Zt?= =?utf-8?q?CPJuQOK6p95WLB5DbE1S41qZ5PmpIU3Jm1jRLMnBao6s9NVYJcBo9J8oJn+e1mqxr?= =?utf-8?q?nFInGvvpRQNpztvbjfTiSg2b1H/z5NS141+BY9BbfvmqmJe2HlsyDQIG3PJoI9aYx?= =?utf-8?q?gKZ8QAAG127fR44lZFRrs9FxLnKkvktfHq7hDa7QvcZTE9GjkXo4kDmZLIDKqnS6K?= =?utf-8?q?iYBJJYqQmIXarIJkg1h+LiOgbUukMFGJANdxntnPU+tGYIsMPbf4Dn6motX8G7vqu?= =?utf-8?q?omxk0GZUmv0ZWcw1Q5JK9CJRhnXUefMzP6vZn3TImd06qC4JzRqREQYaRxCGD/Uo8?= =?utf-8?q?F+X0sOwD4VzWEa9jmePwSFvyPAMZYxWc+6tvfGvKvrrIjhu8eEVjE6uRo3gEIrSQs?= =?utf-8?q?Mi2TzD1egjX5jjDJzLlcW6guC4b6UnfARY5JQfbxyisd45oR1gkBLl/HD+V6e0puf?= =?utf-8?q?cMNYosYx2nscclSHpzmw9y19f6UM6i3NJc1mrxDcAFv3iPtqD1qzzFec6Vxn91tEe?= =?utf-8?q?yTjsNnqrkWmWjoh6lKd/Kukxn6w6uOv3iwZqx/ze4g29JMbwloPrtNTGtSiow2zMf?= =?utf-8?q?Kq3u+sM5PIK7mlpaFJgqFhHLCkeUP26jyfu72F5UvFc6jMyblBafNBRp4n5FCF+bF?= =?utf-8?q?xo1cbUCkfzgkB5yswOXD+QHCKQdW9LG939P3MRJq/cLF+xoxS3pFBXY8a1Ilihw0l?= =?utf-8?q?smVRazwzwSZfo8dT4YZA7Nt62mJAm011QL3WeQw2ae/wo2u/PdbTDYGt8Mtr6NMpu?= =?utf-8?q?s9hNF9tRw80jH9ZijbxggSRb5DYN8/6yqQ=3D=3D?= X-OriginatorOrg: wolfvision.net X-MS-Exchange-CrossTenant-Network-Message-Id: 574213ca-a78e-4c77-2658-08dc31f7ee25 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:10.2574 (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: DVmv5tx2iGPh9/TLxO6rPB1H8k5Zvgy71YvA75tqKHfAaLpIwLuvAYRekz48YlT4rQIE0U187FyTnvDhJiaQ3xGkg50carO27sdmSwYDkyQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6763 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240220_014017_730217_3034A6A2 X-CRM114-Status: UNSURE ( 9.43 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Fix formatting according to coding conventions. No functional change. Signed-off-by: Michael Riesch --- drivers/media/platform/rockchip/cif/cif-capture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/cif-capture.c b/drivers/media/platform/rockchip/cif/cif-capture.c index 2c7716684de0..c80a52028a21 100644 --- a/drivers/media/platform/rockchip/cif/cif-capture.c +++ b/drivers/media/platform/rockchip/cif/cif-capture.c @@ -273,8 +273,8 @@ cif_input_fmt *get_input_fmt(struct v4l2_subdev *sd) return NULL; } -static struct -cif_output_fmt *find_output_fmt(struct cif_stream *stream, u32 pixelfmt) +static struct cif_output_fmt *find_output_fmt(struct cif_stream *stream, + u32 pixelfmt) { struct cif_output_fmt *fmt; u32 i; From patchwork Tue Feb 20 09:39:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Riesch X-Patchwork-Id: 13563773 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AF7CDC48BC3 for ; Tue, 20 Feb 2024 09:41:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Cc:To:In-Reply-To: References:Message-Id:Subject:Date:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=g71wnXwtlHO/gqETrSh5zxiRInEUou1Vd27o5pu53hE=; b=mI23VfenjGaVnYsP7WtJdkDL/m lZ/iLaLbQWsAEeyIkFmqCXh5Mcj57gl1x2DddKKKftkIehHt9JJuXuimmepzj4/ZYC/XAVHLt/xEi CKMiO1D7i8VQnJEZbTWXRhT5c+qJY8aiDOlGtpHIRBwlR7JU+jDfofcDUY1NfmkatHIvs01oHuS+4 qUzKmqypIlrlnfMQireC4Jy7Xe9tMLxK1eq6Sxl16TKAjF0RUFREekY2YRzGy+5B9OTkWGgju51Nw A0Ko9YMKKK9zqYbyjF7dKS3Jk16GKuyBZAOkB8UHrDWPGS/+Fw4Wtp8dOgaCQ7EF8hvFL/gb7vYW0 7pg6a9xQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMcZ-0000000E2qu-1LgM; Tue, 20 Feb 2024 09:41:03 +0000 Received: from mail-he1eur04on20700.outbound.protection.outlook.com ([2a01:111:f403:260f::700] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMbs-0000000E230-1L0A; Tue, 20 Feb 2024 09:40:25 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G2ar07AkIvYfpvWGxyXhuVDGzf116ou+iJRxy6jDK3SHCCcrRwAxIXNkoJxVdoLHMeKb91S2MKrtRAQFR5j5f1J6uS4wqqW9jL4B6A5CHM7sSP6FoG/Ew6bDW2rgJxavtvw7q2e0McUflYHc9Dq/E1XiduKWNndxHSe7sR5/lRrrgDoQwYnx9BAq8XBxDnyxomZex6IAMzc9/4ibk9AVzEHcdR6SfX7ddf7C4r5ZX/1dMrzBv7IMsQFwjs9EQfSH+obE27STaZ2kIxHTbToBe0dB2y4U75GESBp1/k14BUCoXDV8RaMInNg+KnlUlji9w77BWif3OwfjdTE+QGigcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=lnJCaZUTWdtDlpnJeFNWzjxRCQWowo4QDLyEyvF5jkY=; b=nY1ynd6Li44OYvzJgf+H0qs8Xj+QB+4cG6vQ6t/JaKAmWlmW3xSg5dHqOO+YWSajcLwFUM1On8nOiJuq2rsiqeR5VAtVvjZcrAUICxtBjyD18o2/tIJ0BRPZ1caDU8gvtbitOhKs5VuyzFczNmVJZS9vApqtOZ1/guWxqJUZTkftcUytbgUvCO+EBO8Lz9bw0GeHR+k/JamjtTEL/uAvETjhl56/5NXkDbH3gZ5E0vrLOxhLb5bwnO+cWpo5HFunihbaAwvdCNYxbyAh18e8pejM6atsd+UTirbbhqGzglYonGm6CR/F96hrYxEQY+ZwNBhnAweuAdLR6ktzUVpcDw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wolfvision.net; dmarc=pass action=none header.from=wolfvision.net; dkim=pass header.d=wolfvision.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfvision.net; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lnJCaZUTWdtDlpnJeFNWzjxRCQWowo4QDLyEyvF5jkY=; b=tIuQvPYYo4q+1tUh+vzroZZtxrfG3O+FX1fZXMibm1rr5ud+pUsJRCCNOo0CxTMRCYA3Za6NhJhIlOohuW6jhGVFeDPl9XmPxiBfnNI1OeZgJgRNhMynr+FP4MdirBmUrdQUTJnmUu1ysZdIBy2QSVdkJ8Wd1LuPvtdnEl91bfw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wolfvision.net; Received: from DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) by DB9PR08MB6763.eurprd08.prod.outlook.com (2603:10a6:10:2af::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.39; Tue, 20 Feb 2024 09:40:12 +0000 Received: from DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4]) by DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4%6]) with mapi id 15.20.7270.043; Tue, 20 Feb 2024 09:40:12 +0000 From: Michael Riesch Date: Tue, 20 Feb 2024 10:39:18 +0100 Subject: [PATCH 08/14] media: rockchip: cif: use port definitions from new header file Message-Id: <20240220-v6-8-topic-rk3568-vicap-v1-8-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 , =?utf-8?q?Th=C3=A9o_Lebrun?= , Thomas Petazzoni , Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Sakari Ailus 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 X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708421995; l=1108; i=michael.riesch@wolfvision.net; s=20230803; h=from:subject:message-id; bh=GLiudDkgxd9PwtDF2ZLVlA9KPqdrWKb0+KfZ9LqBOQU=; b=DbC1mpRB6C3Pwlv0a9oO0CV69LRew8Owjlx6bhq+HAFb7VT1VxFI3wDldmoag4cY0t7ieA3m0 tog1BIuGX/NCGamjFux/GZhMn0/9HG0cQ9n/F4ahtd04ZWEl88w1Cq3 X-Developer-Key: i=michael.riesch@wolfvision.net; a=ed25519; pk=9ral3sulLe95bLcbaiNXTgUTRiBayRBEFZ5OVIEHp+0= X-ClientProxiedBy: VI1PR04CA0128.eurprd04.prod.outlook.com (2603:10a6:803:f0::26) To DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR08MB9155:EE_|DB9PR08MB6763:EE_ X-MS-Office365-Filtering-Correlation-Id: 6e25c655-ae6e-46d7-d6ce-08dc31f7ef58 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: z7rzcSuNbPESye/Gy3KvxWUwnBJB25wct1AprihqklxfzBE1GKtgGUrErn5lXBYLWtciFYOJTY8FKKHu5HKkJhv5nTi0HZ+Uo0PCEdkQdJfUQ+TRZ9b4ieBHxdkejr5/PSKoR8LGfooN+aD3tleBbTZzRwhQ6BhfpSEEV0x2i8CfBz0FvRFDuR1NoeZRrmHYV8uEvJ3cywxMVM9CKdMyY50EjXeLteVOrQ8msaBJhI/Y5QijmqTYcH3KycPLvJW/UB/1B5to2YRnQgiRVhCJxjumDpkCa8ixSPZXdH2ItcHHuWoYvE0b+rvYU6EZ3tj1yuOXEKNrxF96sy3gU8NrZ6KJdoxMqa5aVZ9n9XdrSVEs+z4nNgZauVmv8CIoVkPne6Pi0PyP3wECyk/8StwSWO8R8aKI0q2FqRuJG8t36wkjYc4BhmeT9OGrjeXuThgVtFA2wm37BhNVbMplu1qdtcWHbGnPF3IMkwIuUOQiXjpY214j9pj75Virv0UfTrtzjQpgGk6H+K9C0mL5QtPLVnyE/9RH8ffVe7J3lIN73JbN5nemkRRq5XyESIM4wgREOy/C7Ls8WjGJ/bJbh8xO8G4habIPHz5YkD8wFevI8+HshKSRkCnzYViG8ShqvGp08OfapH/c6KVhITFk0KYd9A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR08MB9155.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(921011)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?nR3KyvZYc3d2LOMylqj/iy0DA0xp?= =?utf-8?q?io4c2AbSBB1bRM3puAu/k3k2GwJO+7H4d2AFZlOCDAn3fL2IA68QfWDJKybievref?= =?utf-8?q?6eZJmsqeDAKNl1VJexm7Pg3PccTQq6idQXmld9kfaxY1ryuvOzy1Qcpo5E/LxpNk9?= =?utf-8?q?oo3WBWh/PrmpXMl9nPYdGA2MfV4NcmoTbTAYUYTGK1VtYvrohB6j+shSvrR3AFyC7?= =?utf-8?q?hyLt/6OfR+jG13AY89bJUHAnVdcY+f9Lmcmey7S3sbMmkai05MkqmlPSErDV/1uV3?= =?utf-8?q?oRj9hX9XaYIr2OFvgLVAjOl9LyjTWqJoxhFdmeuDKZdA8evJexfM1oylDgfwvNp4T?= =?utf-8?q?7mlItdW8ehjFnklCgsLG9Ji7a+aTfDeVgOFK9yKDYt7SP7BOp2WiiktLJEEgyf+n4?= =?utf-8?q?iU/3VBE2VvXeWw4agaQ7E2H1iGqOVj10OgHgZf9Q7Ye86wqxyghN03Fg9BsOYnY5M?= =?utf-8?q?nbAaAMVSK9lSqSgsqS8pKnQ5ELSsqW9JqxIq9IIFf3UfQXY/Fr5NtjE0l65NzXbm/?= =?utf-8?q?36FSvTKPADTetzLtRzREQ6JD98PK6kyu6230sYCM/eXlL7/1XOh0DEpgsjG5L9jdk?= =?utf-8?q?1cmsN3q4fJRRlHHYYpMjLMvM/1zsCxxX3kWPYipgutSYreMqf5TEaLvj6iCwG7W7W?= =?utf-8?q?63roGICA9as0PI+Kb6KgSJ7bqOZPpjzLJzJjZ1EEsEqS2rekd48vw8VKtgMlRFXWz?= =?utf-8?q?Q3u1DS0KKJxCMU/ECjO7arcLwlpst4yfMA9O4TZJXHTR6zGvft2sB2Q3J2Qd5gvP1?= =?utf-8?q?2lU4woBZqr3h6FFdTEbiM+rhzl6Ytl8TuxeUqZtGdXDZQUfp6WgnTJS/phKcgsQnN?= =?utf-8?q?j2qc/3xrI9XSHYdpKWRFXN7PplGOnwY1FmJi0W6DFG/n0AnhKoBIKAcDB7vqOsJ5l?= =?utf-8?q?M0BFHbaAFtSPRjhPJsUI3qNbMF2adtBjJfDHKuSY8441ImZAoNxpeqV+bcGPKnWId?= =?utf-8?q?svcfIKHnVXz4DQor3e6rWNQe/XbFgrR3TS+p7Tse9bgwWioZKjfKo3QbkJzVHkazG?= =?utf-8?q?/pmzgUgubfE3w5KXHuoYNXnTXGBxtvfAaVH4PteLGBXNaVncW2JAY1IaWbdwznzpc?= =?utf-8?q?pdOh4ADaVpp4hvqRd6N49Xg8pnpw+IgxKwbM6GBkfVnhYO64TsWEPcQ+a1ab+s/HI?= =?utf-8?q?cFb26z/kXHF5/oGD42oYW4/5vqcNL2UOinrDfBk7B1j4YAAIG5z3Jqp4WTuTacE0Y?= =?utf-8?q?qj2/onjnDPujyv0ti+KQedj62/OEIFOR+qyj0xSoF5pdnPxhxfiNv0mK+Bb7zwqse?= =?utf-8?q?GV+IbjnusLPKBr6f+l7VdjA+C7S6Yw0chBYn/QsXT6+wuTbtrn2hgXhXQZkavydL7?= =?utf-8?q?x3gozwBxSC4R0xTDxZlbExNDVx2cTrycHkQPCXFqEUUkUDY7g57V9jGd3ahhKXCmC?= =?utf-8?q?AOHF4tfvafwQYOaXufbwql791JuWWjvFK6YMGsVsd1KeVv//IGUJIezGk0N/bw0RI?= =?utf-8?q?PeuHgEwpITXBjrPiXOQorkdZTd/KWrs07bfTHC4GjxO18mjxyTGnzEzw5swCVyOav?= =?utf-8?q?eQrfTyhB6qP6+DN+noywK8jLz1tZ1DX2Bg=3D=3D?= X-OriginatorOrg: wolfvision.net X-MS-Exchange-CrossTenant-Network-Message-Id: 6e25c655-ae6e-46d7-d6ce-08dc31f7ef58 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:12.2767 (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: r/cNMi6+pTuLQooRPdbzWWN8NY6ZST6iiw16PPlZivgK7LhCAhx6pdXel0DEuSsMhsOB8DQkzaSeWdeqqys7Kr7zD8byKxQcpX09yPfGTes= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6763 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240220_014020_624871_E1FB0A1B X-CRM114-Status: GOOD ( 11.27 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Use the recently introduced port definitions instead of hardcoded constants. Signed-off-by: Michael Riesch --- drivers/media/platform/rockchip/cif/cif-dev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/rockchip/cif/cif-dev.c b/drivers/media/platform/rockchip/cif/cif-dev.c index 923831827be4..c4282449a93d 100644 --- a/drivers/media/platform/rockchip/cif/cif-dev.c +++ b/drivers/media/platform/rockchip/cif/cif-dev.c @@ -7,6 +7,7 @@ * Copyright (C) 2023 Mehdi Djait */ +#include #include #include #include @@ -85,7 +86,8 @@ static int cif_subdev_notifier(struct cif_device *cif_dev) v4l2_async_nf_init(ntf, &cif_dev->v4l2_dev); - ep = fwnode_graph_get_endpoint_by_id(dev_fwnode(dev), 0, 0, + ep = fwnode_graph_get_endpoint_by_id(dev_fwnode(dev), + MEDIA_ROCKCHIP_CIF_DVP, 0, FWNODE_GRAPH_ENDPOINT_NEXT); if (!ep) return -ENODEV; From patchwork Tue Feb 20 09:39:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Riesch X-Patchwork-Id: 13563774 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1066FC48BC3 for ; Tue, 20 Feb 2024 09:41:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Cc:To:In-Reply-To: References:Message-Id:Subject:Date:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=JbHyAIfEVYkO0Xk/WzMJBee8ROgp0fIM+dLRLS/ABmQ=; b=Rp1EKf6gbmtTJE92U//SqxS8A0 ILBXXgBJsTYmhTNqP1b+n954uHJmWUUkjnw3ryqm+8qzIS0xlPE6T3uCNkbjVcuS53gGaN+5uqEpu 4GN8KLG0oNrTHbmMXKwg+6H/tinxkztXAAuQGs8Z6Fqx3P0iuocZN9hKdVqUvYtTpc4FCT4CeIU7b w/IVdd8J5CgrXPYg1WvRZRTIjfceZRtEcxK4icIOOrCECvNks+qGA0+E4bUiDZlDakK23vtIra1wB 5G6bvJ742qJnwinOXZzjZ932f+BVuNH5O0TzGOkkHSheCKAx8fXBZVP/5D+7LZTW2DaE+EK8nE0oB Ld/E4phA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMct-0000000E31i-04s3; Tue, 20 Feb 2024 09:41:23 +0000 Received: from mail-he1eur04on20700.outbound.protection.outlook.com ([2a01:111:f403:260f::700] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMby-0000000E230-01WL; Tue, 20 Feb 2024 09:40:29 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YIMBx1WolY0Mmn3zYBb35/NEROcPigAlFjtJCYkGmcsREKiZGOOU1Bv0t1VgpaenGgSyT5uue6mbbIxoF6skGzG21GLXqieoCJNWGpWIX1xOZepUINH7NZYVT7P2oJbI/M8fx+pBAF7+yclYcpxn5UvbJIX50I+Q0cyxLcvsLYQ+/fBuJndy2RjVybEmG8+aCxm3WC/r8/5qNc88QqDBp2a795FAkSgSwyJu+cYT6XbHDy2hmryXaLJUsMPCiXpZFkY+Otqk5dpdx7fPv9pqNmBMPKFcfHXCJJ3vWT4iRpNmLyONocNy1KZVCrUFh3DRPvRSTkFecdYjfEiIjfyEpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=CYHmj6K+Yw2I1Wxuq6WyAkSBG52uQ7q3/Hw6yocyE/A=; b=C48DRYD4xXpUjji6HyfqRl4KvK2apkvObqz/yZZeIxVRq1BiLFV/He4GvCSzoEmpjg2KlowpeCo4eXpAqUHm+KmGV0HQaT90I771lKDB+iEnkyjV/OTOcJvd3N+91q7SIKxwpVVUObFKHkUPYfWU8HJQy2foBqy4NLIYIigSOVpJX8lInkOlBuO5ECdcM5azU6w9UafdId/qVFScLHxqx10lEJcr3XToWaFF6FfmzsssgEuyFTRbAjv5MltSOtA/EmuBWic4YHYRKqBYk0bvjMsxfmr0dLrVoBapAUQAYrbRGE4oBufPpmqnZUZaCfGnDt8WGnwuMQfa1hxqv1WnGQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wolfvision.net; dmarc=pass action=none header.from=wolfvision.net; dkim=pass header.d=wolfvision.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfvision.net; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CYHmj6K+Yw2I1Wxuq6WyAkSBG52uQ7q3/Hw6yocyE/A=; b=Mht8sSpo+/x8xLAavFwI41IlgCbA9Fe5MABFWvwVJzeoo8oxxdOd2Hz2tQVERIiDub8XLS4vR+gGuz7lI80GEYAL0WH8gcN7UnH7n3RtfFupnsRgOts6+S8yYJvfwq/gFILB8d/Hz87wJQ5uPXXL7GYDoHrmm1c5mqsPX7yyUlo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wolfvision.net; Received: from DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) by DB9PR08MB6763.eurprd08.prod.outlook.com (2603:10a6:10:2af::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.39; Tue, 20 Feb 2024 09:40:14 +0000 Received: from DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4]) by DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4%6]) with mapi id 15.20.7270.043; Tue, 20 Feb 2024 09:40:14 +0000 From: Michael Riesch Date: Tue, 20 Feb 2024 10:39:19 +0100 Subject: [PATCH 09/14] media: rockchip: cif: add support for grf Message-Id: <20240220-v6-8-topic-rk3568-vicap-v1-9-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 , =?utf-8?q?Th=C3=A9o_Lebrun?= , Thomas Petazzoni , Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Sakari Ailus 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 X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708421995; l=2405; i=michael.riesch@wolfvision.net; s=20230803; h=from:subject:message-id; bh=ou+V5Mg+cQK/+nx6chzqIuN6MNQRuWnEU7n6yunl2Vo=; b=UhFzY5PlVTRDbx2zhAFD/+wl3qGXUYSTlRxtBvmokC5BVMJ/wBk1raT8A+xpQ+9ftwWuDQUIq es5posc4+TUBUXICGo60PEqVWxC2h8GdBb+5JO3+2rPDwdGcCJfqKx6 X-Developer-Key: i=michael.riesch@wolfvision.net; a=ed25519; pk=9ral3sulLe95bLcbaiNXTgUTRiBayRBEFZ5OVIEHp+0= X-ClientProxiedBy: VI1PR04CA0128.eurprd04.prod.outlook.com (2603:10a6:803:f0::26) To DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR08MB9155:EE_|DB9PR08MB6763:EE_ X-MS-Office365-Filtering-Correlation-Id: 603c4d07-d2aa-48cf-0fe6-08dc31f7f087 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IS5Nu/mrRmrS/DanQQNS8u3lBnPujwwqp4e1yNVuDWfRdjJ120kF53yTmjbecyCeiN4Z7VH6TV1DEnRKgxfMwoMyqvbl43E1zH9AXVaIgEqR5w9wPVrC9c9lr8uyEH+vsO8c8W8ItAmIm7e/0THg5HqQAUajW51eyXUtArS+mkS2YKCwnmZPFp4KSQT2ZYKUBK3/GtTmpavghiTvFEn/+K4E/pRuqPhU2up1YqZHfmc9EeGwhO8JNmlnpulDoAv3h5msV6E/dnGs0CI8TU49LXA8VfKb763wtJdj9k+PUBevT43S48vu145+sHYmr+b/+gC3Rlx6fMZWe9dkKISVTthDjD5wyUs4P1t0Tj3/pmGnRYBXzl51LePW1edm8wlIGj0clLMVFdhQAfBwq5J5RNK83F56oHeZesDcWFEpN1a3v7mzQZ/El9T5gYgJK1AUHfg+WALVQcpc3kI3/ZOag5eIuAUH7tHKLYAFj1k+FnaL9qvy6CE10FV43Pw1m1IJN2vc0XLqFlj2lDZqh9/c00hcZ/h6NG+wo4F4HbwS3oRyIsu4pQYAR9ciPZ1V55Hx4eFWcPUQonjn/Ee08tDMlHReWPsOZp9JRBEXK2YpsOo/q8gANloElcpu3w2fILGK8+cpaKqTU+d0v8eszYXwGA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR08MB9155.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(921011)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?vH84JnW2Emjp7nXq2sjpmsSzu0Fp?= =?utf-8?q?crENKNyTyg6FaT34niy5d1LrY66RfPm/wuXhXAXKB1bmKn3NXNKj+BSn3RwzvwWFs?= =?utf-8?q?s9T+qsqqb7yCSDvVhWW8LoHBMcqWfVWf21uFLgf15KfRtKpX9ngRwnRsZ7fHUPRm3?= =?utf-8?q?fIZcwYHfkwG2VFhr9Tvlwbn8TsEN2+ysKpy4/F74O1Tvor16PG9KokqYSuWHfdZGK?= =?utf-8?q?xR+M49LmGSHhmVVC0Yo0IwDgBHHwLsYLlVE1LC/eBOPJM34GLyjHg/92MBSMQP2Vm?= =?utf-8?q?E65JqpEttcX+QLptCV36uSxDdZrTQmZ5XZlsepZ4fln2nYQNwt0S4Yaud4oM6EGAh?= =?utf-8?q?/jG84RQRsIrHG0KMMsTiGq0FIyPJhq/SrH+qYS0kQi7AZvaBr+p1/9HLovud59Eqj?= =?utf-8?q?0Gsf2LCPJ24QcZxecVyIziXvBIMGi6iQhvZG2SDXedHKSY9qJP7onhdcvWaX/QZgh?= =?utf-8?q?tAN+o0rwyOkG8gHwALZFWBPWb7TPsYWtc91vsHnr+MKYMvwVyTMQvvrTHeR30yH5a?= =?utf-8?q?NpMJvMc4my31rfKqII0QxF24LoxY5iujtqPv5FOhNXHHPaoQ4/FWEhIxnrZnEMlTJ?= =?utf-8?q?sZZAxyKZl4+3FJzIMD8o1oOTemMmSn5ZWVOIfipefP8c8LZ7B6snMmDNYyMFujGwi?= =?utf-8?q?CBPurGTW5IhjEIKQ6k8CiDU7bp9G/yR7ujMvKARjWItkxwNVxRrUqwGdZ9254kdiN?= =?utf-8?q?yQukd1eO5cutXb2khJnStc81JXjGp5amoRRfy+rrLXAiVaZouUt9LsVGUGUqdQziM?= =?utf-8?q?koVSiMnB4X3wj19ZFg5XDMNQAMQNv6JOFFja7JfBU/VqWNuGAQQSgTdz9nCjJE15S?= =?utf-8?q?BjeGvvc273pGEC4A+bamcDVe4wexxkJQhgTy6xcK9g1ceEXwUmMQ9jmJXZk/NqZ5u?= =?utf-8?q?8hM1V5rkO4Rw6xWqSyNk9R8Nk/DGaXzfJesAzfeVE/84YK/xoZtmbedbHEIzg9a/H?= =?utf-8?q?Gs/mFkKp59vTt6TsUl7doz4rThvopVoqCZZpdICm+WZHeoH5JdgN+FNp+xjTGdGpr?= =?utf-8?q?7XAzUjisZ+ySYHLnNjUYT4IVS51h0jqjWsbv09DPoJUBFmQF1LolCjB5NDbp2Ifeg?= =?utf-8?q?QAYx1MxrlS958HL/D2YskBylb7eo52c0CGE3SP1vdz6gYNkzHVgoEyS/lnpR6f2fM?= =?utf-8?q?GJILd3nlwAp8N9aoNvKql2l4De24jssOzQ6P4u6+HcUzP34XHXVjtOkWZam31J4c6?= =?utf-8?q?QInsBd6+ZV1+tn6LL9g4+mZDZz3+fGDiPu/tRCwULJ7J200pkiuX0suby+hFFhYN0?= =?utf-8?q?lPGQwITmFqsznN9Bn19oSO6S9Cbh9XzusGJwtsBCwsXffAI0xf1ty5IWTTwhSAxID?= =?utf-8?q?vFgjcqhx53CLYGMkVMoVdOESq4gFH3SkK7mEYPZTmS4c0CRUTHXxdnXlvdwjXwGvo?= =?utf-8?q?mD4ybh6ymVYvEc/JKo/wEGntshiWjJ0NTtSdXKnGyrNBmnMzJQVEEJbeOUUkt1aSw?= =?utf-8?q?G2qplgNjvqmMCrMnijMMtamaj8dZz1jIZS/TSa2CUPJ8/a17zSRJRjtJIEWtnrJrL?= =?utf-8?q?wzP7B8doy7aF8FOI3CoyIXEPc1QTZARuhA=3D=3D?= X-OriginatorOrg: wolfvision.net X-MS-Exchange-CrossTenant-Network-Message-Id: 603c4d07-d2aa-48cf-0fe6-08dc31f7f087 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:14.2829 (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: sjtYwmDdpx0UER9CPusNJeZ77948ImjIjKQQvcGaxGMurQO96mwSIb4Gsaq1dZ49MDGiQiHAcQ0dG5JitktTir3Ren2p+IuUuol0Pr/YXnY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6763 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240220_014026_245471_331C623A X-CRM114-Status: GOOD ( 12.55 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Some variants of the Rockchip CIF require the General Register File for video input block control. Signed-off-by: Michael Riesch --- drivers/media/platform/rockchip/cif/cif-common.h | 3 +++ drivers/media/platform/rockchip/cif/cif-dev.c | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/drivers/media/platform/rockchip/cif/cif-common.h b/drivers/media/platform/rockchip/cif/cif-common.h index 34da800a0504..ae8fedeadd1c 100644 --- a/drivers/media/platform/rockchip/cif/cif-common.h +++ b/drivers/media/platform/rockchip/cif/cif-common.h @@ -11,6 +11,7 @@ #include #include +#include #include #include @@ -96,6 +97,7 @@ static inline struct cif_stream *to_cif_stream(struct video_device *vdev) struct cif_match_data { struct clk_bulk_data *clks; int clks_num; + void (*grf_dvp_setup)(struct cif_device *cif_dev); }; struct cif_device { @@ -103,6 +105,7 @@ struct cif_device { int irq; void __iomem *base_addr; struct reset_control *cif_rst; + struct regmap *grf; struct v4l2_device v4l2_dev; struct media_device media_dev; diff --git a/drivers/media/platform/rockchip/cif/cif-dev.c b/drivers/media/platform/rockchip/cif/cif-dev.c index c4282449a93d..b75b76508793 100644 --- a/drivers/media/platform/rockchip/cif/cif-dev.c +++ b/drivers/media/platform/rockchip/cif/cif-dev.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -103,6 +104,9 @@ static int cif_subdev_notifier(struct cif_device *cif_dev) goto complete; } + if (cif_dev->match_data->grf_dvp_setup) + cif_dev->match_data->grf_dvp_setup(cif_dev); + asd = v4l2_async_nf_add_fwnode_remote(ntf, ep, struct v4l2_async_connection); if (IS_ERR(asd)) { @@ -191,6 +195,9 @@ static int cif_plat_probe(struct platform_device *pdev) if (IS_ERR(cif_dev->cif_rst)) return PTR_ERR(cif_dev->cif_rst); + cif_dev->grf = syscon_regmap_lookup_by_phandle(dev->of_node, + "rockchip,grf"); + cif_stream_init(cif_dev); strscpy(cif_dev->media_dev.model, "cif", sizeof(cif_dev->media_dev.model)); From patchwork Tue Feb 20 09:39:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Riesch X-Patchwork-Id: 13563816 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C5FDBC48BC4 for ; Tue, 20 Feb 2024 09:55:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Cc:To:In-Reply-To: References:Message-Id:Subject:Date:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=4Gene06JBUxukhxRDR4P7K/WwzTwubfFPEe10/Mtad0=; b=hw4XuoQtFWHcuY4eDTeULte0fQ xNduTF5orCCQg7RUekHXYf4XFWLXxnXtprueAqRYatcACW1XDkHH8H249Q7QNzMYaddoZpwQc5FNi XWrrPbYr9FjFmF2OsG0B24bxdX9vHOGOIHHBLkGNU3T6VSU8GJeHMCuzW8dLeBA+BCpVXL27fxsHz JeVJw2Yg3a1RVUakWEJCC1S8zW38f3diNF8EFOaKiSyH5BYTHRaNTz+wchfhVqxB9+zRAEW1LeAu9 mHsVHy3p7UqhS02bTVRJtECWse3VLsuGzv77BvnGCSJJkQTXLvt3wRRMvEK920GC98Q1kCYgvpG/q ZY+d8Ngg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMq7-0000000E7mH-2zNW; Tue, 20 Feb 2024 09:55:03 +0000 Received: from mail-db5eur01on0717.outbound.protection.outlook.com ([2a01:111:f400:fe02::717] helo=EUR01-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMq3-0000000E7kc-4BMM; Tue, 20 Feb 2024 09:55:01 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Df5jUfft/nsyS6bXWy8D21yO5Y4BP/DKqi47Da0S0hgcogm8OzOQeE5wLF3nkr1EtuaqxxGeHbogbqHJfOXvvxUg/qh5U0jhDR/SCXiYfjwRL+AIfx9Q+4R+YNCtbolXGWY09mM/+JGgUGaIbl7490Jq8yxrd7qMQ4+CEzZsJfAbstliL6oYM5zQKg4BKDPVEijw9MQBXRKZxMHLvpSNM2AmGhLGS9SCYupgW/EyYIi9+N1jR4inkpJkbk00ASwWiKXVE6iCABzGlRhgOVDA4QveQxvL5j/s/xNRmVRP7sdP8DMfonpA9wG4SgQR10MkvEBKSk+mZtNnnGzOPPZKzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=EkTvgcGVFEdoJI5SU3mp1RMsMu+o0r2GkRiBHATwNfw=; b=DSPocW5VIBv/GsWA4h005VWtbyC9f+nSiCJd2F86TgnGSdgAwhIDMNjGJLOAG7ViR+KDSewENX7jAq8zVSje4L2sizu4Eoki07gGUdgi5PRFmmlmyaBvn93Zd4fA8VJC7P91znT9BC+4TXkmPNT6KRvbg59tQFnnP9yf96vX4I2I62RsVurxbgI4cnPk/8OgBs1/ldvLc+3jPOcgOo1UBBHElbe3SnNZ+2kLNVo0lEonDmKW5Bqi+9uloZEfGnxHLQJ8O7VbHXvLT17x55tKTLXctH5f6D5YhgQ2r2WBnQjXYZZBFlLj8KNX/HkoXOXnaMT7EoKCuj1n96NS66uUjQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wolfvision.net; dmarc=pass action=none header.from=wolfvision.net; dkim=pass header.d=wolfvision.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfvision.net; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EkTvgcGVFEdoJI5SU3mp1RMsMu+o0r2GkRiBHATwNfw=; b=lOQdyYKz9gHGgblkYFhC5+70RhaxgEQxnx401skJXAQVmJnHqHTp4VtfrB56+BICqyp+/vyGzaikZMxPPHnRng6dHo2nZ0SDBo2+RhOIbH/56kAP+hQ0Gq5bIo6ji5i5G2azXE8uBwgq0Mq6guL2ynNwMR0TTCn+mD4rhqhwm6M= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wolfvision.net; Received: from DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) by DB9PR08MB6763.eurprd08.prod.outlook.com (2603:10a6:10:2af::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.39; Tue, 20 Feb 2024 09:40:16 +0000 Received: from DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4]) by DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4%6]) with mapi id 15.20.7270.043; Tue, 20 Feb 2024 09:40:16 +0000 From: Michael Riesch Date: Tue, 20 Feb 2024 10:39:20 +0100 Subject: [PATCH 10/14] media: rockchip: cif: add variant specific input format list Message-Id: <20240220-v6-8-topic-rk3568-vicap-v1-10-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 , =?utf-8?q?Th=C3=A9o_Lebrun?= , Thomas Petazzoni , Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Sakari Ailus 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 X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708421995; l=12621; i=michael.riesch@wolfvision.net; s=20230803; h=from:subject:message-id; bh=yxvnetxzaHXZbGOMHByLMYoilZ4RD8drlFJrk+JeioI=; b=V/vHX+ML5xC6knGUSZYfu5ybfpeU+hRjnXyhiGjxSe1OzdSYsQESQnCR/cyS2xv2X1AW+jY28 GnwEImC6e0cDmWIzqpV15BA2IvHkAh6bOMk7b70ee1fv++3lWRfyJZY X-Developer-Key: i=michael.riesch@wolfvision.net; a=ed25519; pk=9ral3sulLe95bLcbaiNXTgUTRiBayRBEFZ5OVIEHp+0= X-ClientProxiedBy: VI1PR04CA0128.eurprd04.prod.outlook.com (2603:10a6:803:f0::26) To DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR08MB9155:EE_|DB9PR08MB6763:EE_ X-MS-Office365-Filtering-Correlation-Id: c6f4bfb8-8fe4-4233-1c0f-08dc31f7f1c9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tm5u1P1hTgdL+5T/yyzwR1k2Gu0IydJ9pcF/ea0uiDgWQAaT0R/cwxNseCEwHCa1DeRieYHAtGMSY0QV/eM3pd9jcOYj94qtB+zmXu59DP5ongOcqzEi3s5T656nfRu9wBPTIwIMPJeLnFWg2TIzr429vnrd3HMYbi6oDa53DouuRMQX+tRHTI2Z96Nwphhaa5SJ7RfMEEB5OI7XbUHW1ND1p9GAofbocnh8goJ1nrkh2jIAYs+9BWfAUpAGeWmHDQqBwEiRu+/PD15wpO7AWtZLMmVTwvYJlzhwbEpIM7ijB+zy0UBI5eWcfqUm0Ja/3pbgffCCKzDVVteLxdRM/FVoCx2y2llf+V45wXStslQMTMkU9pcUZcnUkD/649oUeFnwJQVuEdjwt6dHtZ/zMkcXL9we01B0HzPcxXpl7fuSe6Xyg5UbhM0ej8kubavHV5MEOo95Tev+p3QJIYtG/XbKg26rCsv+CZscZWGSgkdtHXGBI1k5nLxsp/j7Ft86MffrN+3nimAS/2OPvlyKaVaha2vU93oJwiz+ONS7yOMnY7l49RwH+aphtMYEEsdA5PYtaOztBhAI1SgM1pZO3y6PQmPL/KyBTooD9cLp2d8NIVU5iFXG934oCuEe3hqrA0ctDH0w0XdaLeyCd+dkbg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR08MB9155.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(921011)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?vhELaC6tDaE/eVI145Ge1F54v8JX?= =?utf-8?q?oKfArNr5mwBIzyFBu202EeN9O9Kj438ARSL9JlWTLVAD5zdfxzUrazysV15gS/Yfk?= =?utf-8?q?apWnaV2d/VX/sYN7YDuPB+kXpjK9aXgE0MbDFUUPFvUGomaEgln6yzEgkT0fgtN0O?= =?utf-8?q?2TD10i5k1+yftgbinHnNjH41T0YlTYIdy5L6P+RTkrwXYMh99WkknN5YXWuFYAjuq?= =?utf-8?q?tUz9ZMANYVpHiPxzT/qNAKNrC3Je9RD+wveMX1zstSnaWeU5tnCb+tPFm7XTRHDwp?= =?utf-8?q?8AAJ7ErrKE//bxCeAitcpCGRaBhLzrNdwyz5PNdFIbCdCxy9dLGp9w406rxZHN6d4?= =?utf-8?q?QNVdYXAuDa3HTOMlyypWJq2zNL4EzTRXMKTx0inXv3X6jyTE8ihNqz7dL7KDzo6JS?= =?utf-8?q?Nlf7t1I45BnQaqfFKwn4joCvIx7YQSq1fINx9pptPJXanvh1zLnYf3JPkvFvx0dyj?= =?utf-8?q?ZVUiLxZuFdUKD5SBadn2ePVmAALKpMPtrHXBdoUBjfGUCBtKHBoFSW+ToJQpAceC1?= =?utf-8?q?muyUYwh3Osvk0QVFJ3AG8h5dZ1R2wQDwYWJO2B72A4cy68JzBVWF1hEEjUMVd4Bp/?= =?utf-8?q?Doek8hP9D7bQFhd+s73QaFYkoZ1gEFCa0dzWzbdfn+K/xP6DmV4b7nrvvIZtqv26o?= =?utf-8?q?E9/kFILcJzVqurDcb0VDz1NVNvAmqQ6JG9kTPRUhIJyyOTDLYlU8Q8gkBidFZX8Xt?= =?utf-8?q?8+xF7EFAYaNeuQrNJI6ISyxCECfAbM3gfhyjEoqvSScxcUHmvPkMmnk/1NU8+5/dq?= =?utf-8?q?Obd9qwrQFv+Z0cQX8SzoFypcqRpQLIqndENGTj2JsKhcymtqdfRNA67JPt+ZsG9qB?= =?utf-8?q?1OP2mFEfqsHhpgX3oxU8jcCBVse8S1KfsMZilQ6gvbXa10xiuV9FNkduLAqn5+J2a?= =?utf-8?q?Pdv0CZz1N24dvWNw6gFnYYZo9PgEN1iQwsFKLEwMHE6QSMoFBXETcwaQFt+kzmOhX?= =?utf-8?q?7UAaC9D8zrutFFQZAcCbE/uHHbipTmBtFK0sgRfC7eFnJcXFBu1EIlvz/UlJ8EahY?= =?utf-8?q?EF49Ym4Q62YKZw5Cu5R0wxBsEjdTBY7x/xFsRGPiahAV+5A0gSfrkRKYOsQexO0Ig?= =?utf-8?q?k4JuFLelw8Iog4lePBeIOXfgWeWwqKF7pk7eWEs8F7P+pVXN/v+/WPHyX70pngN4m?= =?utf-8?q?fujRZal1IKtM1XjpF0GS9UtgdTD1plAV+9/HbZ7hvqCIH78KmNor5ujc497ENQYqc?= =?utf-8?q?tSUzSAf8kpa7i30ph+QRvwCIKNCI1nn1DQzZj5qDnEF6CQdeOV9z+KVkqIMTcgm0q?= =?utf-8?q?YLvDGdreVoyIEwh/ef2aoYjy0siw4VEx/AdqBPv2BZxwTbfvHNxosqkPCdAbQQboP?= =?utf-8?q?NVNgWEMLARulM3vuDP1AqnQi2waGRiUheuZgs+XDaqor0RYS6QFloR6cXMS69ZPR8?= =?utf-8?q?x6ruYumFXEkzpqYCt0tpbaPdKklaAvH0ciHDd+YivUgWK5oklBYV+mGSuBJLngGeQ?= =?utf-8?q?x+tfCGHGFFUSb9l/jmkwRMOzPELGHBLK91BhwwMcwtIZf90GigQCgLHoQZALeVmPN?= =?utf-8?q?4t9a7Q6qkfyKzKjcSm+QJTefhrs2osizow=3D=3D?= X-OriginatorOrg: wolfvision.net X-MS-Exchange-CrossTenant-Network-Message-Id: c6f4bfb8-8fe4-4233-1c0f-08dc31f7f1c9 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:16.3924 (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: D+3Yl6jmqvCquXdM2jvf7aWsDaFvT626mT58mi9UlkqkNPJV58I3w0RN1kEZczx6jHfCLTc4VSKdmursbD+/fgSdUhQIDjNJfNtFFfg/Njw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6763 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240220_015500_205100_B10A253F X-CRM114-Status: GOOD ( 12.71 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org The different variants of the Rockchip CIF may feature different input formats. Add a variant specific input format list to account for this. Signed-off-by: Michael Riesch --- drivers/media/platform/rockchip/cif/cif-capture.c | 154 +--------------------- drivers/media/platform/rockchip/cif/cif-common.h | 2 + drivers/media/platform/rockchip/cif/cif-dev.c | 147 +++++++++++++++++++++ 3 files changed, 154 insertions(+), 149 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/cif-capture.c b/drivers/media/platform/rockchip/cif/cif-capture.c index c80a52028a21..b26e6023c2b0 100644 --- a/drivers/media/platform/rockchip/cif/cif-capture.c +++ b/drivers/media/platform/rockchip/cif/cif-capture.c @@ -109,154 +109,10 @@ static struct cif_output_fmt out_fmts[] = { } }; -static const struct cif_input_fmt in_fmts[] = { - { - .mbus_code = MEDIA_BUS_FMT_YUYV8_2X8, - .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | - CIF_FORMAT_YUV_INPUT_ORDER_YUYV, - .fmt_type = CIF_FMT_TYPE_YUV, - .field = V4L2_FIELD_NONE, - }, { - .mbus_code = MEDIA_BUS_FMT_YUYV8_2X8, - .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | - CIF_FORMAT_YUV_INPUT_ORDER_YUYV, - .fmt_type = CIF_FMT_TYPE_YUV, - .field = V4L2_FIELD_INTERLACED, - }, { - .mbus_code = MEDIA_BUS_FMT_YVYU8_2X8, - .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | - CIF_FORMAT_YUV_INPUT_ORDER_YVYU, - .fmt_type = CIF_FMT_TYPE_YUV, - .field = V4L2_FIELD_NONE, - }, { - .mbus_code = MEDIA_BUS_FMT_YVYU8_2X8, - .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | - CIF_FORMAT_YUV_INPUT_ORDER_YVYU, - .fmt_type = CIF_FMT_TYPE_YUV, - .field = V4L2_FIELD_INTERLACED, - }, { - .mbus_code = MEDIA_BUS_FMT_UYVY8_2X8, - .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | - CIF_FORMAT_YUV_INPUT_ORDER_UYVY, - .fmt_type = CIF_FMT_TYPE_YUV, - .field = V4L2_FIELD_NONE, - }, { - .mbus_code = MEDIA_BUS_FMT_UYVY8_2X8, - .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | - CIF_FORMAT_YUV_INPUT_ORDER_UYVY, - .fmt_type = CIF_FMT_TYPE_YUV, - .field = V4L2_FIELD_INTERLACED, - }, { - .mbus_code = MEDIA_BUS_FMT_VYUY8_2X8, - .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | - CIF_FORMAT_YUV_INPUT_ORDER_VYUY, - .fmt_type = CIF_FMT_TYPE_YUV, - .field = V4L2_FIELD_NONE, - }, { - .mbus_code = MEDIA_BUS_FMT_VYUY8_2X8, - .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | - CIF_FORMAT_YUV_INPUT_ORDER_VYUY, - .fmt_type = CIF_FMT_TYPE_YUV, - .field = V4L2_FIELD_INTERLACED, - }, { - .mbus_code = MEDIA_BUS_FMT_SBGGR8_1X8, - .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | - CIF_FORMAT_RAW_DATA_WIDTH_8, - .fmt_type = CIF_FMT_TYPE_RAW, - .field = V4L2_FIELD_NONE, - }, { - .mbus_code = MEDIA_BUS_FMT_SGBRG8_1X8, - .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | - CIF_FORMAT_RAW_DATA_WIDTH_8, - .fmt_type = CIF_FMT_TYPE_RAW, - .field = V4L2_FIELD_NONE, - }, { - .mbus_code = MEDIA_BUS_FMT_SGRBG8_1X8, - .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | - CIF_FORMAT_RAW_DATA_WIDTH_8, - .fmt_type = CIF_FMT_TYPE_RAW, - .field = V4L2_FIELD_NONE, - }, { - .mbus_code = MEDIA_BUS_FMT_SRGGB8_1X8, - .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | - CIF_FORMAT_RAW_DATA_WIDTH_8, - .fmt_type = CIF_FMT_TYPE_RAW, - .field = V4L2_FIELD_NONE, - }, { - .mbus_code = MEDIA_BUS_FMT_SBGGR10_1X10, - .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | - CIF_FORMAT_RAW_DATA_WIDTH_10, - .fmt_type = CIF_FMT_TYPE_RAW, - .field = V4L2_FIELD_NONE, - }, { - .mbus_code = MEDIA_BUS_FMT_SGBRG10_1X10, - .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | - CIF_FORMAT_RAW_DATA_WIDTH_10, - .fmt_type = CIF_FMT_TYPE_RAW, - .field = V4L2_FIELD_NONE, - }, { - .mbus_code = MEDIA_BUS_FMT_SGRBG10_1X10, - .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | - CIF_FORMAT_RAW_DATA_WIDTH_10, - .fmt_type = CIF_FMT_TYPE_RAW, - .field = V4L2_FIELD_NONE, - }, { - .mbus_code = MEDIA_BUS_FMT_SRGGB10_1X10, - .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | - CIF_FORMAT_RAW_DATA_WIDTH_10, - .fmt_type = CIF_FMT_TYPE_RAW, - .field = V4L2_FIELD_NONE, - }, { - .mbus_code = MEDIA_BUS_FMT_SBGGR12_1X12, - .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | - CIF_FORMAT_RAW_DATA_WIDTH_12, - .fmt_type = CIF_FMT_TYPE_RAW, - .field = V4L2_FIELD_NONE, - }, { - .mbus_code = MEDIA_BUS_FMT_SGBRG12_1X12, - .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | - CIF_FORMAT_RAW_DATA_WIDTH_12, - .fmt_type = CIF_FMT_TYPE_RAW, - .field = V4L2_FIELD_NONE, - }, { - .mbus_code = MEDIA_BUS_FMT_SGRBG12_1X12, - .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | - CIF_FORMAT_RAW_DATA_WIDTH_12, - .fmt_type = CIF_FMT_TYPE_RAW, - .field = V4L2_FIELD_NONE, - }, { - .mbus_code = MEDIA_BUS_FMT_SRGGB12_1X12, - .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | - CIF_FORMAT_RAW_DATA_WIDTH_12, - .fmt_type = CIF_FMT_TYPE_RAW, - .field = V4L2_FIELD_NONE, - }, { - .mbus_code = MEDIA_BUS_FMT_RGB888_1X24, - .field = V4L2_FIELD_NONE, - }, { - .mbus_code = MEDIA_BUS_FMT_Y8_1X8, - .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | - CIF_FORMAT_RAW_DATA_WIDTH_8, - .fmt_type = CIF_FMT_TYPE_RAW, - .field = V4L2_FIELD_NONE, - }, { - .mbus_code = MEDIA_BUS_FMT_Y10_1X10, - .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | - CIF_FORMAT_RAW_DATA_WIDTH_10, - .fmt_type = CIF_FMT_TYPE_RAW, - .field = V4L2_FIELD_NONE, - }, { - .mbus_code = MEDIA_BUS_FMT_Y12_1X12, - .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | - CIF_FORMAT_RAW_DATA_WIDTH_12, - .fmt_type = CIF_FMT_TYPE_RAW, - .field = V4L2_FIELD_NONE, - } -}; - -static const struct -cif_input_fmt *get_input_fmt(struct v4l2_subdev *sd) +static const struct cif_input_fmt *get_input_fmt(struct cif_device *cif_dev, + struct v4l2_subdev *sd) { + const struct cif_input_fmt *in_fmts = cif_dev->match_data->in_fmts; struct v4l2_subdev_format fmt; u32 i; @@ -264,7 +120,7 @@ cif_input_fmt *get_input_fmt(struct v4l2_subdev *sd) fmt.pad = 0; v4l2_subdev_call(sd, pad, get_fmt, NULL, &fmt); - for (i = 0; i < ARRAY_SIZE(in_fmts); i++) + for (i = 0; i < cif_dev->match_data->in_fmts_num; i++) if (fmt.format.code == in_fmts[i].mbus_code && fmt.format.field == in_fmts[i].field) return &in_fmts[i]; @@ -550,7 +406,7 @@ static int cif_start_streaming(struct vb2_queue *queue, unsigned int count) sd = cif_dev->remote.sd; - stream->cif_fmt_in = get_input_fmt(cif_dev->remote.sd); + stream->cif_fmt_in = get_input_fmt(cif_dev, sd); if (!stream->cif_fmt_in) goto runtime_put; diff --git a/drivers/media/platform/rockchip/cif/cif-common.h b/drivers/media/platform/rockchip/cif/cif-common.h index ae8fedeadd1c..84a7545422e1 100644 --- a/drivers/media/platform/rockchip/cif/cif-common.h +++ b/drivers/media/platform/rockchip/cif/cif-common.h @@ -97,6 +97,8 @@ static inline struct cif_stream *to_cif_stream(struct video_device *vdev) struct cif_match_data { struct clk_bulk_data *clks; int clks_num; + const struct cif_input_fmt *in_fmts; + int in_fmts_num; void (*grf_dvp_setup)(struct cif_device *cif_dev); }; diff --git a/drivers/media/platform/rockchip/cif/cif-dev.c b/drivers/media/platform/rockchip/cif/cif-dev.c index b75b76508793..fb80e8f8dcab 100644 --- a/drivers/media/platform/rockchip/cif/cif-dev.c +++ b/drivers/media/platform/rockchip/cif/cif-dev.c @@ -132,9 +132,156 @@ static struct clk_bulk_data px30_cif_clks[] = { { .id = "pclk", }, }; +static const struct cif_input_fmt px30_in_fmts[] = { + { + .mbus_code = MEDIA_BUS_FMT_YUYV8_2X8, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_YUYV, + .fmt_type = CIF_FMT_TYPE_YUV, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_YUYV8_2X8, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_YUYV, + .fmt_type = CIF_FMT_TYPE_YUV, + .field = V4L2_FIELD_INTERLACED, + }, { + .mbus_code = MEDIA_BUS_FMT_YVYU8_2X8, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_YVYU, + .fmt_type = CIF_FMT_TYPE_YUV, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_YVYU8_2X8, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_YVYU, + .fmt_type = CIF_FMT_TYPE_YUV, + .field = V4L2_FIELD_INTERLACED, + }, { + .mbus_code = MEDIA_BUS_FMT_UYVY8_2X8, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_UYVY, + .fmt_type = CIF_FMT_TYPE_YUV, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_UYVY8_2X8, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_UYVY, + .fmt_type = CIF_FMT_TYPE_YUV, + .field = V4L2_FIELD_INTERLACED, + }, { + .mbus_code = MEDIA_BUS_FMT_VYUY8_2X8, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_VYUY, + .fmt_type = CIF_FMT_TYPE_YUV, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_VYUY8_2X8, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_VYUY, + .fmt_type = CIF_FMT_TYPE_YUV, + .field = V4L2_FIELD_INTERLACED, + }, { + .mbus_code = MEDIA_BUS_FMT_SBGGR8_1X8, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_8, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_SGBRG8_1X8, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_8, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_SGRBG8_1X8, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_8, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_SRGGB8_1X8, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_8, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_SBGGR10_1X10, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_10, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_SGBRG10_1X10, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_10, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_SGRBG10_1X10, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_10, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_SRGGB10_1X10, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_10, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_SBGGR12_1X12, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_12, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_SGBRG12_1X12, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_12, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_SGRBG12_1X12, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_12, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_SRGGB12_1X12, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_12, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_RGB888_1X24, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_Y8_1X8, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_8, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_Y10_1X10, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_10, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_Y12_1X12, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_12, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + } +}; + static const struct cif_match_data px30_cif_match_data = { .clks = px30_cif_clks, .clks_num = ARRAY_SIZE(px30_cif_clks), + .in_fmts = px30_in_fmts, + .in_fmts_num = ARRAY_SIZE(px30_in_fmts), }; static const struct of_device_id cif_plat_of_match[] = { From patchwork Tue Feb 20 09:39:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Riesch X-Patchwork-Id: 13563778 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A085FC48BC4 for ; Tue, 20 Feb 2024 09:42:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Cc:To:In-Reply-To: References:Message-Id:Subject:Date:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=qEmUs4XLir6Uqc++G0vXAnZEudjrsixSwNuLzpFM9i0=; b=y8wx+OkyU2ow0CEq+V/LtcXMDN bsEZLPl9Uv2s4hjLMCVRPSPZNmutb2jJaV+ydg9Asev3X8oLez0QDHeF1Vi4jA7bXEMXAqt8Xqb7K rJjaMCPnejquYaeOGYbZYRwNvMzCGUqpMxSXx4gaeN1O9L2LE+7x9ASB/soNeL2o2PmqSJzKYwO8K 6NkPFct8AaX0WTEjf46JHxrWtRynmQwq4nEjU0SgApK06JWadYpPFCKNfwIw1fef2vGVq/op1pgBj mDGooClIhvlB9uVHY+3HH+0nTVyd5qekCXO9a3UtEqnleW8G1anr1+olUx5TXd08wXdBp8ozYgkzh Weet5isg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMdc-0000000E3RP-0961; Tue, 20 Feb 2024 09:42:08 +0000 Received: from mail-he1eur04on20700.outbound.protection.outlook.com ([2a01:111:f403:260f::700] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMcC-0000000E230-35A6; Tue, 20 Feb 2024 09:40:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EN47JydzJbdy2duF7sLkmZW/pB2zGe30Z2UC5hp70tixoBiOxnuRqnu3JY/sW90zLyQdjQ86/s+cnKKcxz33UM5Eu+VBGLj/cVGq5NoV/YChppJOKkny10ebv6pWPTwtM/R+ZVr+Np3wjXfFSH6ykPD2NKrRCO0smvAm3pjtT53vDsKgDFalkcD9WM8EXHItTyiXDTN2lZwLT1lCeU2/kdwiWliJJaZPJ0IKag0sfuoGaatQ1WQ11C4rThJcXJeP4sMTP3+tiCoVetTcxefwAKr3508CWvsZccMWFAarZKMjyZ+UYB66QIDBjhYHJKn7f+Bgp9/OJ6hExDDLDlIV8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=svcCWEqKTdaOLj7tlS28oJTep61vaANv4eUsOEJStv0=; b=c97x8K6rlKmzzV+hqBwR/rxXtwkXczHiV5pXcL9Sq/Fl86k3POcJ+WBYI2GLjTFzJ6Z+hqlED1SXvHSopoNERLXZLvpKBWlscrny88oVfcLp/XlbO+g+B5lNAacPVZP9kSf59vVPWmj0qqZpLfbFO+XyXnJX2K6MlBuV5IuR2+6uXZECqlvaqn+EYRIsUPdfH3Qx9khxVDcEYvUQ4MmVdFs7xPnDcr9SRCaoL6vcEYkow3G0ZcFvMnWOuPqYnsY6zbPgLO/CPdRE7wvPVpr0zqnZ7CULKXbf3dsebE9foyqHgSSd2f00sIXy0qP7RVEkju5wM/i5G6V4gJZLl0SFBA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wolfvision.net; dmarc=pass action=none header.from=wolfvision.net; dkim=pass header.d=wolfvision.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfvision.net; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=svcCWEqKTdaOLj7tlS28oJTep61vaANv4eUsOEJStv0=; b=nBtK1IhDzsWkevBeMa1QI7aJBH1ciEIIGlR6d24I+QhovXVhK1/OExgsD1H8Mg/cBlr/ncLg3e6kshSlRL0bwod2ihcs7s8B65vp5MyPYmz8ulQjHDfVOyAYEezFe/l7eDWyr3gKGwgCD1NJwD/FcVEWazxmVVKIDEm76UKDjws= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wolfvision.net; Received: from DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) by DB9PR08MB6763.eurprd08.prod.outlook.com (2603:10a6:10:2af::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.39; Tue, 20 Feb 2024 09:40:18 +0000 Received: from DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4]) by DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4%6]) with mapi id 15.20.7270.043; Tue, 20 Feb 2024 09:40:18 +0000 From: Michael Riesch Date: Tue, 20 Feb 2024 10:39:21 +0100 Subject: [PATCH 11/14] media: rockchip: cif: make scaler support variant specific Message-Id: <20240220-v6-8-topic-rk3568-vicap-v1-11-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 , =?utf-8?q?Th=C3=A9o_Lebrun?= , Thomas Petazzoni , Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Sakari Ailus 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 X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708421995; l=2344; i=michael.riesch@wolfvision.net; s=20230803; h=from:subject:message-id; bh=GB4WBeer0yHTCcaF3Iic4k4romkbTfe6QlJh2+daQM8=; b=SHZ3lQBcHxWUyTWCGHGvLKxIwBok1VxgYrIGqHAVLuRY1y4GwI0PJHWEm1IfQXJaDX0D9YZXe i1ZfP/BQngWCxEWU7qdqcFsiY/HgrxawsbIi6uch1Kk2YHQjeRK2TX7 X-Developer-Key: i=michael.riesch@wolfvision.net; a=ed25519; pk=9ral3sulLe95bLcbaiNXTgUTRiBayRBEFZ5OVIEHp+0= X-ClientProxiedBy: VI1PR04CA0128.eurprd04.prod.outlook.com (2603:10a6:803:f0::26) To DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR08MB9155:EE_|DB9PR08MB6763:EE_ X-MS-Office365-Filtering-Correlation-Id: 7a234b08-1930-4e5d-6b24-08dc31f7f2fd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b8JWzBPt2mAa2u+z/mMufM0zRJ7Py03CYd/Yc4MAHzTXnmziW3+ZjaFKfpY8HopE/A9TuoGJHz0jNwlkImv3R1o7onN2+NL+VTraO4q1KiumQM4oeoJqQDZ7Jy5dUK2b11tk+7mr6ey7dDHV2ZKFyV+HUyeW6xex61tpA6mUC4L1XjimlAXdX/R53Nhe60Ivlc0Kc6kpxaRE5rId3K0gAeJyV13WSGyeJgqWO8vkHhy99SmOxSfG5CgbUirhsOTBBFRFs6XGHk1vFJ1xP6JAA8+KcnoWxkCaWoJi3JpPgDqFu9jSfadVxNtnvDn21yhlmvyk9GyVrmPTKbfEY+synxcYkfx5IPNzwIod8PW9aPIcrhTZ9DuLL1pNC+cL2Y2bJFoXiqihzbNp3fNbZTuSAQhQexzVXrIBV/wMqGo6n1ev64wtiIfhA+Oxj+N3WrbhHt55l1YbpUL5rVKHE+LNDFnzZr7bgtbkjOai9NbJ1tAcViD7COvpvAj3PVXJ5qE87Fiyw5k8X0yebi7xhCxpODReg6yi7uHwkYdH+7f+DbxxyjrTotgPdSpJEXTia7bxDNtQN4jfNscDSGMzgPilhA4Xah6sg+MvIjOn5YBcNZbBoDs0PY/Uvwh9YXtnh+J4x0XMqJUci7JhaApRbeWohg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR08MB9155.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(921011)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?nZZOPuLDYaxC/jIMyNPm4ohPyKqA?= =?utf-8?q?3k73BDwKtYE7Q8u96rkYH1aNo6Jm8ODOlYg3IoKNdDsi2TwySgq02LY6OjZRRsvxh?= =?utf-8?q?wyia+VGWrMgZ8EUkoNIBzipXrPuIX0UlrOitayRRxhxFPYOzXDEOQXyMtqe3XqCUG?= =?utf-8?q?Y3CGStaXSmtptisUnuRmt1d0c58XnS54JjMwNLwc+pTaD3KYO3xoEmxYsxMGRpbbg?= =?utf-8?q?7bmQSRTGqZ2dnbpsZQodlraDoZG7/g4VHYvs3qxnAMKufaddpJst4if8hFOqXqa2c?= =?utf-8?q?AG1wDA++5KIIU5HTGrswUp8NvgB3XZgq+XwU721MMptFMrvBUWK8z1e4h9fSF5N+D?= =?utf-8?q?ZwmKViFg1idVDJ9/k4eNHy/fBTQctCpfojSPp9iUO8rG+WL0lBzJsPe4wDCs0tisG?= =?utf-8?q?HiKRfFLPnI3ATtHSY8kp5nSm8xs41RCFZZM9HQMz5u7aCqvAcdkEr/XC3LMH0WEDV?= =?utf-8?q?5fPiY6xWtYFV2wzDO0tA1xQa18p9njSUJtTvZgF0suU27CZS3t0DfNbmXrrWOh0ne?= =?utf-8?q?9vw4tAegqFOogZVhwzv/Y1UlgY2GlXXe2+eCrRgi8aT4QS+JZ+LQL4/qzqX07qEnO?= =?utf-8?q?FmsumpPgSMxi8kMu7U5EACnVaQgi4QBc3sTvFtx1Qh6RlWapM81B2g2o/N4h9/ZsO?= =?utf-8?q?XWCaDqtxTbKUIVJblEGI+KjLDZpOfZMoqlVKCrhjugIQxuFDm7LbWdP0/jvg04bou?= =?utf-8?q?RzInVZ4As8kVCEqOhN/7FePhLcW9oJn2mg9DKberdiSR2ktw3ykvvzNyG6j0VB3F3?= =?utf-8?q?OESUD5WhCCcow0PQ0cZmwnjfG7spismajlyK3U8QYEp4iaeQzfY3QYAT+7njmfJkw?= =?utf-8?q?oM7kLrax5VExqKaPIODB4iEmqYmx6QVpU6/5F4mJ3pg7ZAVgmsCgnNK71O8HDlMJh?= =?utf-8?q?MqyE55rc7Eob4WTHGZI/IThmdyn9WTFFdoIUhNnIasl74y+jwZ3MNNyq0gQQhYPG3?= =?utf-8?q?PYf8l7qMdeDwuesOhMa7HCwxLEs8/0M6k5zSD3nRhTJKC3gIeaXBg7CRBDKTJpnli?= =?utf-8?q?NuqD3d/f4a+UIqZ+lMgCkqaRqmKdnDgDRQZQA3GxM0KgNghwwZywWoR9H7SDdKy4X?= =?utf-8?q?+KVvA45mIDNfv281LMCHCIrXoeTQ4yW8WTamqmTwY3LPpDK81y+sGge8+AY2QnR2L?= =?utf-8?q?kruYc7eUkU0cakG3tbrO0F9owDiL29SQ5vkAyEvTt8H79UM9uOQnppI0B5R5kxcAV?= =?utf-8?q?tbshk2kX+zYUVdOV53WBxS/grLAB++jo2ZCI2jmjV0n7HZQAtQ+EhOQomeKCVcDRu?= =?utf-8?q?yTM2lyuH82za5BlQkgermjhb57Ss1e63OWFxZCdhNmG7Esf/4HFURSJKsql+i9rf2?= =?utf-8?q?gSj3xalNyxDSn3okjNhqnSlKpIaK4QpYf8w/v41QgZkWnW+ck6oJgzruHHEGIM52h?= =?utf-8?q?FwuUBVLYvnm7xp7/spa8N1zycuLmBkTWbsSWX2b0CNRZSXpcXopEYqo4UUqf5iL+u?= =?utf-8?q?G8KNnYZwJgjekdx8/eWNPHRp2aHmr+BMj8TQnqDrVgY61zwa1e511F3y3mkJbN5Qn?= =?utf-8?q?f5pp0ansRIhPpfp/VGWmcfRPouJdOflnkg=3D=3D?= X-OriginatorOrg: wolfvision.net X-MS-Exchange-CrossTenant-Network-Message-Id: 7a234b08-1930-4e5d-6b24-08dc31f7f2fd 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:18.3847 (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: Wv2d/9lCYFsPXsR/cp93EfQWyJrewqqE0Tk7TR35KsNYshZq5YvHSH6YzoU/lQ2pB6znpVbhMMVPm7DaKd8xr9rT2fvhiZwBaV/472BMTeM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6763 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240220_014041_252870_A8A3799B X-CRM114-Status: GOOD ( 12.26 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Not all variants of the Rockchip CIF feature a scaler unit. Add variant specific Boolean variable to account for this. Signed-off-by: Michael Riesch --- drivers/media/platform/rockchip/cif/cif-capture.c | 8 +++++--- drivers/media/platform/rockchip/cif/cif-common.h | 1 + drivers/media/platform/rockchip/cif/cif-dev.c | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/cif-capture.c b/drivers/media/platform/rockchip/cif/cif-capture.c index b26e6023c2b0..dd5c45f28cdd 100644 --- a/drivers/media/platform/rockchip/cif/cif-capture.c +++ b/drivers/media/platform/rockchip/cif/cif-capture.c @@ -365,9 +365,11 @@ static int cif_stream_start(struct cif_stream *stream) cif_write(cif_dev, CIF_FRAME_STATUS, CIF_FRAME_STAT_CLS); cif_write(cif_dev, CIF_INTSTAT, CIF_INTSTAT_CLS); - cif_write(cif_dev, CIF_SCL_CTRL, (fmt_type == CIF_FMT_TYPE_YUV) ? - CIF_SCL_CTRL_ENABLE_YUV_16BIT_BYPASS : - CIF_SCL_CTRL_ENABLE_RAW_16BIT_BYPASS); + if (cif_dev->match_data->has_scaler) + cif_write(cif_dev, CIF_SCL_CTRL, + (fmt_type == CIF_FMT_TYPE_YUV) ? + CIF_SCL_CTRL_ENABLE_YUV_16BIT_BYPASS : + CIF_SCL_CTRL_ENABLE_RAW_16BIT_BYPASS); ret = cif_init_buffers(stream); if (ret) diff --git a/drivers/media/platform/rockchip/cif/cif-common.h b/drivers/media/platform/rockchip/cif/cif-common.h index 84a7545422e1..e5500705eee2 100644 --- a/drivers/media/platform/rockchip/cif/cif-common.h +++ b/drivers/media/platform/rockchip/cif/cif-common.h @@ -100,6 +100,7 @@ struct cif_match_data { const struct cif_input_fmt *in_fmts; int in_fmts_num; void (*grf_dvp_setup)(struct cif_device *cif_dev); + bool has_scaler; }; struct cif_device { diff --git a/drivers/media/platform/rockchip/cif/cif-dev.c b/drivers/media/platform/rockchip/cif/cif-dev.c index fb80e8f8dcab..e7b5ae5804ca 100644 --- a/drivers/media/platform/rockchip/cif/cif-dev.c +++ b/drivers/media/platform/rockchip/cif/cif-dev.c @@ -282,6 +282,7 @@ static const struct cif_match_data px30_cif_match_data = { .clks_num = ARRAY_SIZE(px30_cif_clks), .in_fmts = px30_in_fmts, .in_fmts_num = ARRAY_SIZE(px30_in_fmts), + .has_scaler = true, }; static const struct of_device_id cif_plat_of_match[] = { From patchwork Tue Feb 20 09:39:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Riesch X-Patchwork-Id: 13563775 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 46C1CC48BC4 for ; Tue, 20 Feb 2024 09:41:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Cc:To:In-Reply-To: References:Message-Id:Subject:Date:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=+VEA6oLeb9Jwc/L5w0+aFyqYy8UZOP+dP2kUhjjfdvQ=; b=gt04vCQDA4r8qk39+yTsTIMhB5 6HRTo65tjlrCqPanjX8NVr+cRQfop34lqC7x3pcy+dpCOhih6PutjmuwnQ1If0I2ng5LgEJKSKp5w LyOOqOdcV9Ff0fktCsPLobXfNSgq7j1UCXSloK7EW08kY8jp7iHHeAdGP34htabZr3f4QUfeSJEEt pYZptp3KwyuX+ZCetuB5wgwXocHadj8eHaxf1a++r0j3HbNeA+QASLU0ylHTlkm+84gdIOEAykZRQ LGJqADhXwyLIPiH4do1r1BGi4/4mttH2VizK+r2z9AFKnUeLQUQ0BhZApKiQ+2Q1sAMhCz9tmByz2 bNh0VGgQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMd2-0000000E37Z-3Fed; Tue, 20 Feb 2024 09:41:32 +0000 Received: from mail-he1eur04on20701.outbound.protection.outlook.com ([2a01:111:f403:260f::701] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMc0-0000000E2MU-3zBz; Tue, 20 Feb 2024 09:40:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mk+iY7saq2bdwldOFQyts1l25iZU4KpAZGjXzeswteytt5cG1SsmrGiLt6Y8X7JPM0Rx4ulqJ3+Q7MzesHB4OwcyQNRGjKZPH9/7hapyvq4zHhcF+TwsgnCfxw5jAL5/zRvpycKg+qB81AfIiYQFcdw6I0gkMJDchd8o6LhNpWMV+ED3b2uaugDZ33W2N3tlSy4yaGHW+XPSfAVz0PNJmi8xTUga3q7s6kqLvO6zM38+1c5yq8k/CC1Gi9m3bKFlAU6vByLmzdfU7Hsu8Onrk8Jw9S85hw6RcriTKVF1VyT/A0ZawsGeM71PlLW66NVs6oV2KGGu4yNYOw3+RYNHDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=boH9GrW7+OUCqgPgiUWbbmJsWcS2u7Pz66CwVac9ZVo=; b=XSY3WR75ySmIupK2v3gRi/3+mhanD5T5AuSqLL8v7sRHP2MbrsZDJSgqO4r0YIzG52k0fSF5KoN7bjmPytO3pqgsBHkPUibvfZvXkrVdYmkNJcsMFtqbn+PoKQVfuK4/8XnM5NooMZiQBid7oJoTn0a4afjkae0imk+hbkprSh2WGdWi5+o9/+bYRmpKhAMbr54iO7MsnPSIoRryO0bNRVmaGDjW5wpy7g1+av3Qt6uik8QXQa1I/KtLiv2FDSju/Ef0NWZEerEe3R+yLi6XX1VCv3WJbl7SVrVrhms/+ff8iXOBMHxJ9LjV0zh+56Ksd9PBFiKLK0Z5giUt3wBPVA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wolfvision.net; dmarc=pass action=none header.from=wolfvision.net; dkim=pass header.d=wolfvision.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfvision.net; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=boH9GrW7+OUCqgPgiUWbbmJsWcS2u7Pz66CwVac9ZVo=; b=lVeD0BZ6ENSzdJyKGb18d/ABOFpY6tVWLjZS990eQCby9bKBlESBe5iiVIns9R65mnhi68Q1R5O3avyD8ymKkzwtbk3Ye7/H6+Q+KROIztq1BlN8+osyYwkYH7VYYINbcg+jUBsesfMwl/stz/j4WbopKnBdnfq3j1VUf3IszM0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wolfvision.net; Received: from DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) by GV1PR08MB7681.eurprd08.prod.outlook.com (2603:10a6:150:60::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.32; Tue, 20 Feb 2024 09:40:21 +0000 Received: from DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4]) by DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4%6]) with mapi id 15.20.7270.043; Tue, 20 Feb 2024 09:40:20 +0000 From: Michael Riesch Date: Tue, 20 Feb 2024 10:39:22 +0100 Subject: [PATCH 12/14] media: rockchip: cif: make register access variant specific Message-Id: <20240220-v6-8-topic-rk3568-vicap-v1-12-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 , =?utf-8?q?Th=C3=A9o_Lebrun?= , Thomas Petazzoni , Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Sakari Ailus 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 X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708421995; l=4765; i=michael.riesch@wolfvision.net; s=20230803; h=from:subject:message-id; bh=obBxQWVh8Y0Fgnw+fpdRah3Rpr9ZAPUSz141wf1Voiw=; b=Y2lL2xHpFYvCYYNgdHWXnRAHBHxd/4wiFj8uYdTv9u/PTM5aTlb9Jy2IiOZlpk69fGls2DieI PNf8SfYla2QDJeBbbZut4T6pxsk4aTqKuif1wKNzBVMk0tIM/bOqfVu X-Developer-Key: i=michael.riesch@wolfvision.net; a=ed25519; pk=9ral3sulLe95bLcbaiNXTgUTRiBayRBEFZ5OVIEHp+0= X-ClientProxiedBy: VI1PR04CA0128.eurprd04.prod.outlook.com (2603:10a6:803:f0::26) To DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR08MB9155:EE_|GV1PR08MB7681:EE_ X-MS-Office365-Filtering-Correlation-Id: 35172da9-deed-42d6-8b22-08dc31f7f429 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TQLhUpl5/KGF8kcfX2RDZeuXlTbKXeiBzoY3w2rKUT0NyNrcqNrLMJIs3J09IZfE8MBe9yHKz5Zxn/Q9VWYSON2T5+aOunXLTZtRWsy9bwlAoEv/ejhn+mmsWO8WXpCxWSn+JEsLl2ugORBiZyhpQra3bMmeJolHU9g3cyCmyQWp2Z6+9RXqg95Ai6zFr+YDRaEKQ+B9ihtAh3K0Rl7CZjueft6JzZu6TeOZtx012avTtQ3jkhyEguOVb4s3EjyTLo2qM0XJO/hFSXCdX50NHDbvYEDYvA3TJBS253WfsZWqTO9JO8o/E0xD7gIOMIslWPpQHUjhADcICZ6wQZMcf8eUMUd9yWhWEGYzNvrwOcM96oSV5QcbNMKuoMgBMPgbl89JVQc11CFIcxeQBekEuUYblS9j3ZaPI01TKAky2S9CmAvEsuChIJSQMk+fOby2X4NOu0kmB4mLDeb9561b0WUl9FJGGA73bewQWXRmnRhv3BxuarUFD3PS+HVJ0MMsl1DWg9Frcu7BSGRd2CwzVvq5TDo2gHqfItsAnZVTNl+vZb600hKiX/xZ9UDUOPyTJ+fKAkOcM/kdm24yld1gtWZ6Sno/w6xNEFAUbCDA4r9HWi1T1jfNJ0WpNory/I62CMxvGFDlIFBlOm06Y1HhFQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR08MB9155.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(921011)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?W+5lbqFfEFOFKMWpObjvLRwsMhki?= =?utf-8?q?IvevM1iaFsEUNuKEk5KqDQnm4Qtijdk98PooVLpCC9zs3owkTA1t9yhQh6wAKIugw?= =?utf-8?q?LzQjmTB57uYjpwHQ6vAAJcfEmpvvpC+hZjbxN6Bi+Q7U5zYqT0jdxpp4/iFil+iwl?= =?utf-8?q?0UBQDlq1DRvFIUoyA4RUc58rDvqkLGr4JqYZEEBN65Uebh0v5s9C4b2dxsqWyoG/z?= =?utf-8?q?nqMWIFX9q1vwqKy9zJIz5yJTJTE9pIk1rc0U6PBn+TNxPAJ1ZIQJ/sJb9fM/BK3XO?= =?utf-8?q?gggQGITNM2C2BISkTXxLygVkcXL/mgufz8BoWUWNaPaKeZKBK415gozs6A23RUvqH?= =?utf-8?q?XfBcpV0V2UyCLVhyoSwv1siwUyv+mKpz7nOjp+HT297DePzGtnQqII8lnPfqpoUye?= =?utf-8?q?hUVDwxYH010633omJEhK1Mj98vbrN1+XxuCH0o8CliMjRPhar4G0VVoXGl8mPNgx+?= =?utf-8?q?RIsOgrrQTRcQybbVQ/mUvGMQVfQM2CAPOEHS8sHeNsyAN/HfkmeX0rmiiFBKt38Nt?= =?utf-8?q?OuR/J+Cp3vRl4sP11JhpPvKZHNsiN4Hgey/e3xgbvKSh4ZWOg+M5pZlJHzmt/08kw?= =?utf-8?q?vGEGC0U5qyOk9+WWRnzBcbtUZT1XtkaLm7/I7Ty8UI8cNvdd3OaFkxjbaJGr8r3JO?= =?utf-8?q?WECffkveDhYwzPb9QyrZNNnaUTwdSpttlWa/hM8qlM2AoH/V52AITgcAIJXIhDirk?= =?utf-8?q?92jcRqG649PAdfGYPSRjhe3zFMpERxJJPrGhIHxVHJdxmpVmbTMVB3vkuBXKz7sWz?= =?utf-8?q?LJFvTPMQ+jln+qZf+x5LEvAtxxMN8Vo3Rgstc57ugKyENVB/LGzQsXPJ7iln2Sd8+?= =?utf-8?q?3OltseW50Wt+OpCvY/caOFY+bwwQhjwAnzSPXUDU3yuTdNEyFz4hug8DYI+4FgHO7?= =?utf-8?q?XN+3DyGBYTZX7TwRLM0T7dpE03o4SJDqnUGdy9Bc5zNOgyZhgWLxt9BbGQFC7QHSk?= =?utf-8?q?o4rSESgh8gXWTDrV+P5Cs2tfXVEU67S3chjwYXKd2PwLldeV/33BnE72f7Uble0BS?= =?utf-8?q?u1Xa8MGEwQV5U1VAuPjafBXdFPmFUurBdto7E4yDnp8wA8fHchIihdKc5EzhQb2PV?= =?utf-8?q?fc+dg4SZbNacY+ORAueLIEOuQ/Qynk5gEpUKmStAQKxVA+8PJHaIewQ16ZVPZeWeU?= =?utf-8?q?1Ft5UyJtSKZ1GdQMJkKVILWrrbC7huXGS3ar8whH+bo1N3VWvpWlHcUFR3AndLyWr?= =?utf-8?q?9A1Jg3RfcjykIIlvzZDrRIW3VqbCxyAuGPXSBugKyE+VxoBT/Wmi+D8HtbzBFHZ8h?= =?utf-8?q?2onyeofpHX6HqfWxJRI5B1IH8Z9kE3GzkKf53HN1ghStS48k30MSHugtyNBi0Euv9?= =?utf-8?q?+hTrdbGT6PfWSfMGMz6vj87mZjOdIkBx/mFjkfVdGBu1KcQTUo+h4Ye40zYFbSZW+?= =?utf-8?q?SPioF4x7ulFXBKatsGezMKAhzlzCnnx8d5JGR/+6cLY7BfiQis1/a6NqlamFJJ2og?= =?utf-8?q?rERcswZKfab3XYC6Hp0nafYWxnXXbFLe0upRn8DFyY9G22UnhxyMpPeL+2rJmP4vE?= =?utf-8?q?Uv++SSAY6YO+4CWQqRmfYIQEnqfsxyr7sA=3D=3D?= X-OriginatorOrg: wolfvision.net X-MS-Exchange-CrossTenant-Network-Message-Id: 35172da9-deed-42d6-8b22-08dc31f7f429 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:20.3638 (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: r7vTBWUv2SN1g1b9M+SfotGVwY8xgrM2/iWj59suFNjr/NAGj4o/pBxpgVaNQ42pV+7QCUOyc4Ts6Iwpn0u1q9EKY5TEFw6nCEGbfpzBeIQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR08MB7681 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240220_014029_645314_974E947D X-CRM114-Status: GOOD ( 14.12 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org The offsets of the Rockchip CIF registers may differ between the different variants. Modify the cif_{read,write} methods in order to support variant specific register offsets Signed-off-by: Michael Riesch --- drivers/media/platform/rockchip/cif/cif-common.h | 26 ++++++++++++- drivers/media/platform/rockchip/cif/cif-dev.c | 17 +++++++++ drivers/media/platform/rockchip/cif/cif-regs.h | 47 ++++++++++-------------- 3 files changed, 61 insertions(+), 29 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/cif-common.h b/drivers/media/platform/rockchip/cif/cif-common.h index e5500705eee2..7ecdc820171e 100644 --- a/drivers/media/platform/rockchip/cif/cif-common.h +++ b/drivers/media/platform/rockchip/cif/cif-common.h @@ -19,6 +19,8 @@ #include #include +#include "cif-regs.h" + #define CIF_DRIVER_NAME "rockchip-cif" #define CIF_MAX_BUS_CLK 8 @@ -101,6 +103,7 @@ struct cif_match_data { int in_fmts_num; void (*grf_dvp_setup)(struct cif_device *cif_dev); bool has_scaler; + unsigned int regs[CIF_REGISTERS_MAX]; }; struct cif_device { @@ -121,14 +124,33 @@ struct cif_device { const struct cif_match_data *match_data; }; -static inline void cif_write(struct cif_device *cif_dev, unsigned int addr, +static inline unsigned int cif_get_addr(struct cif_device *cif_device, + unsigned int index) +{ + if (index >= CIF_REGISTERS_MAX) + return CIF_REGISTERS_INVALID; + + return cif_device->match_data->regs[index]; +} + +static inline void cif_write(struct cif_device *cif_dev, unsigned int index, u32 val) { + unsigned int addr = cif_get_addr(cif_dev, index); + + if (addr == CIF_REGISTERS_INVALID) + return; + writel(val, cif_dev->base_addr + addr); } -static inline u32 cif_read(struct cif_device *cif_dev, unsigned int addr) +static inline u32 cif_read(struct cif_device *cif_dev, unsigned int index) { + unsigned int addr = cif_get_addr(cif_dev, index); + + if (addr == CIF_REGISTERS_INVALID) + return 0; + return readl(cif_dev->base_addr + addr); } diff --git a/drivers/media/platform/rockchip/cif/cif-dev.c b/drivers/media/platform/rockchip/cif/cif-dev.c index e7b5ae5804ca..929ea39dd832 100644 --- a/drivers/media/platform/rockchip/cif/cif-dev.c +++ b/drivers/media/platform/rockchip/cif/cif-dev.c @@ -283,6 +283,23 @@ static const struct cif_match_data px30_cif_match_data = { .in_fmts = px30_in_fmts, .in_fmts_num = ARRAY_SIZE(px30_in_fmts), .has_scaler = true, + .regs = { + [CIF_CTRL] = 0x00, + [CIF_INTEN] = 0x04, + [CIF_INTSTAT] = 0x08, + [CIF_FOR] = 0x0c, + [CIF_LINE_NUM_ADDR] = 0x10, + [CIF_FRM0_ADDR_Y] = 0x14, + [CIF_FRM0_ADDR_UV] = 0x18, + [CIF_FRM1_ADDR_Y] = 0x1c, + [CIF_FRM1_ADDR_UV] = 0x20, + [CIF_VIR_LINE_WIDTH] = 0x24, + [CIF_SET_SIZE] = 0x28, + [CIF_SCL_CTRL] = 0x48, + [CIF_FRAME_STATUS] = 0x60, + [CIF_LAST_LINE] = 0x68, + [CIF_LAST_PIX] = 0x6c, + }, }; static const struct of_device_id cif_plat_of_match[] = { diff --git a/drivers/media/platform/rockchip/cif/cif-regs.h b/drivers/media/platform/rockchip/cif/cif-regs.h index b8500f0a9ac1..2ce756fde204 100644 --- a/drivers/media/platform/rockchip/cif/cif-regs.h +++ b/drivers/media/platform/rockchip/cif/cif-regs.h @@ -9,33 +9,26 @@ #ifndef _CIF_REGS_H #define _CIF_REGS_H -#define CIF_CTRL 0x00 -#define CIF_INTEN 0x04 -#define CIF_INTSTAT 0x08 -#define CIF_FOR 0x0c -#define CIF_LINE_NUM_ADDR 0x10 -#define CIF_FRM0_ADDR_Y 0x14 -#define CIF_FRM0_ADDR_UV 0x18 -#define CIF_FRM1_ADDR_Y 0x1c -#define CIF_FRM1_ADDR_UV 0x20 -#define CIF_VIR_LINE_WIDTH 0x24 -#define CIF_SET_SIZE 0x28 -#define CIF_SCM_ADDR_Y 0x2c -#define CIF_SCM_ADDR_U 0x30 -#define CIF_SCM_ADDR_V 0x34 -#define CIF_WB_UP_FILTER 0x38 -#define CIF_WB_LOW_FILTER 0x3c -#define CIF_WBC_CNT 0x40 -#define CIF_CROP 0x44 -#define CIF_SCL_CTRL 0x48 -#define CIF_SCL_DST 0x4c -#define CIF_SCL_FCT 0x50 -#define CIF_SCL_VALID_NUM 0x54 -#define CIF_LINE_LOOP_CTR 0x58 -#define CIF_FRAME_STATUS 0x60 -#define CIF_CUR_DST 0x64 -#define CIF_LAST_LINE 0x68 -#define CIF_LAST_PIX 0x6c +enum cif_register { + CIF_CTRL, + CIF_INTEN, + CIF_INTSTAT, + CIF_FOR, + CIF_LINE_NUM_ADDR, + CIF_FRM0_ADDR_Y, + CIF_FRM0_ADDR_UV, + CIF_FRM1_ADDR_Y, + CIF_FRM1_ADDR_UV, + CIF_VIR_LINE_WIDTH, + CIF_SET_SIZE, + CIF_SCL_CTRL, + CIF_FRAME_STATUS, + CIF_LAST_LINE, + CIF_LAST_PIX, + CIF_REGISTERS_MAX, + CIF_REGISTERS_INVALID, +}; + #define CIF_FETCH_Y_LAST_LINE(VAL) ((VAL) & 0x1fff) #define CIF_CTRL_ENABLE_CAPTURE BIT(0) From patchwork Tue Feb 20 09:39:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Riesch X-Patchwork-Id: 13563777 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5E9EDC48BC3 for ; Tue, 20 Feb 2024 09:42:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Cc:To:In-Reply-To: References:Message-Id:Subject:Date:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=e6wy8BdfDnbhFfNRNvNqsKdVY7+dvFQzAT/gFKWYJIw=; b=iULh88DqMgrG66OIz3LGSztn4h GbM5eREsb/P4uNNAFGwkmZY8KY6e9zXZqVL2ajpflWSwOcRgY38z1pQCT5S2Asd5yl2KmOCtRdXKI vUczm1dRVmgxwbxGpqJ7biuzdlw0q2fwDUH+nj03829CgxhwMDJqNHnC4n780XKqdrRzuFxDZ4bnp Pz1wGCcUdQwVhZtSDX1yo2CfceWN3f2iXuRP3Y/5v+jWtCSmiQs8ytdKeJX9w7EpSyVvBPg0jtfwW 3xetsUb7CAIDdO8IHo9BxCgqHFrFP00g2PeBbAi5rI2rA3db5ZoIVNmRRRIHPpQcHBokojpLTAs3s 37PvmjpQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMdY-0000000E3O8-04Vf; Tue, 20 Feb 2024 09:42:04 +0000 Received: from mail-he1eur04on20701.outbound.protection.outlook.com ([2a01:111:f403:260f::701] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMc7-0000000E2MU-13rH; Tue, 20 Feb 2024 09:40:48 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ro07HGmIRACpjYnQVCKpNfKFfcDFLJMYTQpP0y1itk7/oXpbfbAsPFaLgPvOwqgMndZZ8Pdgm2RTvfLBRpamsZbQYdlyb1tDWi5DUOIFnX5lqxYBigNzuHbbsVdGpTIpqhnQJC+NnJkiO4LA4k550UO5NUATQ6/pgZxKwpm6RAE9AgAvxeOTlyq/mQ6nOfSJ3TAfK7tGMzRYzrzTbZAfkBpsL3xGkA2SKyb/q+7KphjExGA9mKNIQEg9NWr6hyKijaAEhyiWLL6TjM494k4bpL0ggfX+kLdMlLsuE6fzgnpq42B81Fx9XIL1FcO6F8tMqrtH8Ndg518rK7C7MYJOMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=8qfr+Qy7s3fqAc7HhNtMhVOBc72tDs9HdCFnwzWlVIo=; b=hEwnL10364e3IG8ydvgHNxm9RVT0ZXpaoDdfsIwJ4+OgHYQVueCSsfE+QbgjvJpy+SM8A3nIoWAunVCusAK4N8o+JxBJZH7FbP9xbkK+LGIInpsdiqdpA71TO1/kqdufleIy+Beqoi0QZw1l50lMoeTDQga9A+lmo1DdR4tGMzgVVM4rnwdRM+dvVKafX9Rvar+cQ/pMgQun7c9ZOnln64MW6C1OadO1Q+2RvXWNQRI1FLIRaLSfDN8kZHqx/hf6ErdA/L0G6VirhvQbaINBPl2xMA0KcDnO6g4QuwqDm4As8oNyRgcWeCNfa+JWV1r4sZMdQ0aATlIEcaDTdJ2lTw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wolfvision.net; dmarc=pass action=none header.from=wolfvision.net; dkim=pass header.d=wolfvision.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfvision.net; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8qfr+Qy7s3fqAc7HhNtMhVOBc72tDs9HdCFnwzWlVIo=; b=zPLna+m8YTm7dm+EwBDidriWN91AT2T47ZuIlhhkPPsVYbW5YAfLW7FYL/ztbjFOZlYNZF14fJzYyTxv7E/d8HrgqQbX8V35Q+Q0ufUuB5uZxhmHNWKNs4IzJQSwNQ2NGyVZYgeaexuGHodoS/FbeKMA6fur2TRX1/lZcmCxaN0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wolfvision.net; Received: from DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) by GV1PR08MB7681.eurprd08.prod.outlook.com (2603:10a6:150:60::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.32; Tue, 20 Feb 2024 09:40:22 +0000 Received: from DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4]) by DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4%6]) with mapi id 15.20.7270.043; Tue, 20 Feb 2024 09:40:22 +0000 From: Michael Riesch Date: Tue, 20 Feb 2024 10:39:23 +0100 Subject: [PATCH 13/14] media: rockchip: cif: add support for rk3568 vicap Message-Id: <20240220-v6-8-topic-rk3568-vicap-v1-13-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 , =?utf-8?q?Th=C3=A9o_Lebrun?= , Thomas Petazzoni , Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Sakari Ailus 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 X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708421995; l=10682; i=michael.riesch@wolfvision.net; s=20230803; h=from:subject:message-id; bh=P9Qxsw9kjyeE5rbxicA+k/0vkgilDJms8XWxah2XXTE=; b=AdirQIj9JolCGpJ3i/cVeTkZRxGso9vf0xUn8Q+zjsuocZy/Fu0BOCXFy3Wtedfi+kye5grBs Jq66aqW0oeDDUBmolBvR6oJconbVU25f+EkswsYTAmOA3ilWVm5LQKf X-Developer-Key: i=michael.riesch@wolfvision.net; a=ed25519; pk=9ral3sulLe95bLcbaiNXTgUTRiBayRBEFZ5OVIEHp+0= X-ClientProxiedBy: VI1PR04CA0128.eurprd04.prod.outlook.com (2603:10a6:803:f0::26) To DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR08MB9155:EE_|GV1PR08MB7681:EE_ X-MS-Office365-Filtering-Correlation-Id: 1a5f7d57-60ad-4390-f70c-08dc31f7f55b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: N+Vgm2EOxCYGT0zLYarKoqGeWqi09v0GRPvMBaL3ZIag6b5YZqwNcf57OfFFEx8NTPzNz0Gl1AwA11NrlP20WcP/mvtunlXToqQ977PX07iuxEDXw2mfEYGaTuuT4UV5xDBYS+GdSI/DRbBkGK38wk5P5d+I8vP7j02dKgKOIOUea2Ipee3FhaWRtWOReTwAltPKZgcYQi5MFME2QFm+cZ629MrAUv+dqScA/tj3BXV3QIvcb0PL3DFUTmVdiD6GSPlk8BTEj2X5yTQR3Jnx3m1p8EuWWVy+/mCy7or3qD+IonJkDoLp9wEvWSK5OZ/b8/OesC2PqvrDfw8+p0H2yBEooLYB81Mq1kEF8BD5uz9IzUxXMulRoXMFHurAJj/fGsKJ7knBZTCdv4l7WV3IUFSxDENEEKrzbi4ZGW3UJc+ybApH1xZ4nBX6CMSSXcSzdqNH8P/l/ozEPXQZGvvqMzT2SQ0+cTdFsysjrGTLFDoKd8r/MEd/fhMIdtpqL5U8FsK2xkiscx/GkFE3RGgucgAQgnQyyNyJtyExuQDkj6j7HxyYL0b8C2VmnzXSEK336IxhDdzxcbMjk1aSvBi8Yj7iPzZR2qYpVp5uM9QsMnrF228tB/J/l06RLnZ2fhyEFtceQXE+ya/41a0npUTiCg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR08MB9155.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(921011)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?VoOyY+Xca+Gbb9AsAkmQ3X69U3SL?= =?utf-8?q?Y07oNh3DZWfVgICNoYPLm33dGMJGQxMAIqZ6iJKKCemvnnHW819FJOGc3TO67/MhE?= =?utf-8?q?lBUx6m2seRqu/V3Insdv5NYWA4Z6wpyXwNIUq6l7LkphRNxlodI5KOn4Fo8gAdCSa?= =?utf-8?q?isTtBI13Bz8LG/X8XWvrz+DGqCfKwuEUklkN6GpA5558TUlXQEKdQaw8jXC478URe?= =?utf-8?q?AzPC7Y8zdCkeNIyVn63FCyE7soIHRZ63TiYIJiFQPkmluLKUFbdd/5i0XeThlckF/?= =?utf-8?q?Ezr5A4e7vxCCQ0zus0I/eYlXxLP3UfBFCwZ1QVFtE8O4PNYF3gQJq0OTjoPqLuiEQ?= =?utf-8?q?fxyQl8OSaYDNxu5PZ0oGUM/9aU1RsIJFfI6owGIhwCVVWl4e8ikHA060JUHrNizK4?= =?utf-8?q?OvkWqTh+mu+Dn9YYQ4FzjlVaCf5osqGElapa7ILdnwx2FHiUeLts9emS1qZWPLsIq?= =?utf-8?q?PvgUEcP8hsuEDFpq9OLmyWNVhm7CwNnilIO49KSTiXUauuqwjio4evtOQu6hf3ch5?= =?utf-8?q?M8m2Q79C438SO+h9ceMsb4JPIbFV3xYFsVVckQNVCHNC6bB4kLuSIL0O3YG7I1l46?= =?utf-8?q?VOcMr63LyGbxSYIOG7+P4i+Rjsc9+D4hfKavhUoa7ivOeHoHemuTm8CmMF27C/H5p?= =?utf-8?q?sgYepBHmLIHQUhFVSSEqhHSEsD8vODt3h90m2BAqVunD3ge4/tqWu+Dano5V8LzBI?= =?utf-8?q?PA6SfHeYFCq0M6WkZdcfnY0/pcZhuyDwbZooDZpCJKY3PmAa6EqkmPSJNtRD6+Lva?= =?utf-8?q?ijPD1/JyiNV/lkGcQSsoI1Y88g9kfIPfIdE0zh96xfVvh+yrJmKSxkBdoRM36lo6q?= =?utf-8?q?SWY3+7Ckx6kmcE9m2QVzOKJrbRb6kOGCkatugKLvURiotCDQUIcXyKXS5RkdEoQWI?= =?utf-8?q?uba/SLsXS76jYyWzQq5YU7p0L4QMI9VGj8TAYarW0URP42NPFFlnq2bOKumXInrlL?= =?utf-8?q?EBgpjX+noHyTRWvg4iEkmWTu0pyiK6Zl2yMJVDofMfYUaPUtLgDTFlrM/ooP/ZLzh?= =?utf-8?q?7z8rsl3LkdU3raqxfacxr3eDpjTDo9cInSZ/uN0vsqiWqJLUXvPlEs7widek/92ST?= =?utf-8?q?wI4KbnxN/Hsgh+qqJjcCLxofjHV1TSiuFw12KDY6a7xjXHHPiep7Hv5jbKlpovcvv?= =?utf-8?q?ic7rN1yBsPrinJAyYPyQrQdVseiFkhZjVcRijVJmkTWUxHxUSsDFo+YxHvQEy2ALr?= =?utf-8?q?DrfLAXpMxfIh15z+YFb0Ru8p40VycwOBd+YBdDOG+XEHU7lmKpXdqls0OFjImvfr6?= =?utf-8?q?WBgrnfGw/lvLsAFLsJFfaXTJYprIe2QcFWpwfq9xib0ix6rkDVnKo6nLKupRW78sp?= =?utf-8?q?4X+H75xxpBHAkgzQUvicJq4cZ8DX2JomJ8QlJnX9iGyImhQ0e+P1Xs8bdk5XKLEY+?= =?utf-8?q?3jPHAmH2gZrKJ9DKNP0r+MyPzES296U3Llu1ovShLkx1yw845KL9ac0ZPjZR3zljA?= =?utf-8?q?bpxoW1TYI43zBaMl1IVaaZ7KHyC2Xo4jl5ZQhmo+Z4TeEGSgT2QFN3iXtkScloiqP?= =?utf-8?q?+RiBHgq56ZWFTXI4K7OF9ql8xWQA/cd7zw=3D=3D?= X-OriginatorOrg: wolfvision.net X-MS-Exchange-CrossTenant-Network-Message-Id: 1a5f7d57-60ad-4390-f70c-08dc31f7f55b 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:22.3631 (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: DHrLfHlV9CNgV9LPTEcx5Baj9LiA3U3syKCSn6PyMH88L8WgzC2JIU752qI+PTVLqg75bmEhLqEF4/AvwGEjkIRz3Qy4KURSoYXnxWJGUOE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR08MB7681 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240220_014035_749502_59548D13 X-CRM114-Status: GOOD ( 11.99 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Add support for the Rockchip RK3568 video capture (VICAP) block. Signed-off-by: Michael Riesch --- drivers/media/platform/rockchip/cif/cif-capture.c | 6 + drivers/media/platform/rockchip/cif/cif-dev.c | 247 ++++++++++++++++++++++ drivers/media/platform/rockchip/cif/cif-regs.h | 9 + 3 files changed, 262 insertions(+) diff --git a/drivers/media/platform/rockchip/cif/cif-capture.c b/drivers/media/platform/rockchip/cif/cif-capture.c index dd5c45f28cdd..d0e8f3b49d38 100644 --- a/drivers/media/platform/rockchip/cif/cif-capture.c +++ b/drivers/media/platform/rockchip/cif/cif-capture.c @@ -340,6 +340,7 @@ static int cif_stream_start(struct cif_stream *stream) u32 val, fmt_type, xfer_mode = 0; struct cif_device *cif_dev = stream->cifdev; struct cif_remote *remote_info = &cif_dev->remote; + struct v4l2_mbus_config_parallel *parallel; int ret; u32 input_mode; @@ -351,6 +352,11 @@ static int cif_stream_start(struct cif_stream *stream) CIF_FORMAT_INPUT_MODE_NTSC : CIF_FORMAT_INPUT_MODE_PAL; + parallel = &cif_dev->vep.bus.parallel; + if ((parallel->bus_width == 16) && + (parallel->flags & V4L2_MBUS_PCLK_SAMPLE_DUALEDGE)) + xfer_mode |= CIF_FORMAT_BT1120_CLOCK_DOUBLE_EDGES; + val = input_mode | stream->cif_fmt_out->fmt_val | stream->cif_fmt_in->dvp_fmt_val | xfer_mode; cif_write(cif_dev, CIF_FOR, val); diff --git a/drivers/media/platform/rockchip/cif/cif-dev.c b/drivers/media/platform/rockchip/cif/cif-dev.c index 929ea39dd832..3b895b496c45 100644 --- a/drivers/media/platform/rockchip/cif/cif-dev.c +++ b/drivers/media/platform/rockchip/cif/cif-dev.c @@ -302,11 +302,258 @@ static const struct cif_match_data px30_cif_match_data = { }, }; +static const struct cif_input_fmt rk3568_in_fmts[] = { + { + .mbus_code = MEDIA_BUS_FMT_YUYV8_2X8, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_YUYV, + .fmt_type = CIF_FMT_TYPE_YUV, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_YUYV8_2X8, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_YUYV, + .fmt_type = CIF_FMT_TYPE_YUV, + .field = V4L2_FIELD_INTERLACED, + }, { + .mbus_code = MEDIA_BUS_FMT_YVYU8_2X8, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_YVYU, + .fmt_type = CIF_FMT_TYPE_YUV, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_YVYU8_2X8, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_YVYU, + .fmt_type = CIF_FMT_TYPE_YUV, + .field = V4L2_FIELD_INTERLACED, + }, { + .mbus_code = MEDIA_BUS_FMT_UYVY8_2X8, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_UYVY, + .fmt_type = CIF_FMT_TYPE_YUV, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_UYVY8_2X8, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_UYVY, + .fmt_type = CIF_FMT_TYPE_YUV, + .field = V4L2_FIELD_INTERLACED, + }, { + .mbus_code = MEDIA_BUS_FMT_VYUY8_2X8, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_VYUY, + .fmt_type = CIF_FMT_TYPE_YUV, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_VYUY8_2X8, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_VYUY, + .fmt_type = CIF_FMT_TYPE_YUV, + .field = V4L2_FIELD_INTERLACED, + }, { + .mbus_code = MEDIA_BUS_FMT_YUYV8_1X16, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_YUYV | + CIF_FORMAT_INPUT_MODE_BT1120 | + CIF_FORMAT_BT1120_TRANSMIT_PROGRESS, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_YUYV8_1X16, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_YUYV | + CIF_FORMAT_INPUT_MODE_BT1120, + .field = V4L2_FIELD_INTERLACED, + }, { + .mbus_code = MEDIA_BUS_FMT_YVYU8_1X16, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_YVYU | + CIF_FORMAT_INPUT_MODE_BT1120 | + CIF_FORMAT_BT1120_TRANSMIT_PROGRESS, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_YVYU8_1X16, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_YVYU | + CIF_FORMAT_INPUT_MODE_BT1120, + .field = V4L2_FIELD_INTERLACED, + }, { + .mbus_code = MEDIA_BUS_FMT_UYVY8_1X16, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_YUYV | + CIF_FORMAT_INPUT_MODE_BT1120 | + CIF_FORMAT_BT1120_YC_SWAP | + CIF_FORMAT_BT1120_TRANSMIT_PROGRESS, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_UYVY8_1X16, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_YUYV | + CIF_FORMAT_BT1120_YC_SWAP | + CIF_FORMAT_INPUT_MODE_BT1120, + .field = V4L2_FIELD_INTERLACED, + }, { + .mbus_code = MEDIA_BUS_FMT_VYUY8_1X16, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_YVYU | + CIF_FORMAT_INPUT_MODE_BT1120 | + CIF_FORMAT_BT1120_YC_SWAP | + CIF_FORMAT_BT1120_TRANSMIT_PROGRESS, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_VYUY8_1X16, + .dvp_fmt_val = CIF_FORMAT_YUV_INPUT_422 | + CIF_FORMAT_YUV_INPUT_ORDER_YVYU | + CIF_FORMAT_BT1120_YC_SWAP | + CIF_FORMAT_INPUT_MODE_BT1120, + .field = V4L2_FIELD_INTERLACED, + }, { + .mbus_code = MEDIA_BUS_FMT_SBGGR8_1X8, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_8, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_SGBRG8_1X8, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_8, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_SGRBG8_1X8, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_8, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_SRGGB8_1X8, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_8, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_SBGGR10_1X10, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_10, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_SGBRG10_1X10, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_10, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_SGRBG10_1X10, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_10, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_SRGGB10_1X10, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_10, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_SBGGR12_1X12, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_12, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_SGBRG12_1X12, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_12, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_SGRBG12_1X12, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_12, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_SRGGB12_1X12, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_12, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_RGB888_1X24, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_Y8_1X8, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_8, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_Y10_1X10, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_10, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, { + .mbus_code = MEDIA_BUS_FMT_Y12_1X12, + .dvp_fmt_val = CIF_FORMAT_INPUT_MODE_RAW | + CIF_FORMAT_RAW_DATA_WIDTH_12, + .fmt_type = CIF_FMT_TYPE_RAW, + .field = V4L2_FIELD_NONE, + }, +}; + +static struct clk_bulk_data rk3568_cif_clks[] = { + { .id = "aclk", }, + { .id = "hclk", }, + { .id = "dclk", }, + { .id = "iclk", }, +}; + +static void rk3568_grf_dvp_setup(struct cif_device *cif_dev) +{ + u32 con1 = RK3568_GRF_WRITE_ENABLE(RK3568_GRF_VI_CON1_CIF_DATAPATH); + + if (cif_dev->vep.bus.parallel.flags & V4L2_MBUS_PCLK_SAMPLE_DUALEDGE) + con1 |= RK3568_GRF_VI_CON1_CIF_DATAPATH; + + regmap_write(cif_dev->grf, RK3568_GRF_VI_CON1, con1); +} + +static const struct cif_match_data rk3568_cif_match_data = { + .clks = rk3568_cif_clks, + .clks_num = ARRAY_SIZE(rk3568_cif_clks), + .grf_dvp_setup = rk3568_grf_dvp_setup, + .in_fmts = rk3568_in_fmts, + .in_fmts_num = ARRAY_SIZE(rk3568_in_fmts), + .has_scaler = false, + .regs = { + [CIF_CTRL] = 0x00, + [CIF_INTEN] = 0x04, + [CIF_INTSTAT] = 0x08, + [CIF_FOR] = 0x0c, + [CIF_LINE_NUM_ADDR] = 0x2c, + [CIF_FRM0_ADDR_Y] = 0x14, + [CIF_FRM0_ADDR_UV] = 0x18, + [CIF_FRM1_ADDR_Y] = 0x1c, + [CIF_FRM1_ADDR_UV] = 0x20, + [CIF_VIR_LINE_WIDTH] = 0x24, + [CIF_SET_SIZE] = 0x28, + [CIF_FRAME_STATUS] = 0x3c, + [CIF_LAST_LINE] = 0x44, + [CIF_LAST_PIX] = 0x48, + }, +}; + static const struct of_device_id cif_plat_of_match[] = { { .compatible = "rockchip,px30-vip", .data = &px30_cif_match_data, }, + { + .compatible = "rockchip,rk3568-vicap", + .data = &rk3568_cif_match_data, + }, {}, }; diff --git a/drivers/media/platform/rockchip/cif/cif-regs.h b/drivers/media/platform/rockchip/cif/cif-regs.h index 2ce756fde204..261bc71240f2 100644 --- a/drivers/media/platform/rockchip/cif/cif-regs.h +++ b/drivers/media/platform/rockchip/cif/cif-regs.h @@ -117,4 +117,13 @@ enum cif_register { #define CIF_CROP_Y_SHIFT 16 #define CIF_CROP_X_SHIFT 0 +/* GRF register offsets */ +#define RK3568_GRF_VI_CON0 0x340 +#define RK3568_GRF_VI_CON1 0x344 +#define RK3568_GRF_VI_STATUS0 0x348 + +#define RK3568_GRF_VI_CON1_CIF_DATAPATH BIT(9) + +#define RK3568_GRF_WRITE_ENABLE(x) ((x) << 16) + #endif From patchwork Tue Feb 20 09:39:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Riesch X-Patchwork-Id: 13563776 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9829DC48BC4 for ; Tue, 20 Feb 2024 09:41:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Cc:To:In-Reply-To: References:Message-Id:Subject:Date:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=10ilFJtr9fmW8vA3OoaVyYmvW2sRY7mKR8FdhYHXZgA=; b=3yBjFYW2FADY1wWvGOo2We1JqX WkDbn+IfY0jG8JzL5rFF3UTADKWCBSLCyKvuplX06ulIUaxA3h2S/7d38qtkHUvPZvpqFLIjfq8JA /Z46j1RjfkJnAM3OnroPMkGJ1v33pPTpkOE0aUoXXoULGCDG/8zSZMubS5EOBVXuNUAIaxqi58jyV rxLc14O/L4s5RTYzpsAZcvrKYZTL86MvIYGxwrs4pDtMppBmPqnKVcDFi2BT8JpVk8Gf+RZMsBv9F UDvfu4p7erJU+dHESYgyHNAJ0Xbr3ZSZ98BvRtiYbcghxO0R+Sk2/O9+8EZq3UWD+O6w3AP2WLWZV pKORWV6g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMdD-0000000E3Eb-07N0; Tue, 20 Feb 2024 09:41:43 +0000 Received: from mail-vi1eur04on20701.outbound.protection.outlook.com ([2a01:111:f403:2611::701] helo=EUR04-VI1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMc2-0000000E2NK-0aKN; Tue, 20 Feb 2024 09:40:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bGL/JCN0L6WcnI5q6/sQlj8rY2fNbhxLF8xd0EkIxAm8dLfc/q6PYqH3lITmBwd1elMCGl4pMBz88dTaK68ih2U1hrbrCqtpS4linKhUR7e7p+AMgLE84MXrklWkEk1h32rFa1o2CBFyVLcknImnqKiHIZ9V8qEkwvr+T7icecW4DAQ1k26n+52448rlKo+Sqz1e/BI/9huCifv7MskaicDslmza7IdaK92bS3ypYeQNRNyeWydMUki+FPOvRymbAoZ3CU7b+RbmS27fjXb4dqXrbLNbkgmZ+L+42dkDraEiZQxDzrYM+hIQ3HEDMvBe+OMgeUWgbEXfFQ2YLuen8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=lFBNepf4pT5Z+UVSMHeI4wc9QqXpHqSP5xxqc77jhS0=; b=QRlt/fhtbDgz78p/bmH0ldVCKgbFIyyvhZ1gwVxJAZfNK5FI04CSYg/1HgZetjHJx1YNwsjqswggL5P8wFJ0FlRhfjQplKzf+IZ4gLuyZ0+KksEGVFF+n07mjBeSjQ4VLi4uEuXJAm4Kzja7vZ8d3oU0rFOMnxfHk1G9Ewf6T0abbo8D8b2BhFnbNiUX4WYGysRg+zVNiPHdkxWYo0iZkYZU9C9sq4wJLoApLN2sozWIs3s31iyQqgz4JRb97iigGk1H6vwSTKUFYb5ZTFy51wWoD9bV7IktqhQiT+1ZvWcYkOtlVTVG1vz2Ojef5z1o5bTxAv2ZISQC0RlUL5ZvPA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wolfvision.net; dmarc=pass action=none header.from=wolfvision.net; dkim=pass header.d=wolfvision.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfvision.net; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lFBNepf4pT5Z+UVSMHeI4wc9QqXpHqSP5xxqc77jhS0=; b=xi5Ov/s6+Azv0UPA+/YcD3D/zthHoLbw1kzctYxyYjjEviTYgAJOIqsbVcU1TyplyiJ7x5RWMKkwj2yODtVud1RlgnBAJjoQzchg59ax1dKhTdM+csOOLcOOr6ziRNXyNTnfPyPP8u1kkCAHPu6CuACi2hUk9kPmI9Kp5nhvxgE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wolfvision.net; Received: from DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) by DB4PR08MB9357.eurprd08.prod.outlook.com (2603:10a6:10:3f3::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.39; Tue, 20 Feb 2024 09:40:24 +0000 Received: from DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4]) by DU0PR08MB9155.eurprd08.prod.outlook.com ([fe80::7409:db60:8209:c9f4%6]) with mapi id 15.20.7270.043; Tue, 20 Feb 2024 09:40:24 +0000 From: Michael Riesch Date: Tue, 20 Feb 2024 10:39:24 +0100 Subject: [PATCH 14/14] arm64: dts: rockchip: add vicap node to rk356x Message-Id: <20240220-v6-8-topic-rk3568-vicap-v1-14-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 , =?utf-8?q?Th=C3=A9o_Lebrun?= , Thomas Petazzoni , Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Sakari Ailus 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 X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708421995; l=2396; i=michael.riesch@wolfvision.net; s=20230803; h=from:subject:message-id; bh=RKZXPNXHmUaOg5wL+hV6LweGPMEPN+5I6UNCMOLdLas=; b=J8OtPxGHxTeFBcoWvj2EBzbRwi1DObzht3jj3cSjTISl1PYORzE+Y0n5WAK+yZElkPJmUAARN ivdndc10u4/BsiCucaFKJdTxkt1ptSSoOTD1kaSslea4UXFGiE474ah X-Developer-Key: i=michael.riesch@wolfvision.net; a=ed25519; pk=9ral3sulLe95bLcbaiNXTgUTRiBayRBEFZ5OVIEHp+0= X-ClientProxiedBy: VI1PR04CA0128.eurprd04.prod.outlook.com (2603:10a6:803:f0::26) To DU0PR08MB9155.eurprd08.prod.outlook.com (2603:10a6:10:416::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR08MB9155:EE_|DB4PR08MB9357:EE_ X-MS-Office365-Filtering-Correlation-Id: c1a1c8d8-93aa-4b0d-51c3-08dc31f7f6c7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fp7OkyOO7SX8TTu90S8JA5ZOfQkQUk4fQ2kviKXxAWjDdb/lZV5ul1yFuYjqE8r7lugzh35dVVfDPEUntk49GdLFpDJ6yBIgxF6QXfRtX/rHxBSK/cPwi85/3pabG6gbxWqXgcWAy0N2iig2GJhmY+8wegTUP1SFk9WFoZyaB9WsfusfuedebXXXpDfLvnd85oxVrqtGJKKdGSy3RENK4RCNu5I68UNrmiar10Xe5eXPrVKSzrSWDr56n0QN1ccjY4W67Flr5zPQVxNxDm6yY7Ynor0S6XTzRfP/URsEMlkvFD2bITp65nJ4oUPK/u52MHCeljFx7/x5VZNdI8TfFb5C9CdPNhtwWqzk4Liypatq4ZRheHqpr8bMKyVdAL78fWPNpXQ0CIDpeJFVxX3WeVT12ybqPuLBF0Iaajz2CqTL418RjBI75rzQ3QkUd10GEBJhU64ebL1FM19nQLZKxar+Xv2fnDzx8jMQfJLMuj+XIX97oGDadeZ32rqTaztUnJ4/sGpr4IgHHiy1q+GgAx1By4h0hdSUbxWYe9QBsplGFxlb9a8pLmv7eH5f/U6lDda9e9ME6/nUsVMYmA8BKz94skWi2uU1Y9SvAEy3/kfxOUQLF0rIZygM/uUrqXA8 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR08MB9155.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(38350700005)(921011);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Xf2aBH9FExlljtukA22IXHB/D8xn?= =?utf-8?q?M0eg4tbkXaQ87nxgSk16L+scm+uMHOl1qe6raUDOewB05F4DfPbCZawVALQNyiiWe?= =?utf-8?q?iNmFoPPDlvoZKa3+eietBSTbsBwloOyadyTzOz3hedOxRMB8MHMhEMk56evH5qDjQ?= =?utf-8?q?wHLVAAgi5tAnrPeygEWh0PPX38i4HNrLxBaMctBaI/TkNZcGBuEpXMI1+KdyKu1TT?= =?utf-8?q?+yvZiEdSwjtCk+kOFrFWBPUClJM8OsCMspe3dS9de+HWuO+LzlzvJ8eINc8+jDKp3?= =?utf-8?q?3AeTUvDZGv+2WTSO79ukID3KPXMdg2bAZNswFqIvohzi6eW2FKjW4vMjYZRGb2yf0?= =?utf-8?q?zgFvsRGh1i1U8rSSLtL0cSK4qM1IqWyeyMo+/alIuZTFOyWJNnG/dhBISPD/UvsAP?= =?utf-8?q?TCyWPptqTgVdwAd3itWooyaCP+NpE4oN1xZM/7+ZFmRlMbeEF3I9EuUc0negmVMGR?= =?utf-8?q?yGqbaOKUyyj4SEnNibqYye4eel0lpIAEh9dMv//JwKWixuwGw8o37T5IY1C1TLu7L?= =?utf-8?q?IJYGuLV24T1JTiO2UluMK8vJY+b0FQ+6j6tRWKx+yalq1f7gAAmPliOypGXmv2ygk?= =?utf-8?q?knWACyr2laP64xeYDiISidGVAV3eC2Jw+EJo8LcbMKMRnRH5SvPd17L0xXTHewzWp?= =?utf-8?q?6zLweHClO6/3az/0Yu/OlacXBJyeCfbAuIFflo+ztFPkKi6/VcxCTw6faiWr9bIQg?= =?utf-8?q?92wnQnbUYHypfKjXoyEmmBhh7eb+LawmDFIhwU08Qs57JoeE+/wzYllzhGwXDeOlS?= =?utf-8?q?v35SkG64+9q6tMtrvkHZswkGIEsX9JUq6esZ7Q8UDVPAk2AI02lugCq9o1SMph9BR?= =?utf-8?q?Rupxx2EjEE0iQ45Ol/Taco4L4xs8kxevDCHDEq7om1zfDiKrKjT/C9MYZZa/z3EfO?= =?utf-8?q?0i+EtPxU0a2tDJ1OVE5Hz3wYkDhfmx+LWVYabsT3IYfyzaB685lvlvEubLEfBdj3C?= =?utf-8?q?jgjAp1/MtWwTvdnfoMenoesRIESCqrd0TNQAxLfZCX53a5nOYQLEjBREJK1CGi+zy?= =?utf-8?q?cbmhypyl/e7+T3eLL8virsgNOq3tUjYtZwY/Ly0nrUJtpYU4AvijSEJUSbruVD/hm?= =?utf-8?q?VHz9BDCdG7eagu467FRu8c0Bp64ilyeSwpqb1xlatmpoECf+MqG8l48OpRmlyExKT?= =?utf-8?q?ksvbfIkusPeR+vRXrIakEhH8elUYcdV++VIrO+uOZXaaAS2/0Yc1wJA/99JKMJxxn?= =?utf-8?q?DMd9lv+SKKdQv25COO/s9xK35jlz3bTajoI0gaD6rDIESGhkURLKehqd2J/BOgMQ5?= =?utf-8?q?+Qrwiex9f7RBygXYmsVeYkTMKdQW+aQLMQTRVhZJ2KaFLRvMNvR6IYv0udTUq18/4?= =?utf-8?q?Z9BRwn9uAjHIg6ikIgjqWTdkdluxA/Skbm35ma6nv4NPuAg4luZOjvtPLzygWUcNi?= =?utf-8?q?0HHkBrjWsPQYXveBhKYL+C8SKAV5Qu7R3vdyOI27B8w3J/43P27nN4E/kCoaLt9/M?= =?utf-8?q?++rz/ph42U9DAk36ydBoC7QFRZRbSnTl3KjZtHkppENH2I21TGyTGQ01CEa11nPZn?= =?utf-8?q?k65DP9bWUFaFUvxPr5+G8VjnnTSmcY/GjQ=3D=3D?= X-OriginatorOrg: wolfvision.net X-MS-Exchange-CrossTenant-Network-Message-Id: c1a1c8d8-93aa-4b0d-51c3-08dc31f7f6c7 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:24.7551 (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: VRbhh20BwTEcBxxN+ZAG9DuFwFUqp9Lm7U/Yte/d0ZzbGkb5lTFkt0RBTLBLzvcv6aJ14m0fmWeqD3Nm5xpvHLnZVzO7LlwAkgrdnCUshQE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR08MB9357 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240220_014030_757289_43C68528 X-CRM114-Status: GOOD ( 11.11 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Add the device tree node for the RK356x Video Capture (VICAP) block. Signed-off-by: Michael Riesch --- arch/arm64/boot/dts/rockchip/rk356x.dtsi | 45 ++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi index c19c0f1b3778..ad61afd84c12 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -593,6 +594,50 @@ gpu: gpu@fde60000 { status = "disabled"; }; + vicap: video-capture@fdfe0000 { + compatible = "rockchip,rk3568-vicap"; + reg = <0x0 0xfdfe0000 0x0 0x200>; + interrupts = ; + assigned-clocks = <&cru DCLK_VICAP>; + assigned-clock-rates = <300000000>; + clocks = <&cru ACLK_VICAP>, <&cru HCLK_VICAP>, + <&cru DCLK_VICAP>, <&cru ICLK_VICAP_G>; + clock-names = "aclk", "hclk", "dclk", "iclk"; + iommus = <&vicap_mmu>; + power-domains = <&power RK3568_PD_VI>; + resets = <&cru SRST_A_VICAP>, <&cru SRST_H_VICAP>, + <&cru SRST_D_VICAP>, <&cru SRST_P_VICAP>, + <&cru SRST_I_VICAP>; + reset-names = "arst", "hrst", "drst", "prst", "irst"; + rockchip,grf = <&grf>; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + vicap_dvp: port@MEDIA_ROCKCHIP_CIF_DVP { + reg = ; + }; + + vicap_mipi: port@MEDIA_ROCKCHIP_CIF_MIPI { + reg = ; + }; + }; + }; + + vicap_mmu: iommu@fdfe0800 { + compatible = "rockchip,rk3568-iommu"; + reg = <0x0 0xfdfe0800 0x0 0x100>; + interrupts = ; + clocks = <&cru ACLK_VICAP>, <&cru HCLK_VICAP>; + clock-names = "aclk", "iface"; + #iommu-cells = <0>; + power-domains = <&power RK3568_PD_VI>; + rockchip,disable-mmu-reset; + status = "disabled"; + }; + vpu: video-codec@fdea0400 { compatible = "rockchip,rk3568-vpu"; reg = <0x0 0xfdea0000 0x0 0x800>;