ARM: mach-nspire: Rework support and directory structure

Having a platform need a mach-* directory should be seen as a negative,
it means the platform needs special non-standard handling. ARM64 support
does not allow mach-* directories at all. While we may not get to that
given all the non-standard architectures we support, we should still try
to get as close as we can and reduce the number of mach directories.

The mach-nspire/ directory and files, provides just one "feature":
having the kernel print the machine name if the DTB does not also contain
a "model" string (which they always do). To reduce the number of mach-*
directories let's do without that feature and remove this directory.

NOTE: The default l2c_aux_mask is now ~0 but these devices never have
this type of cache controller so this is safe.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 395530fe22402ec1ced1f4a1dc732ab1ee471a1b..2afa519deebed9984e685387f1d986082ee34e62 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -413,8 +413,6 @@ source "arch/arm/mach-nomadik/Kconfig"
 
 source "arch/arm/mach-npcm/Kconfig"
 
-source "arch/arm/mach-nspire/Kconfig"
-
 source "arch/arm/mach-omap1/Kconfig"
 
 source "arch/arm/mach-omap2/Kconfig"

diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms
index acaced2f0ab049f8f17e7d14c1de27e2a5981bfd..845ab08e20a4b5b669428e738f9f680a7adda948 100644 (file)
--- a/arch/arm/Kconfig.platforms
+++ b/arch/arm/Kconfig.platforms
@@ -115,6 +115,21 @@ config MACH_UC7112LX
 
 endif
 
+config ARCH_NSPIRE
+       bool "TI-NSPIRE based"
+       depends on ARCH_MULTI_V4T
+       depends on CPU_LITTLE_ENDIAN
+       select CPU_ARM926T
+       select GENERIC_IRQ_CHIP
+       select ARM_AMBA
+       select ARM_VIC
+       select ARM_TIMER_SP804
+       select NSPIRE_TIMER
+       select POWER_RESET
+       select POWER_RESET_SYSCON
+       help
+         This enables support for systems using the TI-NSPIRE CPU
+
 config ARCH_RDA
        bool "RDA Micro SoCs"
        depends on ARCH_MULTI_V7

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 699be64a74be6c9c480f3b3da5de2f8e66a36897..473280d5adce3426165ac80c01da4aa81659839a 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -200,7 +200,6 @@ machine-$(CONFIG_ARCH_MXS)          += mxs
 machine-$(CONFIG_ARCH_MSTARV7)         += mstar
 machine-$(CONFIG_ARCH_NOMADIK)         += nomadik
 machine-$(CONFIG_ARCH_NPCM)            += npcm
-machine-$(CONFIG_ARCH_NSPIRE)          += nspire
 machine-$(CONFIG_ARCH_OMAP1)           += omap1
 machine-$(CONFIG_ARCH_OMAP2PLUS)       += omap2
 machine-$(CONFIG_ARCH_ORION5X)         += orion5x

diff --git a/arch/arm/mach-nspire/Kconfig b/arch/arm/mach-nspire/Kconfig
deleted file mode 100644 (file)
index 0ffdcac..0000000
--- a/arch/arm/mach-nspire/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-config ARCH_NSPIRE
-       bool "TI-NSPIRE based"
-       depends on ARCH_MULTI_V4T
-       depends on CPU_LITTLE_ENDIAN
-       select CPU_ARM926T
-       select GENERIC_IRQ_CHIP
-       select ARM_AMBA
-       select ARM_VIC
-       select ARM_TIMER_SP804
-       select NSPIRE_TIMER
-       select POWER_RESET
-       select POWER_RESET_SYSCON
-       help
-         This enables support for systems using the TI-NSPIRE CPU

diff --git a/arch/arm/mach-nspire/Makefile b/arch/arm/mach-nspire/Makefile
deleted file mode 100644 (file)
index 4716b9b..0000000
--- a/arch/arm/mach-nspire/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-obj-y                          += nspire.o

diff --git a/arch/arm/mach-nspire/nspire.c b/arch/arm/mach-nspire/nspire.c
deleted file mode 100644 (file)
index 2fbfc23..0000000
--- a/arch/arm/mach-nspire/nspire.c
+++ /dev/null
@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- *     Copyright (C) 2013 Daniel Tang <tangrs@tangrs.id.au>
- */
-
-#include <asm/mach/arch.h>
-
-static const char *const nspire_dt_match[] __initconst = {
-       "ti,nspire",
-       "ti,nspire-cx",
-       "ti,nspire-tp",
-       "ti,nspire-clp",
-       NULL,
-};
-
-DT_MACHINE_START(NSPIRE, "TI-NSPIRE")
-       .dt_compat      = nspire_dt_match,
-MACHINE_END