* [PATCH 1/2] spi/pxa2xx-pci: correct the return value check of pcim_iomap_regions()
@ 2013-03-05 10:05 Mika Westerberg
2013-03-05 10:05 ` [PATCH 2/2] spi/pxa2xx: enable multiblock DMA transfers for LPSS devices Mika Westerberg
2013-03-12 18:31 ` [PATCH 1/2] spi/pxa2xx-pci: correct the return value check of pcim_iomap_regions() Mark Brown
0 siblings, 2 replies; 3+ messages in thread
From: Mika Westerberg @ 2013-03-05 10:05 UTC (permalink / raw)
To: linux-kernel
Cc: Eric Miao, Russell King, Haojian Zhuang, Grant Likely, Mark Brown,
Mika Westerberg
The function returns 0 on success and negative errno in case of failure.
Fix this.
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
drivers/spi/spi-pxa2xx-pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c
index 364964d..48abae5 100644
--- a/drivers/spi/spi-pxa2xx-pci.c
+++ b/drivers/spi/spi-pxa2xx-pci.c
@@ -22,7 +22,7 @@ static int ce4100_spi_probe(struct pci_dev *dev,
return ret;
ret = pcim_iomap_regions(dev, 1 << 0, "PXA2xx SPI");
- if (!ret)
+ if (ret)
return ret;
memset(&spi_pdata, 0, sizeof(spi_pdata));
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] spi/pxa2xx: enable multiblock DMA transfers for LPSS devices
2013-03-05 10:05 [PATCH 1/2] spi/pxa2xx-pci: correct the return value check of pcim_iomap_regions() Mika Westerberg
@ 2013-03-05 10:05 ` Mika Westerberg
2013-03-12 18:31 ` [PATCH 1/2] spi/pxa2xx-pci: correct the return value check of pcim_iomap_regions() Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mika Westerberg @ 2013-03-05 10:05 UTC (permalink / raw)
To: linux-kernel
Cc: Eric Miao, Russell King, Haojian Zhuang, Grant Likely, Mark Brown,
Mika Westerberg
Intel LPSS SPI controllers need to have bit 0 (disable_ssp_dma_finish) set
in SSP_REG in order to properly perform DMA transfers spanning over
multiple blocks.
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
drivers/spi/spi-pxa2xx.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 90b27a3..c6d5b97 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -68,6 +68,7 @@ MODULE_ALIAS("platform:pxa2xx-spi");
#define LPSS_TX_HITHRESH_DFLT 224
/* Offset from drv_data->lpss_base */
+#define SSP_REG 0x0c
#define SPI_CS_CONTROL 0x18
#define SPI_CS_CONTROL_SW_MODE BIT(0)
#define SPI_CS_CONTROL_CS_HIGH BIT(1)
@@ -138,6 +139,10 @@ detection_done:
/* Enable software chip select control */
value = SPI_CS_CONTROL_SW_MODE | SPI_CS_CONTROL_CS_HIGH;
__lpss_ssp_write_priv(drv_data, SPI_CS_CONTROL, value);
+
+ /* Enable multiblock DMA transfers */
+ if (drv_data->master_info->enable_dma)
+ __lpss_ssp_write_priv(drv_data, SSP_REG, 1);
}
static void lpss_ssp_cs_control(struct driver_data *drv_data, bool enable)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] spi/pxa2xx-pci: correct the return value check of pcim_iomap_regions()
2013-03-05 10:05 [PATCH 1/2] spi/pxa2xx-pci: correct the return value check of pcim_iomap_regions() Mika Westerberg
2013-03-05 10:05 ` [PATCH 2/2] spi/pxa2xx: enable multiblock DMA transfers for LPSS devices Mika Westerberg
@ 2013-03-12 18:31 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2013-03-12 18:31 UTC (permalink / raw)
To: Mika Westerberg
Cc: linux-kernel, Eric Miao, Russell King, Haojian Zhuang,
Grant Likely
[-- Attachment #1: Type: text/plain, Size: 175 bytes --]
On Tue, Mar 05, 2013 at 12:05:16PM +0200, Mika Westerberg wrote:
> The function returns 0 on success and negative errno in case of failure.
> Fix this.
Applied both, thanks.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-03-12 18:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-05 10:05 [PATCH 1/2] spi/pxa2xx-pci: correct the return value check of pcim_iomap_regions() Mika Westerberg
2013-03-05 10:05 ` [PATCH 2/2] spi/pxa2xx: enable multiblock DMA transfers for LPSS devices Mika Westerberg
2013-03-12 18:31 ` [PATCH 1/2] spi/pxa2xx-pci: correct the return value check of pcim_iomap_regions() Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox