| Message ID | 1524230914-10175-4-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Geert, On Saturday, 21 April 2018 11:07:11 EEST Laurent Pinchart wrote: > On Friday, 20 April 2018 16:28:29 EEST Geert Uytterhoeven wrote: > > The Renesas Fine Display Processor driver is used on Renesas R-Car SoCs > > only. Since commit 9b5ba0df4ea4f940 ("ARM: shmobile: Introduce > > ARCH_RENESAS") is ARCH_RENESAS a more appropriate platform dependency > > than the legacy ARCH_SHMOBILE, hence use the former. > > > > This will allow to drop ARCH_SHMOBILE on ARM and ARM64 in the near > > future. > > > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > How would you like to get this merged ? Unless you would like to merge the whole series in one go, I'll take this in my tree as I have a conflicting patch I would like to submit for v4.18. > > --- > > > > drivers/media/platform/Kconfig | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/media/platform/Kconfig > > b/drivers/media/platform/Kconfig index f9235e8f8e962d2e..7ad4725f9d1f9627 > > 100644 > > --- a/drivers/media/platform/Kconfig > > +++ b/drivers/media/platform/Kconfig > > @@ -396,7 +396,7 @@ config VIDEO_SH_VEU > > config VIDEO_RENESAS_FDP1 > > tristate "Renesas Fine Display Processor" > > depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA > > - depends on ARCH_SHMOBILE || COMPILE_TEST > > + depends on ARCH_RENESAS || COMPILE_TEST > > depends on (!ARCH_RENESAS && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP > > select VIDEOBUF2_DMA_CONTIG > > select V4L2_MEM2MEM_DEV
On Fri, Apr 20, 2018 at 03:28:29PM +0200, Geert Uytterhoeven wrote: > The Renesas Fine Display Processor driver is used on Renesas R-Car SoCs > only. Since commit 9b5ba0df4ea4f940 ("ARM: shmobile: Introduce > ARCH_RENESAS") is ARCH_RENESAS a more appropriate platform dependency > than the legacy ARCH_SHMOBILE, hence use the former. > > This will allow to drop ARCH_SHMOBILE on ARM and ARM64 in the near > future. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Hi Laurent, On Sun, Apr 22, 2018 at 10:46 AM, Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote: > On Saturday, 21 April 2018 11:07:11 EEST Laurent Pinchart wrote: >> On Friday, 20 April 2018 16:28:29 EEST Geert Uytterhoeven wrote: >> > The Renesas Fine Display Processor driver is used on Renesas R-Car SoCs >> > only. Since commit 9b5ba0df4ea4f940 ("ARM: shmobile: Introduce >> > ARCH_RENESAS") is ARCH_RENESAS a more appropriate platform dependency >> > than the legacy ARCH_SHMOBILE, hence use the former. >> > >> > This will allow to drop ARCH_SHMOBILE on ARM and ARM64 in the near >> > future. >> > >> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> >> >> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> >> >> How would you like to get this merged ? > > Unless you would like to merge the whole series in one go, I'll take this in > my tree as I have a conflicting patch I would like to submit for v4.18. Please take it in your tree, thanks! Gr{oetje,eeting}s, Geert
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index f9235e8f8e962d2e..7ad4725f9d1f9627 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -396,7 +396,7 @@ config VIDEO_SH_VEU config VIDEO_RENESAS_FDP1 tristate "Renesas Fine Display Processor" depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA - depends on ARCH_SHMOBILE || COMPILE_TEST + depends on ARCH_RENESAS || COMPILE_TEST depends on (!ARCH_RENESAS && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV
The Renesas Fine Display Processor driver is used on Renesas R-Car SoCs only. Since commit 9b5ba0df4ea4f940 ("ARM: shmobile: Introduce ARCH_RENESAS") is ARCH_RENESAS a more appropriate platform dependency than the legacy ARCH_SHMOBILE, hence use the former. This will allow to drop ARCH_SHMOBILE on ARM and ARM64 in the near future. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/media/platform/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)