Skip to content

Commit fb249b2

Browse files
torvaldstorvalds
committed
Merge tag 'soc-arm-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC code updates from Arnd Bergmann: "There are two notable changes this time: - add a arch/arm/Kconfig.platforms file to simplify the platforms that have no code except their Kconfig file (Andrew Davis) - remove support for the ARM11MPCore CPU in the versatile/realview platform. Since this is the last remaining one after removing ox820, some core code can go as well (Linus Walleij) The other changes are minor cleanups and bugfixes" * tag 'soc-arm-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: ARM: davinci: always select CONFIG_CPU_ARM926T soc: pxa: ssp: fix casts ARM: debug: fix DEBUG_UNCOMPRESS help for !MULTIPLATFORM ARM: MAINTAINERS: drop empty entries for removed boards ARM: Delete ARM11MPCore perf leftovers ARM: mach-nspire: Rework support and directory structure ARM: mach-sunplus: Rework support and directory structure ARM: mach-airoha: Rework support and directory structure ARM: mach-moxart: Move MOXA ART support into Kconfig.platforms ARM: mach-uniphier: Move Socionext UniPhier support into Kconfig.platforms ARM: mach-rda: Move RDA Micro support into Kconfig.platforms ARM: mach-asm9260: Move ASM9260 support into Kconfig.platforms ARM: Kconfig: move platform selection into its own Kconfig file ARM: Delete ARM11MPCore (ARM11 ARMv6K SMP) support MAINTAINERS: add Marvell MBus driver to Marvell EBU SoCs support ARM: mxs: Do not search for "fsl,clkctrl" ARM: imx: Use device_get_match_data() MAINTAINERS: add omap bus drivers to OMAP2+ SUPPORT ARM: at91: pm: set soc_pm.data.mode in at91_pm_secure_init()
2 parents f6597d1 + 40974ee commit fb249b2

30 files changed

Lines changed: 206 additions & 498 deletions

File tree

‎MAINTAINERS‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2015,11 +2015,6 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
20152015
S: Odd Fixes
20162016
N: clps711x
20172017

2018-
ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT
2019-
M: Lennert Buytenhek <kernel@wantstofly.org>
2020-
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
2021-
S: Maintained
2022-
20232018
ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
20242019
M: Hartley Sweeten <hsweeten@visionengravers.com>
20252020
M: Alexander Sverdlin <alexander.sverdlin@gmail.com>
@@ -2305,6 +2300,7 @@ F: arch/arm/mach-dove/
23052300
F: arch/arm/mach-mv78xx0/
23062301
F: arch/arm/mach-orion5x/
23072302
F: arch/arm/plat-orion/
2303+
F: drivers/bus/mvebu-mbus.c
23082304
F: drivers/soc/dove/
23092305

23102306
ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SOC support
@@ -2821,7 +2817,6 @@ F: Documentation/devicetree/bindings/interrupt-controller/sunplus,sp7021-intc.ya
28212817
F: Documentation/devicetree/bindings/reset/sunplus,reset.yaml
28222818
F: arch/arm/boot/dts/sunplus/
28232819
F: arch/arm/configs/sp7021_*defconfig
2824-
F: arch/arm/mach-sunplus/
28252820
F: drivers/clk/clk-sp7021.c
28262821
F: drivers/irqchip/irq-sp7021-intc.c
28272822
F: drivers/reset/reset-sunplus.c
@@ -2837,11 +2832,6 @@ F: arch/arm/boot/dts/synaptics/
28372832
F: arch/arm/mach-berlin/
28382833
F: arch/arm64/boot/dts/synaptics/
28392834

2840-
ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
2841-
M: Lennert Buytenhek <kernel@wantstofly.org>
2842-
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
2843-
S: Maintained
2844-
28452835
ARM/TEGRA HDMI CEC SUBSYSTEM SUPPORT
28462836
M: Hans Verkuil <hverkuil-cisco@xs4all.nl>
28472837
L: linux-tegra@vger.kernel.org
@@ -2858,11 +2848,6 @@ L: linux-samsung-soc@vger.kernel.org
28582848
S: Maintained
28592849
F: arch/arm64/boot/dts/tesla/
28602850

