Skip to contentSkip to conversation

soc: starfive: remove stale Makefile entry

PATCH In review Arnd Bergmann 3 participants 5 messages Jul 26, 2023 Arm/actions semi architecture

lore
Share & tools
lore
#0 lore raw

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

From: Arnd Bergmann <[email protected]>

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 <[email protected]

---
 drivers/soc/Makefile | 1 -
 1 file changed, 1 deletion(-)
drivers/soc/Makefile +0 -1
index 3b0f9fb3b5c84..efdcd42f68cb3 100644
@@ -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/
Signature · 1 line
2.39.2
#1 lore raw

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

From: Arnd Bergmann <[email protected]>

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.

---
 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
drivers/genpd/actions/Makefile +1 -0
index e78c420a24540..7e8aa473d12d1 100644
@@ -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
drivers/genpd/actions/owl-sps-helper.c renamed from drivers/soc/actions/owl-sps-helper.c +0 -0
similarity index 100%
rename from drivers/soc/actions/owl-sps-helper.c
rename to drivers/genpd/actions/owl-sps-helper.c
drivers/soc/Makefile +0 -1
index efdcd42f68cb3..708eaad8f590d 100644
@@ -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/
drivers/soc/actions/Makefile deleted +0 -3
deleted file mode 100644
index 4ac88fec2050a..0000000000000
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-
-obj-$(CONFIG_OWL_PM_DOMAINS_HELPER) += owl-sps-helper.o
Signature · 1 line
2.39.2
#2 lore raw

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

Quoted 7 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

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:

Quoted 7 lines

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.

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

Quoted 45 lines
---
 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
drivers/genpd/actions/Makefile +1 -0
index e78c420a24540..7e8aa473d12d1 100644
@@ -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
drivers/genpd/actions/owl-sps-helper.c renamed from drivers/soc/actions/owl-sps-helper.c +0 -0
similarity index 100%
rename from drivers/soc/actions/owl-sps-helper.c
rename to drivers/genpd/actions/owl-sps-helper.c
drivers/soc/Makefile +0 -1
index efdcd42f68cb3..708eaad8f590d 100644
@@ -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/
drivers/soc/actions/Makefile deleted +0 -4
deleted file mode 100644
index 4ac88fec2050a..0000000000000
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-
-obj-$(CONFIG_OWL_PM_DOMAINS_HELPER) += owl-sps-helper.o
--

2.39.2

#3 lore raw
In reply to Arnd Bergmann
Quoted 11 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

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 <[email protected]

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

Quoted 19 lines
---
 drivers/soc/Makefile | 1 -
 1 file changed, 1 deletion(-)
drivers/soc/Makefile +0 -2
index 3b0f9fb3b5c84..efdcd42f68cb3 100644
@@ -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

Acked-by on v1 1/2
#4 lore raw
In reply to Arnd Bergmann
Quoted 10 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

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 <[email protected]

There's a - & a missing > in this tag.
Otherwise,

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

Thanks,
Conor.