summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-22Merge remote-tracking branch 'asoc/topic/rcar' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/pxa' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/pcm3008' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/omap' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/nuc900' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/new-pcm' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/mxs' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/mc13783' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/max9877' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/max98090' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/max9768' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/lm4857' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/fsl' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/dma' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/dapm' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/cs4270' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/core' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/compress' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/bt' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/blackfin' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/au1x' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/atmel' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/arizona' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/ak5386' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/ak4554' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/adsp' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/ads711x' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/adav80x' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/adau1701' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/ad73311' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/ad1980' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/topic/ac97' into asoc-nextMark Brown
2013-08-22Merge remote-tracking branch 'asoc/fix/wm8960' into asoc-linusMark Brown
2013-08-22ASoC: samsung: Fix build error with dma function renameTushar Behera
commit 85ff3c29d720 ("ASoC: samsung: Rename DMA platform registration functions") renames the DMA registration functions. Fix the places where it was left out. Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-22spi: DUAL and QUAD supportwangyuhang
fix the previous patch some mistake below: 1. DT in slave node, use "spi-tx-nbits = <1/2/4>" in place of using "spi-tx-dual, spi-tx-quad" directly, same to rx. So correct the previous way to get the property in @of_register_spi_devices(). 2. Change the value of transfer bit macro(SPI_NBITS_SINGLE, SPI_NBITS_DUAL SPI_NBITS_QUAD) to 0x01, 0x02 and 0x04 to match the actual wires. 3. Add the following check (1)keep the tx_nbits and rx_nbits in spi_transfer is not beyond the single, dual and quad. (2)keep tx_nbits and rx_nbits are contained by @spi_device->mode example: if @spi_device->mode = DUAL, then tx/rx_nbits can not be set to QUAD(SPI_NBITS_QUAD) (3)if "@spi_device->mode & SPI_3WIRE", then tx/rx_nbits should be in single(SPI_NBITS_SINGLE) Signed-off-by: wangyuhang <wangyuhang2014@gmail.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-22spi/qspi: Add qspi flash controllerSourav Poddar
The patch add basic support for the quad spi controller. QSPI is a kind of spi module that allows single, dual and quad read access to external spi devices. The module has a memory mapped interface which provide direct interface for accessing data form external spi devices. The patch will configure controller clocks, device control register and for defining low level transfer apis which will be used by the spi framework to transfer data to the slave spi device(flash in this case). Test details: ------------- Tested this on dra7 board. Test1: Ran mtd_stesstest for 40000 iterations. - All iterations went through without failure. Test2: Use mtd utilities: - flash_erase to erase the flash device - mtd_debug read to read data back. - mtd_debug write to write to the data flash. diff between the write and read data shows zero. Acked-by: Felipe Balbi<balbi@ti.com> Reviewed-by: Felipe Balbi<balbi@ti.com> Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-22spi: spi-efm32: remove redundant dev_err call in efm32_spi_probe()Wei Yongjun
There is a error message within devm_ioremap_resource already, so remove the dev_err call to avoid redundant error message. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-22spi:Add Freescale DSPI driver for Vybrid VF610 platformChao Fu
The serial peripheral interface (SPI) module implemented on Freescale Vybrid platform provides a synchronous serial bus for communication between Vybrid and the external peripheral device. The SPI supports full-duplex, three-wire synchronous transfer, has TX/RX FIFO with depth of four entries. This driver is the SPI master mode driver and has been tested on Vybrid VF610TWR board. Signed-off-by: Alison Wang <b18965@freescale.com> Signed-off-by: Chao Fu <b44548@freescale.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-22Documentation: DT: Add Freescale DSPI driverChao Fu
This patch adds the document for DSPI driver under Documentation/devicetree/bindings/spi/. Signed-off-by: Chao Fu <b44548@freescale.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-22s390/kprobes: add support for compare and branch instructionsHeiko Carstens
The compare and branch instructions (not relative) all need special handling when kprobed: - if a branch was taken, the instruction pointer should be left alone - if a branch was not taken, the instruction pointer must be adjusted The compare and branch instructions family was introduced with the general instruction extension facility (z10). Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2013-08-22s390/switch_to: fix save_access_regs() / restore_access_regs()Heiko Carstens
Fix broken contraints for both save_access_regs() and restore_access_regs(). The constraints are incorrect since they tell the compiler that the inline assemblies only access the first element of an array of 16 elements. Therefore the compiler could generate incorrect code. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2013-08-22s390/bitops: fix inline assembly constraintsHeiko Carstens
Fix inline assembly contraints for non atomic bitops functions. This is broken since 2.6.34 987bcdac "[S390] use inline assembly contraints available with gcc 3.3.3". Reported-by: Andreas Krebbel <krebbel@linux.vnet.ibm.com> Reported-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2013-08-22s390/dasd: enable raw_track_access reads without direct I/OStefan Weinhuber
The ECKD protocol supports reading of tracks with arbitrary format as raw track images. The DASD device driver supports this in its raw_track_access mode. In this mode it maps each track to sixteen 4096 byte sectors and rejects all requests that are not properly aligned to this mapping. An application that wants to use a DASD in raw_track_access mode will usually use direct I/O to make sure that properly aligned requests are directly submitted to the driver. However, applications that are not aware of this mode, e.g. udev, will encounter I/O errors. To make the use without direct I/O possible and avoid this kind of alignment errors, we now pad unaligned read requests with a dummy page, so that we can always read full tracks. Please note that writing is still only possible for full track images that are properly aligned. Signed-off-by: Stefan Weinhuber <wein@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>