summaryrefslogtreecommitdiffstats
path: root/include/linux/amba
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds2012-01-171-2/+2
|\
| * Merge branch 'dma_slave_direction' into next_test_dirnVinod Koul2011-11-171-2/+2
| |\
| | * dmaengine: move drivers to dma_transfer_directionVinod Koul2011-10-271-2/+2
* | | Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2012-01-141-1/+1
|\ \ \
| * \ \ Merge branch 'gpio-for-grant' of git://sources.calxeda.com/kernel/linux into ...Grant Likely2012-01-051-1/+1
| |\ \ \
| | * | | gpio: pl061: convert to use 0 for no irqRob Herring2012-01-041-1/+1
| | |/ /
* | | | Merge tag 'mmc-merge-for-3.3-rc1' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2012-01-131-0/+2
|\ \ \ \
| * | | | mmc: mmci: add capabilities2 for MMC_CAP2Per Forlin2012-01-111-0/+2
| | |/ / | |/| |
* | | | Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-01-091-10/+5
|\ \ \ \
| * | | | DMA: PL330: Infer transfer direction from transfer request instead of platfor...Thomas Abraham2011-12-231-10/+3
| * | | | DMA: PL330: move filter function into driverThomas Abraham2011-12-231-0/+2
| |/ / /
* | | | Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2012-01-071-0/+4
|\ \ \ \ | | |/ / | |/| |
| * | | spi/pl022: add support for pm_runtime autosuspendChris Blair2011-12-011-0/+4
| |/ /
* | | ARM: amba: Move definition of struct amba_id to mod_devicetable.hDave Martin2011-11-221-6/+1
|/ /
* | Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds2011-11-042-10/+26
|\ \ | |/
| * Merge branch 'samsung_dma' into nextVinod Koul2011-09-211-5/+1
| |\
| | * DMA: PL330: Update PL330 DMA API driverBoojin Kim2011-09-141-5/+1
| * | dmaengine/amba-pl08x: Add support for sg len greater than one for slave trans...Viresh Kumar2011-09-191-6/+16
| |/
| * dmaengine/amba-pl08x: Pass flow controller information with slave channel dataViresh Kumar2011-08-251-0/+4
| * dmaengine/amba-pl08x: Get rid of pl08x_pre_boundary()Viresh Kumar2011-08-251-2/+0
| * dmaengine/amba-pl08x: Complete doc comment for struct pl08x_txdViresh Kumar2011-08-251-0/+8
* | gpio: pl061: add DT binding supportRob Herring2011-10-261-2/+1
|/
* Merge branch 'next' into for-linus-3.0Vinod Koul2011-07-271-3/+6
|\
| * DMA: PL08x: constify plchan->cd and plat->slave_channelsRussell King - ARM Linux2011-07-261-2/+2
| * DMA: PL08x: separately store source/destination cctlRussell King - ARM Linux2011-07-261-0/+2
| * DMA: PL08x: separately store source/destination slave addressRussell King - ARM Linux2011-07-261-1/+2
* | amba pl011: workaround for uart registers lockupShreshtha Kumar Sahu2011-06-161-0/+3
|/
* Fix common misspellingsLucas De Marchi2011-03-312-4/+4
*---. 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
OpenPOWER on IntegriCloud