2861-
ARM/TETON BGA MACHINE SUPPORT
2862-
M: "Mark F. Brown" <mark.brown314@gmail.com>
2863-
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
2864-
S: Maintained
2865-
28662851
ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS
28672852
M: Santosh Shilimkar <ssantosh@kernel.org>
28682853
L: linux-kernel@vger.kernel.org
@@ -2941,7 +2926,6 @@ F: Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.yaml
29412926
F: Documentation/devicetree/bindings/soc/socionext/socionext,uniphier*.yaml
29422927
F: arch/arm/boot/dts/socionext/uniphier*
29432928
F: arch/arm/include/asm/hardware/cache-uniphier.h
2944-
F: arch/arm/mach-uniphier/
29452929
F: arch/arm/mm/cache-uniphier.c
29462930
F: arch/arm64/boot/dts/socionext/uniphier*
29472931
F: drivers/bus/uniphier-system-bus.c
@@ -15874,6 +15858,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
1587415858
F: Documentation/devicetree/bindings/arm/ti/omap.yaml
1587515859
F: arch/arm/configs/omap2plus_defconfig
1587615860
F: arch/arm/mach-omap2/
15861+
F: drivers/bus/omap*.[ch]
1587715862
F: drivers/bus/ti-sysc.c
1587815863
F: drivers/gpio/gpio-tps65219.c
1587915864
F: drivers/i2c/busses/i2c-omap.c
@@ -19839,11 +19824,6 @@ F: Documentation/devicetree/bindings/display/simple-framebuffer.yaml
1983919824
F: drivers/video/fbdev/simplefb.c
1984019825
F: include/linux/platform_data/simplefb.h
1984119826

19842-
SIMTEC EB110ATX (Chalice CATS)
19843-
M: Simtec Linux Team <linux@simtec.co.uk>
19844-
S: Supported
19845-
W: http://www.simtec.co.uk/products/EB110ATX/
19846-
1984719827
SIOX
1984819828
M: Thorsten Scherer <t.scherer@eckelmann.de>
1984919829
M: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

‎arch/arm/Kconfig‎

Lines changed: 1 addition & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -340,83 +340,7 @@ config ARCH_MULTIPLATFORM
340340
Selecting N here allows using those options, including
341341
DEBUG_UNCOMPRESS, XIP_KERNEL and ZBOOT_ROM. If unsure, say Y.
342342

343-
menu "Platform selection"
344-
depends on MMU
345-
346-
comment "CPU Core family selection"
347-
348-
config ARCH_MULTI_V4
349-
bool "ARMv4 based platforms (FA526, StrongARM)"
350-
depends on !ARCH_MULTI_V6_V7
351-
# https://github.com/llvm/llvm-project/issues/50764
352-
depends on !LD_IS_LLD || LLD_VERSION >= 160000
353-
select ARCH_MULTI_V4_V5
354-
select CPU_FA526 if !(CPU_SA110 || CPU_SA1100)
355-
356-
config ARCH_MULTI_V4T
357-
bool "ARMv4T based platforms (ARM720T, ARM920T, ...)"
358-
depends on !ARCH_MULTI_V6_V7
359-
# https://github.com/llvm/llvm-project/issues/50764
360-
depends on !LD_IS_LLD || LLD_VERSION >= 160000
361-
select ARCH_MULTI_V4_V5
362-
select CPU_ARM920T if !(CPU_ARM7TDMI || CPU_ARM720T || \
363-
CPU_ARM740T || CPU_ARM9TDMI || CPU_ARM922T || \
364-
CPU_ARM925T || CPU_ARM940T)
365-
366-
config ARCH_MULTI_V5
367-
bool "ARMv5 based platforms (ARM926T, XSCALE, PJ1, ...)"
368-
depends on !ARCH_MULTI_V6_V7
369-
select ARCH_MULTI_V4_V5
370-
select CPU_ARM926T if !(CPU_ARM946E || CPU_ARM1020 || \
371-
CPU_ARM1020E || CPU_ARM1022 || CPU_ARM1026 || \
372-
CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_FEROCEON)
373-
374-
config ARCH_MULTI_V4_V5
375-
bool
376-
377-
config ARCH_MULTI_V6
378-
bool "ARMv6 based platforms (ARM11)"
379-
select ARCH_MULTI_V6_V7
380-
select CPU_V6K
381-
382-
config ARCH_MULTI_V7
383-
bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"
384-
default y
385-
select ARCH_MULTI_V6_V7
386-
select CPU_V7
387-
select HAVE_SMP
388-
389-
config ARCH_MULTI_V6_V7
390-
bool
391-
select MIGHT_HAVE_CACHE_L2X0
392-
393-
config ARCH_MULTI_CPU_AUTO
394-
def_bool !(ARCH_MULTI_V4 || ARCH_MULTI_V4T || ARCH_MULTI_V6_V7)
395-
select ARCH_MULTI_V5
396-
397-
endmenu
398-
399-
config ARCH_VIRT
400-
bool "Dummy Virtual Machine"
401-
depends on ARCH_MULTI_V7
402-
select ARM_AMBA
403-
select ARM_GIC
404-
select ARM_GIC_V2M if PCI
405-
select ARM_GIC_V3
406-
select ARM_GIC_V3_ITS if PCI
407-
select ARM_PSCI
408-
select HAVE_ARM_ARCH_TIMER
409-
410-
config ARCH_AIROHA
411-
bool "Airoha SoC Support"
412-
depends on ARCH_MULTI_V7
413-
select ARM_AMBA
414-
select ARM_GIC
415-
select ARM_GIC_V3
416-
select ARM_PSCI
417-
select HAVE_ARM_ARCH_TIMER
418-
help
419-
Support for Airoha EN7523 SoCs
343+
source "arch/arm/Kconfig.platforms"
420344

