[PATCH 1/2] soc: starfive: remove stale Makefile entry

[PATCH 1/2] soc: starfive: remove stale Makefile entry

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

After the only starfive driver was moved out to the genpd subsystem, we get
a build failure:

scripts/Makefile.build:41: drivers/soc/starfive/Makefile: No such file or directory

Fixes: f3fb16291f486 ("soc: starfive: Move the power-domain driver to the genpd dir")
Reported=by: kernel test robot <lkp@intel.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/soc/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index 3b0f9fb3b5c84..efdcd42f68cb3 100644
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@ -29,7 +29,6 @@ obj-y				+= renesas/
 obj-y				+= rockchip/
 obj-$(CONFIG_SOC_SAMSUNG)	+= samsung/
 obj-y				+= sifive/
-obj-$(CONFIG_SOC_STARFIVE)	+= starfive/
 obj-y				+= sunxi/
 obj-$(CONFIG_ARCH_TEGRA)	+= tegra/
 obj-y				+= ti/
-- 
2.39.2

[PATCH 2/2] genpd: move owl-sps-helper.c from drivers/soc

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

Moving only one of the two files in drivers/soc/actions to drivers/genpd
caused a link failure in allmodconfig, as drivers/genpd is entered
for compile testing, but drivers/soc/actions accidentally got skipped:

x86_64-linux-gnu-ld: vmlinux.o: in function `owl_sps_set_power':
owl-sps.c:(.text+0x16e259d): undefined reference to `owl_sps_set_pg'

Move the other one as well to allow build testing to work correctly.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/genpd/actions/Makefile                  | 1 +
 drivers/{soc => genpd}/actions/owl-sps-helper.c | 0
 drivers/soc/Makefile                            | 1 -
 drivers/soc/actions/Makefile                    | 3 ---
 4 files changed, 1 insertion(+), 4 deletions(-)
 rename drivers/{soc => genpd}/actions/owl-sps-helper.c (100%)
 delete mode 100644 drivers/soc/actions/Makefile

diff --git a/drivers/genpd/actions/Makefile b/drivers/genpd/actions/Makefile
index e78c420a24540..7e8aa473d12d1 100644
--- a/drivers/genpd/actions/Makefile
+++ b/drivers/genpd/actions/Makefile
@@ -1,2 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0+
+obj-$(CONFIG_OWL_PM_DOMAINS_HELPER)	+= owl-sps-helper.o
 obj-$(CONFIG_OWL_PM_DOMAINS)		+= owl-sps.o
diff --git a/drivers/soc/actions/owl-sps-helper.c b/drivers/genpd/actions/owl-sps-helper.c
similarity index 100%
rename from drivers/soc/actions/owl-sps-helper.c
rename to drivers/genpd/actions/owl-sps-helper.c
diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index efdcd42f68cb3..708eaad8f590d 100644
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@ -3,7 +3,6 @@
 # Makefile for the Linux Kernel SOC specific device drivers.
 #
 
-obj-$(CONFIG_ARCH_ACTIONS)	+= actions/
 obj-y				+= apple/
 obj-y				+= aspeed/
 obj-$(CONFIG_ARCH_AT91)		+= atmel/
diff --git a/drivers/soc/actions/Makefile b/drivers/soc/actions/Makefile
deleted file mode 100644
index 4ac88fec2050a..0000000000000
--- a/drivers/soc/actions/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-
-obj-$(CONFIG_OWL_PM_DOMAINS_HELPER) += owl-sps-helper.o
-- 
2.39.2

Re: [PATCH 2/2] genpd: move owl-sps-helper.c from drivers/soc

[Ulf Hansson]

On Wed, 26 Jul 2023 at 14:17, Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> Moving only one of the two files in drivers/soc/actions to drivers/genpd
> caused a link failure in allmodconfig, as drivers/genpd is entered
> for compile testing, but drivers/soc/actions accidentally got skipped:
>
> x86_64-linux-gnu-ld: vmlinux.o: in function `owl_sps_set_power':
> owl-sps.c:(.text+0x16e259d): undefined reference to `owl_sps_set_pg'
>
> Move the other one as well to allow build testing to work correctly.
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Thanks Arnd!

I have added this to my immutable genpd branch too:

git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git genpd_create_dir

Kind regards
Uffe


