[PATCH 07/10] ARM: mach-digicolor: Rework support and directory structure

[Andrew Davis]

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-digicolor/ 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.

Signed-off-by: Andrew Davis <afd at ti.com>
---
 arch/arm/Kconfig                    |  2 --
 arch/arm/Kconfig.platforms          | 11 +++++++++++
 arch/arm/Makefile                   |  1 -
 arch/arm/mach-digicolor/Kconfig     | 11 -----------
 arch/arm/mach-digicolor/Makefile    |  2 --
 arch/arm/mach-digicolor/digicolor.c | 15 ---------------
 6 files changed, 11 insertions(+), 31 deletions(-)
 delete mode 100644 arch/arm/mach-digicolor/Kconfig
 delete mode 100644 arch/arm/mach-digicolor/Makefile
 delete mode 100644 arch/arm/mach-digicolor/digicolor.c

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f60e98da58cd..d4afd5a01307 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -363,8 +363,6 @@ source "arch/arm/mach-clps711x/Kconfig"
 
 source "arch/arm/mach-davinci/Kconfig"
 
-source "arch/arm/mach-digicolor/Kconfig"
-
 source "arch/arm/mach-dove/Kconfig"
 
 source "arch/arm/mach-ep93xx/Kconfig"
diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms
index 38457d5a18ff..c74392419cc3 100644
--- a/arch/arm/Kconfig.platforms
+++ b/arch/arm/Kconfig.platforms
@@ -87,6 +87,17 @@ config MACH_ASM9260
 	help
 	  Support for Alphascale ASM9260 based platform.
 
+config ARCH_DIGICOLOR
+	bool "Conexant Digicolor SoC Support"
+	depends on ARCH_MULTI_V7
+	select CLKSRC_MMIO
+	select DIGICOLOR_TIMER
+	select GENERIC_IRQ_CHIP
+	select GPIOLIB
+	select MFD_SYSCON
+	select PINCTRL
+	select PINCTRL_DIGICOLOR
+
 menuconfig ARCH_MOXART
 	bool "MOXA ART SoC"
 	depends on ARCH_MULTI_V4
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index e20c8af34d51..82ec2c8bd749 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -176,7 +176,6 @@ machine-$(CONFIG_ARCH_BCM)		+= bcm
 machine-$(CONFIG_ARCH_BERLIN)		+= berlin
 machine-$(CONFIG_ARCH_CLPS711X)		+= clps711x
 machine-$(CONFIG_ARCH_DAVINCI)		+= davinci
-machine-$(CONFIG_ARCH_DIGICOLOR)	+= digicolor
 machine-$(CONFIG_ARCH_DOVE)		+= dove
 machine-$(CONFIG_ARCH_EP93XX)		+= ep93xx
 machine-$(CONFIG_ARCH_EXYNOS)		+= exynos
diff --git a/arch/arm/mach-digicolor/Kconfig b/arch/arm/mach-digicolor/Kconfig
deleted file mode 100644
index 90394433c405..000000000000
--- a/arch/arm/mach-digicolor/Kconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-config ARCH_DIGICOLOR
-	bool "Conexant Digicolor SoC Support"
-	depends on ARCH_MULTI_V7
-	select CLKSRC_MMIO
-	select DIGICOLOR_TIMER
-	select GENERIC_IRQ_CHIP
-	select GPIOLIB
-	select MFD_SYSCON
-	select PINCTRL
-	select PINCTRL_DIGICOLOR
diff --git a/arch/arm/mach-digicolor/Makefile b/arch/arm/mach-digicolor/Makefile
deleted file mode 100644
index fc5b7c98c824..000000000000
--- a/arch/arm/mach-digicolor/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_ARCH_DIGICOLOR)	+= digicolor.o
diff --git a/arch/arm/mach-digicolor/digicolor.c b/arch/arm/mach-digicolor/digicolor.c
deleted file mode 100644
index 156d0d5996a9..000000000000
--- a/arch/arm/mach-digicolor/digicolor.c
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Support for Conexant Digicolor SoCs
-*/
-
-#include <asm/mach/arch.h>
-
-static const char *const digicolor_dt_compat[] __initconst = {
-	"cnxt,cx92755",
-	NULL,
-};
-
-DT_MACHINE_START(DIGICOLOR, "Conexant Digicolor (Flattened Device Tree)")
-	.dt_compat	= digicolor_dt_compat,
-MACHINE_END
-- 
2.39.2