diff mbox series

[17/24] media: platform: rename stm32/ to sti/stm32/

Message ID dc5be62a56ac19c6f49f4c8432558fd7b0efe7e6.1647167750.git.mchehab@kernel.org (mailing list archive)
State New, archived
Headers show
Series Organize media platform drivers per manufacturer | expand

Commit Message

Mauro Carvalho Chehab March 13, 2022, 10:51 a.m. UTC
As the end goal is to have platform drivers split by vendor,
rename stm32/ to sti/stm32/.

Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/

 MAINTAINERS                                               | 2 +-
 drivers/media/platform/Kconfig                            | 2 +-
 drivers/media/platform/Makefile                           | 2 +-
 drivers/media/platform/{ => sti}/stm32/Kconfig            | 0
 drivers/media/platform/{ => sti}/stm32/Makefile           | 0
 drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-hw.c   | 0
 drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-regs.h | 0
 drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.c      | 0
 drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.h      | 0
 drivers/media/platform/{ => sti}/stm32/stm32-dcmi.c       | 0
 10 files changed, 3 insertions(+), 3 deletions(-)
 rename drivers/media/platform/{ => sti}/stm32/Kconfig (100%)
 rename drivers/media/platform/{ => sti}/stm32/Makefile (100%)
 rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-hw.c (100%)
 rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-regs.h (100%)
 rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.c (100%)
 rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.h (100%)
 rename drivers/media/platform/{ => sti}/stm32/stm32-dcmi.c (100%)

Comments

Alain Volmat March 14, 2022, 8:39 a.m. UTC | #1
Hi Mauro,

I don't think stm32 should be put within the sti platform folder.
sti and stm32 are 2 different platforms from ST Microelectronics.
STi refers to the platform with SoCs such as STiH407/STiH410 and STiH418
while stm32 are all STM32 ones. Those two platforms aren't related.
What about having a folder stmicro or stmicroelectronics (too long
probably :D) with the 2 folders sti and stm32 into it ?

Alain

