Skip to content

Commit 0dabf24

Browse files
committed
Merge tag 'vexpress-updates-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into soc/arm
Arm Vexpress updates for v6.11 Remove obsolete RTSM DCSCB support which was only ever implemented on a software model which is neither available to download nor maintained. It predates the very first bL cluster based platforms. Other change include addition of the missing MODULE_DESCRIPTION macro in vexpress config bus driver. * tag 'vexpress-updates-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux: bus: vexpress-config: Add missing MODULE_DESCRIPTION() macro dt-bindings: arm: Remove obsolete RTSM DCSCB binding arm: vexpress: Remove obsolete RTSM DCSCB support Link: https://lore.kernel.org/r/20240620093924.375244-4-sudeep.holla@arm.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 6ba59ff + 69a6661 commit 0dabf24

7 files changed

Lines changed: 1 addition & 238 deletions

File tree

Documentation/devicetree/bindings/arm/rtsm-dcscb.txt

Lines changed: 0 additions & 19 deletions
This file was deleted.

arch/arm/configs/vexpress_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ CONFIG_CPUSETS=y
1414
CONFIG_BLK_DEV_INITRD=y
1515
CONFIG_PROFILING=y
1616
CONFIG_ARCH_VEXPRESS=y
17-
CONFIG_ARCH_VEXPRESS_DCSCB=y
1817
CONFIG_ARCH_VEXPRESS_TC2_PM=y
1918
CONFIG_SMP=y
2019
CONFIG_HAVE_ARM_ARCH_TIMER=y

arch/arm/mach-versatile/Kconfig

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -278,15 +278,6 @@ config ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA
278278
build a working kernel, you must also enable relevant core
279279
tile support or Flattened Device Tree based support options.
280280

281-
config ARCH_VEXPRESS_DCSCB
282-
bool "Dual Cluster System Control Block (DCSCB) support"
283-
depends on MCPM
284-
select ARM_CCI400_PORT_CTRL
285-
help
286-
Support for the Dual Cluster System Configuration Block (DCSCB).
287-
This is needed to provide CPU and cluster power management
288-
on RTSM implementing big.LITTLE.
289-
290281
config ARCH_VEXPRESS_SPC
291282
bool "Versatile Express Serial Power Controller (SPC)"
292283
select PM_OPP

arch/arm/mach-versatile/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ obj-$(CONFIG_ARCH_REALVIEW) += realview.o
1616

1717
# vexpress
1818
obj-$(CONFIG_ARCH_VEXPRESS) := v2m.o
19-
obj-$(CONFIG_ARCH_VEXPRESS_DCSCB) += dcscb.o dcscb_setup.o
20-
CFLAGS_dcscb.o += -march=armv7-a
21-
CFLAGS_REMOVE_dcscb.o = -pg
2219
obj-$(CONFIG_ARCH_VEXPRESS_SPC) += spc.o
2320
CFLAGS_REMOVE_spc.o = -pg
2421
obj-$(CONFIG_ARCH_VEXPRESS_TC2_PM) += tc2_pm.o

arch/arm/mach-versatile/dcscb.c

Lines changed: 0 additions & 173 deletions
This file was deleted.

arch/arm/mach-versatile/dcscb_setup.S

Lines changed: 0 additions & 33 deletions
This file was deleted.

drivers/bus/vexpress-config.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,4 +414,5 @@ static struct platform_driver vexpress_syscfg_driver = {
414414
.probe = vexpress_syscfg_probe,
415415
};
416416
module_platform_driver(vexpress_syscfg_driver);
417+
MODULE_DESCRIPTION("Versatile Express configuration bus");
417418
MODULE_LICENSE("GPL v2");

0 commit comments

Comments
 (0)