[GIT PULL 4/4] ARM: SoC code changes for 6.1
From: Arnd Bergmann
Date: Thu Oct 06 2022 - 05:28:57 EST
The following changes since commit b90cb1053190353cc30f0fef0ef1f378ccc063c5:
Linux 6.0-rc3 (2022-08-28 15:05:29 -0700)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git tags/arm-soc-6.1
for you to fetch changes up to ef2fb84c130b08ce2a05359c35bc4e9541712375:
ARM: aspeed: Kconfig: Fix indentation (2022-09-28 22:33:55 +0200)
----------------------------------------------------------------
ARM: SoC code changes for 6.1
The main changes this time are for the organization of the Kconfig
files, introducing per-vendor top-level options on arm64 to match
those on arm32, and making the platform selection on arm32 more
uniform, in particular for the remaining StrongARM platforms that
still have a couple of special cases compared to the more recent
ones.
I also did a cleanup of the old Footbridge platform, which was
the last holdout for the phys_to_dma()/dma_to_phys() interface
that is now completely gone from arm32, completing work started
by Christoph Hellwig.
----------------------------------------------------------------
Arnd Bergmann (15):
ARM: remove obsolete Makefile.boot infrastructure
ARM: simplify machdirs/platdirs handling
ARM: Kconfig: clean up platform selection
ARM: fix XIP_KERNEL dependencies
ARM: make ARCH_MULTIPLATFORM user-visible
ARM: footbridge: remove addin mode
ARM: footbridge: remove leftover from personal-server
ARM: footbridge: move isa-dma support into footbridge
ARM: footbridge: remove custom DMA address handling
Merge tag 'arm-soc/for-6.1/maintainers' of https://github.com/Broadcom/stblinux into arm/soc
Merge branch 'footbridge/cleanup' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc into arm/soc
Merge branch 'arm-multiplatform-cleanup' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc into arm/soc
ARM: disallow PCI with MMU=n again
Merge tag 'renesas-arm-soc-for-v6.1-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/soc
ARM: orion: fix include path
Florian Fainelli (2):
arm64: Kconfig.platforms: Re-organized Broadcom menu
arm64: Kconfig.platforms: Group NXP platforms together
Gaosheng Cui (1):
ARM: s3c: remove orphan declarations from arch/arm/mach-s3c/devs.h
Geert Uytterhoeven (2):
ARM: Drop CMDLINE_FORCE dependency on !ARCH_MULTIPLATFORM
ARM: Drop CMDLINE_* dependency on ATAGS
Juerg Haefliger (1):
ARM: aspeed: Kconfig: Fix indentation
Lad Prabhakar (2):
arm64: renesas: Drop selecting SOC_BUS
ARM: shmobile: Drop selecting SOC_BUS
Uwe Kleine-König (1):
pxa: Drop if with an always false condition
William Zhang (1):
MAINTAINERS: Add BCM4908 maintainer to BCMBCA entry
MAINTAINERS | 1 +
arch/arm/Kconfig | 135 +++++----------------
arch/arm/Kconfig.debug | 8 +-
arch/arm/Makefile | 40 ++----
arch/arm/boot/Makefile | 27 ++---
arch/arm/boot/bootp/Makefile | 35 +++++-
arch/arm/configs/assabet_defconfig | 2 +
arch/arm/configs/badge4_defconfig | 2 +
arch/arm/configs/cerfcube_defconfig | 2 +
arch/arm/configs/collie_defconfig | 2 +
arch/arm/configs/footbridge_defconfig | 2 +
arch/arm/configs/h3600_defconfig | 2 +
arch/arm/configs/hackkit_defconfig | 2 +
arch/arm/configs/jornada720_defconfig | 2 +
arch/arm/configs/lart_defconfig | 2 +
arch/arm/configs/neponset_defconfig | 2 +
arch/arm/configs/netwinder_defconfig | 2 +
arch/arm/configs/pleb_defconfig | 2 +
arch/arm/configs/rpc_defconfig | 2 +
arch/arm/configs/shannon_defconfig | 2 +
arch/arm/configs/simpad_defconfig | 2 +
arch/arm/include/asm/dma-direct.h | 1 -
arch/arm/include/asm/dma.h | 2 +-
arch/arm/include/asm/hardware/dec21285.h | 20 ++-
arch/arm/include/asm/mach/dma.h | 5 -
arch/arm/include/asm/memory.h | 11 --
arch/arm/kernel/Makefile | 1 -
arch/arm/kernel/devtree.c | 2 -
arch/arm/mach-aspeed/Kconfig | 14 +--
arch/arm/mach-at91/Makefile.boot | 4 -
arch/arm/mach-davinci/Makefile.boot | 8 --
arch/arm/mach-dove/Makefile | 2 +-
arch/arm/mach-dove/Makefile.boot | 4 -
arch/arm/mach-ep93xx/Makefile.boot | 2 -
arch/arm/mach-footbridge/Kconfig | 48 +++-----
arch/arm/mach-footbridge/Makefile | 5 +-
arch/arm/mach-footbridge/Makefile.boot | 5 -
arch/arm/mach-footbridge/common.c | 79 +-----------
arch/arm/mach-footbridge/dc21285.c | 80 ++++++------
arch/arm/{kernel => mach-footbridge}/dma-isa.c | 11 +-
arch/arm/mach-footbridge/dma.c | 58 ---------
arch/arm/mach-footbridge/include/mach/dma-direct.h | 8 --
arch/arm/mach-footbridge/include/mach/isa-dma.h | 14 +--
arch/arm/mach-footbridge/include/mach/memory.h | 31 -----
arch/arm/mach-footbridge/isa.c | 14 +--
arch/arm/mach-imx/Kconfig | 2 +-
arch/arm/mach-imx/Makefile.boot | 0
arch/arm/mach-iop32x/Makefile.boot | 4 -
arch/arm/mach-lpc18xx/Makefile.boot | 4 -
arch/arm/mach-lpc32xx/Makefile.boot | 4 -
arch/arm/mach-mv78xx0/Makefile | 2 +-
arch/arm/mach-mvebu/Makefile | 2 +-
arch/arm/mach-nspire/Kconfig | 2 +-
arch/arm/mach-omap1/Makefile.boot | 4 -
arch/arm/mach-orion5x/Makefile | 2 +-
arch/arm/mach-rpc/Kconfig | 21 ++++
arch/arm/mach-rpc/Makefile.boot | 5 -
arch/arm/mach-s3c/Makefile.boot | 9 --
arch/arm/mach-s3c/devs.h | 2 -
arch/arm/mach-sa1100/Kconfig | 25 +++-
arch/arm/mach-sa1100/Makefile.boot | 9 --
arch/arm/mach-shmobile/Kconfig | 1 -
arch/arm/mach-stm32/Makefile.boot | 4 -
arch/arm/mach-versatile/Makefile.boot | 4 -
arch/arm/mach-vt8500/Makefile.boot | 4 -
arch/arm/plat-orion/Makefile | 2 +-
arch/arm64/Kconfig.platforms | 53 +++++---
drivers/soc/pxa/ssp.c | 6 +-
drivers/tty/serial/21285.c | 3 -
69 files changed, 294 insertions(+), 585 deletions(-)
delete mode 100644 arch/arm/include/asm/dma-direct.h
delete mode 100644 arch/arm/mach-at91/Makefile.boot
delete mode 100644 arch/arm/mach-davinci/Makefile.boot
delete mode 100644 arch/arm/mach-dove/Makefile.boot
delete mode 100644 arch/arm/mach-ep93xx/Makefile.boot
delete mode 100644 arch/arm/mach-footbridge/Makefile.boot
rename arch/arm/{kernel => mach-footbridge}/dma-isa.c (95%)
delete mode 100644 arch/arm/mach-footbridge/dma.c
delete mode 100644 arch/arm/mach-footbridge/include/mach/dma-direct.h
delete mode 100644 arch/arm/mach-imx/Makefile.boot
delete mode 100644 arch/arm/mach-iop32x/Makefile.boot
delete mode 100644 arch/arm/mach-lpc18xx/Makefile.boot
delete mode 100644 arch/arm/mach-lpc32xx/Makefile.boot
delete mode 100644 arch/arm/mach-omap1/Makefile.boot
create mode 100644 arch/arm/mach-rpc/Kconfig
delete mode 100644 arch/arm/mach-rpc/Makefile.boot
delete mode 100644 arch/arm/mach-s3c/Makefile.boot
delete mode 100644 arch/arm/mach-sa1100/Makefile.boot
delete mode 100644 arch/arm/mach-stm32/Makefile.boot
delete mode 100644 arch/arm/mach-versatile/Makefile.boot
delete mode 100644 arch/arm/mach-vt8500/Makefile.boot