From patchwork Thu Jan 25 19:54:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 767928 Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D7A59134759 for ; Thu, 25 Jan 2024 19:55:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706212520; cv=none; b=VLmhU/j5CvFFx7+YrmZSmhCDTAASPUVr6orEJYHxX1Wu9c0fhXZJ3juRBVqY3pSVzXQNHmqvDWkj472y6eMi48JTp5HzdL0n4C/SzbTDyCpHcSgLIBKNT/8iQEsRTjfUYVXcbCV/uoU83bNWoUs0xp8TKBJnzYcqwq2Z9gC55rw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706212520; c=relaxed/simple; bh=tyGJPSdLLqL4ZqqIIV1A5m+kw+4O/iJFU53bNEEP28M=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=WngQ3uwooiQv0/xZpm9YZJn8VcBERuFzgtGaUiyupmI3Nlq1cu51drzKjJKtU0rfGUgKBMDG2v8tMJzTqMVKzcFqaT7ROvHh4ry3LEoZNk9jGgOEroe8fqUeFdSstS1U+oCM7UC6MvXic1F6G9FlkkcjWiF3xGoJQcOf2cmeqXk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ragnatech.se; spf=pass smtp.mailfrom=ragnatech.se; dkim=pass (2048-bit key) header.d=ragnatech.se header.i=@ragnatech.se header.b=cEm0SI7f; arc=none smtp.client-ip=209.85.218.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ragnatech.se Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ragnatech.se Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ragnatech.se header.i=@ragnatech.se header.b="cEm0SI7f" Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-a26fa294e56so734466866b.0 for ; Thu, 25 Jan 2024 11:55:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ragnatech.se; s=google; t=1706212515; x=1706817315; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Yz97naasz57ghtKxH2RM1w/PN9uU/7we3O2M+hv9/1w=; b=cEm0SI7f68T1dh1C+yuY8BJ310jdtJ+0fcS9BNr26rIKim06/sdE3RzdVrq5zu0nRS xa4C92xy1LUTqyqa9Ktrr5N29os+utNiRDM/FX4TbNRhyYNj4rhC18BR1ouPkyh1oGLm sxsr8Vimq65Xu85XIo029kc8xVKlDh3dnqzCCerh7DgjlLM5f1qmluWPlt/xfVWidE24 IY4AVQnT1mVHj52rxxhCxQ/E7yoZl4Fy13rD/B0e99Bgkr4dD0l5xPqCP1QG97HGBTqg RUQ/DE09YRvX4ddKtSbPbYfJosOA278At5h4WmcymGxYssZfrdAk03YtGv3sLre0nsDM R9Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706212515; x=1706817315; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Yz97naasz57ghtKxH2RM1w/PN9uU/7we3O2M+hv9/1w=; b=SruRSTyvMXKBorIVLx2IjdPDS7NOC0VlLEnwwkd/h50G0hp2YjpzRUxa6LvKNDFb2v 9Wor26UxpTe0S3fhgngtbTNTQ+JERVG5C0lnR9OhbIU8/t+y1ESFZQFmqrdAu6RysKH6 +0r5jYXF6f33xfXx53l+O672TwujtfWzzFEzaZ/PoeV3JKs5Y9XJmJHBpq0Nv5an7UY9 xGtCUCNAGoglNHnw610Dxucwqrbphd5kH6XpIhp9JOoeTxWggJoarWcOCuTg8gX2Ot92 h6ZG3QRh7v3LGW+FZ7PfoNY2nIiQkAibV5secqm0gMrUNP7vA3B6e3osOCpdNk1Y+50f h6cA== X-Gm-Message-State: AOJu0YyGMMpUIh7Kqknnt5No2TqrY44e3GFtWmzlo8BgF/SWEZ7hU2Wl 266N/AUOqVJbqeJ2IjNAPR8MlWmxrDoNfVI5h1LnJ6contf3WrT/OOwfNOkrYOE= X-Google-Smtp-Source: AGHT+IGsioElMK4m0rpxX+UtLukezKMQZyu84Omeyclfh7wfWC4t0/+Bv53Jwquvcrb42IMj7k/1vw== X-Received: by 2002:a17:906:4117:b0:a28:f8d2:7897 with SMTP id j23-20020a170906411700b00a28f8d27897mr74983ejk.20.1706212514953; Thu, 25 Jan 2024 11:55:14 -0800 (PST) Received: from sleipner.berto.se (p4fcc8c6a.dip0.t-ipconnect.de. [79.204.140.106]) by smtp.googlemail.com with ESMTPSA id tj3-20020a170907c24300b00a2fde3a8097sm658042ejc.74.2024.01.25.11.55.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 11:55:14 -0800 (PST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: Sakari Ailus , Hans Verkuil , linux-media@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, =?utf-8?q?Niklas_S=C3=B6derlund?= Subject: [PATCH] media: rcar-csi2: Move driver to renesas directory Date: Thu, 25 Jan 2024 20:54:58 +0100 Message-ID: <20240125195458.960961-1-niklas.soderlund+renesas@ragnatech.se> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The rcar-csi2 driver was added before the platform/renesas directory existed and since it was used together in a pipeline with the rcar-vin driver it was located together with it. The rcar-isp driver can also be used together with the rcar-csi2 driver in a pipeline that is terminated by the rcar-vin driver. However by the time rcar-isp was added the platform/renesas directory existed so it was added there. To remove the confusion that the rcar-csi2 driver have code dependencies on the rcar-vin driver move it to the same directory level as the rcar-isp driver. This makes it clear they are three distinct drivers that can be used together in a pipeline, but do not depend on each other. Signed-off-by: Niklas Söderlund --- MAINTAINERS | 1 + drivers/media/platform/renesas/Kconfig | 16 ++++++++++++++++ drivers/media/platform/renesas/Makefile | 1 + .../platform/renesas/{rcar-vin => }/rcar-csi2.c | 0 drivers/media/platform/renesas/rcar-vin/Kconfig | 16 ---------------- drivers/media/platform/renesas/rcar-vin/Makefile | 1 - 6 files changed, 18 insertions(+), 17 deletions(-) rename drivers/media/platform/renesas/{rcar-vin => }/rcar-csi2.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 675e5d63a25b..ea49082ec3a0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13430,6 +13430,7 @@ T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/renesas,csi2.yaml F: Documentation/devicetree/bindings/media/renesas,isp.yaml F: Documentation/devicetree/bindings/media/renesas,vin.yaml +F: drivers/media/platform/renesas/rcar-csi2.c F: drivers/media/platform/renesas/rcar-isp.c F: drivers/media/platform/renesas/rcar-vin/ diff --git a/drivers/media/platform/renesas/Kconfig b/drivers/media/platform/renesas/Kconfig index ed788e991f74..c7fc718a30a5 100644 --- a/drivers/media/platform/renesas/Kconfig +++ b/drivers/media/platform/renesas/Kconfig @@ -14,6 +14,22 @@ config VIDEO_RENESAS_CEU help This is a v4l2 driver for the Renesas CEU Interface +config VIDEO_RCAR_CSI2 + tristate "R-Car MIPI CSI-2 Receiver" + depends on V4L_PLATFORM_DRIVERS + depends on VIDEO_DEV && OF + depends on ARCH_RENESAS || COMPILE_TEST + select MEDIA_CONTROLLER + select VIDEO_V4L2_SUBDEV_API + select RESET_CONTROLLER + select V4L2_FWNODE + help + Support for Renesas R-Car MIPI CSI-2 receiver. + Supports R-Car Gen3 and RZ/G2 SoCs. + + To compile this driver as a module, choose M here: the + module will be called rcar-csi2. + config VIDEO_RCAR_ISP tristate "R-Car Image Signal Processor (ISP)" depends on V4L_PLATFORM_DRIVERS diff --git a/drivers/media/platform/renesas/Makefile b/drivers/media/platform/renesas/Makefile index 55854e868887..50774a20330c 100644 --- a/drivers/media/platform/renesas/Makefile +++ b/drivers/media/platform/renesas/Makefile @@ -7,6 +7,7 @@ obj-y += rcar-vin/ obj-y += rzg2l-cru/ obj-y += vsp1/ +obj-$(CONFIG_VIDEO_RCAR_CSI2) += rcar-csi2.o obj-$(CONFIG_VIDEO_RCAR_DRIF) += rcar_drif.o obj-$(CONFIG_VIDEO_RCAR_ISP) += rcar-isp.o obj-$(CONFIG_VIDEO_RENESAS_CEU) += renesas-ceu.o diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c b/drivers/media/platform/renesas/rcar-csi2.c similarity index 100% rename from drivers/media/platform/renesas/rcar-vin/rcar-csi2.c rename to drivers/media/platform/renesas/rcar-csi2.c diff --git a/drivers/media/platform/renesas/rcar-vin/Kconfig b/drivers/media/platform/renesas/rcar-vin/Kconfig index de55fe63d84c..2ec857ab83cb 100644 --- a/drivers/media/platform/renesas/rcar-vin/Kconfig +++ b/drivers/media/platform/renesas/rcar-vin/Kconfig @@ -1,20 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -config VIDEO_RCAR_CSI2 - tristate "R-Car MIPI CSI-2 Receiver" - depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_DEV && OF - depends on ARCH_RENESAS || COMPILE_TEST - select MEDIA_CONTROLLER - select VIDEO_V4L2_SUBDEV_API - select RESET_CONTROLLER - select V4L2_FWNODE - help - Support for Renesas R-Car MIPI CSI-2 receiver. - Supports R-Car Gen3 and RZ/G2 SoCs. - - To compile this driver as a module, choose M here: the - module will be called rcar-csi2. - config VIDEO_RCAR_VIN tristate "R-Car Video Input (VIN) Driver" depends on V4L_PLATFORM_DRIVERS diff --git a/drivers/media/platform/renesas/rcar-vin/Makefile b/drivers/media/platform/renesas/rcar-vin/Makefile index 00d809f5d2c1..5938ad6290c8 100644 --- a/drivers/media/platform/renesas/rcar-vin/Makefile +++ b/drivers/media/platform/renesas/rcar-vin/Makefile @@ -1,5 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 rcar-vin-objs = rcar-core.o rcar-dma.o rcar-v4l2.o -obj-$(CONFIG_VIDEO_RCAR_CSI2) += rcar-csi2.o obj-$(CONFIG_VIDEO_RCAR_VIN) += rcar-vin.o