d027db132b
This contains the bulk of new SoC development for this merge window. Two new platforms have been added, the sunxi platforms (Allwinner A1x SoCs) by Maxime Ripard, and a generic Broadcom platform for a new series of ARMv7 platforms from them, where the hope is that we can keep the platform code generic enough to have them all share one mach directory. The new Broadcom platform is contributed by Christian Daudt. Highbank has grown support for Calxeda's next generation of hardware, ECX-2000. clps711x has seen a lot of cleanup from Alexander Shiyan, and he's also taken on maintainership of the platform. Beyond this there has been a bunch of work from a number of people on converting more platforms to IRQ domains, pinctrl conversion, cleanup and general feature enablement across most of the active platforms. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQyLCjAAoJEIwa5zzehBx3AdQP/R+L3+EQMjiEWt/p7g/ql5Em 0SnP92CcGzrjgLTg9z1FeOazfOsGnkZAYUlDRkqfKobH3VqkhYFFtt1/0x0KMahm xcowHgMBOyimFdWT9vLK3J8U6DLui5XrEG9LGH2VL+lqmfjIyP/OOF3mVc0/+pV9 WTLAsYswdBRSeiNuF43kqlfrOwF6xsPLgiNMlc82w6BzHqoHu6dOif5M9MqWaApS V74DPmwLD371Tyit6aHqt3JOqpgiPSHlmxkzomK+5idcW3Pa7HnzzFYmx85dk/eN J2siqIkoOu7tEfjIbNZTL2MYoX4tUUKv4qZZ3IOl3YSWaV3P5ilMApF01XVrkk8E DWOMhzte9hC7L90W+/kCPLF1VyeAhCem2KQWUitO71fKur3r+3ZaUokNVvWzkJIL 7aduxAJOV2hfLgEqbjbjF3o4S8p63OV3kzivFJM1And15zDJo4+qqOh67+bPo4jj +R4du+SqzXriw4i3tDLGVpdjDffk4D41tbLzgkWAtvGyoP45yeYfHAzAh0pDFPRv ASfZVmZ5PhwAUAkIMnpC2sjgmxMYff3SYqmDgnsqXES7rbDH/hG+teymtHFTyUQp m+f60DNotSMcMvkLdvruLSB4aeTiwbfOqPn/g+aXYUlPuNMq1fVWgN7EJKWkamK4 nRwaJmLwx1/ojcVbpy2G =YMKB -----END PGP SIGNATURE----- Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC updates from Olof Johansson: "This contains the bulk of new SoC development for this merge window. Two new platforms have been added, the sunxi platforms (Allwinner A1x SoCs) by Maxime Ripard, and a generic Broadcom platform for a new series of ARMv7 platforms from them, where the hope is that we can keep the platform code generic enough to have them all share one mach directory. The new Broadcom platform is contributed by Christian Daudt. Highbank has grown support for Calxeda's next generation of hardware, ECX-2000. clps711x has seen a lot of cleanup from Alexander Shiyan, and he's also taken on maintainership of the platform. Beyond this there has been a bunch of work from a number of people on converting more platforms to IRQ domains, pinctrl conversion, cleanup and general feature enablement across most of the active platforms." Fix up trivial conflicts as per Olof. * tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (174 commits) mfd: vexpress-sysreg: Remove LEDs code irqchip: irq-sunxi: Add terminating entry for sunxi_irq_dt_ids clocksource: sunxi_timer: Add terminating entry for sunxi_timer_dt_ids irq: versatile: delete dangling variable ARM: sunxi: add missing include for mdelay() ARM: EXYNOS: Avoid early use of of_machine_is_compatible() ARM: dts: add node for PL330 MDMA1 controller for exynos4 ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412 ARM: EXYNOS: add UART3 to DEBUG_LL ports ARM: S3C24XX: Add clkdev entry for camif-upll clock ARM: SAMSUNG: Add s3c24xx/s3c64xx CAMIF GPIO setup helpers ARM: sunxi: Add missing sun4i.dtsi file pinctrl: samsung: Do not initialise statics to 0 ARM i.MX6: remove gate_mask from pllv3 ARM i.MX6: Fix ethernet PLL clocks ARM i.MX6: rename PLLs according to datasheet ARM i.MX6: Add pwm support ARM i.MX51: Add pwm support ARM i.MX53: Add pwm support ARM: mx5: Replace clk_register_clkdev with clock DT lookup ...
131 lines
4.3 KiB
Text
131 lines
4.3 KiB
Text
menuconfig UIO
|
|
tristate "Userspace I/O drivers"
|
|
depends on !S390
|
|
help
|
|
Enable this to allow the userspace driver core code to be
|
|
built. This code allows userspace programs easy access to
|
|
kernel interrupts and memory locations, allowing some drivers
|
|
to be written in userspace. Note that a small kernel driver
|
|
is also required for interrupt handling to work properly.
|
|
|
|
If you don't know what to do here, say N.
|
|
|
|
if UIO
|
|
|
|
config UIO_CIF
|
|
tristate "generic Hilscher CIF Card driver"
|
|
depends on PCI
|
|
help
|
|
Driver for Hilscher CIF DeviceNet and Profibus cards. This
|
|
driver requires a userspace component called cif that handles
|
|
all of the heavy lifting and can be found at:
|
|
<http://www.osadl.org/projects/downloads/UIO/user/>
|
|
|
|
To compile this driver as a module, choose M here: the module
|
|
will be called uio_cif.
|
|
|
|
config UIO_PDRV
|
|
tristate "Userspace I/O platform driver"
|
|
help
|
|
Generic platform driver for Userspace I/O devices.
|
|
|
|
If you don't know what to do here, say N.
|
|
|
|
config UIO_PDRV_GENIRQ
|
|
tristate "Userspace I/O platform driver with generic IRQ handling"
|
|
help
|
|
Platform driver for Userspace I/O devices, including generic
|
|
interrupt handling code. Shared interrupts are not supported.
|
|
|
|
This kernel driver requires that the matching userspace driver
|
|
handles interrupts in a special way. Userspace is responsible
|
|
for acknowledging the hardware device if needed, and re-enabling
|
|
interrupts in the interrupt controller using the write() syscall.
|
|
|
|
If you don't know what to do here, say N.
|
|
|
|
config UIO_DMEM_GENIRQ
|
|
tristate "Userspace platform driver with generic irq and dynamic memory"
|
|
help
|
|
Platform driver for Userspace I/O devices, including generic
|
|
interrupt handling code. Shared interrupts are not supported.
|
|
|
|
Memory regions can be specified with the same platform device
|
|
resources as the UIO_PDRV drivers, but dynamic regions can also
|
|
be specified.
|
|
The number and size of these regions is static,
|
|
but the memory allocation is not performed until
|
|
the associated device file is opened. The
|
|
memory is freed once the uio device is closed.
|
|
|
|
If you don't know what to do here, say N.
|
|
|
|
config UIO_AEC
|
|
tristate "AEC video timestamp device"
|
|
depends on PCI
|
|
help
|
|
|
|
UIO driver for the Adrienne Electronics Corporation PCI time
|
|
code device.
|
|
|
|
This device differs from other UIO devices since it uses I/O
|
|
ports instead of memory mapped I/O. In order to make it
|
|
possible for UIO to work with this device a utility, uioport,
|
|
can be used to read and write the ports:
|
|
|
|
git clone git://ifup.org/philips/uioport.git
|
|
|
|
If you compile this as a module, it will be called uio_aec.
|
|
|
|
config UIO_SERCOS3
|
|
tristate "Automata Sercos III PCI card driver"
|
|
depends on PCI
|
|
help
|
|
Userspace I/O interface for the Sercos III PCI card from
|
|
Automata GmbH. The userspace part of this driver will be
|
|
available for download from the Automata GmbH web site.
|
|
|
|
Automata GmbH: http://www.automataweb.com
|
|
Sercos III interface: http://www.sercos.com
|
|
|
|
If you compile this as a module, it will be called uio_sercos3.
|
|
|
|
config UIO_PCI_GENERIC
|
|
tristate "Generic driver for PCI 2.3 and PCI Express cards"
|
|
depends on PCI
|
|
help
|
|
Generic driver that you can bind, dynamically, to any
|
|
PCI 2.3 compliant and PCI Express card. It is useful,
|
|
primarily, for virtualization scenarios.
|
|
If you compile this as a module, it will be called uio_pci_generic.
|
|
|
|
config UIO_NETX
|
|
tristate "Hilscher NetX Card driver"
|
|
depends on PCI
|
|
help
|
|
Driver for Hilscher NetX based fieldbus cards (cifX, comX).
|
|
This driver requires a userspace component that comes with the card
|
|
or is available from Hilscher (http://www.hilscher.com).
|
|
|
|
To compile this driver as a module, choose M here; the module
|
|
will be called uio_netx.
|
|
|
|
config UIO_PRUSS
|
|
tristate "Texas Instruments PRUSS driver"
|
|
depends on ARCH_DAVINCI_DA850
|
|
select GENERIC_ALLOCATOR
|
|
help
|
|
PRUSS driver for OMAPL138/DA850/AM18XX devices
|
|
PRUSS driver requires user space components, examples and user space
|
|
driver is available from below SVN repo - you may use anonymous login
|
|
|
|
https://gforge.ti.com/gf/project/pru_sw/
|
|
|
|
More info on API is available at below wiki
|
|
|
|
http://processors.wiki.ti.com/index.php/PRU_Linux_Application_Loader
|
|
|
|
To compile this driver as a module, choose M here: the module
|
|
will be called uio_pruss.
|
|
|
|
endif
|