ARM: ep93xx: DT for the Cirrus ep93xx SoC platforms

This adds compulsory device tree support to the Cirrus ep93xx ARMv4
platform.

- We select PINCTRL_EP93xx
- We select COMMON_CLK_EP93XX, as clock driver moved out of platform
  code
- We select ARCH_HAS_RESET_CONTROLLER

And also we need ARM_ATAG_DTB_COMPAT to update device tree with
information about memory passed from bootloader.

We have to leave all MACH options as they are used for board checking
before decomp, to turn off watchdog and ethernet DMA.

Signed-off-by: Nikita Shubin <nikita.shubin@maquefel.me>

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 4067f5169144246b22e96e734d9af369a32b1e45..7eb03f8a7fc362424679d86b80d190ef98f01134 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -182,7 +182,6 @@ machine-$(CONFIG_ARCH_CNS3XXX)              += cns3xxx
 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
 machine-$(CONFIG_ARCH_FOOTBRIDGE)      += footbridge
 machine-$(CONFIG_ARCH_GEMINI)          += gemini

diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig
index 2c40996a444baa2228514fff8210002ee491b2f2..d696b4fbff0d122db9fd60b9309bf51b575c7f2b 100644 (file)
--- a/arch/arm/mach-ep93xx/Kconfig
+++ b/arch/arm/mach-ep93xx/Kconfig
@@ -3,34 +3,27 @@ menuconfig ARCH_EP93XX
        bool "EP93xx-based"
        depends on ATAGS
        depends on ARCH_MULTI_V4T
+       # CONFIG_ARCH_MULTI_V7 is not set
        depends on CPU_LITTLE_ENDIAN
+       select ARCH_HAS_RESET_CONTROLLER
        select ARCH_SPARSEMEM_ENABLE
        select ARM_AMBA
        select ARM_VIC
+       select ARM_APPENDED_DTB # Old Redboot bootloaders deployed
+       select ARM_ATAG_DTB_COMPAT # we need this to update dt memory node
+       select COMMON_CLK_EP93XX
+       select EP93XX_TIMER
        select CLKSRC_MMIO
        select CPU_ARM920T
        select GPIOLIB
+       select PINCTRL
+       select PINCTRL_EP93XX
        help
          This enables support for the Cirrus EP93xx series of CPUs.
 
 if ARCH_EP93XX
 
-menu "Cirrus EP93xx Implementation Options"
-
-config EP93XX_SOC_COMMON
-       bool
-       default y
-       select SOC_BUS
-       select LEDS_GPIO_REGISTER
-
-comment "EP93xx Platforms"
-
-config MACH_ADSSPHERE
-       bool "Support ADS Sphere"
-       depends on UNUSED_BOARD_FILES
-       help
-         Say 'Y' here if you want your kernel to support the ADS
-         Sphere board.
+menu "EP93xx Platforms"
 
 config MACH_BK3
        bool "Support Liebherr BK3.1"
@@ -98,62 +91,6 @@ config MACH_EDB9315A
          Say 'Y' here if you want your kernel to support the Cirrus
          Logic EDB9315A Evaluation Board.
 
-config MACH_GESBC9312
-       bool "Support Glomation GESBC-9312-sx"
-       depends on UNUSED_BOARD_FILES
-       help
-         Say 'Y' here if you want your kernel to support the Glomation
-         GESBC-9312-sx board.
-
-config MACH_MICRO9
-       bool
-
-config MACH_MICRO9H
-       bool "Support Contec Micro9-High"
-       select MACH_MICRO9
-       depends on UNUSED_BOARD_FILES
-       help
-         Say 'Y' here if you want your kernel to support the
-         Contec Micro9-High board.
-
-config MACH_MICRO9M
-       bool "Support Contec Micro9-Mid"
-       select MACH_MICRO9
-       depends on UNUSED_BOARD_FILES
-       help
-         Say 'Y' here if you want your kernel to support the
-         Contec Micro9-Mid board.
-
-config MACH_MICRO9L
-       bool "Support Contec Micro9-Lite"
-       select MACH_MICRO9
-       depends on UNUSED_BOARD_FILES
-       help
-         Say 'Y' here if you want your kernel to support the
-         Contec Micro9-Lite board.
-
-config MACH_MICRO9S
-       bool "Support Contec Micro9-Slim"
-       select MACH_MICRO9
-       depends on UNUSED_BOARD_FILES
-       help
-         Say 'Y' here if you want your kernel to support the
-         Contec Micro9-Slim board.
-
-config MACH_SIM_ONE
-        bool "Support Simplemachines Sim.One board"
-       depends on UNUSED_BOARD_FILES
-        help
-          Say 'Y' here if you want your kernel to support the
-          Simplemachines Sim.One board.
-
-config MACH_SNAPPER_CL15
-       bool "Support Bluewater Systems Snapper CL15 Module"
-       depends on UNUSED_BOARD_FILES
-       help
-         Say 'Y' here if you want your kernel to support the Bluewater
-         Systems Snapper CL15 Module.
-
 config MACH_TS72XX
        bool "Support Technologic Systems TS-72xx SBC"
        help

diff --git a/arch/arm/mach-ep93xx/Makefile b/arch/arm/mach-ep93xx/Makefile
deleted file mode 100644 (file)
index cfad517..0000000
--- a/arch/arm/mach-ep93xx/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-#
-# Makefile for the linux kernel.
-#
-obj-y                  := core.o clock.o timer-ep93xx.o
-
-obj-$(CONFIG_EP93XX_DMA)       += dma.o
-
-obj-$(CONFIG_MACH_ADSSPHERE)   += adssphere.o
-obj-$(CONFIG_MACH_EDB93XX)     += edb93xx.o
-obj-$(CONFIG_MACH_GESBC9312)   += gesbc9312.o
-obj-$(CONFIG_MACH_MICRO9)      += micro9.o
-obj-$(CONFIG_MACH_SIM_ONE)     += simone.o
-obj-$(CONFIG_MACH_SNAPPER_CL15)        += snappercl15.o
-obj-$(CONFIG_MACH_TS72XX)      += ts72xx.o
-obj-$(CONFIG_MACH_VISION_EP9307)+= vision_ep9307.o