On 22/02/18 11:37, Jacopo Mondi wrote: > Migo-R platform uses sh_mobile_ceu camera driver, which is now being > replaced by a proper V4L2 camera driver named 'renesas-ceu'. > > Move Migo-R platform to use the v4l2 renesas-ceu camera driver > interface and get rid of soc_camera defined components used to register > sensor drivers and of platform specific enable/disable routines. > > Register clock source and GPIOs for sensor drivers, so they can use > clock and gpio APIs. > > Also, memory for CEU video buffers is now reserved with membocks APIs, > and need to be declared as dma_coherent during machine initialization to > remove that architecture specific part from CEU driver. > > Signed-off-by: Jacopo Mondi <jacopo+renesas@xxxxxxxxxx> > Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > Acked-by: Hans Verkuil <hans.verkuil@xxxxxxxxx> > --- > arch/sh/boards/mach-migor/setup.c | 225 +++++++++++++++------------------ > arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 2 +- > 2 files changed, 101 insertions(+), 126 deletions(-) > > diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c > index 0bcbe58..271dfc2 100644 > --- a/arch/sh/boards/mach-migor/setup.c > +++ b/arch/sh/boards/mach-migor/setup.c > @@ -1,17 +1,16 @@ > +// SPDX-License-Identifier: GPL-2.0 > /* > * Renesas System Solutions Asia Pte. Ltd - Migo-R > * > * Copyright (C) 2008 Magnus Damm > - * > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > */ > +#include <linux/clkdev.h> > #include <linux/init.h> > #include <linux/platform_device.h> > #include <linux/interrupt.h> > #include <linux/input.h> > #include <linux/input/sh_keysc.h> > +#include <linux/memblock.h> > #include <linux/mmc/host.h> > #include <linux/mtd/physmap.h> > #include <linux/mfd/tmio.h> > @@ -23,10 +22,11 @@ > #include <linux/delay.h> > #include <linux/clk.h> > #include <linux/gpio.h> > +#include <linux/gpio/machine.h> > #include <linux/videodev2.h> > #include <linux/sh_intc.h> > #include <video/sh_mobile_lcdc.h> > -#include <media/drv-intf/sh_mobile_ceu.h> > +#include <media/drv-intf/renesas-ceu.h> > #include <media/i2c/ov772x.h> > #include <media/soc_camera.h> You left a stray soc_camera.h include here. Can you make a patch that removes this and verify that everything compiles? I also see CONFIG_SOC_CAMERA in several arch/sh/configs/*_defconfig files. Should those be updated? Regards, Hans
