mirror of
https://github.com/torvalds/linux
synced 2024-10-10 13:24:04 +00:00
1205b62390
- Florian Fainelli noticed that userspace segfaults caused by the lack
of kernel-userspace helpers was hard to diagnose; we now issue a
warning when userspace tries to use the helpers but the kernel has
them disabled.
- Ben Dooks wants compatibility for the old ATAG serial number with DT
systems.
- Some cleanup of assembly by Nicolas Pitre.
- User accessors optimisation from Vincent Whitchurch.
- More robust kdump on SMP systems from Yufen Wang.
- Sebastian Andrzej Siewior noticed problems with the SMP "boot_lock"
on RT kernels, and so we convert the Versatile series of platforms
to use a raw spinlock instead, consolidating the Versatile
implementation. We entirely remove the boot_lock on OMAP systems,
where it's unnecessary. Further patches for other systems will be
submitted for the following merge window.
- Start switching old StrongARM-11x0 systems to use gpiolib rather
than their private GPIO implementation - mostly PCMCIA bits.
- ARM Kconfig cleanups.
- Cleanup a mostly harmless mistake in the recent Spectre patch in 4.20
(which had the effect that data that can be placed into the init
sections was incorrectly always placed in the rodata section.)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIVAwUAXC9wVPTnkBvkraxkAQL9Ig/+Noy2YqJ/OpSvbsGC6k7qMU5b+99SW3Tu
NvHLE7Y9XBp55QJqLvGW3N8QKOt86W7JVPprWoYiGqLyq3p8271IArrwdYjutn5h
b03zVoMOW0o8q7uWjXbXk6vangsFGC/pI3o4aXrHUSCUR9ZttItpCprjdfVmwsA8
EOROZ0lzMlsjwcBZQq/pflHNr6IiEtulaBTgFx2cqKHFoW4QpR4d8yupqi4kyLLP
C+WVXmp2YaxNZMuBXbLHq28Spkkt/6yNFgxsCnleVaEYjbZ5TvIaZYrd20NN7KSE
4smGfy5sgv5s1osxY00cVkvAARyRGrNIZ9Y3C1qH3+M+zaW3tsA46dUGC0cZmZPi
OBRMx8SKqEwzPvL8Mhpj2aCOIzKtJzI52c6Oc4O/dwUZD7QIiA6yJrvmTbwvLDus
korzyy1/YjpjGyDV2U3+eFalbwXdtsE6hh/Sv6LXIzX2KSLXd1LYyduYYc9hnh/m
s99j3EGluRlMxB0IhcCOES4jEsAzttKdDXCPichxmjcsYWh1YZtoS+vKYVSXnv/S
dJk0NuJcrmobV21qvr7U5C9mVek4DIF5CE2k3pcCmpbTk5G9nYMbCTBJWKdKq3WC
z/oGhc/wwkfcFmqQrf9hJ+Fisn8uHmvE69X1QDe43nUg3xC6hD+O9+rVJhf+zAjB
dgmMY+pPDHQ=
=Yl96
-----END PGP SIGNATURE-----
Merge tag 'for-4.21' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM updates from Russell King:
"Included in this update:
- Florian Fainelli noticed that userspace segfaults caused by the
lack of kernel-userspace helpers was hard to diagnose; we now issue
a warning when userspace tries to use the helpers but the kernel
has them disabled.
- Ben Dooks wants compatibility for the old ATAG serial number with
DT systems.
- Some cleanup of assembly by Nicolas Pitre.
- User accessors optimisation from Vincent Whitchurch.
- More robust kdump on SMP systems from Yufen Wang.
- Sebastian Andrzej Siewior noticed problems with the SMP "boot_lock"
on RT kernels, and so we convert the Versatile series of platforms
to use a raw spinlock instead, consolidating the Versatile
implementation. We entirely remove the boot_lock on OMAP systems,
where it's unnecessary. Further patches for other systems will be
submitted for the following merge window.
- Start switching old StrongARM-11x0 systems to use gpiolib rather
than their private GPIO implementation - mostly PCMCIA bits.
- ARM Kconfig cleanups.
- Cleanup a mostly harmless mistake in the recent Spectre patch in
4.20 (which had the effect that data that can be placed into the
init sections was incorrectly always placed in the rodata section)"
* tag 'for-4.21' of git://git.armlinux.org.uk/~rmk/linux-arm: (25 commits)
ARM: omap2: remove unnecessary boot_lock
ARM: versatile: rename and comment SMP implementation
ARM: versatile: convert boot_lock to raw
ARM: vexpress/realview: consolidate immitation CPU hotplug
ARM: fix the cockup in the previous patch
ARM: sa1100/cerf: switch to using gpio_led_register_device()
ARM: sa1100/assabet: switch to using gpio leds
ARM: sa1100/assabet: add gpio keys support for right-hand two buttons
ARM: sa1111: remove legacy GPIO interfaces
pcmcia: sa1100*: remove redundant bvd1/bvd2 setting
ARM: pxa/lubbock: switch PCMCIA to MAX1600 library
ARM: pxa/mainstone: switch PCMCIA to MAX1600 library and gpiod APIs
ARM: sa1100/neponset: switch PCMCIA to MAX1600 library and gpiod APIs
ARM: sa1100/jornada720: switch PCMCIA to gpiod APIs
pcmcia: add MAX1600 library
ARM: sa1100: explicitly register sa11x0-pcmcia devices
ARM: 8813/1: Make aligned 2-byte getuser()/putuser() atomic on ARMv6+
ARM: 8812/1: Optimise copy_{from/to}_user for !CPU_USE_DOMAINS
ARM: 8811/1: always list both ldrd/strd registers explicitly
ARM: 8808/1: kexec:offline panic_smp_self_stop CPU
...
174 lines
4.6 KiB
Plaintext
174 lines
4.6 KiB
Plaintext
if ARCH_SA1100
|
|
|
|
menu "SA11x0 Implementations"
|
|
|
|
config SA1100_ASSABET
|
|
bool "Assabet"
|
|
select ARM_SA1110_CPUFREQ
|
|
select GPIO_REG
|
|
select LEDS_GPIO_REGISTER
|
|
select REGULATOR
|
|
select REGULATOR_FIXED_VOLTAGE
|
|
help
|
|
Say Y here if you are using the Intel(R) StrongARM(R) SA-1110
|
|
Microprocessor Development Board (also known as the Assabet).
|
|
|
|
config ASSABET_NEPONSET
|
|
bool "Include support for Neponset"
|
|
depends on SA1100_ASSABET
|
|
select SA1111
|
|
help
|
|
Say Y here if you are using the Intel(R) StrongARM(R) SA-1110
|
|
Microprocessor Development Board (Assabet) with the SA-1111
|
|
Development Board (Nepon).
|
|
|
|
config SA1100_CERF
|
|
bool "CerfBoard"
|
|
select ARM_SA1110_CPUFREQ
|
|
select LEDS_GPIO_REGISTER
|
|
help
|
|
The Intrinsyc CerfBoard is based on the StrongARM 1110 (Discontinued).
|
|
More information is available at:
|
|
<http://www.intrinsyc.com/products/cerfboard/>.
|
|
|
|
Say Y if configuring for an Intrinsyc CerfBoard.
|
|
Say N otherwise.
|
|
|
|
choice
|
|
prompt "Cerf Flash available"
|
|
depends on SA1100_CERF
|
|
default SA1100_CERF_FLASH_8MB
|
|
|
|
config SA1100_CERF_FLASH_8MB
|
|
bool "8MB"
|
|
|
|
config SA1100_CERF_FLASH_16MB
|
|
bool "16MB"
|
|
|
|
config SA1100_CERF_FLASH_32MB
|
|
bool "32MB"
|
|
|
|
endchoice
|
|
|
|
config SA1100_COLLIE
|
|
bool "Sharp Zaurus SL5500"
|
|
# FIXME: select ARM_SA11x0_CPUFREQ
|
|
select SHARP_LOCOMO
|
|
select SHARP_PARAM
|
|
select SHARP_SCOOP
|
|
help
|
|
Say Y here to support the Sharp Zaurus SL5500 PDAs.
|
|
|
|
config SA1100_H3100
|
|
bool "Compaq iPAQ H3100"
|
|
select ARM_SA1110_CPUFREQ
|
|
select HTC_EGPIO
|
|
select MFD_IPAQ_MICRO
|
|
help
|
|
Say Y here if you intend to run this kernel on the Compaq iPAQ
|
|
H3100 handheld computer.
|
|
|
|
config SA1100_H3600
|
|
bool "Compaq iPAQ H3600/H3700"
|
|
select ARM_SA1110_CPUFREQ
|
|
select HTC_EGPIO
|
|
select MFD_IPAQ_MICRO
|
|
help
|
|
Say Y here if you intend to run this kernel on the Compaq iPAQ
|
|
H3600 and H3700 handheld computers.
|
|
|
|
config SA1100_BADGE4
|
|
bool "HP Labs BadgePAD 4"
|
|
select ARM_SA1100_CPUFREQ
|
|
select SA1111
|
|
help
|
|
Say Y here if you want to build a kernel for the HP Laboratories
|
|
BadgePAD 4.
|
|
|
|
config SA1100_JORNADA720
|
|
bool "HP Jornada 720"
|
|
# FIXME: select ARM_SA11x0_CPUFREQ
|
|
select SA1111
|
|
help
|
|
Say Y here if you want to build a kernel for the HP Jornada 720
|
|
handheld computer. See
|
|
<http://h10025.www1.hp.com/ewfrf/wc/product?product=61677&cc=us&lc=en&dlc=en&product=61677#>
|
|
|
|
config SA1100_JORNADA720_SSP
|
|
bool "HP Jornada 720 Extended SSP driver"
|
|
depends on SA1100_JORNADA720
|
|
select SA1100_SSP
|
|
help
|
|
Say Y here if you have a HP Jornada 7xx handheld computer and you
|
|
want to access devices connected to the MCU. Those include the
|
|
keyboard, touchscreen, backlight and battery. This driver also activates
|
|
the generic SSP which it extends.
|
|
|
|
config SA1100_HACKKIT
|
|
bool "HackKit Core CPU Board"
|
|
select ARM_SA1100_CPUFREQ
|
|
help
|
|
Say Y here to support the HackKit Core CPU Board
|
|
<http://hackkit.eletztrick.de>;
|
|
|
|
config SA1100_LART
|
|
bool "LART"
|
|
select ARM_SA1100_CPUFREQ
|
|
help
|
|
Say Y here if you are using the Linux Advanced Radio Terminal
|
|
(also known as the LART). See <http://www.lartmaker.nl/> for
|
|
information on the LART.
|
|
|
|
config SA1100_NANOENGINE
|
|
bool "nanoEngine"
|
|
select ARM_SA1110_CPUFREQ
|
|
select FORCE_PCI
|
|
select PCI_NANOENGINE
|
|
help
|
|
Say Y here if you are using the Bright Star Engineering nanoEngine.
|
|
See <http://www.brightstareng.com/arm/nanoeng.htm> for information
|
|
on the BSE nanoEngine.
|
|
|
|
config SA1100_PLEB
|
|
bool "PLEB"
|
|
select ARM_SA1100_CPUFREQ
|
|
help
|
|
Say Y here if you are using version 1 of the Portable Linux
|
|
Embedded Board (also known as PLEB).
|
|
See <http://www.disy.cse.unsw.edu.au/Hardware/PLEB/>
|
|
for more information.
|
|
|
|
config SA1100_SHANNON
|
|
bool "Shannon"
|
|
select ARM_SA1100_CPUFREQ
|
|
select REGULATOR
|
|
select REGULATOR_FIXED_VOLTAGE
|
|
help
|
|
The Shannon (also known as a Tuxscreen, and also as a IS2630) was a
|
|
limited edition webphone produced by Philips. The Shannon is a SA1100
|
|
platform with a 640x480 LCD, touchscreen, CIR keyboard, PCMCIA slots,
|
|
and a telco interface.
|
|
|
|
config SA1100_SIMPAD
|
|
bool "Simpad"
|
|
select ARM_SA1110_CPUFREQ
|
|
help
|
|
The SIEMENS webpad SIMpad is based on the StrongARM 1110. There
|
|
are two different versions CL4 and SL4. CL4 has 32MB RAM and 16MB
|
|
FLASH. The SL4 version got 64 MB RAM and 32 MB FLASH and a
|
|
PCMCIA-Slot. The version for the Germany Telecom (DTAG) is the same
|
|
like CL4 in additional it has a PCMCIA-Slot. For more information
|
|
visit <http://www.usa.siemens.com/> or <http://www.siemens.ch/>.
|
|
|
|
config SA1100_SSP
|
|
tristate "Generic PIO SSP"
|
|
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
|
|
|