> ---
>  drivers/genpd/actions/Makefile                  | 1 +
>  drivers/{soc => genpd}/actions/owl-sps-helper.c | 0
>  drivers/soc/Makefile                            | 1 -
>  drivers/soc/actions/Makefile                    | 3 ---
>  4 files changed, 1 insertion(+), 4 deletions(-)
>  rename drivers/{soc => genpd}/actions/owl-sps-helper.c (100%)
>  delete mode 100644 drivers/soc/actions/Makefile
>
> diff --git a/drivers/genpd/actions/Makefile b/drivers/genpd/actions/Makefile
> index e78c420a24540..7e8aa473d12d1 100644
> --- a/drivers/genpd/actions/Makefile
> +++ b/drivers/genpd/actions/Makefile
> @@ -1,2 +1,3 @@
>  # SPDX-License-Identifier: GPL-2.0+
> +obj-$(CONFIG_OWL_PM_DOMAINS_HELPER)    += owl-sps-helper.o
>  obj-$(CONFIG_OWL_PM_DOMAINS)           += owl-sps.o
> diff --git a/drivers/soc/actions/owl-sps-helper.c b/drivers/genpd/actions/owl-sps-helper.c
> similarity index 100%
> rename from drivers/soc/actions/owl-sps-helper.c
> rename to drivers/genpd/actions/owl-sps-helper.c
> diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
> index efdcd42f68cb3..708eaad8f590d 100644
> --- a/drivers/soc/Makefile
> +++ b/drivers/soc/Makefile
> @@ -3,7 +3,6 @@
>  # Makefile for the Linux Kernel SOC specific device drivers.
>  #
>
> -obj-$(CONFIG_ARCH_ACTIONS)     += actions/
>  obj-y                          += apple/
>  obj-y                          += aspeed/
>  obj-$(CONFIG_ARCH_AT91)                += atmel/
> diff --git a/drivers/soc/actions/Makefile b/drivers/soc/actions/Makefile
> deleted file mode 100644
> index 4ac88fec2050a..0000000000000
> --- a/drivers/soc/actions/Makefile
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -# SPDX-License-Identifier: GPL-2.0+
> -
> -obj-$(CONFIG_OWL_PM_DOMAINS_HELPER) += owl-sps-helper.o
> --
> 2.39.2
>

Re: [PATCH 1/2] soc: starfive: remove stale Makefile entry

[Ulf Hansson]

On Wed, 26 Jul 2023 at 14:17, Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> After the only starfive driver was moved out to the genpd subsystem, we get
> a build failure:
>
> scripts/Makefile.build:41: drivers/soc/starfive/Makefile: No such file or directory
>
> Fixes: f3fb16291f486 ("soc: starfive: Move the power-domain driver to the genpd dir")
> Reported=by: kernel test robot <lkp@intel.com
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Thanks Arnd!

I have added this to my immutable genpd branch too:

git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git genpd_create_dir

Kind regards
Uffe


> ---
>  drivers/soc/Makefile | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
> index 3b0f9fb3b5c84..efdcd42f68cb3 100644
> --- a/drivers/soc/Makefile
> +++ b/drivers/soc/Makefile
> @@ -29,7 +29,6 @@ obj-y                         += renesas/
>  obj-y                          += rockchip/
>  obj-$(CONFIG_SOC_SAMSUNG)      += samsung/
>  obj-y                          += sifive/
> -obj-$(CONFIG_SOC_STARFIVE)     += starfive/
>  obj-y                          += sunxi/
>  obj-$(CONFIG_ARCH_TEGRA)       += tegra/
>  obj-y                          += ti/
> --
> 2.39.2
>

Re: [PATCH 1/2] soc: starfive: remove stale Makefile entry

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 682 bytes --]

On Wed, Jul 26, 2023 at 02:17:14PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> After the only starfive driver was moved out to the genpd subsystem, we get
> a build failure:
> 
> scripts/Makefile.build:41: drivers/soc/starfive/Makefile: No such file or directory
> 
> Fixes: f3fb16291f486 ("soc: starfive: Move the power-domain driver to the genpd dir")

> Reported=by: kernel test robot <lkp@intel.com

There's a - & a missing > in this tag.
Otherwise,
Acked-by: Conor Dooley <conor.dooley@microchip.com>

Reminds me, I need to also send a patch moving the Kconfig entry &
delete the directory and MAINTAINERS entry.

Thanks,
Conor.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]