Re: [PATCH] media: rename soc_camera I2C drivers
Hi Jacopo, On Fri, Oct 19, 2018 at 03:13:28PM +0200, jacopo mondi wrote: > Hi Mauro, Hans, Sakari, > > On Fri, Oct 19, 2018 at 03:58:51PM +0300, Sakari Ailus wrote: > > Hi Hans, Mauro, > > > > On Fri, Oct 19, 2018 at 02:39:27PM +0200, Hans Verkuil wrote: > > > On 10/19/18 14:31, Mauro Carvalho Chehab wrote: > > > > Em Fri, 19 Oct 2018 13:45:32 +0200 > > > > Hans Verkuil escreveu: > > > > > > > >> On 10/19/18 13:43, Mauro Carvalho Chehab wrote: > > > >>> Those drivers are part of the legacy SoC camera framework. > > > >>> They're being converted to not use it, but sometimes we're > > > >>> keeping both legacy any new driver. > > > >>> > > > >>> This time, for example, we have two drivers on media with > > > >>> the same name: ov772x. That's bad. > > > >>> > > > >>> So, in order to prevent that to happen, let's prepend the SoC > > > >>> legacy drivers with soc_. > > > >>> > > > >>> No functional changes. > > > >>> > > > >>> Signed-off-by: Mauro Carvalho Chehab > > > >> > > > >> Acked-by: Hans Verkuil > > > > > > > > For now, let's just avoid the conflict if one builds both modules and > > > > do a modprobe ov772x. > > > > > > > >> Let's kill all of these in the next kernel. I see no reason for keeping > > > >> them around. > > > > > > > > While people are doing those SoC conversions, I would keep it. We > > > > > > Which people are doing SoC conversions? Nobody is using soc-camera > > > anymore. > > > It is a dead driver. The only reason it hasn't been removed yet is lack of > > > time since it is not just removing the driver, but also patching old board > > > files that use soc_camera headers. Really left-overs since the > > > corresponding > > > soc-camera drivers have long since been removed. > > > > > > > could move it to staging, to let it clear that those drivers require > > > > conversion, and give people some time to work on it. > > > > > > There is nobody working on it. These are old sensors, and few will have > > > the hardware to test it. If someone needs such a sensor driver, then they > > > can always look at an older kernel version. It's still in git after all. > > > > > > Just kill it rather then polluting the media tree. > > > > I remember at least Jacopo has been doing some. There was someone else as > > well, but I don't remember right now who it was. That said, I'm not sure if > > there's anything happening to the rest. > > Yes, I did port a few drivers and there are patches for others coming. > > [PATCH v2 0/4] media: soc_camera: ov9640: switch driver to v4l2_async > from Peter Cvek (now in Cc) > > > > Is there something that prevents removing these right away? As you said > > it's not functional and people can always check old versions if they want > > to port the driver to V4L2 sub-device framework. > > All dependencies should have been solved so far, but given that > someone might want to do the porting at some point, I don't see how > bad would it be to have them in staging, even if people could look > into the git history... The atomisp driver was removed on similar basis --- it was not functional and no-one was actively working on it. And there was lots of work to keep the codebase compiling (not as much the case with these drivers though). I think that decision regarding atomisp was a correct one, and I don't see much difference between that and these drivers. -- Regards, Sakari Ailus sakari.ai...@linux.intel.com
Re: [PATCH] media: rename soc_camera I2C drivers
Hi Mauro, Hans, Sakari, On Fri, Oct 19, 2018 at 03:58:51PM +0300, Sakari Ailus wrote: > Hi Hans, Mauro, > > On Fri, Oct 19, 2018 at 02:39:27PM +0200, Hans Verkuil wrote: > > On 10/19/18 14:31, Mauro Carvalho Chehab wrote: > > > Em Fri, 19 Oct 2018 13:45:32 +0200 > > > Hans Verkuil escreveu: > > > > > >> On 10/19/18 13:43, Mauro Carvalho Chehab wrote: > > >>> Those drivers are part of the legacy SoC camera framework. > > >>> They're being converted to not use it, but sometimes we're > > >>> keeping both legacy any new driver. > > >>> > > >>> This time, for example, we have two drivers on media with > > >>> the same name: ov772x. That's bad. > > >>> > > >>> So, in order to prevent that to happen, let's prepend the SoC > > >>> legacy drivers with soc_. > > >>> > > >>> No functional changes. > > >>> > > >>> Signed-off-by: Mauro Carvalho Chehab > > >> > > >> Acked-by: Hans Verkuil > > > > > > For now, let's just avoid the conflict if one builds both modules and > > > do a modprobe ov772x. > > > > > >> Let's kill all of these in the next kernel. I see no reason for keeping > > >> them around. > > > > > > While people are doing those SoC conversions, I would keep it. We > > > > Which people are doing SoC conversions? Nobody is using soc-camera anymore. > > It is a dead driver. The only reason it hasn't been removed yet is lack of > > time since it is not just removing the driver, but also patching old board > > files that use soc_camera headers. Really left-overs since the corresponding > > soc-camera drivers have long since been removed. > > > > > could move it to staging, to let it clear that those drivers require > > > conversion, and give people some time to work on it. > > > > There is nobody working on it. These are old sensors, and few will have > > the hardware to test it. If someone needs such a sensor driver, then they > > can always look at an older kernel version. It's still in git after all. > > > > Just kill it rather then polluting the media tree. > > I remember at least Jacopo has been doing some. There was someone else as > well, but I don't remember right now who it was. That said, I'm not sure if > there's anything happening to the rest. Yes, I did port a few drivers and there are patches for others coming. [PATCH v2 0/4] media: soc_camera: ov9640: switch driver to v4l2_async from Peter Cvek (now in Cc) > > Is there something that prevents removing these right away? As you said > it's not functional and people can always check old versions if they want > to port the driver to V4L2 sub-device framework. All dependencies should have been solved so far, but given that someone might want to do the porting at some point, I don't see how bad would it be to have them in staging, even if people could look into the git history... > > -- > Regards, > > Sakari Ailus > sakari.ai...@linux.intel.com signature.asc Description: PGP signature
Re: [PATCH] media: rename soc_camera I2C drivers
Hi Hans, Mauro, On Fri, Oct 19, 2018 at 02:39:27PM +0200, Hans Verkuil wrote: > On 10/19/18 14:31, Mauro Carvalho Chehab wrote: > > Em Fri, 19 Oct 2018 13:45:32 +0200 > > Hans Verkuil escreveu: > > > >> On 10/19/18 13:43, Mauro Carvalho Chehab wrote: > >>> Those drivers are part of the legacy SoC camera framework. > >>> They're being converted to not use it, but sometimes we're > >>> keeping both legacy any new driver. > >>> > >>> This time, for example, we have two drivers on media with > >>> the same name: ov772x. That's bad. > >>> > >>> So, in order to prevent that to happen, let's prepend the SoC > >>> legacy drivers with soc_. > >>> > >>> No functional changes. > >>> > >>> Signed-off-by: Mauro Carvalho Chehab > >> > >> Acked-by: Hans Verkuil > > > > For now, let's just avoid the conflict if one builds both modules and > > do a modprobe ov772x. > > > >> Let's kill all of these in the next kernel. I see no reason for keeping > >> them around. > > > > While people are doing those SoC conversions, I would keep it. We > > Which people are doing SoC conversions? Nobody is using soc-camera anymore. > It is a dead driver. The only reason it hasn't been removed yet is lack of > time since it is not just removing the driver, but also patching old board > files that use soc_camera headers. Really left-overs since the corresponding > soc-camera drivers have long since been removed. > > > could move it to staging, to let it clear that those drivers require > > conversion, and give people some time to work on it. > > There is nobody working on it. These are old sensors, and few will have > the hardware to test it. If someone needs such a sensor driver, then they > can always look at an older kernel version. It's still in git after all. > > Just kill it rather then polluting the media tree. I remember at least Jacopo has been doing some. There was someone else as well, but I don't remember right now who it was. That said, I'm not sure if there's anything happening to the rest. Is there something that prevents removing these right away? As you said it's not functional and people can always check old versions if they want to port the driver to V4L2 sub-device framework. -- Regards, Sakari Ailus sakari.ai...@linux.intel.com
Re: [PATCH] media: rename soc_camera I2C drivers
On 10/19/18 14:31, Mauro Carvalho Chehab wrote:
> Em Fri, 19 Oct 2018 13:45:32 +0200
> Hans Verkuil escreveu:
>
>> On 10/19/18 13:43, Mauro Carvalho Chehab wrote:
>>> Those drivers are part of the legacy SoC camera framework.
>>> They're being converted to not use it, but sometimes we're
>>> keeping both legacy any new driver.
>>>
>>> This time, for example, we have two drivers on media with
>>> the same name: ov772x. That's bad.
>>>
>>> So, in order to prevent that to happen, let's prepend the SoC
>>> legacy drivers with soc_.
>>>
>>> No functional changes.
>>>
>>> Signed-off-by: Mauro Carvalho Chehab
>>
>> Acked-by: Hans Verkuil
>
> For now, let's just avoid the conflict if one builds both modules and
> do a modprobe ov772x.
>
>> Let's kill all of these in the next kernel. I see no reason for keeping
>> them around.
>
> While people are doing those SoC conversions, I would keep it. We
Which people are doing SoC conversions? Nobody is using soc-camera anymore.
It is a dead driver. The only reason it hasn't been removed yet is lack of
time since it is not just removing the driver, but also patching old board
files that use soc_camera headers. Really left-overs since the corresponding
soc-camera drivers have long since been removed.
> could move it to staging, to let it clear that those drivers require
> conversion, and give people some time to work on it.
There is nobody working on it. These are old sensors, and few will have
the hardware to test it. If someone needs such a sensor driver, then they
can always look at an older kernel version. It's still in git after all.
Just kill it rather then polluting the media tree.
Regards,
Hans
>
> In the specific case of ov772x, as we have already a driver that doesn't
> require soc_camera, we can strip it for -next.
>
>>
>> Regards,
>>
>> Hans
>>
>>> ---
>>> drivers/media/i2c/soc_camera/Makefile | 18 +-
>>> .../soc_camera/{mt9m001.c => soc_mt9m001.c}| 0
>>> .../soc_camera/{mt9t112.c => soc_mt9t112.c}| 0
>>> .../soc_camera/{mt9v022.c => soc_mt9v022.c}| 0
>>> .../i2c/soc_camera/{ov5642.c => soc_ov5642.c} | 0
>>> .../i2c/soc_camera/{ov772x.c => soc_ov772x.c} | 0
>>> .../i2c/soc_camera/{ov9640.c => soc_ov9640.c} | 0
>>> .../i2c/soc_camera/{ov9740.c => soc_ov9740.c} | 0
>>> .../{rj54n1cb0c.c => soc_rj54n1cb0c.c} | 0
>>> .../i2c/soc_camera/{tw9910.c => soc_tw9910.c} | 0
>>> 10 files changed, 9 insertions(+), 9 deletions(-)
>>> rename drivers/media/i2c/soc_camera/{mt9m001.c => soc_mt9m001.c} (100%)
>>> rename drivers/media/i2c/soc_camera/{mt9t112.c => soc_mt9t112.c} (100%)
>>> rename drivers/media/i2c/soc_camera/{mt9v022.c => soc_mt9v022.c} (100%)
>>> rename drivers/media/i2c/soc_camera/{ov5642.c => soc_ov5642.c} (100%)
>>> rename drivers/media/i2c/soc_camera/{ov772x.c => soc_ov772x.c} (100%)
>>> rename drivers/media/i2c/soc_camera/{ov9640.c => soc_ov9640.c} (100%)
>>> rename drivers/media/i2c/soc_camera/{ov9740.c => soc_ov9740.c} (100%)
>>> rename drivers/media/i2c/soc_camera/{rj54n1cb0c.c => soc_rj54n1cb0c.c}
>>> (100%)
>>> rename drivers/media/i2c/soc_camera/{tw9910.c => soc_tw9910.c} (100%)
>>>
>>> diff --git a/drivers/media/i2c/soc_camera/Makefile
>>> b/drivers/media/i2c/soc_camera/Makefile
>>> index 8c7770f62997..09ae483b96ef 100644
>>> --- a/drivers/media/i2c/soc_camera/Makefile
>>> +++ b/drivers/media/i2c/soc_camera/Makefile
>>> @@ -1,10 +1,10 @@
>>> # SPDX-License-Identifier: GPL-2.0
>>> -obj-$(CONFIG_SOC_CAMERA_MT9M001) += mt9m001.o
>>> -obj-$(CONFIG_SOC_CAMERA_MT9T112) += mt9t112.o
>>> -obj-$(CONFIG_SOC_CAMERA_MT9V022) += mt9v022.o
>>> -obj-$(CONFIG_SOC_CAMERA_OV5642)+= ov5642.o
>>> -obj-$(CONFIG_SOC_CAMERA_OV772X)+= ov772x.o
>>> -obj-$(CONFIG_SOC_CAMERA_OV9640)+= ov9640.o
>>> -obj-$(CONFIG_SOC_CAMERA_OV9740)+= ov9740.o
>>> -obj-$(CONFIG_SOC_CAMERA_RJ54N1)+= rj54n1cb0c.o
>>> -obj-$(CONFIG_SOC_CAMERA_TW9910)+= tw9910.o
>>> +obj-$(CONFIG_SOC_CAMERA_MT9M001) += soc_mt9m001.o
>>> +obj-$(CONFIG_SOC_CAMERA_MT9T112) += soc_mt9t112.o
>>> +obj-$(CONFIG_SOC_CAMERA_MT9V022) += soc_mt9v022.o
>>> +obj-$(CONFIG_SOC_CAMERA_OV5642)+= soc_ov5642.o
>>> +obj-$(CONFIG_SOC_CAMERA_OV772X)+= soc_ov772x.o
>>> +obj-$(CONFIG_SOC_CAMERA_OV9640)+= soc_ov9640.o
>>> +obj-$(CONFIG_SOC_CAMERA_OV9740)+= soc_ov9740.o
>>> +obj-$(CONFIG_SOC_CAMERA_RJ54N1)+= soc_rj54n1cb0c.o
>>> +obj-$(CONFIG_SOC_CAMERA_TW9910)+= soc_tw9910.o
>>> diff --git a/drivers/media/i2c/soc_camera/mt9m001.c
>>> b/drivers/media/i2c/soc_camera/soc_mt9m001.c
>>> similarity index 100%
>>> rename from drivers/media/i2c/soc_camera/mt9m001.c
>>> rename to drivers/media/i2c/soc_camera/soc_mt9m001.c
>>> diff --git a/drivers/media/i2c/soc_camera/mt9t112.c
>>> b/drivers/media/i2c/soc_camera/soc_mt9t112.c
>>> similarity index 100%
>>> rename from
Re: [PATCH] media: rename soc_camera I2C drivers
Em Fri, 19 Oct 2018 13:45:32 +0200
Hans Verkuil escreveu:
> On 10/19/18 13:43, Mauro Carvalho Chehab wrote:
> > Those drivers are part of the legacy SoC camera framework.
> > They're being converted to not use it, but sometimes we're
> > keeping both legacy any new driver.
> >
> > This time, for example, we have two drivers on media with
> > the same name: ov772x. That's bad.
> >
> > So, in order to prevent that to happen, let's prepend the SoC
> > legacy drivers with soc_.
> >
> > No functional changes.
> >
> > Signed-off-by: Mauro Carvalho Chehab
>
> Acked-by: Hans Verkuil
For now, let's just avoid the conflict if one builds both modules and
do a modprobe ov772x.
> Let's kill all of these in the next kernel. I see no reason for keeping
> them around.
While people are doing those SoC conversions, I would keep it. We
could move it to staging, to let it clear that those drivers require
conversion, and give people some time to work on it.
In the specific case of ov772x, as we have already a driver that doesn't
require soc_camera, we can strip it for -next.
>
> Regards,
>
> Hans
>
> > ---
> > drivers/media/i2c/soc_camera/Makefile | 18 +-
> > .../soc_camera/{mt9m001.c => soc_mt9m001.c}| 0
> > .../soc_camera/{mt9t112.c => soc_mt9t112.c}| 0
> > .../soc_camera/{mt9v022.c => soc_mt9v022.c}| 0
> > .../i2c/soc_camera/{ov5642.c => soc_ov5642.c} | 0
> > .../i2c/soc_camera/{ov772x.c => soc_ov772x.c} | 0
> > .../i2c/soc_camera/{ov9640.c => soc_ov9640.c} | 0
> > .../i2c/soc_camera/{ov9740.c => soc_ov9740.c} | 0
> > .../{rj54n1cb0c.c => soc_rj54n1cb0c.c} | 0
> > .../i2c/soc_camera/{tw9910.c => soc_tw9910.c} | 0
> > 10 files changed, 9 insertions(+), 9 deletions(-)
> > rename drivers/media/i2c/soc_camera/{mt9m001.c => soc_mt9m001.c} (100%)
> > rename drivers/media/i2c/soc_camera/{mt9t112.c => soc_mt9t112.c} (100%)
> > rename drivers/media/i2c/soc_camera/{mt9v022.c => soc_mt9v022.c} (100%)
> > rename drivers/media/i2c/soc_camera/{ov5642.c => soc_ov5642.c} (100%)
> > rename drivers/media/i2c/soc_camera/{ov772x.c => soc_ov772x.c} (100%)
> > rename drivers/media/i2c/soc_camera/{ov9640.c => soc_ov9640.c} (100%)
> > rename drivers/media/i2c/soc_camera/{ov9740.c => soc_ov9740.c} (100%)
> > rename drivers/media/i2c/soc_camera/{rj54n1cb0c.c => soc_rj54n1cb0c.c}
> > (100%)
> > rename drivers/media/i2c/soc_camera/{tw9910.c => soc_tw9910.c} (100%)
> >
> > diff --git a/drivers/media/i2c/soc_camera/Makefile
> > b/drivers/media/i2c/soc_camera/Makefile
> > index 8c7770f62997..09ae483b96ef 100644
> > --- a/drivers/media/i2c/soc_camera/Makefile
> > +++ b/drivers/media/i2c/soc_camera/Makefile
> > @@ -1,10 +1,10 @@
> > # SPDX-License-Identifier: GPL-2.0
> > -obj-$(CONFIG_SOC_CAMERA_MT9M001) += mt9m001.o
> > -obj-$(CONFIG_SOC_CAMERA_MT9T112) += mt9t112.o
> > -obj-$(CONFIG_SOC_CAMERA_MT9V022) += mt9v022.o
> > -obj-$(CONFIG_SOC_CAMERA_OV5642)+= ov5642.o
> > -obj-$(CONFIG_SOC_CAMERA_OV772X)+= ov772x.o
> > -obj-$(CONFIG_SOC_CAMERA_OV9640)+= ov9640.o
> > -obj-$(CONFIG_SOC_CAMERA_OV9740)+= ov9740.o
> > -obj-$(CONFIG_SOC_CAMERA_RJ54N1)+= rj54n1cb0c.o
> > -obj-$(CONFIG_SOC_CAMERA_TW9910)+= tw9910.o
> > +obj-$(CONFIG_SOC_CAMERA_MT9M001) += soc_mt9m001.o
> > +obj-$(CONFIG_SOC_CAMERA_MT9T112) += soc_mt9t112.o
> > +obj-$(CONFIG_SOC_CAMERA_MT9V022) += soc_mt9v022.o
> > +obj-$(CONFIG_SOC_CAMERA_OV5642)+= soc_ov5642.o
> > +obj-$(CONFIG_SOC_CAMERA_OV772X)+= soc_ov772x.o
> > +obj-$(CONFIG_SOC_CAMERA_OV9640)+= soc_ov9640.o
> > +obj-$(CONFIG_SOC_CAMERA_OV9740)+= soc_ov9740.o
> > +obj-$(CONFIG_SOC_CAMERA_RJ54N1)+= soc_rj54n1cb0c.o
> > +obj-$(CONFIG_SOC_CAMERA_TW9910)+= soc_tw9910.o
> > diff --git a/drivers/media/i2c/soc_camera/mt9m001.c
> > b/drivers/media/i2c/soc_camera/soc_mt9m001.c
> > similarity index 100%
> > rename from drivers/media/i2c/soc_camera/mt9m001.c
> > rename to drivers/media/i2c/soc_camera/soc_mt9m001.c
> > diff --git a/drivers/media/i2c/soc_camera/mt9t112.c
> > b/drivers/media/i2c/soc_camera/soc_mt9t112.c
> > similarity index 100%
> > rename from drivers/media/i2c/soc_camera/mt9t112.c
> > rename to drivers/media/i2c/soc_camera/soc_mt9t112.c
> > diff --git a/drivers/media/i2c/soc_camera/mt9v022.c
> > b/drivers/media/i2c/soc_camera/soc_mt9v022.c
> > similarity index 100%
> > rename from drivers/media/i2c/soc_camera/mt9v022.c
> > rename to drivers/media/i2c/soc_camera/soc_mt9v022.c
> > diff --git a/drivers/media/i2c/soc_camera/ov5642.c
> > b/drivers/media/i2c/soc_camera/soc_ov5642.c
> > similarity index 100%
> > rename from drivers/media/i2c/soc_camera/ov5642.c
> > rename to drivers/media/i2c/soc_camera/soc_ov5642.c
> > diff --git a/drivers/media/i2c/soc_camera/ov772x.c
> > b/drivers/media/i2c/soc_camera/soc_ov772x.c
> > similarity index 100%
> > rename from
Re: [PATCH] media: rename soc_camera I2C drivers
On 10/19/18 13:43, Mauro Carvalho Chehab wrote:
> Those drivers are part of the legacy SoC camera framework.
> They're being converted to not use it, but sometimes we're
> keeping both legacy any new driver.
>
> This time, for example, we have two drivers on media with
> the same name: ov772x. That's bad.
>
> So, in order to prevent that to happen, let's prepend the SoC
> legacy drivers with soc_.
>
> No functional changes.
>
> Signed-off-by: Mauro Carvalho Chehab
Acked-by: Hans Verkuil
Let's kill all of these in the next kernel. I see no reason for keeping
them around.
Regards,
Hans
> ---
> drivers/media/i2c/soc_camera/Makefile | 18 +-
> .../soc_camera/{mt9m001.c => soc_mt9m001.c}| 0
> .../soc_camera/{mt9t112.c => soc_mt9t112.c}| 0
> .../soc_camera/{mt9v022.c => soc_mt9v022.c}| 0
> .../i2c/soc_camera/{ov5642.c => soc_ov5642.c} | 0
> .../i2c/soc_camera/{ov772x.c => soc_ov772x.c} | 0
> .../i2c/soc_camera/{ov9640.c => soc_ov9640.c} | 0
> .../i2c/soc_camera/{ov9740.c => soc_ov9740.c} | 0
> .../{rj54n1cb0c.c => soc_rj54n1cb0c.c} | 0
> .../i2c/soc_camera/{tw9910.c => soc_tw9910.c} | 0
> 10 files changed, 9 insertions(+), 9 deletions(-)
> rename drivers/media/i2c/soc_camera/{mt9m001.c => soc_mt9m001.c} (100%)
> rename drivers/media/i2c/soc_camera/{mt9t112.c => soc_mt9t112.c} (100%)
> rename drivers/media/i2c/soc_camera/{mt9v022.c => soc_mt9v022.c} (100%)
> rename drivers/media/i2c/soc_camera/{ov5642.c => soc_ov5642.c} (100%)
> rename drivers/media/i2c/soc_camera/{ov772x.c => soc_ov772x.c} (100%)
> rename drivers/media/i2c/soc_camera/{ov9640.c => soc_ov9640.c} (100%)
> rename drivers/media/i2c/soc_camera/{ov9740.c => soc_ov9740.c} (100%)
> rename drivers/media/i2c/soc_camera/{rj54n1cb0c.c => soc_rj54n1cb0c.c} (100%)
> rename drivers/media/i2c/soc_camera/{tw9910.c => soc_tw9910.c} (100%)
>
> diff --git a/drivers/media/i2c/soc_camera/Makefile
> b/drivers/media/i2c/soc_camera/Makefile
> index 8c7770f62997..09ae483b96ef 100644
> --- a/drivers/media/i2c/soc_camera/Makefile
> +++ b/drivers/media/i2c/soc_camera/Makefile
> @@ -1,10 +1,10 @@
> # SPDX-License-Identifier: GPL-2.0
> -obj-$(CONFIG_SOC_CAMERA_MT9M001) += mt9m001.o
> -obj-$(CONFIG_SOC_CAMERA_MT9T112) += mt9t112.o
> -obj-$(CONFIG_SOC_CAMERA_MT9V022) += mt9v022.o
> -obj-$(CONFIG_SOC_CAMERA_OV5642) += ov5642.o
> -obj-$(CONFIG_SOC_CAMERA_OV772X) += ov772x.o
> -obj-$(CONFIG_SOC_CAMERA_OV9640) += ov9640.o
> -obj-$(CONFIG_SOC_CAMERA_OV9740) += ov9740.o
> -obj-$(CONFIG_SOC_CAMERA_RJ54N1) += rj54n1cb0c.o
> -obj-$(CONFIG_SOC_CAMERA_TW9910) += tw9910.o
> +obj-$(CONFIG_SOC_CAMERA_MT9M001) += soc_mt9m001.o
> +obj-$(CONFIG_SOC_CAMERA_MT9T112) += soc_mt9t112.o
> +obj-$(CONFIG_SOC_CAMERA_MT9V022) += soc_mt9v022.o
> +obj-$(CONFIG_SOC_CAMERA_OV5642) += soc_ov5642.o
> +obj-$(CONFIG_SOC_CAMERA_OV772X) += soc_ov772x.o
> +obj-$(CONFIG_SOC_CAMERA_OV9640) += soc_ov9640.o
> +obj-$(CONFIG_SOC_CAMERA_OV9740) += soc_ov9740.o
> +obj-$(CONFIG_SOC_CAMERA_RJ54N1) += soc_rj54n1cb0c.o
> +obj-$(CONFIG_SOC_CAMERA_TW9910) += soc_tw9910.o
> diff --git a/drivers/media/i2c/soc_camera/mt9m001.c
> b/drivers/media/i2c/soc_camera/soc_mt9m001.c
> similarity index 100%
> rename from drivers/media/i2c/soc_camera/mt9m001.c
> rename to drivers/media/i2c/soc_camera/soc_mt9m001.c
> diff --git a/drivers/media/i2c/soc_camera/mt9t112.c
> b/drivers/media/i2c/soc_camera/soc_mt9t112.c
> similarity index 100%
> rename from drivers/media/i2c/soc_camera/mt9t112.c
> rename to drivers/media/i2c/soc_camera/soc_mt9t112.c
> diff --git a/drivers/media/i2c/soc_camera/mt9v022.c
> b/drivers/media/i2c/soc_camera/soc_mt9v022.c
> similarity index 100%
> rename from drivers/media/i2c/soc_camera/mt9v022.c
> rename to drivers/media/i2c/soc_camera/soc_mt9v022.c
> diff --git a/drivers/media/i2c/soc_camera/ov5642.c
> b/drivers/media/i2c/soc_camera/soc_ov5642.c
> similarity index 100%
> rename from drivers/media/i2c/soc_camera/ov5642.c
> rename to drivers/media/i2c/soc_camera/soc_ov5642.c
> diff --git a/drivers/media/i2c/soc_camera/ov772x.c
> b/drivers/media/i2c/soc_camera/soc_ov772x.c
> similarity index 100%
> rename from drivers/media/i2c/soc_camera/ov772x.c
> rename to drivers/media/i2c/soc_camera/soc_ov772x.c
> diff --git a/drivers/media/i2c/soc_camera/ov9640.c
> b/drivers/media/i2c/soc_camera/soc_ov9640.c
> similarity index 100%
> rename from drivers/media/i2c/soc_camera/ov9640.c
> rename to drivers/media/i2c/soc_camera/soc_ov9640.c
> diff --git a/drivers/media/i2c/soc_camera/ov9740.c
> b/drivers/media/i2c/soc_camera/soc_ov9740.c
> similarity index 100%
> rename from drivers/media/i2c/soc_camera/ov9740.c
> rename to drivers/media/i2c/soc_camera/soc_ov9740.c
> diff --git a/drivers/media/i2c/soc_camera/rj54n1cb0c.c
>
[PATCH] media: rename soc_camera I2C drivers
Those drivers are part of the legacy SoC camera framework.
They're being converted to not use it, but sometimes we're
keeping both legacy any new driver.
This time, for example, we have two drivers on media with
the same name: ov772x. That's bad.
So, in order to prevent that to happen, let's prepend the SoC
legacy drivers with soc_.
No functional changes.
Signed-off-by: Mauro Carvalho Chehab
---
drivers/media/i2c/soc_camera/Makefile | 18 +-
.../soc_camera/{mt9m001.c => soc_mt9m001.c}| 0
.../soc_camera/{mt9t112.c => soc_mt9t112.c}| 0
.../soc_camera/{mt9v022.c => soc_mt9v022.c}| 0
.../i2c/soc_camera/{ov5642.c => soc_ov5642.c} | 0
.../i2c/soc_camera/{ov772x.c => soc_ov772x.c} | 0
.../i2c/soc_camera/{ov9640.c => soc_ov9640.c} | 0
.../i2c/soc_camera/{ov9740.c => soc_ov9740.c} | 0
.../{rj54n1cb0c.c => soc_rj54n1cb0c.c} | 0
.../i2c/soc_camera/{tw9910.c => soc_tw9910.c} | 0
10 files changed, 9 insertions(+), 9 deletions(-)
rename drivers/media/i2c/soc_camera/{mt9m001.c => soc_mt9m001.c} (100%)
rename drivers/media/i2c/soc_camera/{mt9t112.c => soc_mt9t112.c} (100%)
rename drivers/media/i2c/soc_camera/{mt9v022.c => soc_mt9v022.c} (100%)
rename drivers/media/i2c/soc_camera/{ov5642.c => soc_ov5642.c} (100%)
rename drivers/media/i2c/soc_camera/{ov772x.c => soc_ov772x.c} (100%)
rename drivers/media/i2c/soc_camera/{ov9640.c => soc_ov9640.c} (100%)
rename drivers/media/i2c/soc_camera/{ov9740.c => soc_ov9740.c} (100%)
rename drivers/media/i2c/soc_camera/{rj54n1cb0c.c => soc_rj54n1cb0c.c} (100%)
rename drivers/media/i2c/soc_camera/{tw9910.c => soc_tw9910.c} (100%)
diff --git a/drivers/media/i2c/soc_camera/Makefile
b/drivers/media/i2c/soc_camera/Makefile
index 8c7770f62997..09ae483b96ef 100644
--- a/drivers/media/i2c/soc_camera/Makefile
+++ b/drivers/media/i2c/soc_camera/Makefile
@@ -1,10 +1,10 @@
# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_SOC_CAMERA_MT9M001) += mt9m001.o
-obj-$(CONFIG_SOC_CAMERA_MT9T112) += mt9t112.o
-obj-$(CONFIG_SOC_CAMERA_MT9V022) += mt9v022.o
-obj-$(CONFIG_SOC_CAMERA_OV5642)+= ov5642.o
-obj-$(CONFIG_SOC_CAMERA_OV772X)+= ov772x.o
-obj-$(CONFIG_SOC_CAMERA_OV9640)+= ov9640.o
-obj-$(CONFIG_SOC_CAMERA_OV9740)+= ov9740.o
-obj-$(CONFIG_SOC_CAMERA_RJ54N1)+= rj54n1cb0c.o
-obj-$(CONFIG_SOC_CAMERA_TW9910)+= tw9910.o
+obj-$(CONFIG_SOC_CAMERA_MT9M001) += soc_mt9m001.o
+obj-$(CONFIG_SOC_CAMERA_MT9T112) += soc_mt9t112.o
+obj-$(CONFIG_SOC_CAMERA_MT9V022) += soc_mt9v022.o
+obj-$(CONFIG_SOC_CAMERA_OV5642)+= soc_ov5642.o
+obj-$(CONFIG_SOC_CAMERA_OV772X)+= soc_ov772x.o
+obj-$(CONFIG_SOC_CAMERA_OV9640)+= soc_ov9640.o
+obj-$(CONFIG_SOC_CAMERA_OV9740)+= soc_ov9740.o
+obj-$(CONFIG_SOC_CAMERA_RJ54N1)+= soc_rj54n1cb0c.o
+obj-$(CONFIG_SOC_CAMERA_TW9910)+= soc_tw9910.o
diff --git a/drivers/media/i2c/soc_camera/mt9m001.c
b/drivers/media/i2c/soc_camera/soc_mt9m001.c
similarity index 100%
rename from drivers/media/i2c/soc_camera/mt9m001.c
rename to drivers/media/i2c/soc_camera/soc_mt9m001.c
diff --git a/drivers/media/i2c/soc_camera/mt9t112.c
b/drivers/media/i2c/soc_camera/soc_mt9t112.c
similarity index 100%
rename from drivers/media/i2c/soc_camera/mt9t112.c
rename to drivers/media/i2c/soc_camera/soc_mt9t112.c
diff --git a/drivers/media/i2c/soc_camera/mt9v022.c
b/drivers/media/i2c/soc_camera/soc_mt9v022.c
similarity index 100%
rename from drivers/media/i2c/soc_camera/mt9v022.c
rename to drivers/media/i2c/soc_camera/soc_mt9v022.c
diff --git a/drivers/media/i2c/soc_camera/ov5642.c
b/drivers/media/i2c/soc_camera/soc_ov5642.c
similarity index 100%
rename from drivers/media/i2c/soc_camera/ov5642.c
rename to drivers/media/i2c/soc_camera/soc_ov5642.c
diff --git a/drivers/media/i2c/soc_camera/ov772x.c
b/drivers/media/i2c/soc_camera/soc_ov772x.c
similarity index 100%
rename from drivers/media/i2c/soc_camera/ov772x.c
rename to drivers/media/i2c/soc_camera/soc_ov772x.c
diff --git a/drivers/media/i2c/soc_camera/ov9640.c
b/drivers/media/i2c/soc_camera/soc_ov9640.c
similarity index 100%
rename from drivers/media/i2c/soc_camera/ov9640.c
rename to drivers/media/i2c/soc_camera/soc_ov9640.c
diff --git a/drivers/media/i2c/soc_camera/ov9740.c
b/drivers/media/i2c/soc_camera/soc_ov9740.c
similarity index 100%
rename from drivers/media/i2c/soc_camera/ov9740.c
rename to drivers/media/i2c/soc_camera/soc_ov9740.c
diff --git a/drivers/media/i2c/soc_camera/rj54n1cb0c.c
b/drivers/media/i2c/soc_camera/soc_rj54n1cb0c.c
similarity index 100%
rename from drivers/media/i2c/soc_camera/rj54n1cb0c.c
rename to drivers/media/i2c/soc_camera/soc_rj54n1cb0c.c
diff --git a/drivers/media/i2c/soc_camera/tw9910.c
b/drivers/media/i2c/soc_camera/soc_tw9910.c
similarity index 100%
rename from drivers/media/i2c/soc_camera/tw9910.c
rename to
