9e4db1c3ee
Pull ARM platform updates from Russell King:
"This covers platform stuff for platforms I have a direct interest in
(iow, I have the hardware). Essentially:
- as we no longer support any other Acorn platforms other than RiscPC
anymore, we can collect all that code into mach-rpc.
- convert Acorn expansion card stuff to use IRQ allocation functions,
and get rid of NO_IRQ from there.
- cleanups to the ebsa110 platform to move some private stuff out of
its header files.
- large amount of SA11x0 updates:
- conversion of private DMA implementation to DMA engine support
(this actually gives us greater flexibility in drivers over the old
API.)
- re-worked ucb1x00 updates - convert to genirq, remove sa11x0
dependencies, fix various minor issues
- move platform specific sa11x0 framebuffer data into platform files
in arch/arm instead of keeping this in the driver itself
- update sa11x0 IrDA driver for DMA engine, and allow it to use DMA
for SIR transmissions as well as FIR
- rework sa1111 support for genirq, and irq allocation
- fix sa1111 IRQ support so it works again
- use sparse IRQ support
After this, I have one more pull request remaining from my current
set, which I think is going to be the most problematical as it
generates 8 conflicts."
Fixed up the trivial conflict in arch/arm/mach-rpc/Makefile as per
Russell.
* 'platforms' of git://git.linaro.org/people/rmk/linux-arm: (125 commits)
ARM: 7343/1: sa11x0: convert to sparse IRQ
ARM: 7342/2: sa1100: prepare for sparse irq conversion
ARM: 7341/1: input: prepare jornada720 keyboard and ts for sa11x0 sparse irq
ARM: 7340/1: rtc: sa1100: include mach/irqs.h instead of asm/irq.h
ARM: sa11x0: remove unused DMA controller definitions
ARM: sa11x0: remove old SoC private DMA driver
USB: sa1111: add hcd .reset method
USB: sa1111: add OHCI shutdown methods
USB: sa1111: reorganize ohci-sa1111.c
USB: sa1111: get rid of nasty printk(KERN_DEBUG "%s: ...", __FILE__)
USB: sa1111: sparse and checkpatch cleanups
ARM: sa11x0: don't static map sa1111
ARM: sa1111: use dev_err() rather than printk()
ARM: sa1111: cleanup sub-device registration and unregistration
ARM: sa1111: only setup DMA for DMA capable devices
ARM: sa1111: register sa1111 devices with dmabounce in bus notifier
ARM: sa1111: move USB interface register definitions to ohci-sa1111.c
ARM: sa1111: move PCMCIA interface register definitions to sa1111_generic.c
ARM: sa1111: move PS/2 interface register definitions to sa1111p2.c
ARM: sa1111: delete unused physical GPIO register definitions
...
39 lines
1.8 KiB
C
39 lines
1.8 KiB
C
#ifndef _INCLUDE_SHANNON_H
|
|
#define _INCLUDE_SHANNON_H
|
|
|
|
/* taken from comp.os.inferno Tue, 12 Sep 2000 09:21:50 GMT,
|
|
* written by <forsyth@vitanuova.com> */
|
|
|
|
#define SHANNON_GPIO_SPI_FLASH GPIO_GPIO (0) /* Output - Driven low, enables SPI to flash */
|
|
#define SHANNON_GPIO_SPI_DSP GPIO_GPIO (1) /* Output - Driven low, enables SPI to DSP */
|
|
/* lcd lower = GPIO 2-9 */
|
|
#define SHANNON_GPIO_SPI_OUTPUT GPIO_GPIO (10) /* Output - SPI output to DSP */
|
|
#define SHANNON_GPIO_SPI_INPUT GPIO_GPIO (11) /* Input - SPI input from DSP */
|
|
#define SHANNON_GPIO_SPI_CLOCK GPIO_GPIO (12) /* Output - Clock for SPI */
|
|
#define SHANNON_GPIO_SPI_FRAME GPIO_GPIO (13) /* Output - Frame marker - not used */
|
|
#define SHANNON_GPIO_SPI_RTS GPIO_GPIO (14) /* Input - SPI Ready to Send */
|
|
#define SHANNON_IRQ_GPIO_SPI_RTS IRQ_GPIO14
|
|
#define SHANNON_GPIO_SPI_CTS GPIO_GPIO (15) /* Output - SPI Clear to Send */
|
|
#define SHANNON_GPIO_IRQ_CODEC GPIO_GPIO (16) /* in, irq from ucb1200 */
|
|
#define SHANNON_IRQ_GPIO_IRQ_CODEC IRQ_GPIO16
|
|
#define SHANNON_GPIO_DSP_RESET GPIO_GPIO (17) /* Output - Drive low to reset the DSP */
|
|
#define SHANNON_GPIO_CODEC_RESET GPIO_GPIO (18) /* Output - Drive low to reset the UCB1x00 */
|
|
#define SHANNON_GPIO_U3_RTS GPIO_GPIO (19) /* ?? */
|
|
#define SHANNON_GPIO_U3_CTS GPIO_GPIO (20) /* ?? */
|
|
#define SHANNON_GPIO_SENSE_12V GPIO_GPIO (21) /* Input, 12v flash unprotect detected */
|
|
#define SHANNON_GPIO_DISP_EN 22 /* out */
|
|
/* XXX GPIO 23 unaccounted for */
|
|
#define SHANNON_GPIO_EJECT_0 24 /* in */
|
|
#define SHANNON_GPIO_EJECT_1 25 /* in */
|
|
#define SHANNON_GPIO_RDY_0 26 /* in */
|
|
#define SHANNON_GPIO_RDY_1 27 /* in */
|
|
|
|
/* MCP UCB codec GPIO pins... */
|
|
|
|
#define SHANNON_UCB_GPIO_BACKLIGHT 9
|
|
#define SHANNON_UCB_GPIO_BRIGHT_MASK 7
|
|
#define SHANNON_UCB_GPIO_BRIGHT 6
|
|
#define SHANNON_UCB_GPIO_CONTRAST_MASK 0x3f
|
|
#define SHANNON_UCB_GPIO_CONTRAST 0
|
|
|
|
#endif
|