Message ID | 20250315152708.328036-6-niklas.soderlund+renesas@ragnatech.se (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | rcar-isp: Prepare for ISP core support | expand |
Hi Niklas On Sat, Mar 15, 2025 at 04:27:06PM +0100, Niklas Söderlund wrote: > Before extending the driver with functions from the R-Car ISP core that > will span multiple files move the existing driver to a separate > directory. While at it rename the single source file to allow future > files to be grouped by functions. > > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com> Thanks j > --- > MAINTAINERS | 2 +- > drivers/media/platform/renesas/Kconfig | 18 +----------------- > drivers/media/platform/renesas/Makefile | 2 +- > .../media/platform/renesas/rcar-isp/Kconfig | 17 +++++++++++++++++ > .../media/platform/renesas/rcar-isp/Makefile | 4 ++++ > .../renesas/{rcar-isp.c => rcar-isp/csisp.c} | 0 > 6 files changed, 24 insertions(+), 19 deletions(-) > create mode 100644 drivers/media/platform/renesas/rcar-isp/Kconfig > create mode 100644 drivers/media/platform/renesas/rcar-isp/Makefile > rename drivers/media/platform/renesas/{rcar-isp.c => rcar-isp/csisp.c} (100%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index f3658f16fa24..c2f36486f5f5 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -14679,7 +14679,7 @@ 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-isp/ > F: drivers/media/platform/renesas/rcar-vin/ > > MEDIA DRIVERS FOR RENESAS - VSP1 > diff --git a/drivers/media/platform/renesas/Kconfig b/drivers/media/platform/renesas/Kconfig > index c7fc718a30a5..27a54fa79083 100644 > --- a/drivers/media/platform/renesas/Kconfig > +++ b/drivers/media/platform/renesas/Kconfig > @@ -30,23 +30,6 @@ config VIDEO_RCAR_CSI2 > 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 > - 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 Image Signal Processor (ISP). > - Enable this to support the Renesas R-Car Image Signal > - Processor (ISP). > - > - To compile this driver as a module, choose M here: the > - module will be called rcar-isp. > - > config VIDEO_SH_VOU > tristate "SuperH VOU video output driver" > depends on V4L_PLATFORM_DRIVERS > @@ -56,6 +39,7 @@ config VIDEO_SH_VOU > help > Support for the Video Output Unit (VOU) on SuperH SoCs. > > +source "drivers/media/platform/renesas/rcar-isp/Kconfig" > source "drivers/media/platform/renesas/rcar-vin/Kconfig" > source "drivers/media/platform/renesas/rzg2l-cru/Kconfig" > > diff --git a/drivers/media/platform/renesas/Makefile b/drivers/media/platform/renesas/Makefile > index 50774a20330c..1127259c09d6 100644 > --- a/drivers/media/platform/renesas/Makefile > +++ b/drivers/media/platform/renesas/Makefile > @@ -3,13 +3,13 @@ > # Makefile for the Renesas capture/playback device drivers. > # > > +obj-y += rcar-isp/ > 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 > obj-$(CONFIG_VIDEO_RENESAS_FCP) += rcar-fcp.o > obj-$(CONFIG_VIDEO_RENESAS_FDP1) += rcar_fdp1.o > diff --git a/drivers/media/platform/renesas/rcar-isp/Kconfig b/drivers/media/platform/renesas/rcar-isp/Kconfig > new file mode 100644 > index 000000000000..59e0d91862d1 > --- /dev/null > +++ b/drivers/media/platform/renesas/rcar-isp/Kconfig > @@ -0,0 +1,17 @@ > +# SPDX-License-Identifier: GPL-2.0 > +config VIDEO_RCAR_ISP > + tristate "R-Car Image Signal Processor (ISP)" > + 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 Image Signal Processor (ISP). > + Enable this to support the Renesas R-Car Image Signal > + Processor (ISP). > + > + To compile this driver as a module, choose M here: the > + module will be called rcar-isp. > diff --git a/drivers/media/platform/renesas/rcar-isp/Makefile b/drivers/media/platform/renesas/rcar-isp/Makefile > new file mode 100644 > index 000000000000..b542118c831e > --- /dev/null > +++ b/drivers/media/platform/renesas/rcar-isp/Makefile > @@ -0,0 +1,4 @@ > +# SPDX-License-Identifier: GPL-2.0 > +rcar-isp-objs = csisp.o > + > +obj-$(CONFIG_VIDEO_RCAR_ISP) += rcar-isp.o > diff --git a/drivers/media/platform/renesas/rcar-isp.c b/drivers/media/platform/renesas/rcar-isp/csisp.c > similarity index 100% > rename from drivers/media/platform/renesas/rcar-isp.c > rename to drivers/media/platform/renesas/rcar-isp/csisp.c > -- > 2.48.1 > >
diff --git a/MAINTAINERS b/MAINTAINERS index f3658f16fa24..c2f36486f5f5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14679,7 +14679,7 @@ 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-isp/ F: drivers/media/platform/renesas/rcar-vin/ MEDIA DRIVERS FOR RENESAS - VSP1 diff --git a/drivers/media/platform/renesas/Kconfig b/drivers/media/platform/renesas/Kconfig index c7fc718a30a5..27a54fa79083 100644 --- a/drivers/media/platform/renesas/Kconfig +++ b/drivers/media/platform/renesas/Kconfig @@ -30,23 +30,6 @@ config VIDEO_RCAR_CSI2 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 - 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 Image Signal Processor (ISP). - Enable this to support the Renesas R-Car Image Signal - Processor (ISP). - - To compile this driver as a module, choose M here: the - module will be called rcar-isp. - config VIDEO_SH_VOU tristate "SuperH VOU video output driver" depends on V4L_PLATFORM_DRIVERS @@ -56,6 +39,7 @@ config VIDEO_SH_VOU help Support for the Video Output Unit (VOU) on SuperH SoCs. +source "drivers/media/platform/renesas/rcar-isp/Kconfig" source "drivers/media/platform/renesas/rcar-vin/Kconfig" source "drivers/media/platform/renesas/rzg2l-cru/Kconfig" diff --git a/drivers/media/platform/renesas/Makefile b/drivers/media/platform/renesas/Makefile index 50774a20330c..1127259c09d6 100644 --- a/drivers/media/platform/renesas/Makefile +++ b/drivers/media/platform/renesas/Makefile @@ -3,13 +3,13 @@ # Makefile for the Renesas capture/playback device drivers. # +obj-y += rcar-isp/ 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 obj-$(CONFIG_VIDEO_RENESAS_FCP) += rcar-fcp.o obj-$(CONFIG_VIDEO_RENESAS_FDP1) += rcar_fdp1.o diff --git a/drivers/media/platform/renesas/rcar-isp/Kconfig b/drivers/media/platform/renesas/rcar-isp/Kconfig new file mode 100644 index 000000000000..59e0d91862d1 --- /dev/null +++ b/drivers/media/platform/renesas/rcar-isp/Kconfig @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: GPL-2.0 +config VIDEO_RCAR_ISP + tristate "R-Car Image Signal Processor (ISP)" + 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 Image Signal Processor (ISP). + Enable this to support the Renesas R-Car Image Signal + Processor (ISP). + + To compile this driver as a module, choose M here: the + module will be called rcar-isp. diff --git a/drivers/media/platform/renesas/rcar-isp/Makefile b/drivers/media/platform/renesas/rcar-isp/Makefile new file mode 100644 index 000000000000..b542118c831e --- /dev/null +++ b/drivers/media/platform/renesas/rcar-isp/Makefile @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 +rcar-isp-objs = csisp.o + +obj-$(CONFIG_VIDEO_RCAR_ISP) += rcar-isp.o diff --git a/drivers/media/platform/renesas/rcar-isp.c b/drivers/media/platform/renesas/rcar-isp/csisp.c similarity index 100% rename from drivers/media/platform/renesas/rcar-isp.c rename to drivers/media/platform/renesas/rcar-isp/csisp.c
Before extending the driver with functions from the R-Car ISP core that will span multiple files move the existing driver to a separate directory. While at it rename the single source file to allow future files to be grouped by functions. Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> --- MAINTAINERS | 2 +- drivers/media/platform/renesas/Kconfig | 18 +----------------- drivers/media/platform/renesas/Makefile | 2 +- .../media/platform/renesas/rcar-isp/Kconfig | 17 +++++++++++++++++ .../media/platform/renesas/rcar-isp/Makefile | 4 ++++ .../renesas/{rcar-isp.c => rcar-isp/csisp.c} | 0 6 files changed, 24 insertions(+), 19 deletions(-) create mode 100644 drivers/media/platform/renesas/rcar-isp/Kconfig create mode 100644 drivers/media/platform/renesas/rcar-isp/Makefile rename drivers/media/platform/renesas/{rcar-isp.c => rcar-isp/csisp.c} (100%)