Received-SPF: pass (google.com: domain of linux-kernel+bounces-72717-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Michael Riesch <michael.riesch@wolfvision.net>
Date: Tue, 20 Feb 2024 10:39:19 +0100
Subject: [PATCH 09/14] media: rockchip: cif: add support for grf
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
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 <mehdi.djait.k@gmail.com>, 
 =?utf-8?q?Th=C3=A9o_Lebrun?= <theo.lebrun@bootlin.com>, 
 Thomas Petazzoni <thomas.petazzoni@bootlin.com>, 
 Laurent Pinchart <laurent.pinchart@ideasonboard.com>, 
 Mauro Carvalho Chehab <mchehab@kernel.org>, 
 Rob Herring <robh+dt@kernel.org>, 
 Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, 
 Conor Dooley <conor+dt@kernel.org>, Heiko Stuebner <heiko@sntech.de>, 
 Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, 
 linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, 
 linux-rockchip@lists.infradead.org, 
 Michael Riesch <michael.riesch@wolfvision.net>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?dkg4NEpuVzJFbWpwN25YcTJzanBtc1N6dTBGcGNyRU5LTnlUeWc2RmFUMzRu?=
 =?utf-8?B?aXk1ZDFMclk2NlJmUG0vd3VYaFhBWEtCMWJtS24zTlhOS2orQlNuM1J3enZ3?=
 =?utf-8?B?V0ZzczlUK3FzcXFiN3lDU0R2VmhXVzhMb0hCTWNxV2ZWV2YyMXVGTGdmMTVL?=
 =?utf-8?B?ZlJ0S3BYOW5nUnduUnNaN2ZIVVBSbTNmSVpjd1lIZmt3RzJWRmhyOVR2bHdi?=
 =?utf-8?B?bjhUc0VOMit5c0tweTQvRjc0TzFUdm9yMTZQRzlLb2txWVN1V0hmZFpHS3hS?=
 =?utf-8?B?K000OUxtR1NIaG1WVkMwWW8wSXdEZ0JISHdMc1lMbFZFMUxDL2VCT1BKTTM0?=
 =?utf-8?B?R0x5akhnLzkyTUJTTVFQMlZtRTY1SnFwRXR0Y1grUUxwdENWMzZ1U3hEZFpy?=
 =?utf-8?B?VFFtWjVYWmxzZXBaNGZsbjJuWVFOd3QwUzRZYXVkNG9NNkVHQWgvakc4NFJR?=
 =?utf-8?B?UnNJckhHMEtNTXNUaUdxMEZJeVBKaHEvU3JIK3FZUzBrUWk3QVp2YUJyK3Ax?=
 =?utf-8?B?LzlITG92dWQ1OUVxajBHc2YyTENQSjI0UWNaeGVjVnlJemlYdkJJTUdpNmlR?=
 =?utf-8?B?aHZaRzJTRFhlZEhLU1k5cUpQN29uaGRjdldhWC9RWmdodEFOK28wcnd5T2tH?=
 =?utf-8?B?OGdId0FMWkZXQlBXYjdUUHNZV3RjOTF2c0hucitNS1lNdndWeVRNUXZ2clRI?=
 =?utf-8?B?ZVIzMHlINWFOcE1Kdk1jNG15MzFyZktxSUkwUXhGMjRMb3hZNWl1anRxUHY1?=
 =?utf-8?B?Rk9oTlhISFBhb1E0L0ZXRWhJeG5yWm5FTWxUSnNaWkF4eUtabDQrM0ZKeklN?=
 =?utf-8?B?RDhvMW9PVGVtTW1TbjVaV1ZPSWZpcGVmUDhjOExaN0I2c25NbUROWXlNRnVq?=
 =?utf-8?B?R3dpQ0JQdXJHVFc1SWhqRUlLUTZrOENpRFU3YnA5Ry95Ujd1ak12S0FSaldJ?=
 =?utf-8?B?dGt4d05WeFJyVXF3R2RaOTI1NGtkaU55UXVrZDFlTzVjdXRYYjJraEpuU3Rj?=
 =?utf-8?B?ODFKWGpHcDVhbW9SUmZ5K3JyTFhBaVZhWm91VXQ5THNWR1VHVXFkUXppTWtv?=
 =?utf-8?B?VlNpTW5CNFgzd2oxOVpGZzVYRE1OUUFNUU52NkpPRkZqYTdKZkJVL1ZxV051?=
 =?utf-8?B?R0FRUVNnVGR6OW5DakpFMTVTQmplR3Z2YzI3M3BHRUM0QStiYW1jRFZlNHdl?=
 =?utf-8?B?eHhrSlFoZ1R5NnhjSzlnMWNlRVh3VW1NUTlqbUpYWmsvTnFaNXU4aE0xVjVy?=
 =?utf-8?B?a080Unc2eFdxU3lOazlSOE5rL0RHYVh6Zkplc0F6ZmVWRS84NFlLL3hvWnRt?=
 =?utf-8?B?YmVkYkhFSXpnOWEvSEdzL21Ga0twNTl2VHQ2VHNVbDdkb3o0clRodm9wVm9x?=
 =?utf-8?B?Q1pacGRJQ20rV1pIZW9INUpkZ04rRk5wK3hqVEdkR3ByN1hBelVqaXNaK3lT?=
 =?utf-8?B?WUhMbk5qVVlUNElWUzUxaDBqcWpXc2J2MDlEUG9KVUJGbVFGMUxvbENqQjVO?=
 =?utf-8?B?RGJwMklmZWdRQVl4MU14cmxTOTU4SEwvRDJZc2tCeWxiN2VvNTJjMENHRTNT?=
 =?utf-8?B?UDF2ZHo2Z1lOa3pIVmdvRXlTL2xucFI2ZjJmTUdKSUxkM25sd0FwOE45YW9O?=
 =?utf-8?B?dktxbDJsNERlMjRqc3NPelE2UDR1NitIY1V6UDM0WEhYVmp0T2tXWmFtMzFK?=
 =?utf-8?B?NGM2UUluc0JkNitaVjErdG42TEw5ZzQrbVpEWnozK2ZHRGlQdS90UkN3VUxK?=
 =?utf-8?B?N0oyMDBwa2l1WDBzdWJ5K2hGRmhZTjBsUEdRd0lUbUZxc3puTjlCbjE5b1NP?=
 =?utf-8?B?NlM5Q2JoOVh6dXNHSnd0c0JDd3NYZmZBSTB4ZjF0eTVJV1RUd2hTQXhJRHZG?=
 =?utf-8?B?Z2pjcWh4NTNDTFlHTWtWTW9WZE9FU3E0Z0ZIM1NrSzdtRVlQWlRtUzRjMENS?=
 =?utf-8?B?VVRIWHhkblhsdmR3alh3R3ZvbUQ0eWJoNnltVll2RWMvSktvL3dFR250c2hp?=
 =?utf-8?B?V2pKME5UdFNkWEtuR3lyTkJtbk16SlFWRUVKYmVPVVVrdDFhU3dHMnFwbGdO?=
 =?utf-8?B?anZxbU1Dck1uaWpNTXRhbWFqOGRaejFqSVpTL1RTYTJDVVBKOC9hMTd6U1JK?=
 =?utf-8?B?Ump0SklFV3RuckpyTHd6UDdCOGRveTdhRjhGT0kzQ295SVhFUGMxUVRaQVJ1?=
 =?utf-8?B?aEE9PQ==?=
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

Some variants of the Rockchip CIF require the General Register File
for video input block control.

Signed-off-by: Michael Riesch <michael.riesch@wolfvision.net>
---
 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 <linux/clk.h>
 #include <linux/mutex.h>
+#include <linux/regmap.h>
 
 #include <media/media-device.h>
 #include <media/media-entity.h>
@@ -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 <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/mfd/syscon.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_graph.h>
@@ -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));

-- 
2.30.2