On Sun, Mar 13, 2022 at 11:51:58AM +0100, Mauro Carvalho Chehab wrote:
> As the end goal is to have platform drivers split by vendor,
> rename stm32/ to sti/stm32/.
> 
> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
> ---
> 
> To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
> See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
> 
>  MAINTAINERS                                               | 2 +-
>  drivers/media/platform/Kconfig                            | 2 +-
>  drivers/media/platform/Makefile                           | 2 +-
>  drivers/media/platform/{ => sti}/stm32/Kconfig            | 0
>  drivers/media/platform/{ => sti}/stm32/Makefile           | 0
>  drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-hw.c   | 0
>  drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-regs.h | 0
>  drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.c      | 0
>  drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.h      | 0
>  drivers/media/platform/{ => sti}/stm32/stm32-dcmi.c       | 0
>  10 files changed, 3 insertions(+), 3 deletions(-)
>  rename drivers/media/platform/{ => sti}/stm32/Kconfig (100%)
>  rename drivers/media/platform/{ => sti}/stm32/Makefile (100%)
>  rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-hw.c (100%)
>  rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-regs.h (100%)
>  rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.c (100%)
>  rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.h (100%)
>  rename drivers/media/platform/{ => sti}/stm32/stm32-dcmi.c (100%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 7711a5ea125e..620705e0f043 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -12046,7 +12046,7 @@ L:	linux-media@vger.kernel.org
>  S:	Supported
>  T:	git git://linuxtv.org/media_tree.git
>  F:	Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
> -F:	drivers/media/platform/stm32/stm32-dcmi.c
> +F:	drivers/media/platform/sti/stm32/stm32-dcmi.c
>  
>  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
>  M:	Mauro Carvalho Chehab <mchehab@kernel.org>
> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> index c3594807f8d7..cf373bfbca1b 100644
> --- a/drivers/media/platform/Kconfig
> +++ b/drivers/media/platform/Kconfig
> @@ -95,7 +95,7 @@ source "drivers/media/platform/samsung/s5p-g2d/Kconfig"
>  source "drivers/media/platform/samsung/s5p-jpeg/Kconfig"
>  source "drivers/media/platform/samsung/s5p-mfc/Kconfig"
>  source "drivers/media/platform/sti/Kconfig"
> -source "drivers/media/platform/stm32/Kconfig"
> +source "drivers/media/platform/sti/stm32/Kconfig"
>  source "drivers/media/platform/ti-vpe/Kconfig"
>  source "drivers/media/platform/via/Kconfig"
>  source "drivers/media/platform/xilinx/Kconfig"
> diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
> index 6a766acfbe37..e3dd2331003a 100644
> --- a/drivers/media/platform/Makefile
> +++ b/drivers/media/platform/Makefile
> @@ -40,7 +40,7 @@ obj-y += sti/bdisp/
>  obj-y += sti/c8sectpfe/
>  obj-y += sti/delta/
>  obj-y += sti/hva/
> -obj-y += stm32/
> +obj-y += sti/stm32/
>  obj-y += ti-vpe/
>  obj-y += via/
>  obj-y += xilinx/
> diff --git a/drivers/media/platform/stm32/Kconfig b/drivers/media/platform/sti/stm32/Kconfig
> similarity index 100%
> rename from drivers/media/platform/stm32/Kconfig
> rename to drivers/media/platform/sti/stm32/Kconfig
> diff --git a/drivers/media/platform/stm32/Makefile b/drivers/media/platform/sti/stm32/Makefile
> similarity index 100%
> rename from drivers/media/platform/stm32/Makefile
> rename to drivers/media/platform/sti/stm32/Makefile
> diff --git a/drivers/media/platform/stm32/dma2d/dma2d-hw.c b/drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c
> similarity index 100%
> rename from drivers/media/platform/stm32/dma2d/dma2d-hw.c
> rename to drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c
> diff --git a/drivers/media/platform/stm32/dma2d/dma2d-regs.h b/drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h
> similarity index 100%
> rename from drivers/media/platform/stm32/dma2d/dma2d-regs.h
> rename to drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h
> diff --git a/drivers/media/platform/stm32/dma2d/dma2d.c b/drivers/media/platform/sti/stm32/dma2d/dma2d.c
> similarity index 100%
> rename from drivers/media/platform/stm32/dma2d/dma2d.c
> rename to drivers/media/platform/sti/stm32/dma2d/dma2d.c
> diff --git a/drivers/media/platform/stm32/dma2d/dma2d.h b/drivers/media/platform/sti/stm32/dma2d/dma2d.h
> similarity index 100%
> rename from drivers/media/platform/stm32/dma2d/dma2d.h
> rename to drivers/media/platform/sti/stm32/dma2d/dma2d.h
> diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/sti/stm32/stm32-dcmi.c
> similarity index 100%
> rename from drivers/media/platform/stm32/stm32-dcmi.c
> rename to drivers/media/platform/sti/stm32/stm32-dcmi.c
> -- 
> 2.35.1
>
Mauro Carvalho Chehab March 14, 2022, 11:14 a.m. UTC | #2
Hi Alain,

Em Mon, 14 Mar 2022 09:39:42 +0100
Alain Volmat <alain.volmat@foss.st.com> escreveu:

> Hi Mauro,
> 
> I don't think stm32 should be put within the sti platform folder.
> sti and stm32 are 2 different platforms from ST Microelectronics.
> STi refers to the platform with SoCs such as STiH407/STiH410 and STiH418
> while stm32 are all STM32 ones. Those two platforms aren't related.
> What about having a folder stmicro or stmicroelectronics (too long
> probably :D) with the 2 folders sti and stm32 into it ?

Yeah, a folder like "st", "stm" (New York Stock Exchange uses this name),
"stmicro", or even "stmicroelectronics" with either two folders on it
or two separate submenus work from my side.

I would prefer to have a short name there, like "st" or "stm", but it
is up to you to choose whatever works best for ST Microelectronics.

Just let me know what works best and I'll change it at the patch.

> 
> Alain
> 
> On Sun, Mar 13, 2022 at 11:51:58AM +0100, Mauro Carvalho Chehab wrote:
> > As the end goal is to have platform drivers split by vendor,
> > rename stm32/ to sti/stm32/.
> > 
> > Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
> > ---
> > 
> > To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
> > See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
> > 
> >  MAINTAINERS                                               | 2 +-
> >  drivers/media/platform/Kconfig                            | 2 +-
> >  drivers/media/platform/Makefile                           | 2 +-
> >  drivers/media/platform/{ => sti}/stm32/Kconfig            | 0
> >  drivers/media/platform/{ => sti}/stm32/Makefile           | 0
> >  drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-hw.c   | 0
> >  drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-regs.h | 0
> >  drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.c      | 0
> >  drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.h      | 0
> >  drivers/media/platform/{ => sti}/stm32/stm32-dcmi.c       | 0
> >  10 files changed, 3 insertions(+), 3 deletions(-)
> >  rename drivers/media/platform/{ => sti}/stm32/Kconfig (100%)
> >  rename drivers/media/platform/{ => sti}/stm32/Makefile (100%)
> >  rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-hw.c (100%)
> >  rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-regs.h (100%)
> >  rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.c (100%)
> >  rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.h (100%)
> >  rename drivers/media/platform/{ => sti}/stm32/stm32-dcmi.c (100%)
> > 
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index 7711a5ea125e..620705e0f043 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -12046,7 +12046,7 @@ L:	linux-media@vger.kernel.org
> >  S:	Supported
> >  T:	git git://linuxtv.org/media_tree.git
> >  F:	Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
> > -F:	drivers/media/platform/stm32/stm32-dcmi.c
> > +F:	drivers/media/platform/sti/stm32/stm32-dcmi.c
> >  
> >  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
> >  M:	Mauro Carvalho Chehab <mchehab@kernel.org>
> > diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> > index c3594807f8d7..cf373bfbca1b 100644
> > --- a/drivers/media/platform/Kconfig
> > +++ b/drivers/media/platform/Kconfig
> > @@ -95,7 +95,7 @@ source "drivers/media/platform/samsung/s5p-g2d/Kconfig"
> >  source "drivers/media/platform/samsung/s5p-jpeg/Kconfig"
> >  source "drivers/media/platform/samsung/s5p-mfc/Kconfig"
> >  source "drivers/media/platform/sti/Kconfig"
> > -source "drivers/media/platform/stm32/Kconfig"
> > +source "drivers/media/platform/sti/stm32/Kconfig"
> >  source "drivers/media/platform/ti-vpe/Kconfig"
> >  source "drivers/media/platform/via/Kconfig"
> >  source "drivers/media/platform/xilinx/Kconfig"
> > diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
> > index 6a766acfbe37..e3dd2331003a 100644
> > --- a/drivers/media/platform/Makefile
> > +++ b/drivers/media/platform/Makefile
> > @@ -40,7 +40,7 @@ obj-y += sti/bdisp/
> >  obj-y += sti/c8sectpfe/
> >  obj-y += sti/delta/
> >  obj-y += sti/hva/
> > -obj-y += stm32/
> > +obj-y += sti/stm32/
> >  obj-y += ti-vpe/
> >  obj-y += via/
> >  obj-y += xilinx/
> > diff --git a/drivers/media/platform/stm32/Kconfig b/drivers/media/platform/sti/stm32/Kconfig
> > similarity index 100%
> > rename from drivers/media/platform/stm32/Kconfig
> > rename to drivers/media/platform/sti/stm32/Kconfig
> > diff --git a/drivers/media/platform/stm32/Makefile b/drivers/media/platform/sti/stm32/Makefile
> > similarity index 100%
> > rename from drivers/media/platform/stm32/Makefile
> > rename to drivers/media/platform/sti/stm32/Makefile
> > diff --git a/drivers/media/platform/stm32/dma2d/dma2d-hw.c b/drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c
> > similarity index 100%
> > rename from drivers/media/platform/stm32/dma2d/dma2d-hw.c
> > rename to drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c
> > diff --git a/drivers/media/platform/stm32/dma2d/dma2d-regs.h b/drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h
> > similarity index 100%
> > rename from drivers/media/platform/stm32/dma2d/dma2d-regs.h
> > rename to drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h
> > diff --git a/drivers/media/platform/stm32/dma2d/dma2d.c b/drivers/media/platform/sti/stm32/dma2d/dma2d.c
> > similarity index 100%
> > rename from drivers/media/platform/stm32/dma2d/dma2d.c
> > rename to drivers/media/platform/sti/stm32/dma2d/dma2d.c
> > diff --git a/drivers/media/platform/stm32/dma2d/dma2d.h b/drivers/media/platform/sti/stm32/dma2d/dma2d.h
> > similarity index 100%
> > rename from drivers/media/platform/stm32/dma2d/dma2d.h
> > rename to drivers/media/platform/sti/stm32/dma2d/dma2d.h
> > diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/sti/stm32/stm32-dcmi.c
> > similarity index 100%
> > rename from drivers/media/platform/stm32/stm32-dcmi.c
> > rename to drivers/media/platform/sti/stm32/stm32-dcmi.c
> > -- 
> > 2.35.1
> >   



Thanks,
Mauro
Hugues Fruchet March 14, 2022, 11:34 a.m. UTC | #3
Hi Mauro,

Ideally we would like to stick to sti/ and stm32/ at same level, as it 
is done in various other locations:

./Documentation/arm/sti/
./Documentation/arm/stm32/

./arch/arm/mach-sti
./arch/arm/mach-stm32

./drivers/media/cec/platform/sti/
./drivers/media/cec/platform/stm32/

./drivers/gpu/drm/sti/
./drivers/gpu/drm/stm/

./sound/soc/sti/
./sound/soc/stm/

Is this possible to keep those media folders as is ?

Best regards,
Hugues.

On 3/14/22 12:14 PM, Mauro Carvalho Chehab wrote:
> Hi Alain,
> 
> Em Mon, 14 Mar 2022 09:39:42 +0100
> Alain Volmat <alain.volmat@foss.st.com> escreveu:
> 
>> Hi Mauro,
>>
>> I don't think stm32 should be put within the sti platform folder.
>> sti and stm32 are 2 different platforms from ST Microelectronics.
>> STi refers to the platform with SoCs such as STiH407/STiH410 and STiH418
>> while stm32 are all STM32 ones. Those two platforms aren't related.
>> What about having a folder stmicro or stmicroelectronics (too long
>> probably :D) with the 2 folders sti and stm32 into it ?
> 
> Yeah, a folder like "st", "stm" (New York Stock Exchange uses this name),
> "stmicro", or even "stmicroelectronics" with either two folders on it
> or two separate submenus work from my side.
> 
> I would prefer to have a short name there, like "st" or "stm", but it
> is up to you to choose whatever works best for ST Microelectronics.
> 
> Just let me know what works best and I'll change it at the patch.
> 
>>
>> Alain
>>
>> On Sun, Mar 13, 2022 at 11:51:58AM +0100, Mauro Carvalho Chehab wrote:
>>> As the end goal is to have platform drivers split by vendor,
>>> rename stm32/ to sti/stm32/.
>>>
>>> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
>>> ---
>>>
>>> To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
>>> See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
>>>
>>>   MAINTAINERS                                               | 2 +-
>>>   drivers/media/platform/Kconfig                            | 2 +-
>>>   drivers/media/platform/Makefile                           | 2 +-
>>>   drivers/media/platform/{ => sti}/stm32/Kconfig            | 0
>>>   drivers/media/platform/{ => sti}/stm32/Makefile           | 0
>>>   drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-hw.c   | 0
>>>   drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-regs.h | 0
>>>   drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.c      | 0
>>>   drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.h      | 0
>>>   drivers/media/platform/{ => sti}/stm32/stm32-dcmi.c       | 0
>>>   10 files changed, 3 insertions(+), 3 deletions(-)
>>>   rename drivers/media/platform/{ => sti}/stm32/Kconfig (100%)
>>>   rename drivers/media/platform/{ => sti}/stm32/Makefile (100%)
>>>   rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-hw.c (100%)
>>>   rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-regs.h (100%)
>>>   rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.c (100%)
>>>   rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.h (100%)
>>>   rename drivers/media/platform/{ => sti}/stm32/stm32-dcmi.c (100%)
>>>
>>> diff --git a/MAINTAINERS b/MAINTAINERS
>>> index 7711a5ea125e..620705e0f043 100644
>>> --- a/MAINTAINERS
>>> +++ b/MAINTAINERS
>>> @@ -12046,7 +12046,7 @@ L:	linux-media@vger.kernel.org
>>>   S:	Supported
>>>   T:	git git://linuxtv.org/media_tree.git
>>>   F:	Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
>>> -F:	drivers/media/platform/stm32/stm32-dcmi.c
>>> +F:	drivers/media/platform/sti/stm32/stm32-dcmi.c
>>>   
>>>   MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
>>>   M:	Mauro Carvalho Chehab <mchehab@kernel.org>
>>> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
>>> index c3594807f8d7..cf373bfbca1b 100644
>>> --- a/drivers/media/platform/Kconfig
>>> +++ b/drivers/media/platform/Kconfig
>>> @@ -95,7 +95,7 @@ source "drivers/media/platform/samsung/s5p-g2d/Kconfig"
>>>   source "drivers/media/platform/samsung/s5p-jpeg/Kconfig"
>>>   source "drivers/media/platform/samsung/s5p-mfc/Kconfig"
>>>   source "drivers/media/platform/sti/Kconfig"
>>> -source "drivers/media/platform/stm32/Kconfig"
>>> +source "drivers/media/platform/sti/stm32/Kconfig"
>>>   source "drivers/media/platform/ti-vpe/Kconfig"
>>>   source "drivers/media/platform/via/Kconfig"
>>>   source "drivers/media/platform/xilinx/Kconfig"
>>> diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
>>> index 6a766acfbe37..e3dd2331003a 100644
>>> --- a/drivers/media/platform/Makefile
>>> +++ b/drivers/media/platform/Makefile
>>> @@ -40,7 +40,7 @@ obj-y += sti/bdisp/
>>>   obj-y += sti/c8sectpfe/
>>>   obj-y += sti/delta/
>>>   obj-y += sti/hva/
>>> -obj-y += stm32/
>>> +obj-y += sti/stm32/
>>>   obj-y += ti-vpe/
>>>   obj-y += via/
>>>   obj-y += xilinx/
>>> diff --git a/drivers/media/platform/stm32/Kconfig b/drivers/media/platform/sti/stm32/Kconfig
>>> similarity index 100%
>>> rename from drivers/media/platform/stm32/Kconfig
>>> rename to drivers/media/platform/sti/stm32/Kconfig
>>> diff --git a/drivers/media/platform/stm32/Makefile b/drivers/media/platform/sti/stm32/Makefile
>>> similarity index 100%
>>> rename from drivers/media/platform/stm32/Makefile
>>> rename to drivers/media/platform/sti/stm32/Makefile
>>> diff --git a/drivers/media/platform/stm32/dma2d/dma2d-hw.c b/drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c
>>> similarity index 100%
>>> rename from drivers/media/platform/stm32/dma2d/dma2d-hw.c
>>> rename to drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c
>>> diff --git a/drivers/media/platform/stm32/dma2d/dma2d-regs.h b/drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h
>>> similarity index 100%
>>> rename from drivers/media/platform/stm32/dma2d/dma2d-regs.h
>>> rename to drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h
>>> diff --git a/drivers/media/platform/stm32/dma2d/dma2d.c b/drivers/media/platform/sti/stm32/dma2d/dma2d.c
>>> similarity index 100%
>>> rename from drivers/media/platform/stm32/dma2d/dma2d.c
>>> rename to drivers/media/platform/sti/stm32/dma2d/dma2d.c
>>> diff --git a/drivers/media/platform/stm32/dma2d/dma2d.h b/drivers/media/platform/sti/stm32/dma2d/dma2d.h
>>> similarity index 100%
>>> rename from drivers/media/platform/stm32/dma2d/dma2d.h
>>> rename to drivers/media/platform/sti/stm32/dma2d/dma2d.h
>>> diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/sti/stm32/stm32-dcmi.c
>>> similarity index 100%
>>> rename from drivers/media/platform/stm32/stm32-dcmi.c
>>> rename to drivers/media/platform/sti/stm32/stm32-dcmi.c
>>> -- 
>>> 2.35.1
>>>    
> 
> 
> 
> Thanks,
> Mauro
>
Mauro Carvalho Chehab March 14, 2022, 1:10 p.m. UTC | #4
Em Mon, 14 Mar 2022 12:34:47 +0100
Hugues FRUCHET - FOSS <hugues.fruchet@foss.st.com> escreveu:

> Hi Mauro,
> 
> Ideally we would like to stick to sti/ and stm32/ at same level, as it 
> is done in various other locations:
> 
> ./Documentation/arm/sti/
> ./Documentation/arm/stm32/
> 
> ./arch/arm/mach-sti
> ./arch/arm/mach-stm32
> 
> ./drivers/media/cec/platform/sti/
> ./drivers/media/cec/platform/stm32/
> 
> ./drivers/gpu/drm/sti/
> ./drivers/gpu/drm/stm/
> 
> ./sound/soc/sti/
> ./sound/soc/stm/
> 
> Is this possible to keep those media folders as is ?

If we add them under:
	./drivers/media/platform/stm/sti/
	./drivers/media/platform/stm/stm32/

They'll both be at the same level. 

It has been increasingly hard to maintain media/platform, as the file
become too big and disorganized. Sorting it per-vendor seems to be the
best thing, as it will keep things better organized. 

As a side effect, with such kind of change, it is now possible to 
have a MAINTAINERS entry that would point to a mailing list and/or 
some SoC maintainers/reviewers that should be c/c to all patches 
affecting drivers/media/platform/<vendor>.

Thanks,
Mauro
Hugues Fruchet March 15, 2022, 9:02 a.m. UTC | #5
Hi Mauro,

sti and stm32 architectures don't have the same maintainers nor same 
mailing list as you can see below:

ARM/STM32 ARCHITECTURE
M:    Maxime Coquelin <mcoquelin.stm32@gmail.com>
M:    Alexandre Torgue <alexandre.torgue@foss.st.com>
L:    linux-stm32@st-md-mailman.stormreply.com (moderated for 
non-subscribers)
L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:    Maintained
T:    git 
git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32-next
F:    arch/arm/boot/dts/stm32*
F:    arch/arm/mach-stm32/
F:    drivers/clocksource/armv7m_systick.c
N:    stm32
N:    stm

ARM/STI ARCHITECTURE
M:    Patrice Chotard <patrice.chotard@foss.st.com>
L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:    Maintained
W:    http://www.stlinux.com
F:    Documentation/devicetree/bindings/i2c/i2c-st.txt
F:    arch/arm/boot/dts/sti*
F:    arch/arm/mach-sti/
F:    drivers/ata/ahci_st.c
F:    drivers/char/hw_random/st-rng.c
F:    drivers/clocksource/arm_global_timer.c
F:    drivers/clocksource/clksrc_st_lpc.c
F:    drivers/cpufreq/sti-cpufreq.c
F:    drivers/dma/st_fdma*
F:    drivers/i2c/busses/i2c-st.c
F:    drivers/media/platform/sti/c8sectpfe/
F:    drivers/media/rc/st_rc.c
F:    drivers/mmc/host/sdhci-st.c
F:    drivers/phy/st/phy-miphy28lp.c
F:    drivers/phy/st/phy-stih407-usb.c
F:    drivers/pinctrl/pinctrl-st.c
F:    drivers/remoteproc/st_remoteproc.c
F:    drivers/remoteproc/st_slim_rproc.c
F:    drivers/reset/sti/
F:    drivers/rtc/rtc-st-lpc.c
F:    drivers/tty/serial/st-asc.c
F:    drivers/usb/dwc3/dwc3-st.c
F:    drivers/usb/host/ehci-st.c
F:    drivers/usb/host/ohci-st.c
F:    drivers/watchdog/st_lpc_wdt.c
F:    include/linux/remoteproc/st_slim_rproc.h


but anyway, if this is really important for you to have a top folder to 
group all ST stuff, we prefer to have "st" prefix than "stm":
 > 	./drivers/media/platform/st/sti/
 > 	./drivers/media/platform/st/stm32/

But one more time, our flavour is to stick to:
 > 	./drivers/media/platform/sti/
 > 	./drivers/media/platform/stm32/


Best regards,
Hugues.

On 3/14/22 2:10 PM, Mauro Carvalho Chehab wrote:
> Em Mon, 14 Mar 2022 12:34:47 +0100
> Hugues FRUCHET - FOSS <hugues.fruchet@foss.st.com> escreveu:
> 
>> Hi Mauro,
>>
>> Ideally we would like to stick to sti/ and stm32/ at same level, as it
>> is done in various other locations:
>>
>> ./Documentation/arm/sti/
>> ./Documentation/arm/stm32/
>>
>> ./arch/arm/mach-sti
>> ./arch/arm/mach-stm32
>>
>> ./drivers/media/cec/platform/sti/
>> ./drivers/media/cec/platform/stm32/
>>
>> ./drivers/gpu/drm/sti/
>> ./drivers/gpu/drm/stm/
>>
>> ./sound/soc/sti/
>> ./sound/soc/stm/
>>
>> Is this possible to keep those media folders as is ?
> 
> If we add them under:
> 	./drivers/media/platform/stm/sti/
> 	./drivers/media/platform/stm/stm32/
> 
> They'll both be at the same level.
> 
> It has been increasingly hard to maintain media/platform, as the file
> become too big and disorganized. Sorting it per-vendor seems to be the
> best thing, as it will keep things better organized.
> 
> As a side effect, with such kind of change, it is now possible to
> have a MAINTAINERS entry that would point to a mailing list and/or
> some SoC maintainers/reviewers that should be c/c to all patches
> affecting drivers/media/platform/<vendor>.
> 
> Thanks,
> Mauro
>
Mauro Carvalho Chehab March 16, 2022, 1:28 p.m. UTC | #6
Em Tue, 15 Mar 2022 10:02:53 +0100
Hugues FRUCHET - FOSS <hugues.fruchet@foss.st.com> escreveu:

> Hi Mauro,
> 
> sti and stm32 architectures don't have the same maintainers nor same 
> mailing list as you can see below:
> 
> ARM/STM32 ARCHITECTURE
> M:    Maxime Coquelin <mcoquelin.stm32@gmail.com>
> M:    Alexandre Torgue <alexandre.torgue@foss.st.com>
> L:    linux-stm32@st-md-mailman.stormreply.com (moderated for 
> non-subscribers)
> L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
> S:    Maintained
> T:    git 
> git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32-next
> F:    arch/arm/boot/dts/stm32*
> F:    arch/arm/mach-stm32/
> F:    drivers/clocksource/armv7m_systick.c
> N:    stm32
> N:    stm
> 
> ARM/STI ARCHITECTURE
> M:    Patrice Chotard <patrice.chotard@foss.st.com>
> L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
> S:    Maintained
> W:    http://www.stlinux.com
> F:    Documentation/devicetree/bindings/i2c/i2c-st.txt
> F:    arch/arm/boot/dts/sti*
> F:    arch/arm/mach-sti/
> F:    drivers/ata/ahci_st.c
> F:    drivers/char/hw_random/st-rng.c
> F:    drivers/clocksource/arm_global_timer.c
> F:    drivers/clocksource/clksrc_st_lpc.c
> F:    drivers/cpufreq/sti-cpufreq.c
> F:    drivers/dma/st_fdma*
> F:    drivers/i2c/busses/i2c-st.c
> F:    drivers/media/platform/sti/c8sectpfe/
> F:    drivers/media/rc/st_rc.c
> F:    drivers/mmc/host/sdhci-st.c
> F:    drivers/phy/st/phy-miphy28lp.c
> F:    drivers/phy/st/phy-stih407-usb.c
> F:    drivers/pinctrl/pinctrl-st.c
> F:    drivers/remoteproc/st_remoteproc.c
> F:    drivers/remoteproc/st_slim_rproc.c
> F:    drivers/reset/sti/
> F:    drivers/rtc/rtc-st-lpc.c
> F:    drivers/tty/serial/st-asc.c
> F:    drivers/usb/dwc3/dwc3-st.c
> F:    drivers/usb/host/ehci-st.c
> F:    drivers/usb/host/ohci-st.c
> F:    drivers/watchdog/st_lpc_wdt.c
> F:    include/linux/remoteproc/st_slim_rproc.h

Ok.
	
> but anyway, if this is really important for you to have a top folder to 
> group all ST stuff, we prefer to have "st" prefix than "stm":
>  > 	./drivers/media/platform/st/sti/
>  > 	./drivers/media/platform/st/stm32/

Works for me. Yeah, it is important to have them at the same dir. 
After this series, there's a comment on each platform subdir that
tells what vendor is there. That is meant to help selecting the right
drivers with make menuconfig/gconfig/xconfig, and it is reflected at
the .config file. I'm considering to actually add a submenu per vendor. 
Ether way, if there's more than one directory per vendor, the "comment"
and/or "menuconfig/if/endif" entries would needed to be moved back to the
drivers/media/platform, making in messier again.

Thanks,
Mauro
diff mbox series

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 7711a5ea125e..620705e0f043 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12046,7 +12046,7 @@  L:	linux-media@vger.kernel.org
 S:	Supported
 T:	git git://linuxtv.org/media_tree.git
 F:	Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
-F:	drivers/media/platform/stm32/stm32-dcmi.c
+F:	drivers/media/platform/sti/stm32/stm32-dcmi.c
 
 MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
 M:	Mauro Carvalho Chehab <mchehab@kernel.org>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index c3594807f8d7..cf373bfbca1b 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -95,7 +95,7 @@  source "drivers/media/platform/samsung/s5p-g2d/Kconfig"
 source "drivers/media/platform/samsung/s5p-jpeg/Kconfig"
 source "drivers/media/platform/samsung/s5p-mfc/Kconfig"
 source "drivers/media/platform/sti/Kconfig"
-source "drivers/media/platform/stm32/Kconfig"
+source "drivers/media/platform/sti/stm32/Kconfig"
 source "drivers/media/platform/ti-vpe/Kconfig"
 source "drivers/media/platform/via/Kconfig"
 source "drivers/media/platform/xilinx/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 6a766acfbe37..e3dd2331003a 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -40,7 +40,7 @@  obj-y += sti/bdisp/
 obj-y += sti/c8sectpfe/
 obj-y += sti/delta/
 obj-y += sti/hva/
-obj-y += stm32/
+obj-y += sti/stm32/
 obj-y += ti-vpe/
 obj-y += via/
 obj-y += xilinx/
diff --git a/drivers/media/platform/stm32/Kconfig b/drivers/media/platform/sti/stm32/Kconfig
similarity index 100%
rename from drivers/media/platform/stm32/Kconfig
rename to drivers/media/platform/sti/stm32/Kconfig
diff --git a/drivers/media/platform/stm32/Makefile b/drivers/media/platform/sti/stm32/Makefile
similarity index 100%
rename from drivers/media/platform/stm32/Makefile
rename to drivers/media/platform/sti/stm32/Makefile
diff --git a/drivers/media/platform/stm32/dma2d/dma2d-hw.c b/drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c
similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d-hw.c
rename to drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c
diff --git a/drivers/media/platform/stm32/dma2d/dma2d-regs.h b/drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h
similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d-regs.h
rename to drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h
diff --git a/drivers/media/platform/stm32/dma2d/dma2d.c b/drivers/media/platform/sti/stm32/dma2d/dma2d.c
similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d.c
rename to drivers/media/platform/sti/stm32/dma2d/dma2d.c
diff --git a/drivers/media/platform/stm32/dma2d/dma2d.h b/drivers/media/platform/sti/stm32/dma2d/dma2d.h
similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d.h
rename to drivers/media/platform/sti/stm32/dma2d/dma2d.h
diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/sti/stm32/stm32-dcmi.c
similarity index 100%
rename from drivers/media/platform/stm32/stm32-dcmi.c
rename to drivers/media/platform/sti/stm32/stm32-dcmi.c