projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'locking-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
spi
/
spi-mxs.c
diff --git
a/drivers/spi/spi-mxs.c
b/drivers/spi/spi-mxs.c
index 2884f0c2f5f05a086621102e847c2bfbefcb215e..51460878af041f6ce85c518415c13f74fc04c46e 100644
(file)
--- a/
drivers/spi/spi-mxs.c
+++ b/
drivers/spi/spi-mxs.c
@@
-85,7
+85,7
@@
static int mxs_spi_setup_transfer(struct spi_device *dev,
mxs_ssp_set_clk_rate(ssp, hz);
/*
* Save requested rate, hz, rather than the actual rate,
mxs_ssp_set_clk_rate(ssp, hz);
/*
* Save requested rate, hz, rather than the actual rate,
- * ssp->clk_rate. Otherwise we would set the rate every trasfer
+ * ssp->clk_rate. Otherwise we would set the rate every tra
n
sfer
* when the actual rate is not quite the same as requested rate.
*/
spi->sck = hz;
* when the actual rate is not quite the same as requested rate.
*/
spi->sck = hz;
@@
-154,12
+154,14
@@
static int mxs_ssp_wait(struct mxs_spi *spi, int offset, int mask, bool set)
static void mxs_ssp_dma_irq_callback(void *param)
{
struct mxs_spi *spi = param;
static void mxs_ssp_dma_irq_callback(void *param)
{
struct mxs_spi *spi = param;
+
complete(&spi->c);
}
static irqreturn_t mxs_ssp_irq_handler(int irq, void *dev_id)
{
struct mxs_ssp *ssp = dev_id;
complete(&spi->c);
}
static irqreturn_t mxs_ssp_irq_handler(int irq, void *dev_id)
{
struct mxs_ssp *ssp = dev_id;
+
dev_err(ssp->dev, "%s[%i] CTRL1=%08x STATUS=%08x\n",
__func__, __LINE__,
readl(ssp->base + HW_SSP_CTRL1(ssp)),
dev_err(ssp->dev, "%s[%i] CTRL1=%08x STATUS=%08x\n",
__func__, __LINE__,
readl(ssp->base + HW_SSP_CTRL1(ssp)),
@@
-189,7
+191,7
@@
static int mxs_spi_txrx_dma(struct mxs_spi *spi,
if (!len)
return -EINVAL;
if (!len)
return -EINVAL;
- dma_xfer = k
zalloc(sizeof(*dma_xfer) * sgs
, GFP_KERNEL);
+ dma_xfer = k
calloc(sgs, sizeof(*dma_xfer)
, GFP_KERNEL);
if (!dma_xfer)
return -ENOMEM;
if (!dma_xfer)
return -ENOMEM;