[15/18] soc: ti: Mover power-domain drivers to the genpd dir

Message ID 20230707140434.723349-16-ulf.hansson@linaro.org
State New
Headers
Series genpd: Create a genpd directory to host genpd providers |

Commit Message

Ulf Hansson July 7, 2023, 2:04 p.m. UTC
  Cc: Nishanth Menon <nm@ti.com>
Cc: Santosh Shilimkar <ssantosh@kernel.org>
Cc: Tero Kristo <kristo@kernel.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
 MAINTAINERS                                   | 3 ++-
 drivers/genpd/Makefile                        | 1 +
 drivers/genpd/ti/Makefile                     | 3 +++
 drivers/{soc => genpd}/ti/omap_prm.c          | 0
 drivers/{soc => genpd}/ti/ti_sci_pm_domains.c | 0
 drivers/soc/ti/Makefile                       | 2 --
 6 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 drivers/genpd/ti/Makefile
 rename drivers/{soc => genpd}/ti/omap_prm.c (100%)
 rename drivers/{soc => genpd}/ti/ti_sci_pm_domains.c (100%)
  

Comments

Nishanth Menon July 7, 2023, 5:50 p.m. UTC | #1
On 16:04-20230707, Ulf Hansson wrote:
> Cc: Nishanth Menon <nm@ti.com>
> Cc: Santosh Shilimkar <ssantosh@kernel.org>
> Cc: Tero Kristo <kristo@kernel.org>
> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
> ---
>  MAINTAINERS                                   | 3 ++-
>  drivers/genpd/Makefile                        | 1 +
>  drivers/genpd/ti/Makefile                     | 3 +++
>  drivers/{soc => genpd}/ti/omap_prm.c          | 0
>  drivers/{soc => genpd}/ti/ti_sci_pm_domains.c | 0
>  drivers/soc/ti/Makefile                       | 2 --
>  6 files changed, 6 insertions(+), 3 deletions(-)
>  create mode 100644 drivers/genpd/ti/Makefile
>  rename drivers/{soc => genpd}/ti/omap_prm.c (100%)
>  rename drivers/{soc => genpd}/ti/ti_sci_pm_domains.c (100%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 9e580df3e5db..3cf16ffac892 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -21101,7 +21101,7 @@ F:	drivers/irqchip/irq-ti-sci-inta.c
>  F:	drivers/irqchip/irq-ti-sci-intr.c
>  F:	drivers/reset/reset-ti-sci.c
>  F:	drivers/soc/ti/ti_sci_inta_msi.c
> -F:	drivers/soc/ti/ti_sci_pm_domains.c
> +F:	drivers/genpd/ti/ti_sci_pm_domains.c
>  F:	include/dt-bindings/soc/ti,sci_pm_domain.h
>  F:	include/linux/soc/ti/ti_sci_inta_msi.h
>  F:	include/linux/soc/ti/ti_sci_protocol.h
> @@ -21335,6 +21335,7 @@ L:	linux-kernel@vger.kernel.org
>  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
>  S:	Maintained
>  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
> +F:	drivers/genpd/ti/omap_prm.c

Probably the wrong place for this as omap_prm is'nt a keystone navigator
driver set. Maybe Tony has a suggestion?

>  F:	drivers/soc/ti/*
>  
>  TI LM49xxx FAMILY ASoC CODEC DRIVERS
> diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile
> index e6f34d82e6a8..193892189f0d 100644
> --- a/drivers/genpd/Makefile
> +++ b/drivers/genpd/Makefile
> @@ -11,3 +11,4 @@ obj-y					+= samsung/
>  obj-y					+= starfive/
>  obj-y					+= sunxi/
>  obj-y					+= tegra/
> +obj-y					+= ti/
> diff --git a/drivers/genpd/ti/Makefile b/drivers/genpd/ti/Makefile
> new file mode 100644
> index 000000000000..69580afbb436
> --- /dev/null
> +++ b/drivers/genpd/ti/Makefile
> @@ -0,0 +1,3 @@
> +# SPDX-License-Identifier: GPL-2.0
> +obj-$(CONFIG_ARCH_OMAP2PLUS)		+= omap_prm.o
> +obj-$(CONFIG_TI_SCI_PM_DOMAINS)		+= ti_sci_pm_domains.o
> diff --git a/drivers/soc/ti/omap_prm.c b/drivers/genpd/ti/omap_prm.c
> similarity index 100%
> rename from drivers/soc/ti/omap_prm.c
> rename to drivers/genpd/ti/omap_prm.c
> diff --git a/drivers/soc/ti/ti_sci_pm_domains.c b/drivers/genpd/ti/ti_sci_pm_domains.c
> similarity index 100%
> rename from drivers/soc/ti/ti_sci_pm_domains.c
> rename to drivers/genpd/ti/ti_sci_pm_domains.c
> diff --git a/drivers/soc/ti/Makefile b/drivers/soc/ti/Makefile
> index cc3c972fad2e..cb800a745e66 100644
> --- a/drivers/soc/ti/Makefile
> +++ b/drivers/soc/ti/Makefile
> @@ -6,9 +6,7 @@ obj-$(CONFIG_KEYSTONE_NAVIGATOR_QMSS)	+= knav_qmss.o
>  knav_qmss-y := knav_qmss_queue.o knav_qmss_acc.o
>  obj-$(CONFIG_KEYSTONE_NAVIGATOR_DMA)	+= knav_dma.o
>  obj-$(CONFIG_AMX3_PM)			+= pm33xx.o
> -obj-$(CONFIG_ARCH_OMAP2PLUS)		+= omap_prm.o
>  obj-$(CONFIG_WKUP_M3_IPC)		+= wkup_m3_ipc.o
> -obj-$(CONFIG_TI_SCI_PM_DOMAINS)		+= ti_sci_pm_domains.o
>  obj-$(CONFIG_TI_SCI_INTA_MSI_DOMAIN)	+= ti_sci_inta_msi.o
>  obj-$(CONFIG_TI_K3_RINGACC)		+= k3-ringacc.o
>  obj-$(CONFIG_TI_K3_SOCINFO)		+= k3-socinfo.o
> -- 
> 2.34.1
>
  
Ulf Hansson July 11, 2023, 9:16 a.m. UTC | #2
On Fri, 7 Jul 2023 at 19:50, Nishanth Menon <nm@ti.com> wrote:
>
> On 16:04-20230707, Ulf Hansson wrote:
> > Cc: Nishanth Menon <nm@ti.com>
> > Cc: Santosh Shilimkar <ssantosh@kernel.org>
> > Cc: Tero Kristo <kristo@kernel.org>
> > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
> > ---
> >  MAINTAINERS                                   | 3 ++-
> >  drivers/genpd/Makefile                        | 1 +
> >  drivers/genpd/ti/Makefile                     | 3 +++
> >  drivers/{soc => genpd}/ti/omap_prm.c          | 0
> >  drivers/{soc => genpd}/ti/ti_sci_pm_domains.c | 0
> >  drivers/soc/ti/Makefile                       | 2 --
> >  6 files changed, 6 insertions(+), 3 deletions(-)
> >  create mode 100644 drivers/genpd/ti/Makefile
> >  rename drivers/{soc => genpd}/ti/omap_prm.c (100%)
> >  rename drivers/{soc => genpd}/ti/ti_sci_pm_domains.c (100%)
> >
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index 9e580df3e5db..3cf16ffac892 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -21101,7 +21101,7 @@ F:    drivers/irqchip/irq-ti-sci-inta.c
> >  F:   drivers/irqchip/irq-ti-sci-intr.c
> >  F:   drivers/reset/reset-ti-sci.c
> >  F:   drivers/soc/ti/ti_sci_inta_msi.c
> > -F:   drivers/soc/ti/ti_sci_pm_domains.c
> > +F:   drivers/genpd/ti/ti_sci_pm_domains.c
> >  F:   include/dt-bindings/soc/ti,sci_pm_domain.h
> >  F:   include/linux/soc/ti/ti_sci_inta_msi.h
> >  F:   include/linux/soc/ti/ti_sci_protocol.h
> > @@ -21335,6 +21335,7 @@ L:    linux-kernel@vger.kernel.org
> >  L:   linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
> >  S:   Maintained
> >  T:   git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
> > +F:   drivers/genpd/ti/omap_prm.c
>
> Probably the wrong place for this as omap_prm is'nt a keystone navigator
> driver set. Maybe Tony has a suggestion?

I guess we could add it to the OMAP2+ section then?

In any case, I suggest we consider that as a separate patch on top, as
I am just obeying to the existing pattern that the get_maintainers
script provides.

Kind regards
Uffe

>
> >  F:   drivers/soc/ti/*
> >
> >  TI LM49xxx FAMILY ASoC CODEC DRIVERS
> > diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile
> > index e6f34d82e6a8..193892189f0d 100644
> > --- a/drivers/genpd/Makefile
> > +++ b/drivers/genpd/Makefile
> > @@ -11,3 +11,4 @@ obj-y                                       += samsung/
> >  obj-y                                        += starfive/
> >  obj-y                                        += sunxi/
> >  obj-y                                        += tegra/
> > +obj-y                                        += ti/
> > diff --git a/drivers/genpd/ti/Makefile b/drivers/genpd/ti/Makefile
> > new file mode 100644
> > index 000000000000..69580afbb436
> > --- /dev/null
> > +++ b/drivers/genpd/ti/Makefile
> > @@ -0,0 +1,3 @@
> > +# SPDX-License-Identifier: GPL-2.0
> > +obj-$(CONFIG_ARCH_OMAP2PLUS)         += omap_prm.o
> > +obj-$(CONFIG_TI_SCI_PM_DOMAINS)              += ti_sci_pm_domains.o
> > diff --git a/drivers/soc/ti/omap_prm.c b/drivers/genpd/ti/omap_prm.c
> > similarity index 100%
> > rename from drivers/soc/ti/omap_prm.c
> > rename to drivers/genpd/ti/omap_prm.c
> > diff --git a/drivers/soc/ti/ti_sci_pm_domains.c b/drivers/genpd/ti/ti_sci_pm_domains.c
> > similarity index 100%
> > rename from drivers/soc/ti/ti_sci_pm_domains.c
> > rename to drivers/genpd/ti/ti_sci_pm_domains.c
> > diff --git a/drivers/soc/ti/Makefile b/drivers/soc/ti/Makefile
> > index cc3c972fad2e..cb800a745e66 100644
> > --- a/drivers/soc/ti/Makefile
> > +++ b/drivers/soc/ti/Makefile
> > @@ -6,9 +6,7 @@ obj-$(CONFIG_KEYSTONE_NAVIGATOR_QMSS) += knav_qmss.o
> >  knav_qmss-y := knav_qmss_queue.o knav_qmss_acc.o
> >  obj-$(CONFIG_KEYSTONE_NAVIGATOR_DMA) += knav_dma.o
> >  obj-$(CONFIG_AMX3_PM)                        += pm33xx.o
> > -obj-$(CONFIG_ARCH_OMAP2PLUS)         += omap_prm.o
> >  obj-$(CONFIG_WKUP_M3_IPC)            += wkup_m3_ipc.o
> > -obj-$(CONFIG_TI_SCI_PM_DOMAINS)              += ti_sci_pm_domains.o
> >  obj-$(CONFIG_TI_SCI_INTA_MSI_DOMAIN) += ti_sci_inta_msi.o
> >  obj-$(CONFIG_TI_K3_RINGACC)          += k3-ringacc.o
> >  obj-$(CONFIG_TI_K3_SOCINFO)          += k3-socinfo.o
> > --
> > 2.34.1
> >
>
> --
> Regards,
> Nishanth Menon
> Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D
  
Nishanth Menon July 11, 2023, 12:49 p.m. UTC | #3
On 11:16-20230711, Ulf Hansson wrote:
> On Fri, 7 Jul 2023 at 19:50, Nishanth Menon <nm@ti.com> wrote:
> >
> > On 16:04-20230707, Ulf Hansson wrote:
> > > Cc: Nishanth Menon <nm@ti.com>
> > > Cc: Santosh Shilimkar <ssantosh@kernel.org>
> > > Cc: Tero Kristo <kristo@kernel.org>
> > > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
> > > ---
> > >  MAINTAINERS                                   | 3 ++-
> > >  drivers/genpd/Makefile                        | 1 +
> > >  drivers/genpd/ti/Makefile                     | 3 +++
> > >  drivers/{soc => genpd}/ti/omap_prm.c          | 0
> > >  drivers/{soc => genpd}/ti/ti_sci_pm_domains.c | 0
> > >  drivers/soc/ti/Makefile                       | 2 --
> > >  6 files changed, 6 insertions(+), 3 deletions(-)
> > >  create mode 100644 drivers/genpd/ti/Makefile
> > >  rename drivers/{soc => genpd}/ti/omap_prm.c (100%)
> > >  rename drivers/{soc => genpd}/ti/ti_sci_pm_domains.c (100%)
> > >
> > > diff --git a/MAINTAINERS b/MAINTAINERS
> > > index 9e580df3e5db..3cf16ffac892 100644
> > > --- a/MAINTAINERS
> > > +++ b/MAINTAINERS
> > > @@ -21101,7 +21101,7 @@ F:    drivers/irqchip/irq-ti-sci-inta.c
> > >  F:   drivers/irqchip/irq-ti-sci-intr.c
> > >  F:   drivers/reset/reset-ti-sci.c
> > >  F:   drivers/soc/ti/ti_sci_inta_msi.c
> > > -F:   drivers/soc/ti/ti_sci_pm_domains.c
> > > +F:   drivers/genpd/ti/ti_sci_pm_domains.c
> > >  F:   include/dt-bindings/soc/ti,sci_pm_domain.h
> > >  F:   include/linux/soc/ti/ti_sci_inta_msi.h
> > >  F:   include/linux/soc/ti/ti_sci_protocol.h
> > > @@ -21335,6 +21335,7 @@ L:    linux-kernel@vger.kernel.org
> > >  L:   linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
> > >  S:   Maintained
> > >  T:   git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
> > > +F:   drivers/genpd/ti/omap_prm.c
> >
> > Probably the wrong place for this as omap_prm is'nt a keystone navigator
> > driver set. Maybe Tony has a suggestion?
> 
> I guess we could add it to the OMAP2+ section then?

That would be my suggestion.

> 
> In any case, I suggest we consider that as a separate patch on top, as
> I am just obeying to the existing pattern that the get_maintainers
> script provides.
> 

OK. otherwise, this looks good to me.

Reviewed-by: Nishanth Menon <nm@ti.com>
  
Tony Lindgren July 14, 2023, 7:51 a.m. UTC | #4
* Nishanth Menon <nm@ti.com> [230711 12:49]:
> On 11:16-20230711, Ulf Hansson wrote:
> > On Fri, 7 Jul 2023 at 19:50, Nishanth Menon <nm@ti.com> wrote:
> > >
> > > On 16:04-20230707, Ulf Hansson wrote:
> > > > Cc: Nishanth Menon <nm@ti.com>
> > > > Cc: Santosh Shilimkar <ssantosh@kernel.org>
> > > > Cc: Tero Kristo <kristo@kernel.org>
> > > > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
> > > > ---
> > > >  MAINTAINERS                                   | 3 ++-
> > > >  drivers/genpd/Makefile                        | 1 +
> > > >  drivers/genpd/ti/Makefile                     | 3 +++
> > > >  drivers/{soc => genpd}/ti/omap_prm.c          | 0
> > > >  drivers/{soc => genpd}/ti/ti_sci_pm_domains.c | 0
> > > >  drivers/soc/ti/Makefile                       | 2 --
> > > >  6 files changed, 6 insertions(+), 3 deletions(-)
> > > >  create mode 100644 drivers/genpd/ti/Makefile
> > > >  rename drivers/{soc => genpd}/ti/omap_prm.c (100%)
> > > >  rename drivers/{soc => genpd}/ti/ti_sci_pm_domains.c (100%)
> > > >
> > > > diff --git a/MAINTAINERS b/MAINTAINERS
> > > > index 9e580df3e5db..3cf16ffac892 100644
> > > > --- a/MAINTAINERS
> > > > +++ b/MAINTAINERS
> > > > @@ -21101,7 +21101,7 @@ F:    drivers/irqchip/irq-ti-sci-inta.c
> > > >  F:   drivers/irqchip/irq-ti-sci-intr.c
> > > >  F:   drivers/reset/reset-ti-sci.c
> > > >  F:   drivers/soc/ti/ti_sci_inta_msi.c
> > > > -F:   drivers/soc/ti/ti_sci_pm_domains.c
> > > > +F:   drivers/genpd/ti/ti_sci_pm_domains.c
> > > >  F:   include/dt-bindings/soc/ti,sci_pm_domain.h
> > > >  F:   include/linux/soc/ti/ti_sci_inta_msi.h
> > > >  F:   include/linux/soc/ti/ti_sci_protocol.h
> > > > @@ -21335,6 +21335,7 @@ L:    linux-kernel@vger.kernel.org
> > > >  L:   linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
> > > >  S:   Maintained
> > > >  T:   git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
> > > > +F:   drivers/genpd/ti/omap_prm.c
> > >
> > > Probably the wrong place for this as omap_prm is'nt a keystone navigator
> > > driver set. Maybe Tony has a suggestion?
> > 
> > I guess we could add it to the OMAP2+ section then?
> 
> That would be my suggestion.

Makes sense to me too.

Regards,

Tony
  

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 9e580df3e5db..3cf16ffac892 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -21101,7 +21101,7 @@  F:	drivers/irqchip/irq-ti-sci-inta.c
 F:	drivers/irqchip/irq-ti-sci-intr.c
 F:	drivers/reset/reset-ti-sci.c
 F:	drivers/soc/ti/ti_sci_inta_msi.c
-F:	drivers/soc/ti/ti_sci_pm_domains.c
+F:	drivers/genpd/ti/ti_sci_pm_domains.c
 F:	include/dt-bindings/soc/ti,sci_pm_domain.h
 F:	include/linux/soc/ti/ti_sci_inta_msi.h
 F:	include/linux/soc/ti/ti_sci_protocol.h
@@ -21335,6 +21335,7 @@  L:	linux-kernel@vger.kernel.org
 L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:	Maintained
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
+F:	drivers/genpd/ti/omap_prm.c
 F:	drivers/soc/ti/*
 
 TI LM49xxx FAMILY ASoC CODEC DRIVERS
diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile
index e6f34d82e6a8..193892189f0d 100644
--- a/drivers/genpd/Makefile
+++ b/drivers/genpd/Makefile
@@ -11,3 +11,4 @@  obj-y					+= samsung/
 obj-y					+= starfive/
 obj-y					+= sunxi/
 obj-y					+= tegra/
+obj-y					+= ti/
diff --git a/drivers/genpd/ti/Makefile b/drivers/genpd/ti/Makefile
new file mode 100644
index 000000000000..69580afbb436
--- /dev/null
+++ b/drivers/genpd/ti/Makefile
@@ -0,0 +1,3 @@ 
+# SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_ARCH_OMAP2PLUS)		+= omap_prm.o
+obj-$(CONFIG_TI_SCI_PM_DOMAINS)		+= ti_sci_pm_domains.o
diff --git a/drivers/soc/ti/omap_prm.c b/drivers/genpd/ti/omap_prm.c
similarity index 100%
rename from drivers/soc/ti/omap_prm.c
rename to drivers/genpd/ti/omap_prm.c
diff --git a/drivers/soc/ti/ti_sci_pm_domains.c b/drivers/genpd/ti/ti_sci_pm_domains.c
similarity index 100%
rename from drivers/soc/ti/ti_sci_pm_domains.c
rename to drivers/genpd/ti/ti_sci_pm_domains.c
diff --git a/drivers/soc/ti/Makefile b/drivers/soc/ti/Makefile
index cc3c972fad2e..cb800a745e66 100644
--- a/drivers/soc/ti/Makefile
+++ b/drivers/soc/ti/Makefile
@@ -6,9 +6,7 @@  obj-$(CONFIG_KEYSTONE_NAVIGATOR_QMSS)	+= knav_qmss.o
 knav_qmss-y := knav_qmss_queue.o knav_qmss_acc.o
 obj-$(CONFIG_KEYSTONE_NAVIGATOR_DMA)	+= knav_dma.o
 obj-$(CONFIG_AMX3_PM)			+= pm33xx.o
-obj-$(CONFIG_ARCH_OMAP2PLUS)		+= omap_prm.o
 obj-$(CONFIG_WKUP_M3_IPC)		+= wkup_m3_ipc.o
-obj-$(CONFIG_TI_SCI_PM_DOMAINS)		+= ti_sci_pm_domains.o
 obj-$(CONFIG_TI_SCI_INTA_MSI_DOMAIN)	+= ti_sci_inta_msi.o
 obj-$(CONFIG_TI_K3_RINGACC)		+= k3-ringacc.o
 obj-$(CONFIG_TI_K3_SOCINFO)		+= k3-socinfo.o