Message ID | 20240625123244.200533-1-prabhakar.mahadev-lad.rj@bp.renesas.com (mailing list archive) |
---|---|
State | Mainlined |
Commit | 1b5dfd1881dbe303536d4167500b94549ff2f6a7 |
Delegated to: | Kieran Bingham |
Headers | show |
Series | drm: renesas: Move RZ/G2L MIPI DSI driver to rz-du | expand |
Hi Prabhakar, Thanks for the patch. > -----Original Message----- > From: Prabhakar <prabhakar.csengg@gmail.com> > Sent: Tuesday, June 25, 2024 1:33 PM > Subject: [PATCH] drm: renesas: Move RZ/G2L MIPI DSI driver to rz-du > > From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > All the RZ/G2L DU specific components are located under the rz-du folder, so it makes sense to move > the RZ/G2L MIPI DSI driver there instead of keeping it in the rcar-du folder. This change improves > the organization and modularity of the driver configuration by grouping related settings together. > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Acked-by: Biju Das <biju.das.jz@bp.renesas.com> Cheers, Biju > --- > drivers/gpu/drm/renesas/rcar-du/Kconfig | 8 -------- > drivers/gpu/drm/renesas/rcar-du/Makefile | 2 -- > drivers/gpu/drm/renesas/rz-du/Kconfig | 8 ++++++++ > drivers/gpu/drm/renesas/rz-du/Makefile | 2 ++ > .../gpu/drm/renesas/{rcar-du => rz-du}/rzg2l_mipi_dsi.c | 0 > .../drm/renesas/{rcar-du => rz-du}/rzg2l_mipi_dsi_regs.h | 0 > 6 files changed, 10 insertions(+), 10 deletions(-) rename drivers/gpu/drm/renesas/{rcar-du => rz- > du}/rzg2l_mipi_dsi.c (100%) rename drivers/gpu/drm/renesas/{rcar-du => rz- > du}/rzg2l_mipi_dsi_regs.h (100%) > > diff --git a/drivers/gpu/drm/renesas/rcar-du/Kconfig b/drivers/gpu/drm/renesas/rcar-du/Kconfig > index 53c356aed5d5..39af73cf2092 100644 > --- a/drivers/gpu/drm/renesas/rcar-du/Kconfig > +++ b/drivers/gpu/drm/renesas/rcar-du/Kconfig > @@ -60,14 +60,6 @@ config DRM_RCAR_MIPI_DSI > select DRM_MIPI_DSI > select RESET_CONTROLLER > > -config DRM_RZG2L_MIPI_DSI > - tristate "RZ/G2L MIPI DSI Encoder Support" > - depends on DRM && DRM_BRIDGE && OF > - depends on ARCH_RENESAS || COMPILE_TEST > - select DRM_MIPI_DSI > - help > - Enable support for the RZ/G2L Display Unit embedded MIPI DSI encoders. > - > config DRM_RCAR_VSP > bool "R-Car DU VSP Compositor Support" if ARM > default y if ARM64 > diff --git a/drivers/gpu/drm/renesas/rcar-du/Makefile b/drivers/gpu/drm/renesas/rcar-du/Makefile > index b8f2c82651d9..6f132325c8b7 100644 > --- a/drivers/gpu/drm/renesas/rcar-du/Makefile > +++ b/drivers/gpu/drm/renesas/rcar-du/Makefile > @@ -14,5 +14,3 @@ obj-$(CONFIG_DRM_RCAR_DU) += rcar-du-drm.o > obj-$(CONFIG_DRM_RCAR_DW_HDMI) += rcar_dw_hdmi.o > obj-$(CONFIG_DRM_RCAR_LVDS) += rcar_lvds.o > obj-$(CONFIG_DRM_RCAR_MIPI_DSI) += rcar_mipi_dsi.o > - > -obj-$(CONFIG_DRM_RZG2L_MIPI_DSI) += rzg2l_mipi_dsi.o > diff --git a/drivers/gpu/drm/renesas/rz-du/Kconfig b/drivers/gpu/drm/renesas/rz-du/Kconfig > index 5f0db2c5fee6..8ec14271ebba 100644 > --- a/drivers/gpu/drm/renesas/rz-du/Kconfig > +++ b/drivers/gpu/drm/renesas/rz-du/Kconfig > @@ -10,3 +10,11 @@ config DRM_RZG2L_DU > help > Choose this option if you have an RZ/G2L alike chipset. > If M is selected the module will be called rzg2l-du-drm. > + > +config DRM_RZG2L_MIPI_DSI > + tristate "RZ/G2L MIPI DSI Encoder Support" > + depends on DRM && DRM_BRIDGE && OF > + depends on ARCH_RENESAS || COMPILE_TEST > + select DRM_MIPI_DSI > + help > + Enable support for the RZ/G2L Display Unit embedded MIPI DSI encoders. > diff --git a/drivers/gpu/drm/renesas/rz-du/Makefile b/drivers/gpu/drm/renesas/rz-du/Makefile > index 663b82a2577f..2987900ea6b6 100644 > --- a/drivers/gpu/drm/renesas/rz-du/Makefile > +++ b/drivers/gpu/drm/renesas/rz-du/Makefile > @@ -6,3 +6,5 @@ rzg2l-du-drm-y := rzg2l_du_crtc.o \ > > rzg2l-du-drm-$(CONFIG_VIDEO_RENESAS_VSP1) += rzg2l_du_vsp.o > obj-$(CONFIG_DRM_RZG2L_DU) += rzg2l-du-drm.o > + > +obj-$(CONFIG_DRM_RZG2L_MIPI_DSI) += rzg2l_mipi_dsi.o > diff --git a/drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi.c b/drivers/gpu/drm/renesas/rz- > du/rzg2l_mipi_dsi.c > similarity index 100% > rename from drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi.c > rename to drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c > diff --git a/drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi_regs.h b/drivers/gpu/drm/renesas/rz- > du/rzg2l_mipi_dsi_regs.h > similarity index 100% > rename from drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi_regs.h > rename to drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h > -- > 2.34.1
Hi Prabhakar, Thank you for the patch. On Tue, Jun 25, 2024 at 01:32:44PM +0100, Prabhakar wrote: > From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > All the RZ/G2L DU specific components are located under the rz-du folder, > so it makes sense to move the RZ/G2L MIPI DSI driver there instead of > keeping it in the rcar-du folder. This change improves the organization > and modularity of the driver configuration by grouping related settings together. I was thinking the same the other day. Thanks for beating me at sending a patch :-) Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Do you or Biju has committer rights to drm-misc to push this patch ? > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > --- > drivers/gpu/drm/renesas/rcar-du/Kconfig | 8 -------- > drivers/gpu/drm/renesas/rcar-du/Makefile | 2 -- > drivers/gpu/drm/renesas/rz-du/Kconfig | 8 ++++++++ > drivers/gpu/drm/renesas/rz-du/Makefile | 2 ++ > .../gpu/drm/renesas/{rcar-du => rz-du}/rzg2l_mipi_dsi.c | 0 > .../drm/renesas/{rcar-du => rz-du}/rzg2l_mipi_dsi_regs.h | 0 > 6 files changed, 10 insertions(+), 10 deletions(-) > rename drivers/gpu/drm/renesas/{rcar-du => rz-du}/rzg2l_mipi_dsi.c (100%) > rename drivers/gpu/drm/renesas/{rcar-du => rz-du}/rzg2l_mipi_dsi_regs.h (100%) > > diff --git a/drivers/gpu/drm/renesas/rcar-du/Kconfig b/drivers/gpu/drm/renesas/rcar-du/Kconfig > index 53c356aed5d5..39af73cf2092 100644 > --- a/drivers/gpu/drm/renesas/rcar-du/Kconfig > +++ b/drivers/gpu/drm/renesas/rcar-du/Kconfig > @@ -60,14 +60,6 @@ config DRM_RCAR_MIPI_DSI > select DRM_MIPI_DSI > select RESET_CONTROLLER > > -config DRM_RZG2L_MIPI_DSI > - tristate "RZ/G2L MIPI DSI Encoder Support" > - depends on DRM && DRM_BRIDGE && OF > - depends on ARCH_RENESAS || COMPILE_TEST > - select DRM_MIPI_DSI > - help > - Enable support for the RZ/G2L Display Unit embedded MIPI DSI encoders. > - > config DRM_RCAR_VSP > bool "R-Car DU VSP Compositor Support" if ARM > default y if ARM64 > diff --git a/drivers/gpu/drm/renesas/rcar-du/Makefile b/drivers/gpu/drm/renesas/rcar-du/Makefile > index b8f2c82651d9..6f132325c8b7 100644 > --- a/drivers/gpu/drm/renesas/rcar-du/Makefile > +++ b/drivers/gpu/drm/renesas/rcar-du/Makefile > @@ -14,5 +14,3 @@ obj-$(CONFIG_DRM_RCAR_DU) += rcar-du-drm.o > obj-$(CONFIG_DRM_RCAR_DW_HDMI) += rcar_dw_hdmi.o > obj-$(CONFIG_DRM_RCAR_LVDS) += rcar_lvds.o > obj-$(CONFIG_DRM_RCAR_MIPI_DSI) += rcar_mipi_dsi.o > - > -obj-$(CONFIG_DRM_RZG2L_MIPI_DSI) += rzg2l_mipi_dsi.o > diff --git a/drivers/gpu/drm/renesas/rz-du/Kconfig b/drivers/gpu/drm/renesas/rz-du/Kconfig > index 5f0db2c5fee6..8ec14271ebba 100644 > --- a/drivers/gpu/drm/renesas/rz-du/Kconfig > +++ b/drivers/gpu/drm/renesas/rz-du/Kconfig > @@ -10,3 +10,11 @@ config DRM_RZG2L_DU > help > Choose this option if you have an RZ/G2L alike chipset. > If M is selected the module will be called rzg2l-du-drm. > + > +config DRM_RZG2L_MIPI_DSI > + tristate "RZ/G2L MIPI DSI Encoder Support" > + depends on DRM && DRM_BRIDGE && OF > + depends on ARCH_RENESAS || COMPILE_TEST > + select DRM_MIPI_DSI > + help > + Enable support for the RZ/G2L Display Unit embedded MIPI DSI encoders. > diff --git a/drivers/gpu/drm/renesas/rz-du/Makefile b/drivers/gpu/drm/renesas/rz-du/Makefile > index 663b82a2577f..2987900ea6b6 100644 > --- a/drivers/gpu/drm/renesas/rz-du/Makefile > +++ b/drivers/gpu/drm/renesas/rz-du/Makefile > @@ -6,3 +6,5 @@ rzg2l-du-drm-y := rzg2l_du_crtc.o \ > > rzg2l-du-drm-$(CONFIG_VIDEO_RENESAS_VSP1) += rzg2l_du_vsp.o > obj-$(CONFIG_DRM_RZG2L_DU) += rzg2l-du-drm.o > + > +obj-$(CONFIG_DRM_RZG2L_MIPI_DSI) += rzg2l_mipi_dsi.o > diff --git a/drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi.c b/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c > similarity index 100% > rename from drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi.c > rename to drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c > diff --git a/drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi_regs.h b/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h > similarity index 100% > rename from drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi_regs.h > rename to drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h
Hi Laurent Pinchart, > -----Original Message----- > From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Sent: Wednesday, June 26, 2024 6:51 AM > Subject: Re: [PATCH] drm: renesas: Move RZ/G2L MIPI DSI driver to rz-du > > Hi Prabhakar, > > Thank you for the patch. > > On Tue, Jun 25, 2024 at 01:32:44PM +0100, Prabhakar wrote: > > From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > > > All the RZ/G2L DU specific components are located under the rz-du > > folder, so it makes sense to move the RZ/G2L MIPI DSI driver there > > instead of keeping it in the rcar-du folder. This change improves the > > organization and modularity of the driver configuration by grouping related settings together. > > I was thinking the same the other day. Thanks for beating me at sending a patch :-) > > Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > > Do you or Biju has committer rights to drm-misc to push this patch ? I guess, it will be taken by drm-misc folks like du driver, as this is now part of rz-du folder which is part of the list [1] ?? [1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/MAINTAINERS?h=next-20240625#n7345 Cheers, Biju > > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > --- > > drivers/gpu/drm/renesas/rcar-du/Kconfig | 8 -------- > > drivers/gpu/drm/renesas/rcar-du/Makefile | 2 -- > > drivers/gpu/drm/renesas/rz-du/Kconfig | 8 ++++++++ > > drivers/gpu/drm/renesas/rz-du/Makefile | 2 ++ > > .../gpu/drm/renesas/{rcar-du => rz-du}/rzg2l_mipi_dsi.c | 0 > > .../drm/renesas/{rcar-du => rz-du}/rzg2l_mipi_dsi_regs.h | 0 > > 6 files changed, 10 insertions(+), 10 deletions(-) rename > > drivers/gpu/drm/renesas/{rcar-du => rz-du}/rzg2l_mipi_dsi.c (100%) > > rename drivers/gpu/drm/renesas/{rcar-du => > > rz-du}/rzg2l_mipi_dsi_regs.h (100%) > > > > diff --git a/drivers/gpu/drm/renesas/rcar-du/Kconfig > > b/drivers/gpu/drm/renesas/rcar-du/Kconfig > > index 53c356aed5d5..39af73cf2092 100644 > > --- a/drivers/gpu/drm/renesas/rcar-du/Kconfig > > +++ b/drivers/gpu/drm/renesas/rcar-du/Kconfig > > @@ -60,14 +60,6 @@ config DRM_RCAR_MIPI_DSI > > select DRM_MIPI_DSI > > select RESET_CONTROLLER > > > > -config DRM_RZG2L_MIPI_DSI > > - tristate "RZ/G2L MIPI DSI Encoder Support" > > - depends on DRM && DRM_BRIDGE && OF > > - depends on ARCH_RENESAS || COMPILE_TEST > > - select DRM_MIPI_DSI > > - help > > - Enable support for the RZ/G2L Display Unit embedded MIPI DSI encoders. > > - > > config DRM_RCAR_VSP > > bool "R-Car DU VSP Compositor Support" if ARM > > default y if ARM64 > > diff --git a/drivers/gpu/drm/renesas/rcar-du/Makefile > > b/drivers/gpu/drm/renesas/rcar-du/Makefile > > index b8f2c82651d9..6f132325c8b7 100644 > > --- a/drivers/gpu/drm/renesas/rcar-du/Makefile > > +++ b/drivers/gpu/drm/renesas/rcar-du/Makefile > > @@ -14,5 +14,3 @@ obj-$(CONFIG_DRM_RCAR_DU) += rcar-du-drm.o > > obj-$(CONFIG_DRM_RCAR_DW_HDMI) += rcar_dw_hdmi.o > > obj-$(CONFIG_DRM_RCAR_LVDS) += rcar_lvds.o > > obj-$(CONFIG_DRM_RCAR_MIPI_DSI) += rcar_mipi_dsi.o > > - > > -obj-$(CONFIG_DRM_RZG2L_MIPI_DSI) += rzg2l_mipi_dsi.o > > diff --git a/drivers/gpu/drm/renesas/rz-du/Kconfig > > b/drivers/gpu/drm/renesas/rz-du/Kconfig > > index 5f0db2c5fee6..8ec14271ebba 100644 > > --- a/drivers/gpu/drm/renesas/rz-du/Kconfig > > +++ b/drivers/gpu/drm/renesas/rz-du/Kconfig > > @@ -10,3 +10,11 @@ config DRM_RZG2L_DU > > help > > Choose this option if you have an RZ/G2L alike chipset. > > If M is selected the module will be called rzg2l-du-drm. > > + > > +config DRM_RZG2L_MIPI_DSI > > + tristate "RZ/G2L MIPI DSI Encoder Support" > > + depends on DRM && DRM_BRIDGE && OF > > + depends on ARCH_RENESAS || COMPILE_TEST > > + select DRM_MIPI_DSI > > + help > > + Enable support for the RZ/G2L Display Unit embedded MIPI DSI encoders. > > diff --git a/drivers/gpu/drm/renesas/rz-du/Makefile > > b/drivers/gpu/drm/renesas/rz-du/Makefile > > index 663b82a2577f..2987900ea6b6 100644 > > --- a/drivers/gpu/drm/renesas/rz-du/Makefile > > +++ b/drivers/gpu/drm/renesas/rz-du/Makefile > > @@ -6,3 +6,5 @@ rzg2l-du-drm-y := rzg2l_du_crtc.o \ > > > > rzg2l-du-drm-$(CONFIG_VIDEO_RENESAS_VSP1) += rzg2l_du_vsp.o > > obj-$(CONFIG_DRM_RZG2L_DU) += rzg2l-du-drm.o > > + > > +obj-$(CONFIG_DRM_RZG2L_MIPI_DSI) += rzg2l_mipi_dsi.o > > diff --git a/drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi.c > > b/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c > > similarity index 100% > > rename from drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi.c > > rename to drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c > > diff --git a/drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi_regs.h > > b/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h > > similarity index 100% > > rename from drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi_regs.h > > rename to drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h > > -- > Regards, > > Laurent Pinchart
Hi Laurent, On Wed, Jun 26, 2024 at 6:51 AM Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote: > > Hi Prabhakar, > > Thank you for the patch. > > On Tue, Jun 25, 2024 at 01:32:44PM +0100, Prabhakar wrote: > > From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > > > All the RZ/G2L DU specific components are located under the rz-du folder, > > so it makes sense to move the RZ/G2L MIPI DSI driver there instead of > > keeping it in the rcar-du folder. This change improves the organization > > and modularity of the driver configuration by grouping related settings together. > > I was thinking the same the other day. Thanks for beating me at sending > a patch :-) > > Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > > Do you or Biju has committer rights to drm-misc to push this patch ? > We dont, can you please queue this patch via your tree? Cheers, Prabhakar
On Fri, Aug 23, 2024 at 02:33:49PM +0100, Lad, Prabhakar wrote: > On Wed, Jun 26, 2024 at 6:51 AM Laurent Pinchart wrote: > > On Tue, Jun 25, 2024 at 01:32:44PM +0100, Prabhakar wrote: > > > From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > > > > > All the RZ/G2L DU specific components are located under the rz-du folder, > > > so it makes sense to move the RZ/G2L MIPI DSI driver there instead of > > > keeping it in the rcar-du folder. This change improves the organization > > > and modularity of the driver configuration by grouping related settings together. > > > > I was thinking the same the other day. Thanks for beating me at sending > > a patch :-) > > > > Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > > > > Do you or Biju has committer rights to drm-misc to push this patch ? > > We dont, can you please queue this patch via your tree? I don't have other pending patches for DRM at the moment. Tomi, could you push this to drm-misc ?
Hi, On 23/08/2024 18:00, Laurent Pinchart wrote: > On Fri, Aug 23, 2024 at 02:33:49PM +0100, Lad, Prabhakar wrote: >> On Wed, Jun 26, 2024 at 6:51 AM Laurent Pinchart wrote: >>> On Tue, Jun 25, 2024 at 01:32:44PM +0100, Prabhakar wrote: >>>> From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> >>>> >>>> All the RZ/G2L DU specific components are located under the rz-du folder, >>>> so it makes sense to move the RZ/G2L MIPI DSI driver there instead of >>>> keeping it in the rcar-du folder. This change improves the organization >>>> and modularity of the driver configuration by grouping related settings together. >>> >>> I was thinking the same the other day. Thanks for beating me at sending >>> a patch :-) >>> >>> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> >>> >>> Do you or Biju has committer rights to drm-misc to push this patch ? >> >> We dont, can you please queue this patch via your tree? > > I don't have other pending patches for DRM at the moment. Tomi, could > you push this to drm-misc ? I have pushed this. Should the DSI driver depend on the DU driver in the kconfig? It compiles fine without the DU, but can it ever be used alone? Tomi
Hi Tomi, > -----Original Message----- > From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> > Sent: Monday, August 26, 2024 10:50 AM > Subject: Re: [PATCH] drm: renesas: Move RZ/G2L MIPI DSI driver to rz-du > > Hi, > > On 23/08/2024 18:00, Laurent Pinchart wrote: > > On Fri, Aug 23, 2024 at 02:33:49PM +0100, Lad, Prabhakar wrote: > >> On Wed, Jun 26, 2024 at 6:51 AM Laurent Pinchart wrote: > >>> On Tue, Jun 25, 2024 at 01:32:44PM +0100, Prabhakar wrote: > >>>> From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > >>>> > >>>> All the RZ/G2L DU specific components are located under the rz-du > >>>> folder, so it makes sense to move the RZ/G2L MIPI DSI driver there > >>>> instead of keeping it in the rcar-du folder. This change improves > >>>> the organization and modularity of the driver configuration by grouping related settings > together. > >>> > >>> I was thinking the same the other day. Thanks for beating me at > >>> sending a patch :-) > >>> > >>> Reviewed-by: Laurent Pinchart > >>> <laurent.pinchart+renesas@ideasonboard.com> > >>> > >>> Do you or Biju has committer rights to drm-misc to push this patch ? > >> > >> We dont, can you please queue this patch via your tree? > > > > I don't have other pending patches for DRM at the moment. Tomi, could > > you push this to drm-misc ? > > I have pushed this. Thanks. > > Should the DSI driver depend on the DU driver in the kconfig? It compiles fine without the DU, but can > it ever be used alone? DSI driver mainlined first before DU. Now DU driver is available, from a functional Point we should add dependency. Will send a patch soon. Cheers, Biju
diff --git a/drivers/gpu/drm/renesas/rcar-du/Kconfig b/drivers/gpu/drm/renesas/rcar-du/Kconfig index 53c356aed5d5..39af73cf2092 100644 --- a/drivers/gpu/drm/renesas/rcar-du/Kconfig +++ b/drivers/gpu/drm/renesas/rcar-du/Kconfig @@ -60,14 +60,6 @@ config DRM_RCAR_MIPI_DSI select DRM_MIPI_DSI select RESET_CONTROLLER -config DRM_RZG2L_MIPI_DSI - tristate "RZ/G2L MIPI DSI Encoder Support" - depends on DRM && DRM_BRIDGE && OF - depends on ARCH_RENESAS || COMPILE_TEST - select DRM_MIPI_DSI - help - Enable support for the RZ/G2L Display Unit embedded MIPI DSI encoders. - config DRM_RCAR_VSP bool "R-Car DU VSP Compositor Support" if ARM default y if ARM64 diff --git a/drivers/gpu/drm/renesas/rcar-du/Makefile b/drivers/gpu/drm/renesas/rcar-du/Makefile index b8f2c82651d9..6f132325c8b7 100644 --- a/drivers/gpu/drm/renesas/rcar-du/Makefile +++ b/drivers/gpu/drm/renesas/rcar-du/Makefile @@ -14,5 +14,3 @@ obj-$(CONFIG_DRM_RCAR_DU) += rcar-du-drm.o obj-$(CONFIG_DRM_RCAR_DW_HDMI) += rcar_dw_hdmi.o obj-$(CONFIG_DRM_RCAR_LVDS) += rcar_lvds.o obj-$(CONFIG_DRM_RCAR_MIPI_DSI) += rcar_mipi_dsi.o - -obj-$(CONFIG_DRM_RZG2L_MIPI_DSI) += rzg2l_mipi_dsi.o diff --git a/drivers/gpu/drm/renesas/rz-du/Kconfig b/drivers/gpu/drm/renesas/rz-du/Kconfig index 5f0db2c5fee6..8ec14271ebba 100644 --- a/drivers/gpu/drm/renesas/rz-du/Kconfig +++ b/drivers/gpu/drm/renesas/rz-du/Kconfig @@ -10,3 +10,11 @@ config DRM_RZG2L_DU help Choose this option if you have an RZ/G2L alike chipset. If M is selected the module will be called rzg2l-du-drm. + +config DRM_RZG2L_MIPI_DSI + tristate "RZ/G2L MIPI DSI Encoder Support" + depends on DRM && DRM_BRIDGE && OF + depends on ARCH_RENESAS || COMPILE_TEST + select DRM_MIPI_DSI + help + Enable support for the RZ/G2L Display Unit embedded MIPI DSI encoders. diff --git a/drivers/gpu/drm/renesas/rz-du/Makefile b/drivers/gpu/drm/renesas/rz-du/Makefile index 663b82a2577f..2987900ea6b6 100644 --- a/drivers/gpu/drm/renesas/rz-du/Makefile +++ b/drivers/gpu/drm/renesas/rz-du/Makefile @@ -6,3 +6,5 @@ rzg2l-du-drm-y := rzg2l_du_crtc.o \ rzg2l-du-drm-$(CONFIG_VIDEO_RENESAS_VSP1) += rzg2l_du_vsp.o obj-$(CONFIG_DRM_RZG2L_DU) += rzg2l-du-drm.o + +obj-$(CONFIG_DRM_RZG2L_MIPI_DSI) += rzg2l_mipi_dsi.o diff --git a/drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi.c b/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c similarity index 100% rename from drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi.c rename to drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c diff --git a/drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi_regs.h b/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h similarity index 100% rename from drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi_regs.h rename to drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h