diff options
Diffstat (limited to 'arch/arm/mach-sa1100')
| -rw-r--r-- | arch/arm/mach-sa1100/Kconfig | 36 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/Makefile.boot | 9 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/generic.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/include/mach/reset.h | 1 |
4 files changed, 34 insertions, 18 deletions
diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig index 66e79fa9ba2b..fb9cd10705de 100644 --- a/arch/arm/mach-sa1100/Kconfig +++ b/arch/arm/mach-sa1100/Kconfig @@ -1,7 +1,25 @@ # SPDX-License-Identifier: GPL-2.0-only -if ARCH_SA1100 +menuconfig ARCH_SA1100 + bool "SA11x0 Implementations" + depends on ARCH_MULTI_V4 && !(ARCH_MULTI_V4T || ARCH_MULTI_V5) + depends on !(ARCH_MOXART || ARCH_GEMINI) + depends on ATAGS + depends on CPU_LITTLE_ENDIAN + depends on MMU + select ARCH_NO_SG_CHAIN + select ARCH_MTD_XIP + select CLKSRC_MMIO + select CLKSRC_PXA + select CPU_FREQ + select CPU_SA1100 + select GPIOLIB + select IRQ_DOMAIN + select ISA + select NEED_MACH_MEMORY_H + help + Support for StrongARM 11x0 based boards. -menu "SA11x0 Implementations" +if ARCH_SA1100 config SA1100_ASSABET bool "Assabet" @@ -25,6 +43,7 @@ config ASSABET_NEPONSET config SA1100_CERF bool "CerfBoard" + depends on UNUSED_BOARD_FILES select ARM_SA1110_CPUFREQ select LEDS_GPIO_REGISTER help @@ -62,6 +81,7 @@ config SA1100_COLLIE config SA1100_H3100 bool "Compaq iPAQ H3100" + depends on UNUSED_BOARD_FILES select ARM_SA1110_CPUFREQ select HTC_EGPIO select MFD_IPAQ_MICRO @@ -80,6 +100,7 @@ config SA1100_H3600 config SA1100_BADGE4 bool "HP Labs BadgePAD 4" + depends on UNUSED_BOARD_FILES select ARM_SA1100_CPUFREQ select SA1111 help @@ -88,6 +109,7 @@ config SA1100_BADGE4 config SA1100_JORNADA720 bool "HP Jornada 720" + depends on UNUSED_BOARD_FILES # FIXME: select ARM_SA11x0_CPUFREQ select SA1111 help @@ -107,6 +129,7 @@ config SA1100_JORNADA720_SSP config SA1100_HACKKIT bool "HackKit Core CPU Board" + depends on UNUSED_BOARD_FILES select ARM_SA1100_CPUFREQ help Say Y here to support the HackKit Core CPU Board @@ -114,6 +137,7 @@ config SA1100_HACKKIT config SA1100_LART bool "LART" + depends on UNUSED_BOARD_FILES select ARM_SA1100_CPUFREQ help Say Y here if you are using the Linux Advanced Radio Terminal @@ -122,6 +146,7 @@ config SA1100_LART config SA1100_NANOENGINE bool "nanoEngine" + depends on UNUSED_BOARD_FILES select ARM_SA1110_CPUFREQ select FORCE_PCI select PCI_NANOENGINE @@ -132,6 +157,7 @@ config SA1100_NANOENGINE config SA1100_PLEB bool "PLEB" + depends on UNUSED_BOARD_FILES select ARM_SA1100_CPUFREQ help Say Y here if you are using version 1 of the Portable Linux @@ -141,6 +167,7 @@ config SA1100_PLEB config SA1100_SHANNON bool "Shannon" + depends on UNUSED_BOARD_FILES select ARM_SA1100_CPUFREQ select REGULATOR select REGULATOR_FIXED_VOLTAGE @@ -152,6 +179,7 @@ config SA1100_SHANNON config SA1100_SIMPAD bool "Simpad" + depends on UNUSED_BOARD_FILES select ARM_SA1110_CPUFREQ help The SIEMENS webpad SIMpad is based on the StrongARM 1110. There @@ -163,12 +191,10 @@ config SA1100_SIMPAD config SA1100_SSP tristate "Generic PIO SSP" + depends on UNUSED_BOARD_FILES help Say Y here to enable support for the generic PIO SSP driver. This isn't for audio support, but for attached sensors and other devices, eg for BadgePAD 4 sensor support. -endmenu - endif - diff --git a/arch/arm/mach-sa1100/Makefile.boot b/arch/arm/mach-sa1100/Makefile.boot deleted file mode 100644 index 9d8246f2cab4..000000000000 --- a/arch/arm/mach-sa1100/Makefile.boot +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -ifeq ($(CONFIG_SA1111),y) - zreladdr-y += 0xc0208000 -else - zreladdr-y += 0xc0008000 -endif -params_phys-y := 0xc0000100 -initrd_phys-y := 0xc0800000 - diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c index 4dfb7554649d..6c21f214cd60 100644 --- a/arch/arm/mach-sa1100/generic.c +++ b/arch/arm/mach-sa1100/generic.c @@ -39,9 +39,6 @@ #include "generic.h" #include <clocksource/pxa.h> -unsigned int reset_status; -EXPORT_SYMBOL(reset_status); - #define NR_FREQS 16 /* @@ -319,10 +316,13 @@ static struct platform_device *sa11x0_devices[] __initdata = { static int __init sa1100_init(void) { + struct resource wdt_res = DEFINE_RES_MEM(0x90000000, 0x20); pm_power_off = sa1100_power_off; regulator_has_full_constraints(); + platform_device_register_simple("sa1100_wdt", -1, &wdt_res, 1); + return platform_add_devices(sa11x0_devices, ARRAY_SIZE(sa11x0_devices)); } diff --git a/arch/arm/mach-sa1100/include/mach/reset.h b/arch/arm/mach-sa1100/include/mach/reset.h index 27695650a567..a6723d45ae2a 100644 --- a/arch/arm/mach-sa1100/include/mach/reset.h +++ b/arch/arm/mach-sa1100/include/mach/reset.h @@ -10,7 +10,6 @@ #define RESET_STATUS_GPIO (1 << 3) /* GPIO Reset */ #define RESET_STATUS_ALL (0xf) -extern unsigned int reset_status; static inline void clear_reset_status(unsigned int mask) { RCSR = mask; |