aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/amba
Commit message (Expand)AuthorAgeFilesLines
*---. Merge branches 'fixes', 'pgt-next' and 'versatile' into develRussell King2011-03-201-21/+69
|\ \ \
| | | * ARM: clcd: add method for describing display capabilitiesRussell King2011-02-191-17/+65
| | | * ARM: clcd: use amba_part() to determine if we have a PL110 primecellRussell King2011-02-191-5/+5
| | |/ | |/|
| | |
| \ \
*-. \ \ Merge branches 'aaci', 'mmci-dma', 'pl' and 'pl011' into driversRussell King2011-03-172-2/+23
|\ \ \ \ | |_|/ / |/| | |
| | * | ARM: 6758/1: amba: support pm opsRabin Vincent2011-02-231-0/+2
| | * | ARM: amba: make amba_driver id_table constRussell King2011-02-231-1/+1
| | * | ARM: amba: make probe() functions take const id tablesRussell King2011-02-231-1/+1
| | * | ARM: 6662/1: amba: make amba_bustype non-staticRob Herring2011-02-231-0/+2
| |/ / |/| |
| * | ARM: mmci: add dmaengine-based DMA supportRussell King2011-02-041-0/+17
|/ /
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/asy...Linus Torvalds2011-01-171-49/+50
|\ \
| * | ARM: PL08x: cleanup commentsRussell King - ARM Linux2011-01-161-23/+20
| * | ARM: PL08x: fix a warningDan Williams2011-01-141-1/+1
| * | ARM: PL08x: fix locking between prepare function and submit functionRussell King - ARM Linux2011-01-041-4/+0
| * | ARM: PL08x: introduce 'phychan_hold' to hold on to physical channelsRussell King - ARM Linux2011-01-041-0/+3
| * | ARM: PL08x: rename 'desc_list' as 'pend_list'Russell King - ARM Linux2011-01-041-2/+2
| * | ARM: PL08x: shrink srcbus/dstbus in txd structureRussell King - ARM Linux2011-01-041-2/+2
| * | ARM: PL08x: allow AHB master port selection to be configuredRussell King - ARM Linux2011-01-041-2/+13
| * | ARM: PL08x: move default cctl into txd structureRussell King - ARM Linux2011-01-041-1/+2
| * | ARM: PL08x: move ccfg into txd structureRussell King - ARM Linux2011-01-041-1/+5
| * | ARM: PL08x: avoid duplicating registers in txd and phychan structuresRussell King - ARM Linux2011-01-041-13/+0
| * | ARM: PL08x: use 'size_t' for lengthsRussell King - ARM Linux2011-01-041-2/+2
| * | ARM: PL08x: avoid 'void *' struct fields when we can type them properlyRussell King - ARM Linux2011-01-041-1/+4
| * | ARM: PL08x: fix atomic_t usage and tx_submit() return value rangeRussell King - ARM Linux2011-01-041-1/+0
| |/
* | Merge branch 'misc' into develRussell King2011-01-061-0/+8
|\ \
| * | ARM: 6467/1: amba: optional PrimeCell core voltage switchLinus Walleij2010-11-261-0/+8
| |/
* | ARM: PL011: add DMA burst threshold support for ST variantsRussell King2011-01-051-0/+15
* | ARM: PL011: Add support for transmit DMARussell King2011-01-051-0/+7
|/
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/asy...Linus Torvalds2010-10-271-0/+222
|\
| * dmaengine: driver for the ARM PL080/PL081 PrimeCells v5Linus Walleij2010-09-291-0/+222
* | Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-10-213-4/+24
|\ \
| | \
| | \
| *-. \ Merge branches 'at91', 'dcache', 'ftrace', 'hwbpt', 'misc', 'mmci', 's3c', 's...Russell King2010-10-183-4/+24
| |\ \ \ | | |_|/ | |/| |
| | | * ARM: 6307/1: mmci: allow the card detect GPIO value not to be invertedRabin Vincent2010-08-261-0/+2
| | |/ | |/|
| | * ARM: 6421/1: amba-pl011: add missing ST specific registersLinus Walleij2010-10-111-0/+11
| | * ARM: 6368/1: move the PrimeCell IDs to use macrosLinus Walleij2010-10-081-4/+11
| |/
* | spi/pl022: get rid of chipinfo dev pointerLinus Walleij2010-10-121-1/+0
* | spi/pl022: Add spi->mode support to AMBA SPI driverKevin Wells2010-10-121-6/+0
* | spi/pl022: add PrimeCell generic DMA supportLinus Walleij2010-10-121-0/+6
|/
* VIDEO: amba clcd: don't disable an already disabled clockRussell King2010-08-171-0/+1
* Merge branch 'misc' into develRussell King2010-07-312-4/+9
|\
| * ARM: 6243/1: mmci: pass power_mode to the translate_vdd callbackRabin Vincent2010-07-291-4/+6
| * ARM: 6158/2: PL011 baudrate extension for ST-Ericssons derivativeLinus Walleij2010-07-271-0/+1
| * ARM: 6157/2: PL011 TX/RX split of LCR for ST-Ericssons derivativeLinus Walleij2010-07-271-0/+2
* | ARM: AMBA: Add pclk support to AMBA bus infrastructureRussell King2010-07-311-0/+11
|/
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/asy...Linus Torvalds2010-05-301-0/+45
|\
| * DMA: PL330: Add dma api driverJassi Brar2010-05-231-0/+45
* | Merge remote branch 'origin' into secretlab/next-spiGrant Likely2010-05-251-1/+22
|\ \ | |/
| * Merge branch 'devel-stable' into develRussell King2010-05-172-0/+5
| |\
| * | ARM: 6033/1: ARM: MMCI: pass max frequency from platformLinus Walleij2010-04-141-1/+22
* | | spi/pl022: add support for the PL023 derivateLinus Walleij2010-05-251-2/+30
* | | spi/pl022: fix up differences between ARM and ST versionsLinus Walleij2010-05-251-1/+3
| |/ |/|