| Message ID | 1531920672-31153-1-git-send-email-jacopo@jmondi.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f7be103571e8085a363d47b911560a261a440fd4 |
| Delegated to: | Simon Horman |
| Headers | show |
On Wed, Jul 18, 2018 at 03:31:12PM +0200, Jacopo Mondi wrote: > As the soc_camera framework is going to be deprecated soon, remove the > associated configuration options from shmobile defconfig. > > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> > --- > Hi Simon, > I expect Hans to collect this patch as he did for SH defconfig ones. > Please let us know if that's not ok with you. I'd slightly prefer if shmobile_defconfig changes went through me. My motivation is to reduce the chances of merge conflicts. > > Thanks > j > --- > > arch/arm/configs/shmobile_defconfig | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig > index b49887e..239f2c7 100644 > --- a/arch/arm/configs/shmobile_defconfig > +++ b/arch/arm/configs/shmobile_defconfig > @@ -141,8 +141,6 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y > CONFIG_MEDIA_CONTROLLER=y > CONFIG_VIDEO_V4L2_SUBDEV_API=y > CONFIG_V4L_PLATFORM_DRIVERS=y > -CONFIG_SOC_CAMERA=y > -CONFIG_SOC_CAMERA_PLATFORM=y > CONFIG_VIDEO_RCAR_VIN=y > CONFIG_V4L_MEM2MEM_DRIVERS=y > CONFIG_VIDEO_RENESAS_JPU=y > -- > 2.7.4 >
On 07/19/2018 09:44 AM, Simon Horman wrote: > On Wed, Jul 18, 2018 at 03:31:12PM +0200, Jacopo Mondi wrote: >> As the soc_camera framework is going to be deprecated soon, remove the >> associated configuration options from shmobile defconfig. >> >> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> >> --- >> Hi Simon, >> I expect Hans to collect this patch as he did for SH defconfig ones. >> Please let us know if that's not ok with you. > > I'd slightly prefer if shmobile_defconfig changes went through me. > My motivation is to reduce the chances of merge conflicts. Feel free to take it! Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Regards, Hans > >> >> Thanks >> j >> --- >> >> arch/arm/configs/shmobile_defconfig | 2 -- >> 1 file changed, 2 deletions(-) >> >> diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig >> index b49887e..239f2c7 100644 >> --- a/arch/arm/configs/shmobile_defconfig >> +++ b/arch/arm/configs/shmobile_defconfig >> @@ -141,8 +141,6 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y >> CONFIG_MEDIA_CONTROLLER=y >> CONFIG_VIDEO_V4L2_SUBDEV_API=y >> CONFIG_V4L_PLATFORM_DRIVERS=y >> -CONFIG_SOC_CAMERA=y >> -CONFIG_SOC_CAMERA_PLATFORM=y >> CONFIG_VIDEO_RCAR_VIN=y >> CONFIG_V4L_MEM2MEM_DRIVERS=y >> CONFIG_VIDEO_RENESAS_JPU=y >> -- >> 2.7.4 >>
On Thu, Jul 19, 2018 at 09:44:57AM +0200, Hans Verkuil wrote: > On 07/19/2018 09:44 AM, Simon Horman wrote: > > On Wed, Jul 18, 2018 at 03:31:12PM +0200, Jacopo Mondi wrote: > >> As the soc_camera framework is going to be deprecated soon, remove the > >> associated configuration options from shmobile defconfig. > >> > >> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> > >> --- > >> Hi Simon, > >> I expect Hans to collect this patch as he did for SH defconfig ones. > >> Please let us know if that's not ok with you. > > > > I'd slightly prefer if shmobile_defconfig changes went through me. > > My motivation is to reduce the chances of merge conflicts. > > Feel free to take it! > > Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Thanks, applied for v4.20.
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index b49887e..239f2c7 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -141,8 +141,6 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_SOC_CAMERA=y -CONFIG_SOC_CAMERA_PLATFORM=y CONFIG_VIDEO_RCAR_VIN=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_RENESAS_JPU=y
As the soc_camera framework is going to be deprecated soon, remove the associated configuration options from shmobile defconfig. Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> --- Hi Simon, I expect Hans to collect this patch as he did for SH defconfig ones. Please let us know if that's not ok with you. Thanks j --- arch/arm/configs/shmobile_defconfig | 2 -- 1 file changed, 2 deletions(-) -- 2.7.4