mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
- 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 ...
278 lines
8.1 KiB
Text
278 lines
8.1 KiB
Text
#
|
|
# PCCARD (PCMCIA/CardBus) bus subsystem configuration
|
|
#
|
|
|
|
menuconfig PCCARD
|
|
tristate "PCCard (PCMCIA/CardBus) support"
|
|
depends on !UML
|
|
---help---
|
|
Say Y here if you want to attach PCMCIA- or PC-cards to your Linux
|
|
computer. These are credit-card size devices such as network cards,
|
|
modems or hard drives often used with laptops computers. There are
|
|
actually two varieties of these cards: 16 bit PCMCIA and 32 bit
|
|
CardBus cards.
|
|
|
|
To compile this driver as modules, choose M here: the
|
|
module will be called pcmcia_core.
|
|
|
|
if PCCARD
|
|
|
|
config PCMCIA
|
|
tristate "16-bit PCMCIA support"
|
|
select CRC32
|
|
default y
|
|
---help---
|
|
This option enables support for 16-bit PCMCIA cards. Most older
|
|
PC-cards are such 16-bit PCMCIA cards, so unless you know you're
|
|
only using 32-bit CardBus cards, say Y or M here.
|
|
|
|
To use 16-bit PCMCIA cards, you will need supporting software in
|
|
most cases. (see the file <file:Documentation/Changes> for
|
|
location and details).
|
|
|
|
To compile this driver as modules, choose M here: the
|
|
module will be called pcmcia.
|
|
|
|
If unsure, say Y.
|
|
|
|
config PCMCIA_LOAD_CIS
|
|
bool "Load CIS updates from userspace"
|
|
depends on PCMCIA
|
|
select FW_LOADER
|
|
default y
|
|
help
|
|
Some PCMCIA cards require an updated Card Information Structure (CIS)
|
|
to be loaded from userspace to work correctly. If you say Y here,
|
|
and your userspace is arranged correctly, this will be loaded
|
|
automatically using the in-kernel firmware loader and the hotplug
|
|
subsystem, instead of relying on cardmgr from pcmcia-cs to do so.
|
|
|
|
If unsure, say Y.
|
|
|
|
config CARDBUS
|
|
bool "32-bit CardBus support"
|
|
depends on PCI
|
|
default y
|
|
---help---
|
|
CardBus is a bus mastering architecture for PC-cards, which allows
|
|
for 32 bit PC-cards (the original PCMCIA standard specifies only
|
|
a 16 bit wide bus). Many newer PC-cards are actually CardBus cards.
|
|
|
|
To use 32 bit PC-cards, you also need a CardBus compatible host
|
|
bridge. Virtually all modern PCMCIA bridges do this, and most of
|
|
them are "yenta-compatible", so say Y or M there, too.
|
|
|
|
If unsure, say Y.
|
|
|
|
config PCMCIA_MAX1600
|
|
tristate
|
|
|
|
comment "PC-card bridges"
|
|
|
|
config YENTA
|
|
tristate "CardBus yenta-compatible bridge support"
|
|
depends on PCI
|
|
select CARDBUS if !EXPERT
|
|
select PCCARD_NONSTATIC if PCMCIA != n
|
|
---help---
|
|
This option enables support for CardBus host bridges. Virtually
|
|
all modern PCMCIA bridges are CardBus compatible. A "bridge" is
|
|
the hardware inside your computer that PCMCIA cards are plugged
|
|
into.
|
|
|
|
To compile this driver as modules, choose M here: the
|
|
module will be called yenta_socket.
|
|
|
|
If unsure, say Y.
|
|
|
|
config YENTA_O2
|
|
default y
|
|
bool "Special initialization for O2Micro bridges" if EXPERT
|
|
depends on YENTA
|
|
|
|
config YENTA_RICOH
|
|
default y
|
|
bool "Special initialization for Ricoh bridges" if EXPERT
|
|
depends on YENTA
|
|
|
|
config YENTA_TI
|
|
default y
|
|
bool "Special initialization for TI and EnE bridges" if EXPERT
|
|
depends on YENTA
|
|
|
|
config YENTA_ENE_TUNE
|
|
default y
|
|
bool "Auto-tune EnE bridges for CB cards" if EXPERT
|
|
depends on YENTA_TI && CARDBUS
|
|
|
|
config YENTA_TOSHIBA
|
|
default y
|
|
bool "Special initialization for Toshiba ToPIC bridges" if EXPERT
|
|
depends on YENTA
|
|
|
|
config PD6729
|
|
tristate "Cirrus PD6729 compatible bridge support"
|
|
depends on PCMCIA && PCI
|
|
select PCCARD_NONSTATIC
|
|
help
|
|
This provides support for the Cirrus PD6729 PCI-to-PCMCIA bridge
|
|
device, found in some older laptops and PCMCIA card readers.
|
|
|
|
config I82092
|
|
tristate "i82092 compatible bridge support"
|
|
depends on PCMCIA && PCI
|
|
select PCCARD_NONSTATIC
|
|
help
|
|
This provides support for the Intel I82092AA PCI-to-PCMCIA bridge device,
|
|
found in some older laptops and more commonly in evaluation boards for the
|
|
chip.
|
|
|
|
config I82365
|
|
tristate "i82365 compatible bridge support"
|
|
depends on PCMCIA && ISA
|
|
select PCCARD_NONSTATIC
|
|
help
|
|
Say Y here to include support for ISA-bus PCMCIA host bridges that
|
|
are register compatible with the Intel i82365. These are found on
|
|
older laptops and ISA-bus card readers for desktop systems. A
|
|
"bridge" is the hardware inside your computer that PCMCIA cards are
|
|
plugged into. If unsure, say N.
|
|
|
|
config TCIC
|
|
tristate "Databook TCIC host bridge support"
|
|
depends on PCMCIA && ISA
|
|
select PCCARD_NONSTATIC
|
|
help
|
|
Say Y here to include support for the Databook TCIC family of PCMCIA
|
|
host bridges. These are only found on a handful of old systems.
|
|
"Bridge" is the name used for the hardware inside your computer that
|
|
PCMCIA cards are plugged into. If unsure, say N.
|
|
|
|
config PCMCIA_ALCHEMY_DEVBOARD
|
|
tristate "Alchemy Db/Pb1xxx PCMCIA socket services"
|
|
depends on MIPS_ALCHEMY && PCMCIA
|
|
help
|
|
Enable this driver of you want PCMCIA support on your Alchemy
|
|
Db1000, Db/Pb1100, Db/Pb1500, Db/Pb1550, Db/Pb1200, DB1300
|
|
board. NOT suitable for the PB1000!
|
|
|
|
This driver is also available as a module called db1xxx_ss.ko
|
|
|
|
config PCMCIA_XXS1500
|
|
tristate "MyCable XXS1500 PCMCIA socket support"
|
|
depends on PCMCIA && MIPS_XXS1500
|
|
help
|
|
Support for the PCMCIA/CF socket interface on MyCable XXS1500
|
|
systems.
|
|
|
|
This driver is also available as a module called xxs1500_ss.ko
|
|
|
|
config PCMCIA_BCM63XX
|
|
tristate "bcm63xx pcmcia support"
|
|
depends on BCM63XX && PCMCIA
|
|
|
|
config PCMCIA_SOC_COMMON
|
|
tristate
|
|
|
|
config PCMCIA_SA11XX_BASE
|
|
tristate
|
|
|
|
config PCMCIA_SA1100
|
|
tristate "SA1100 support"
|
|
depends on ARM && ARCH_SA1100 && PCMCIA
|
|
select PCMCIA_SOC_COMMON
|
|
select PCMCIA_SA11XX_BASE
|
|
help
|
|
Say Y here to include support for SA11x0-based PCMCIA or CF
|
|
sockets, found on HP iPAQs, Yopy, and other StrongARM(R)/
|
|
Xscale(R) embedded machines.
|
|
|
|
This driver is also available as a module called sa1100_cs.
|
|
|
|
config PCMCIA_SA1111
|
|
tristate "SA1111 support"
|
|
depends on ARM && SA1111 && PCMCIA
|
|
select PCMCIA_SOC_COMMON
|
|
select PCMCIA_SA11XX_BASE if ARCH_SA1100
|
|
select PCMCIA_PXA2XX if ARCH_LUBBOCK && SA1111
|
|
select PCMCIA_MAX1600 if ASSABET_NEPONSET
|
|
select PCMCIA_MAX1600 if ARCH_LUBBOCK && SA1111
|
|
help
|
|
Say Y here to include support for SA1111-based PCMCIA or CF
|
|
sockets, found on the Jornada 720, Graphicsmaster and other
|
|
StrongARM(R)/Xscale(R) embedded machines.
|
|
|
|
This driver is also available as a module called sa1111_cs.
|
|
|
|
config PCMCIA_PXA2XX
|
|
tristate "PXA2xx support"
|
|
depends on ARM && ARCH_PXA && PCMCIA
|
|
depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \
|
|
|| MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \
|
|
|| ARCOM_PCMCIA || ARCH_PXA_ESERIES || MACH_STARGATE2 \
|
|
|| MACH_VPAC270 || MACH_BALLOON3 || MACH_COLIBRI \
|
|
|| MACH_COLIBRI320 || MACH_H4700)
|
|
select PCMCIA_SOC_COMMON
|
|
select PCMCIA_MAX1600 if MACH_MAINSTONE
|
|
help
|
|
Say Y here to include support for the PXA2xx PCMCIA controller
|
|
|
|
config PCMCIA_DEBUG
|
|
bool "Enable debugging"
|
|
depends on (PCMCIA_SA1111 || PCMCIA_SA1100 || PCMCIA_PXA2XX)
|
|
help
|
|
Say Y here to enable debugging for the SoC PCMCIA layer.
|
|
You will need to choose the debugging level either via the
|
|
kernel command line, or module options depending whether
|
|
you build the drivers as modules.
|
|
|
|
The kernel command line options are:
|
|
sa11xx_core.pc_debug=N
|
|
pxa2xx_core.pc_debug=N
|
|
|
|
The module option is called pc_debug=N
|
|
|
|
In all the above examples, N is the debugging verbosity
|
|
level.
|
|
|
|
config PCMCIA_PROBE
|
|
bool
|
|
default y if ISA && !ARCH_SA1100 && !PARISC
|
|
|
|
config PCMCIA_VRC4171
|
|
tristate "NEC VRC4171 Card Controllers support"
|
|
depends on CPU_VR41XX && ISA && PCMCIA
|
|
|
|
config PCMCIA_VRC4173
|
|
tristate "NEC VRC4173 CARDU support"
|
|
depends on CPU_VR41XX && PCI && PCMCIA
|
|
|
|
config OMAP_CF
|
|
tristate "OMAP CompactFlash Controller"
|
|
depends on PCMCIA && ARCH_OMAP16XX
|
|
help
|
|
Say Y here to support the CompactFlash controller on OMAP.
|
|
Note that this doesn't support "True IDE" mode.
|
|
|
|
config AT91_CF
|
|
tristate "AT91 CompactFlash Controller"
|
|
depends on PCI
|
|
depends on PCMCIA && ARCH_AT91
|
|
help
|
|
Say Y here to support the CompactFlash controller on AT91 chips.
|
|
Or choose M to compile the driver as a module named "at91_cf".
|
|
|
|
config ELECTRA_CF
|
|
tristate "Electra CompactFlash Controller"
|
|
depends on PCMCIA && PPC_PASEMI
|
|
help
|
|
Say Y here to support the CompactFlash controller on the
|
|
PA Semi Electra eval board.
|
|
|
|
config PCCARD_NONSTATIC
|
|
bool
|
|
|
|
config PCCARD_IODYN
|
|
bool
|
|
|
|
endif # PCCARD
|