summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-09-01Merge remote-tracking branch 'spi/topic/tegra' into spi-nextMark Brown1-7/+1
2013-09-01Merge remote-tracking branch 'spi/topic/sirf' into spi-nextMark Brown2-47/+182
2013-09-01Merge remote-tracking branch 'spi/topic/sh-msiof' into spi-nextMark Brown1-18/+0
2013-09-01Merge remote-tracking branch 'spi/topic/sh-hspi' into spi-nextMark Brown1-2/+0
2013-09-01Merge remote-tracking branch 'spi/topic/s3c64xx' into spi-nextMark Brown1-69/+43
2013-09-01Merge remote-tracking branch 'spi/topic/rspi' into spi-nextMark Brown1-1/+1
2013-09-01Merge remote-tracking branch 'spi/topic/quad' into spi-nextMark Brown2-40/+47
2013-09-01Merge remote-tracking branch 'spi/topic/qspi' into spi-nextMark Brown16-136/+757
2013-09-01Merge remote-tracking branch 'spi/topic/pxa' into spi-nextMark Brown1-1/+8
2013-09-01Merge remote-tracking branch 'spi/topic/pl022' into spi-nextMark Brown1-2/+2
2013-09-01Merge remote-tracking branch 'spi/topic/pdata' into spi-nextMark Brown30-160/+125
2013-09-01Merge remote-tracking branch 'spi/topic/orion' into spi-nextMark Brown1-17/+5
2013-09-01Merge remote-tracking branch 'spi/topic/omap-100k' into spi-nextMark Brown1-198/+78
2013-09-01Merge remote-tracking branch 'spi/topic/octeon' into spi-nextMark Brown1-44/+5
2013-09-01Merge remote-tracking branch 'spi/topic/nuc900' into spi-nextMark Brown1-1/+1
2013-09-01Merge remote-tracking branch 'spi/topic/mxs' into spi-nextMark Brown1-15/+13
2013-09-01Merge remote-tracking branch 'spi/topic/msglen' into spi-nextMark Brown2-0/+2
2013-09-01Merge remote-tracking branch 'spi/topic/mpc512x' into spi-nextMark Brown1-18/+30
2013-09-01Merge remote-tracking branch 'spi/topic/ioremap' into spi-nextMark Brown2-14/+2
2013-09-01Merge remote-tracking branch 'spi/topic/imx' into spi-nextMark Brown1-50/+26
2013-09-01Merge remote-tracking branch 'spi/topic/ep93xx' into spi-nextMark Brown1-272/+81
2013-09-01Merge remote-tracking branch 'spi/topic/efm32' into spi-nextMark Brown5-0/+572
2013-09-01Merge remote-tracking branch 'spi/topic/dspi' into spi-nextMark Brown4-0/+607
2013-09-01Merge remote-tracking branch 'spi/topic/doc' into spi-nextMark Brown1-1/+1
2013-09-01Merge remote-tracking branch 'spi/topic/davinci' into spi-nextMark Brown1-1/+1
2013-09-01Merge remote-tracking branch 'spi/topic/core' into spi-nextMark Brown1-2/+2
2013-09-01Merge remote-tracking branch 'spi/topic/clps711x' into spi-nextMark Brown1-6/+0
2013-09-01Merge remote-tracking branch 'spi/topic/checks' into spi-nextMark Brown2-1/+24
2013-09-01Merge remote-tracking branch 'spi/topic/build' into spi-nextMark Brown2-14/+15
2013-09-01Merge remote-tracking branch 'spi/topic/bpw' into spi-nextMark Brown1-1/+1
2013-09-01Merge remote-tracking branch 'spi/topic/blackfin-v3' into spi-nextMark Brown3-1/+980
2013-09-01Merge remote-tracking branch 'spi/topic/bitbang' into spi-nextMark Brown5-193/+113
2013-09-01Merge remote-tracking branch 'spi/topic/bcm2835' into spi-nextMark Brown1-8/+2
2013-09-01Merge remote-tracking branch 'spi/topic/atmel' into spi-nextMark Brown1-16/+20
2013-09-01spi/qspi: fix missing unlock on error in ti_qspi_start_transfer_one()Wei Yongjun1-0/+1
Add the missing unlock before return from function ti_qspi_start_transfer_one() in the error handling case. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-09-01spi: quad: fix the name of DT propertywangyuhang2-4/+14
spi: quad: fix the name of DT property in patch The previous property name spi-tx-nbits and spi-rx-nbits looks not human-readable. To make it consistent with other devices, using property name spi-tx-bus-width and spi-rx-bus-width instead of the previous one specify the number of data wires that spi controller will work in. Add the specification in spi-bus.txt. Signed-off-by: wangyuhang <wangyuhang2014@gmail.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-31spi: core: Fix spi_register_master error handlingAxel Lin1-1/+1
In the case spi_master_initialize_queue() fails, current code calls device_unregister() before return error from spi_register_master(). However, all the drivers call spi_master_put() in the error path if spi_register_master() fails. Thus we should call device_del() rather than device_unregister() before return error from spi_register_master(). This also makes all the spi_register_master() error handling consistent, because all other error paths of spi_register_master() expect drivers to call spi_master_put() if spi_register_master() fails. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-31spi: efm32: Fix build errorAxel Lin1-1/+1
Obviously the of_device_id table name is wrong. Fix below build error: CC [M] drivers/spi/spi-efm32.o drivers/spi/spi-efm32.c:499:1: error: '__mod_of_device_table' aliased to undefined symbol 'efm32_uart_dt_ids' make[2]: *** [drivers/spi/spi-efm32.o] Error 1 make[1]: *** [drivers/spi] Error 2 make: *** [drivers] Error 2 Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-31spi: altera: Use DIV_ROUND_UP to calculate hw->bytes_per_wordAxel Lin1-1/+1
The Altera SPI hardware can be configured to support data width from 1 to 32 since Quartus II 8.1. To avoid truncation by integer division, use DIV_ROUND_UP to calculate hw->bytes_per_word. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Thomas Chou <thomas@wytron.com.tw> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-31spi: rspi: Add spi_master_get() call to prevent use after freeAxel Lin1-1/+1
In rspi_remove(), current code dereferences rspi after spi_unregister_master(), thus add an extra spi_master_get() call is necessary to prevent use after free. Current code already has an extra spi_master_put() call in rspi_remove(), so this patch just adds a spi_master_get() call rather than a spi_master_get() with spi_master_put() calls. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-31spi: quad: Make DT properties optionalMark Brown1-38/+34
The addition SPI quad support made the DT properties mandatory, breaking compatibility with existing systems. Fix that by making them optional, also improving the error messages while we're at it. Signed-off-by: Mark Brown <broonie@linaro.org> Tested-by: Stephen Warren <swarren@nvidia.com>
2013-08-31spi: quad: Fix missing returnwangyuhang1-0/+1
Delete a "return" when commit the patch to a new kernel version by mistake. So recover it. Signed-off-by: wangyuhang <wangyuhang2014@gmail.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-29Merge remote-tracking branch 'spi/topic/rspi' into spi-pdataMark Brown977-98490/+10375
Conflicts: drivers/spi/spi-rspi.c
2013-08-29spi: Use dev_get_drvdata at appropriate placesAxel Lin4-12/+8
Use dev_get_drvdata() instead of platform_get_drvdata(to_platform_device(dev)). Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-29spi: use dev_get_platdata()Jingoo Han29-38/+40
Use the wrapper function for retrieving the platform data instead of accessing dev->platform_data directly. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-29Merge remote-tracking branch 'spi/topic/xilinx' into spi-pdataMark Brown1-106/+66
2013-08-29spi: nuc900: Fix mode_bits settingAxel Lin1-1/+1
The code in nuc900_slave_select() supports handling SPI_CS_HIGH. Thus set SPI_CS_HIGH bit in master->mode_bits to make it work. Otherwise, spi_setup() will return unsupported mode bits error message if SPI_CS_HIGH is set in the mode field of struct spi_device. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-29spi: simplify devm_request_mem_region/devm_ioremapJulia Lawall2-25/+14
Convert the composition of devm_request_mem_region and devm_ioremap to a single call to devm_ioremap_resource. The associated call to platform_get_resource is also simplified and moved next to the new call to devm_ioremap_resource. This was done using a combination of the semantic patches devm_ioremap_resource.cocci and devm_request_and_ioremap.cocci, found in the scripts/coccinelle/api directory. This patch also removes the label exit_busy, to use the error code returned by the failing operation, rather than always -EBUSY. Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-28spi: altera: Simplify altera_spi_txrx implementation for noirq caseAxel Lin1-11/+4
This patch simplifies the code and makes it better in readability. Now the logic in the while loop is simply "write to ALTERA_SPI_TXDATA then read from ALTERA_SPI_TXDATA". There is a slightly logic change because now we avoid a read-write cycle when hw->len is 0. Since the code in bitbang library will call bitbang->txrx_bufs() only when t->len is not 0, this is not a problem. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Thomas Chou <thomas@wytron.com.tw> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-08-27spi: spi-rspi: fix inconsistent spin_lock_irqsaveShimoda, Yoshihiro1-4/+6
This patch fixes the following Smatch warning: CHECK drivers/spi/spi-rspi.c drivers/spi/spi-rspi.c:606 rspi_work() warn: inconsistent returns spin_lock:&rspi->lock: locked (602) unlocked (606) drivers/spi/spi-rspi.c:606 rspi_work() warn: inconsistent returns irqsave:flags: locked (602) unlocked (606) Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Signed-off-by: Mark Brown <broonie@linaro.org>
generated by cgit v1.2.3 (git 2.39.0) at 2025-02-03 14:18:15 +0300