421345
#
422346
# This is sorted alphabetically by mach-* pathname. However, plat-*
@@ -429,8 +353,6 @@ source "arch/arm/mach-alpine/Kconfig"
429353

430354
source "arch/arm/mach-artpec/Kconfig"
431355

432-
source "arch/arm/mach-asm9260/Kconfig"
433-
434356
source "arch/arm/mach-aspeed/Kconfig"
435357

436358
source "arch/arm/mach-at91/Kconfig"
@@ -479,8 +401,6 @@ source "arch/arm/mach-milbeaut/Kconfig"
479401

480402
source "arch/arm/mach-mmp/Kconfig"
481403

482-
source "arch/arm/mach-moxart/Kconfig"
483-
484404
source "arch/arm/mach-mstar/Kconfig"
485405

486406
source "arch/arm/mach-mv78xx0/Kconfig"
@@ -493,8 +413,6 @@ source "arch/arm/mach-nomadik/Kconfig"
493413

494414
source "arch/arm/mach-npcm/Kconfig"
495415

496-
source "arch/arm/mach-nspire/Kconfig"
497-
498416
source "arch/arm/mach-omap1/Kconfig"
499417

500418
source "arch/arm/mach-omap2/Kconfig"
@@ -505,8 +423,6 @@ source "arch/arm/mach-pxa/Kconfig"
505423

506424
source "arch/arm/mach-qcom/Kconfig"
507425

508-
source "arch/arm/mach-rda/Kconfig"
509-
510426
source "arch/arm/mach-realtek/Kconfig"
511427

512428
source "arch/arm/mach-rpc/Kconfig"
@@ -529,14 +445,10 @@ source "arch/arm/mach-sti/Kconfig"
529445

530446
source "arch/arm/mach-stm32/Kconfig"
531447

532-
source "arch/arm/mach-sunplus/Kconfig"
533-
534448
source "arch/arm/mach-sunxi/Kconfig"
535449

536450
source "arch/arm/mach-tegra/Kconfig"
537451

538-
source "arch/arm/mach-uniphier/Kconfig"
539-
540452
source "arch/arm/mach-ux500/Kconfig"
541453

542454
source "arch/arm/mach-versatile/Kconfig"

‎arch/arm/Kconfig.debug‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1809,15 +1809,8 @@ config DEBUG_UNCOMPRESS
18091809
(!DEBUG_TEGRA_UART || !ZBOOT_ROM) && \
18101810
!DEBUG_BRCMSTB_UART && !DEBUG_SEMIHOSTING
18111811
help
1812-
This option influences the normal decompressor output for
1813-
multiplatform kernels. Normally, multiplatform kernels disable
1814-
decompressor output because it is not possible to know where to
1815-
send the decompressor output.
1816-
1817-
When this option is set, the selected DEBUG_LL output method
1818-
will be re-used for normal decompressor output on multiplatform
1819-
kernels.
1820-
1812+
Say Y here to enable debug output in the decompressor code, using
1813+
the selected DEBUG_LL output method.
18211814

18221815
config UNCOMPRESS_INCLUDE
18231816
string

0 commit comments

Comments
 (0)