spi/spi-atmel: add dmaengine support for atmel spi controller and to test the device tree support
Subsystems (6)
v7 cover spi/spi-atmel: add dmaengine support for atmel spi controller and to test the device tree support
Hi All,
This set of patches is to add dmaengine support for atmel spi and to test device tree support.
The work is based on Nicolas and Richard's work.
Because the dma engine device tree support isn't available now, to at91sam9x5ek and at91sam9n12ek with dma support, it doesn't work on the dmaengine mode, only on PIO mode so far.
It has been tested as below:
1./tested on v3.9-rc3, by using mtd utils, "mount", "umount" and "cp" commands. 2./tested on "spi/next" git tree after changing master->num_chipselect which fixed in v3.9-rc1. 3./tested by using Documentation/spi/spidev_test.c on "/dev/spidev".
4./tested on on at91sam9x5ek, at91sam9m10g45ek, at91sam9263ek and at91sam9g20ek boards.
It is based on v3.9-rc3 + Joachim Eastwood's spi/atmel: fix speed_hz check in atmel_spi_transfer().
Changelog:
v7:
1./ remove patch: fix probing failure after xfer->speed_hz set. 2./ remove patch: add pinctrl support for atmel spi.
v6:
1./ remove: fix master->num_chipselect wrongly set patch which isn't a issue in v3.9-rc1.
2./ fix probing failure after xfer->speed_hz set.v5:
1./ add pinctrl patches.
2./ detect capabilities by reading spi version register to replace multiple compatiles. 3./ change the "cs-gpios" property of spi node.
4./ rebase on v3.8.
v4:
1./ Take Joe Perches's adivce, rewrite atmel_spi_is_v2(struct atmel_spi *as)
and atmel_spi_use_dma(struct atmel_spi *as),
and remove atmel_spi_use_pdc(struct atmel_spi *as).
2./ Rebase on v3.8-rc3.
V3:
1./ Rebase on v3.8-rc2.
2./ Remove some Jean-Christophe's patches which has been applied on v3.8-rc2. 3./ Remove spi property "cs-gpios" from the SoC dtsi files to the board dts files
to avoid some useless pin conflicts.
v2:
1./ Remove the patch :PATCH]mtd: m25p80: change the m25p80_read to reading page to page
which purpose to fix the BUG: when run "flashcp /bin/busybox /dev/mtdX" in the at91sam9g25ek with DMA mode, it arises a OOPS. Now fix it in this patch:
[PATHC] spi/atmel_spi: add dmaengine support changing to fix the [BUG].
2./ Remove two patches:
which purpose to read dts property to select SPI IP version and DMA mode Now they will be gat from device tree different compatile.
3./ Fix DMA: when enable both spi0 AND spi1, the spi0 doesn't work BUG.
4./ Rebase v3.7-rc8.
Best Regards,
Wenyou Yang.
Nicolas Ferre (5):
spi/spi-atmel: add physical base address spi/spi-atmel: call unmapping on transfers buffers spi/spi-atmel: status information passed through controller data spi/spi-atmel: add flag to controller data for lock operations spi/spi-atmel: add dmaengine support
Richard Genoud (6):
spi/spi-atmel: fix spi-atmel driver to adapt to slave_config changes spi/spi-atmel: correct 16 bits transfers using PIO spi/spi-atmel: correct 16 bits transfers with DMA
ARM: at91: add clocks for spi dt entries
ARM: dts: add spi nodes for atmel SoC
ARM: dts: add spi nodes for the atmel boards
Wenyou Yang (3):
spi/spi-atmel: detect the capabilities of SPI core by reading the
VERSION register.
spi/spi-atmel: add support transfer on CS1,2,3, not only on CS0
ARM: dts: add pinctrl property for spi node for atmel SoC
arch/arm/boot/dts/at91sam9260.dtsi | 40 ++ arch/arm/boot/dts/at91sam9263.dtsi | 40 ++ arch/arm/boot/dts/at91sam9263ek.dts | 10 + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 10 + arch/arm/boot/dts/at91sam9g45.dtsi | 40 ++ arch/arm/boot/dts/at91sam9m10g45ek.dts | 10 + arch/arm/boot/dts/at91sam9n12.dtsi | 40 ++ arch/arm/boot/dts/at91sam9n12ek.dts | 10 + arch/arm/boot/dts/at91sam9x5.dtsi | 40 ++ arch/arm/boot/dts/at91sam9x5ek.dtsi | 10 + arch/arm/mach-at91/at91sam9260.c | 2 + arch/arm/mach-at91/at91sam9g45.c | 2 + arch/arm/mach-at91/at91sam9n12.c | 2 + arch/arm/mach-at91/at91sam9x5.c | 2 + drivers/spi/spi-atmel.c | 753 ++++++++++++++++++++++++--- 15 files changed, 945 insertions(+), 66 deletions(-)
Signature · 1 line
1.7.9.5
PATCH v7 1/14 spi/spi-atmel: detect the capabilities of SPI core by reading the VERSION register.
The "has_dma_support" needed for future use with dmaengine driver.
--- drivers/spi/spi-atmel.c | 66 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 50 insertions(+), 16 deletions(-)
drivers/spi/spi-atmel.c +50 -16
@@ -22,9 +22,8 @@#include <linux/platform_data/atmel.h> #include <linux/of.h> -#include <asm/io.h> -#include <asm/gpio.h> -#include <mach/cpu.h> +#include <linux/io.h> +#include <linux/gpio.h> /* SPI register offsets */ #define SPI_CR 0x0000
@@ -39,6 +38,7 @@#define SPI_CSR1 0x0034#define SPI_CSR2 0x0038#define SPI_CSR3 0x003c +#define SPI_VERSION 0x00fc#define SPI_RPR 0x0100#define SPI_RCR 0x0104#define SPI_TPR 0x0108
@@ -71,6 +71,8 @@#define SPI_FDIV_SIZE 1#define SPI_MODFDIS_OFFSET 4#define SPI_MODFDIS_SIZE 1 +#define SPI_WDRBT_OFFSET 5 +#define SPI_WDRBT_SIZE 1#define SPI_LLB_OFFSET 7#define SPI_LLB_SIZE 1#define SPI_PCS_OFFSET 16
@@ -180,6 +182,11 @@#define spi_writel (port,reg,value) \ __raw_writel((value), (port)->regs + SPI_##reg) +struct atmel_spi_caps { +bool is_spi2; +bool has_wdrbt; +bool has_dma_support; +};/* * The core SPI transfer engine just talks to a register bank to set up
@@ -204,6 +211,8 @@ struct atmel_spi {void *buffer;dma_addr_t buffer_dma; + +struct atmel_spi_caps caps; };/* Controller-specific per-slave state */
@@ -222,14 +231,10 @@ struct atmel_spi_device {* - SPI_SR.TXEMPTY, SPI_SR.NSSR (and corresponding irqs) * - SPI_CSRx.CSAAT * - SPI_CSRx.SBCR allows faster clocking -* -* We can determine the controller version by reading the VERSION -* register, but I haven't checked that it exists on all chips, and -* this is cheaper anyway. */ -static bool atmel_spi_is_v2 (void ) +static bool atmel_spi_is_v2 (struct atmel_spi *as) { -return !cpu_is_at91rm9200 (); +return as->caps.is_spi2; }/*
@@ -263,15 +268,20 @@ static void cs_activate(struct atmel_spi *as, struct spi_device *spi)unsigned active = spi->mode &SPI_CS_HIGH ;u32 mr; -if (atmel_spi_is_v2 ()) { +if (atmel_spi_is_v2 (as)) {/* * Always use CSR0. This ensures that the clock * switches to the correct idle polarity before we * toggle the CS. */ spi_writel (as,CSR0 , asd->csr); -spi_writel (as,MR ,SPI_BF (PCS ,0x0e ) |SPI_BIT (MODFDIS ) +if (as->caps.has_wdrbt) { +spi_writel (as,MR ,SPI_BF (PCS ,0x0e ) |SPI_BIT (WDRBT ) + |SPI_BIT (MODFDIS ) |SPI_BIT (MSTR )); + }else { +spi_writel (as,MR ,SPI_BF (PCS ,0x0e ) |SPI_BIT (MODFDIS ) |SPI_BIT (MSTR )); + } mr =spi_readl (as,MR );gpio_set_value (asd->npcs_pin, active); }else {
@@ -318,7 +328,7 @@ static void cs_deactivate(struct atmel_spi *as, struct spi_device *spi) asd->npcs_pin, active ?" (low)" :"" , mr); -if (atmel_spi_is_v2 () || spi->chip_select !=0 ) +if (atmel_spi_is_v2 (as) || spi->chip_select !=0 )gpio_set_value (asd->npcs_pin, !active); }
@@ -719,7 +729,7 @@ static int atmel_spi_setup(struct spi_device *spi) }/* see notes above re chipselect */ -if (!atmel_spi_is_v2 () +if (!atmel_spi_is_v2 (as) && spi->chip_select ==0 && (spi->mode &SPI_CS_HIGH )) {dev_dbg (&spi->dev,"setup: can't be active-high\n" );
@@ -728,7 +738,7 @@ static int atmel_spi_setup(struct spi_device *spi)/* v1 chips start out at half the peripheral bus speed. */ bus_hz =clk_get_rate (as->clk); -if (!atmel_spi_is_v2 ()) +if (!atmel_spi_is_v2 (as)) bus_hz /=2 ;if (spi->max_speed_hz) {
@@ -804,7 +814,7 @@ static int atmel_spi_setup(struct spi_device *spi)"setup: %lu Hz bpw %u mode 0x%x -> csr%d %08x\n" , bus_hz / scbr, bits, spi->mode, spi->chip_select, csr); -if (!atmel_spi_is_v2 ()) +if (!atmel_spi_is_v2 (as))spi_writel (as,CSR0 +4 * spi->chip_select, csr);return 0 ;
@@ -910,6 +920,23 @@ static void atmel_spi_cleanup(struct spi_device *spi)kfree (asd); } +static inline unsigned int atmel_get_version (struct atmel_spi *as) +{ +return spi_readl (as,VERSION ) &0x00000fff ; +} + +static void atmel_get_caps (struct atmel_spi *as) +{ +unsigned int version; + + version =atmel_get_version (as); +dev_info (&as->pdev->dev,"version: 0x%x\n" , version); + + as->caps.is_spi2 = (version >0x121 ) ? true : false; + as->caps.has_wdrbt = (version >=0x210 ) ? true : false; + as->caps.has_dma_support = (version >=0x212 ) ? true : false; +} +/*-------------------------------------------------------------------------*/ static int atmel_spi_probe (struct platform_device *pdev)
@@ -970,6 +997,8 @@ static int atmel_spi_probe(struct platform_device *pdev) as->irq = irq; as->clk = clk; +atmel_get_caps (as); + ret =request_irq (irq, atmel_spi_interrupt,0 ,dev_name (&pdev->dev), master);if (ret)
@@ -979,7 +1008,12 @@ static int atmel_spi_probe(struct platform_device *pdev)clk_enable (clk);spi_writel (as,CR ,SPI_BIT (SWRST ));spi_writel (as,CR ,SPI_BIT (SWRST ));/* AT91SAM9263 Rev B workaround */ -spi_writel (as,MR ,SPI_BIT (MSTR ) |SPI_BIT (MODFDIS )); +if (as->caps.has_wdrbt) { +spi_writel (as,MR ,SPI_BIT (WDRBT ) |SPI_BIT (MODFDIS ) + |SPI_BIT (MSTR )); + }else { +spi_writel (as,MR ,SPI_BIT (MSTR ) |SPI_BIT (MODFDIS )); + }spi_writel (as,PTCR ,SPI_BIT (RXTDIS ) |SPI_BIT (TXTDIS ));spi_writel (as,CR ,SPI_BIT (SPIEN ));
Signature · 1 line
1.7.9.5
Re: [PATCH v7 01/14] spi/spi-atmel: detect the capabilities of SPI core by reading the VERSION register.
drivers/spi/spi-atmel.c static void atmel_spi_cleanup(struct spi_device *spi) · line 939
Quoted 11 lines · Wenyou Yang
drivers/spi/spi-atmel.c +11
-0+{ +unsigned int version; + + version =atmel_get_version (as); +dev_info (&as->pdev->dev,"version: 0x%x\n" , version); + + as->caps.is_spi2 = (version >0x121 ) ? true : false; + as->caps.has_wdrbt = (version >=0x210 ) ? true : false; + as->caps.has_dma_support = (version >=0x212 ) ? true : false; +} +
There's absolutely no need for the ternery operators here - your comparisons are already boolean, the ternery operators just add noise.
I've applied this with the above edited to remove the ? true : false,
thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130401/e96db89b/attachment.sig>
PATCH v7 2/14 spi/spi-atmel: add support transfer on CS1,2,3, not only on CS0
In reply to Wenyou Yang--- drivers/spi/spi-atmel.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-)
drivers/spi/spi-atmel.c +12 -13
@@ -255,11 +255,6 @@ static bool atmel_spi_is_v2(struct atmel_spi *as)* Master on Chip Select 0.") No workaround exists for that ... so for * nCS0 on that chip, we (a) don't use the GPIO, (b) can't support CS_HIGH, * and (c) will trigger that first erratum in some cases. -* -* TODO: Test if the atmel_spi_is_v2() branch below works on -* AT91RM9200 if we use some other register than CSR0. However, don't -* do this unconditionally since AP7000 has an errata where the BITS -* field in CSR0 overrides all other CSRs. */ static void cs_activate (struct atmel_spi *as,struct spi_device *spi)
@@ -269,18 +264,22 @@ static void cs_activate(struct atmel_spi *as, struct spi_device *spi)u32 mr;if (atmel_spi_is_v2 (as)) { -/* -* Always use CSR0. This ensures that the clock -* switches to the correct idle polarity before we -* toggle the CS. +spi_writel (as,CSR0 +4 * spi->chip_select, asd->csr); +/* For the low SPI version, there is a issue that PDC transfer +* on CS1,2,3 needs SPI_CSR0.BITS config as SPI_CSR1,2,3.BITS */ spi_writel (as,CSR0 , asd->csr);if (as->caps.has_wdrbt) { -spi_writel (as,MR ,SPI_BF (PCS ,0x0e ) |SPI_BIT (WDRBT ) - |SPI_BIT (MODFDIS ) |SPI_BIT (MSTR )); +spi_writel (as,MR , +SPI_BF (PCS , ~(0x01 << spi->chip_select)) + |SPI_BIT (WDRBT ) + |SPI_BIT (MODFDIS ) + |SPI_BIT (MSTR )); }else { -spi_writel (as,MR ,SPI_BF (PCS ,0x0e ) |SPI_BIT (MODFDIS ) - |SPI_BIT (MSTR )); +spi_writel (as,MR , +SPI_BF (PCS , ~(0x01 << spi->chip_select)) + |SPI_BIT (MODFDIS ) + |SPI_BIT (MSTR )); } mr =spi_readl (as,MR );gpio_set_value (asd->npcs_pin, active);
Signature · 1 line
1.7.9.5
Re: [PATCH v7 02/14] spi/spi-atmel: add support transfer on CS1,2,3, not only on CS0
Quoted 1 line · Wenyou Yang
Signed-off-by Wenyou Yang <[email protected]>
Applied, thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130401/a916dc48/attachment.sig>
PATCH v7 3/14 spi/spi-atmel: add physical base address
In reply to Wenyou YangFrom: Nicolas Ferre <[email protected]>
Needed for future use with dmaengine enabled driver.
--- drivers/spi/spi-atmel.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/spi/spi-atmel.c +2 -0
@@ -196,6 +196,7 @@ struct atmel_spi_caps {struct atmel_spi {spinlock_t lock; +resource_size_t phybase;void __iomem *regs;int irq;struct clk *clk;
@@ -993,6 +994,7 @@ static int atmel_spi_probe(struct platform_device *pdev) as->regs =ioremap (regs->start,resource_size (regs));if (!as->regs) goto out_free_buffer; + as->phybase = regs->start; as->irq = irq; as->clk = clk;
Signature · 1 line
1.7.9.5
Re: [PATCH v7 03/14] spi/spi-atmel: add physical base address
drivers/spi/spi-atmel.c struct atmel_spi_caps { · line 202
Quoted 9 lines · Wenyou Yang
+++
b/drivers/spi/spi-atmel.cdrivers/spi/spi-atmel.c +1
-0@@ -196,6 +196,7 @@ struct atmel_spi_caps {struct atmel_spi {spinlock_t lock; +resource_size_t phybase;void __iomem *regs;int irq;struct clk *clk;
This looks like the wrong type?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130401/e5c5ddae/attachment-0001.sig>
RE: [PATCH v7 03/14] spi/spi-atmel: add physical base address
Hi, Mark,
Quoted 15 lines
-----Original Message-----
From: Mark Brown [mailto:broonie at opensource.wolfsonmicro.com]
Sent: 2013?4?1? 21:42
To: Yang, Wenyou
Cc: linux-arm-kernel at lists.infradead.org; grant.likely at secretlab.ca; richard.genoud at gmail.com; plagnioj at jcrosoft.com; Ferre, Nicolas; Lin, JM; spi-devel-general at lists.sourceforge.net; linux-kernel at vger.kernel.org
Subject: Re: [PATCH v7 03/14] spi/spi-atmel: add physical base addressQuoted 4 lines · Wenyou Yang
+++
b/drivers/spi/spi-atmel.cdrivers/spi/spi-atmel.c +0
-0@@ -196,6 +196,7 @@ struct atmel_spi_caps { struct atmel_spi {spinlock_t lock;
Quoted 6 lines
drivers/spi/spi-atmel.c struct atmel_spi_caps { · line 202
Quoted 4 lines
drivers/spi/spi-atmel.c +1
-0+resource_size_t phybase;void __iomem *regs;int irq;struct clk *clk;This looks like the wrong type?
I double checked.
The type ' resource_size_t ' is defined in include/linux/ types.h as below,
typedef phys_addr_t resource_size_t;
I think it is OK.
Best Regards,
Wenyou Yang
RE: [PATCH v7 03/14] spi/spi-atmel: add physical base address
In reply to Mark BrownHi, Mark,
Quoted 9 lines
-----Original Message-----
From: Yang, Wenyou
Sent: 2013?4?2? 13:50
To: 'Mark Brown'
Cc: linux-arm-kernel at lists.infradead.org; grant.likely at secretlab.ca; richard.genoud at gmail.com; plagnioj at jcrosoft.com; Ferre, Nicolas; Lin, JM; spi-devel-general at lists.sourceforge.net; linux-kernel at vger.kernel.org
Subject: RE: [PATCH v7 03/14] spi/spi-atmel: add physical base address
Quoted 24 lines
Hi, Mark,
Quoted 21 lines
-----Original Message-----
From: Mark Brown [mailto:broonie at opensource.wolfsonmicro.com]
Sent: 2013?4?1? 21:42
To: Yang, Wenyou
Cc: linux-arm-kernel at lists.infradead.org; grant.likely at secretlab.ca; richard.genoud at gmail.com; plagnioj at jcrosoft.com; Ferre, Nicolas; Lin, JM; spi-devel-general at lists.sourceforge.net; linux-kernel at vger.kernel.org
Subject: Re: [PATCH v7 03/14] spi/spi-atmel: add physical base addressdrivers/spi/spi-atmel.c struct atmel_spi_caps { struct atmel_spi { · line 201
Quoted 8 lines · Wenyou Yang
+++
b/drivers/spi/spi-atmel.cdrivers/spi/spi-atmel.c +1
-0@@ -196,6 +196,7 @@ struct atmel_spi_caps { struct atmel_spi {spinlock_t lock; +resource_size_t phybase;void __iomem *regs;int irq;struct clk *clk;This looks like the wrong type?
I got it, you are right, you mean It should be used " phys_addr_t " type.
phys_addr_t phybase;
Thanks.
Best Regards,
Wenyou Yang.
Quoted 10 lines
I double checked.
The type '
resource_size_t' is defined ininclude/linux/types.has below,typedef
phys_addr_tresource_size_t;I think it is OK.
Best Regards,
Wenyou Yang
PATCH v7 4/14 spi/spi-atmel: call unmapping on transfers buffers
In reply to Wenyou YangFrom: Nicolas Ferre <[email protected]>
--- drivers/spi/spi-atmel.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/spi/spi-atmel.c +5 -3
@@ -1049,6 +1049,7 @@ static int atmel_spi_remove(struct platform_device *pdev)struct spi_master *master =platform_get_drvdata (pdev);struct atmel_spi *as =spi_master_get_devdata (master);struct spi_message *msg; +struct spi_transfer *xfer;/* reset the hardware and block queue progress */ spin_lock_irq (&as->lock);
@@ -1060,9 +1061,10 @@ static int atmel_spi_remove(struct platform_device *pdev)/* Terminate remaining queued transfers */ list_for_each_entry (msg, &as->queue, queue) { -/* REVISIT unmapping the dma is a NOP on ARM and AVR32 -* but we shouldn't depend on that... -*/ +list_for_each_entry (xfer, &msg->transfers, transfer_list) { +if (!msg->is_dma_mapped) +atmel_spi_dma_unmap_xfer (master, xfer); + } msg->status = -ESHUTDOWN ; msg->complete (msg->context); }
Signature · 1 line
1.7.9.5
Re: [PATCH v7 04/14] spi/spi-atmel: call unmapping on transfers buffers
Quoted 1 line · Wenyou Yang
From: Nicolas Ferre <[email protected]>
Applied, thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130401/068c9875/attachment.sig>
PATCH v7 5/14 spi/spi-atmel: status information passed through controller data
In reply to Wenyou YangFrom: Nicolas Ferre <[email protected]>
The status of transfer is stored in controller data structure so that it can be used not only by atmel_spi_msg_done() function. This will be useful for upcoming dmaengine enabled driver.
--- drivers/spi/spi-atmel.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/spi/spi-atmel.c +8 -5
@@ -209,6 +209,7 @@ struct atmel_spi {unsigned long current_remaining_bytes;struct spi_transfer *next_transfer;unsigned long next_remaining_bytes; +int done_status;void *buffer;dma_addr_t buffer_dma;
@@ -554,15 +555,15 @@ static void atmel_spi_dma_unmap_xfer(struct spi_master *master,static void atmel_spi_msg_done (struct spi_master *master,struct atmel_spi *as, -struct spi_message *msg,int status,int stay) +struct spi_message *msg,int stay) { -if (!stay || status <0 ) +if (!stay || as->done_status <0 )cs_deactivate (as, msg->spi);else as->stay = msg->spi;list_del (&msg->queue); - msg->status = status; + msg->status = as->done_status; dev_dbg(master->dev.parent, "xfer complete: %u bytes transferred\n",
@@ -574,6 +575,7 @@ atmel_spi_msg_done(struct spi_master *master, struct atmel_spi *as, as->current_transfer =NULL ; as->next_transfer =NULL ; + as->done_status =0 ;/* continue if needed */ if (list_empty (&as->queue) || as->stopping)
@@ -651,7 +653,8 @@ atmel_spi_interrupt(int irq, void *dev_id)/* Clear any overrun happening while cleaning up */ spi_readl (as,SR ); -atmel_spi_msg_done (master, as, msg, -EIO ,0 ); + as->done_status = -EIO ; +atmel_spi_msg_done (master, as, msg,0 ); }else if (pending & (SPI_BIT (RXBUFF ) |SPI_BIT (ENDRX ))) { ret =IRQ_HANDLED ;
@@ -669,7 +672,7 @@ atmel_spi_interrupt(int irq, void *dev_id)if (atmel_spi_xfer_is_last (msg, xfer)) {/* report completed message */ -atmel_spi_msg_done (master, as, msg,0 , +atmel_spi_msg_done (master, as, msg, xfer->cs_change); }else {if (xfer->cs_change) {
Signature · 1 line
1.7.9.5
Re: [PATCH v7 05/14] spi/spi-atmel: status information passed through controller data
Quoted 5 lines · Wenyou Yang
From: Nicolas Ferre <[email protected]>
The status of transfer is stored in controller data structure so that it can be used not only by
atmel_spi_msg_done()function. This will be useful for upcoming dmaengine enabled driver.
Applied, thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130401/404c54dd/attachment.sig>
PATCH v7 6/14 spi/spi-atmel: add flag to controller data for lock operations
In reply to Wenyou YangFrom: Nicolas Ferre <[email protected]>
Will allow to drop the lock during DMA operations.
--- drivers/spi/spi-atmel.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-)
drivers/spi/spi-atmel.c +19 -12
@@ -195,6 +195,7 @@ struct atmel_spi_caps {*/ struct atmel_spi {spinlock_t lock; +unsigned long flags;resource_size_t phybase;void __iomem *regs;
@@ -333,6 +334,16 @@ static void cs_deactivate(struct atmel_spi *as, struct spi_device *spi)gpio_set_value (asd->npcs_pin, !active); } +static void atmel_spi_lock (struct atmel_spi *as) +{ +spin_lock_irqsave (&as->lock, as->flags); +} + +static void atmel_spi_unlock (struct atmel_spi *as) +{ +spin_unlock_irqrestore (&as->lock, as->flags); +} +static inline int atmel_spi_xfer_is_last (struct spi_message *msg,struct spi_transfer *xfer) {
@@ -569,9 +580,9 @@ atmel_spi_msg_done(struct spi_master *master, struct atmel_spi *as,"xfer complete: %u bytes transferred\n" , msg->actual_length); -spin_unlock (&as->lock); +atmel_spi_unlock (as); msg->complete (msg->context); -spin_lock (&as->lock); +atmel_spi_lock (as); as->current_transfer =NULL ; as->next_transfer =NULL ;
@@ -802,13 +813,11 @@ static int atmel_spi_setup(struct spi_device *spi) spi->controller_state = asd;gpio_direction_output (npcs_pin, !(spi->mode &SPI_CS_HIGH )); }else { -unsigned long flags; - -spin_lock_irqsave (&as->lock, flags); +atmel_spi_lock (as);if (as->stay == spi) as->stay =NULL ;cs_deactivate (as, spi); -spin_unlock_irqrestore (&as->lock, flags); +atmel_spi_unlock (as); } asd->csr = csr;
@@ -827,7 +836,6 @@ static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg) {struct atmel_spi *as;struct spi_transfer *xfer; -unsigned long flags;struct device *controller = spi->master->dev.parent;u8 bits;struct atmel_spi_device *asd;
@@ -892,11 +900,11 @@ static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg) msg->status = -EINPROGRESS ; msg->actual_length =0 ; -spin_lock_irqsave (&as->lock, flags); +atmel_spi_lock (as);list_add_tail (&msg->queue, &as->queue);if (!as->current_transfer)atmel_spi_next_message (spi->master); -spin_unlock_irqrestore (&as->lock, flags); +atmel_spi_unlock (as);return 0 ; }
@@ -906,17 +914,16 @@ static void atmel_spi_cleanup(struct spi_device *spi)struct atmel_spi *as =spi_master_get_devdata (spi->master);struct atmel_spi_device *asd = spi->controller_state;unsigned gpio = (unsigned ) spi->controller_data; -unsigned long flags;if (!asd)return ; -spin_lock_irqsave (&as->lock, flags); +atmel_spi_lock (as);if (as->stay == spi) { as->stay =NULL ;cs_deactivate (as, spi); } -spin_unlock_irqrestore (&as->lock, flags); +atmel_spi_unlock (as); spi->controller_state =NULL ;gpio_free (gpio);
Signature · 1 line
1.7.9.5
Re: [PATCH v7 06/14] spi/spi-atmel: add flag to controller data for lock operations
drivers/spi/spi-atmel.c static void cs_deactivate(struct atmel_spi *as, struct spi_device *spi) · line 340
Quoted 4 lines · Wenyou Yang
drivers/spi/spi-atmel.c +4
-0+static void atmel_spi_lock (struct atmel_spi *as) +{ +spin_lock_irqsave (&as->lock, as->flags); +}
Coding style.
drivers/spi/spi-atmel.c atmel_spi_msg_done(struct spi_master *master, struct atmel_spi *as, · line 585
Quoted 5 lines
drivers/spi/spi-atmel.c +2
-2-spin_unlock (&as->lock); +atmel_spi_unlock (as); msg->complete (msg->context); -spin_lock (&as->lock); +atmel_spi_lock (as);
This replaces non-irqsave versions with irqsave versions of the lock.
Is this safe/correct? If it is I'd have expected some sort of mention
of it in the commit log.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130401/435cb807/attachment.sig>
RE: [PATCH v7 06/14] spi/spi-atmel: add flag to controller data for lock operations
Hi, Mark,
Quoted 10 lines
-----Original Message-----
From: Mark Brown [mailto:broonie at opensource.wolfsonmicro.com]
Sent: 2013?4?1? 21:46
To: Yang, Wenyou
Cc: linux-arm-kernel at lists.infradead.org; grant.likely at secretlab.ca; richard.genoud at gmail.com; plagnioj at jcrosoft.com; Ferre, Nicolas; Lin, JM; spi-devel-general at lists.sourceforge.net; linux-kernel at vger.kernel.org
Subject: Re: [PATCH v7 06/14] spi/spi-atmel: add flag to controller data for lock operations
Quoted 6 lines
Review
Quoted 2 lines · Wenyou Yang
(quoted diff) +2
-0+static void atmel_spi_lock(struct atmel_spi *as) { + spin_lock_irqsave(&as->lock, as->flags); }Coding style.
I will change it in next version.
Quoted 10 lines
drivers/spi/spi-atmel.c atmel_spi_msg_done(struct spi_master *master, struct atmel_spi *as, · line 585
Quoted 6 lines
drivers/spi/spi-atmel.c +2
-2-spin_unlock (&as->lock); +atmel_spi_unlock (as); msg->complete (msg->context); -spin_lock (&as->lock); +atmel_spi_lock (as);This replaces non-irqsave versions with irqsave versions of the lock. Is this safe/correct? If it is I'd have expected some sort of mention of it in the commit log.
I will add some commit log.
Best Regards,
Wenyou Yang
PATCH v7 7/14 spi/spi-atmel: add dmaengine support
In reply to Wenyou YangFrom: Nicolas Ferre <[email protected]>
Add dmaengine support.
For different SoC, the "has_dma_support" is used to select the transfer mode: dmaengine or PDC.
The "has_dma_support" member of the capabilities struct is used to select the transfer mode: dmaengine or PDC.
For the dmaengine transfer mode, if it fails to config dmaengine, or if the message len less than 16 bytes, it will use the PIO transfer mode.
---
This patch is based on the original patch from Nicolas
[PATCH] spi/atmel_spi: add dmaengine support
and merge the patches from Richard Genoud <[email protected]>
[PATCH] spi-atmel: update with dmaengine interface [PATCH] spi-atmel: fix __init/__devinit sections mismatch
Hi, Richard,
Could you sign your signature in this patch?
Best Regards,
Wenyou Yang
drivers/spi/spi-atmel.c | 541 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 520 insertions(+), 21 deletions(-)
drivers/spi/spi-atmel.c +520 -21
@@ -15,11 +15,13 @@#include <linux/platform_device.h> #include <linux/delay.h> #include <linux/dma-mapping.h> +#include <linux/dmaengine.h> #include <linux/err.h> #include <linux/interrupt.h> #include <linux/spi/spi.h> #include <linux/slab.h> #include <linux/platform_data/atmel.h> +#include <linux/platform_data/dma-atmel.h> #include <linux/of.h> #include <linux/io.h>
@@ -182,6 +184,22 @@#define spi_writel (port,reg,value) \ __raw_writel((value), (port)->regs + SPI_##reg) +/* use PIO for small transfers, avoiding DMA setup/teardown overhead and +* cache operations; better heuristics consider wordsize and bitrate. +*/ +#define DMA_MIN_BYTES 16 + +struct atmel_spi_dma { +struct dma_chan *chan_rx; +struct dma_chan *chan_tx; +struct scatterlist sgrx; +struct scatterlist sgtx; +struct dma_async_tx_descriptor *data_desc_rx; +struct dma_async_tx_descriptor *data_desc_tx; + +struct at_dma_slave dma_slave; +}; +struct atmel_spi_caps {bool is_spi2;bool has_wdrbt;
@@ -206,16 +224,23 @@ struct atmel_spi {u8 stopping;struct list_head queue; +struct tasklet_struct tasklet;struct spi_transfer *current_transfer;unsigned long current_remaining_bytes;struct spi_transfer *next_transfer;unsigned long next_remaining_bytes;int done_status; +/* scratch buffer */ void *buffer;dma_addr_t buffer_dma;struct atmel_spi_caps caps; + +bool use_dma; +bool use_pdc; +/* dmaengine data */ +struct atmel_spi_dma dma; };/* Controller-specific per-slave state */
@@ -284,6 +309,7 @@ static void cs_activate(struct atmel_spi *as, struct spi_device *spi) | SPI_BIT(MODFDIS) | SPI_BIT(MSTR)); } + mr =spi_readl (as,MR );gpio_set_value (asd->npcs_pin, active); }else {
@@ -344,6 +370,12 @@ static void atmel_spi_unlock(struct atmel_spi *as)spin_unlock_irqrestore (&as->lock, as->flags); } +static inline bool atmel_spi_use_dma (struct atmel_spi *as, +struct spi_transfer *xfer) +{ +return as->use_dma && xfer->len >=DMA_MIN_BYTES ; +} +static inline int atmel_spi_xfer_is_last (struct spi_message *msg,struct spi_transfer *xfer) {
@@ -355,6 +387,219 @@ static inline int atmel_spi_xfer_can_be_chained(struct spi_transfer *xfer)return xfer->delay_usecs ==0 && !xfer->cs_change; } +static bool filter (struct dma_chan *chan,void *slave) +{ +struct at_dma_slave *sl = slave; + +if (sl->dma_dev == chan->device->dev) { + chan->private = sl; +return true; + }else { +return false; + } +} + +static int atmel_spi_configure_dma (struct atmel_spi *as) +{ +struct at_dma_slave *sdata = &as->dma.dma_slave; + +if (sdata && sdata->dma_dev) { +dma_cap_mask_t mask; + +/* setup DMA addresses */ + sdata->rx_reg = (dma_addr_t )as->phybase +SPI_RDR ; + sdata->tx_reg = (dma_addr_t )as->phybase +SPI_TDR ; + +/* Try to grab two DMA channels */ +dma_cap_zero (mask); +dma_cap_set (DMA_SLAVE , mask); + as->dma.chan_tx =dma_request_channel (mask, filter, sdata); +if (as->dma.chan_tx) + as->dma.chan_rx = +dma_request_channel (mask, filter, sdata); + } +if (!as->dma.chan_rx || !as->dma.chan_tx) { +if (as->dma.chan_rx) +dma_release_channel (as->dma.chan_rx); +if (as->dma.chan_tx) +dma_release_channel (as->dma.chan_tx); +dev_err (&as->pdev->dev, +"DMA channel not available, unable to use SPI\n" ); +return -EBUSY ; + } + +dev_info (&as->pdev->dev, +"Using %s (tx) and %s (rx) for DMA transfers\n" , +dma_chan_name (as->dma.chan_tx), +dma_chan_name (as->dma.chan_rx)); + +return 0 ; +} + +static void atmel_spi_stop_dma (struct atmel_spi *as) +{ +if (as->dma.chan_rx) + as->dma.chan_rx->device->device_control (as->dma.chan_rx, +DMA_TERMINATE_ALL ,0 ); +if (as->dma.chan_tx) + as->dma.chan_tx->device->device_control (as->dma.chan_tx, +DMA_TERMINATE_ALL ,0 ); +} + +static void atmel_spi_release_dma (struct atmel_spi *as) +{ +if (as->dma.chan_rx) +dma_release_channel (as->dma.chan_rx); +if (as->dma.chan_tx) +dma_release_channel (as->dma.chan_tx); +} + +/* This function is called by the DMA driver from tasklet context */ +static void dma_callback (void *data) +{ +struct spi_master *master = data; +struct atmel_spi *as =spi_master_get_devdata (master); + +/* trigger SPI tasklet */ +tasklet_schedule (&as->tasklet); +} + +/* +* Next transfer using PIO. +* lock is held, spi tasklet is blocked +*/ +static void atmel_spi_next_xfer_pio (struct spi_master *master, +struct spi_transfer *xfer) +{ +struct atmel_spi *as =spi_master_get_devdata (master); + +dev_vdbg (master->dev.parent,"atmel_spi_next_xfer_pio\n" ); + + as->current_remaining_bytes = xfer->len; + +/* Make sure data is not remaining in RDR */ +spi_readl (as,RDR ); +while (spi_readl (as,SR ) &SPI_BIT (RDRF )) { +spi_readl (as,RDR ); +cpu_relax (); + } + +if (xfer->tx_buf) +spi_writel (as,TDR , *(u8 *)(xfer->tx_buf)); +else +spi_writel (as,TDR ,0 ); + +dev_dbg (master->dev.parent, +" start pio xfer %p: len %u tx %p rx %p\n" , + xfer, xfer->len, xfer->tx_buf, xfer->rx_buf); + +/* Enable relevant interrupts */ +spi_writel (as,IER ,SPI_BIT (RDRF ) |SPI_BIT (OVRES )); +} + +/* +* Submit next transfer for DMA. +* lock is held, spi tasklet is blocked +*/ +static int atmel_spi_next_xfer_dma_submit (struct spi_master *master, +struct spi_transfer *xfer, +u32 *plen) +{ +struct atmel_spi *as =spi_master_get_devdata (master); +struct dma_chan *rxchan = as->dma.chan_rx; +struct dma_chan *txchan = as->dma.chan_tx; +struct dma_async_tx_descriptor *rxdesc; +struct dma_async_tx_descriptor *txdesc; +dma_cookie_t cookie; +u32 len = *plen; + +dev_vdbg (master->dev.parent,"atmel_spi_next_xfer_dma_submit\n" ); + +/* Check that the channels are available */ +if (!rxchan || !txchan) +return -ENODEV ; + +/* release lock for DMA operations */ +atmel_spi_unlock (as); + +/* prepare the RX dma transfer */ +sg_init_table (&as->dma.sgrx,1 ); +if (xfer->rx_buf) { + as->dma.sgrx.dma_address = xfer->rx_dma + xfer->len - *plen; + }else { + as->dma.sgrx.dma_address = as->buffer_dma; +if (len >BUFFER_SIZE ) + len =BUFFER_SIZE ; + } + +/* prepare the TX dma transfer */ +sg_init_table (&as->dma.sgtx,1 ); +if (xfer->tx_buf) { + as->dma.sgtx.dma_address = xfer->tx_dma + xfer->len - *plen; + }else { + as->dma.sgtx.dma_address = as->buffer_dma; +if (len >BUFFER_SIZE ) + len =BUFFER_SIZE ; +memset (as->buffer,0 , len); + } + +sg_dma_len (&as->dma.sgtx) = len; +sg_dma_len (&as->dma.sgrx) = len; + + *plen = len; + +/* Send both scatterlists */ + rxdesc = rxchan->device->device_prep_slave_sg (rxchan, + &as->dma.sgrx, +1 , +DMA_FROM_DEVICE , +DMA_PREP_INTERRUPT |DMA_CTRL_ACK , +NULL ); +if (!rxdesc) + goto err_dma; + + txdesc = txchan->device->device_prep_slave_sg (txchan, + &as->dma.sgtx, +1 , +DMA_TO_DEVICE , +DMA_PREP_INTERRUPT |DMA_CTRL_ACK , +NULL ); +if (!txdesc) + goto err_dma; + +dev_dbg (master->dev.parent, +" start dma xfer %p: len %u tx %p/%08x rx %p/%08x\n" , + xfer, xfer->len, xfer->tx_buf, xfer->tx_dma, + xfer->rx_buf, xfer->rx_dma); + +/* Enable relevant interrupts */ +spi_writel (as,IER ,SPI_BIT (OVRES )); + +/* Put the callback on the RX transfer only, that should finish last */ + rxdesc->callback = dma_callback; + rxdesc->callback_param = master; + +/* Submit and fire RX and TX with TX last so we're ready to read! */ + cookie = rxdesc->tx_submit (rxdesc); +if (dma_submit_error (cookie)) + goto err_dma; + cookie = txdesc->tx_submit (txdesc); +if (dma_submit_error (cookie)) + goto err_dma; + rxchan->device->device_issue_pending (rxchan); + txchan->device->device_issue_pending (txchan); + +/* take back lock */ +atmel_spi_lock (as); +return 0 ; + +err_dma: +spi_writel (as,IDR ,SPI_BIT (OVRES )); +atmel_spi_stop_dma (as); +atmel_spi_lock (as); +return -ENOMEM ; +} + static void atmel_spi_next_xfer_data(struct spi_master *master, struct spi_transfer *xfer, dma_addr_t *tx_dma,
@@ -372,6 +617,7 @@ static void atmel_spi_next_xfer_data(struct spi_master *master,if (len >BUFFER_SIZE ) len =BUFFER_SIZE ; } +if (xfer->tx_buf) *tx_dma = xfer->tx_dma + xfer->len - *plen;else {
@@ -387,10 +633,10 @@ static void atmel_spi_next_xfer_data(struct spi_master *master, }/* -* Submit next transfer for DMA. +* Submit next transfer for PDC. * lock is held, spi irq is blocked */ -static void atmel_spi_next_xfer (struct spi_master *master, +static void atmel_spi_pdc_next_xfer (struct spi_master *master,struct spi_message *msg) {struct atmel_spi *as =spi_master_get_devdata (master);
@@ -487,6 +733,48 @@ static void atmel_spi_next_xfer(struct spi_master *master,spi_writel (as,PTCR ,SPI_BIT (TXTEN ) |SPI_BIT (RXTEN )); } +/* +* Choose way to submit next transfer and start it. +* lock is held, spi tasklet is blocked +*/ +static void atmel_spi_dma_next_xfer (struct spi_master *master, +struct spi_message *msg) +{ +struct atmel_spi *as =spi_master_get_devdata (master); +struct spi_transfer *xfer; +u32 remaining, len; + + remaining = as->current_remaining_bytes; +if (remaining) { + xfer = as->current_transfer; + len = remaining; + }else { +if (!as->current_transfer) + xfer =list_entry (msg->transfers.next, + struct spi_transfer, transfer_list); +else + xfer =list_entry ( + as->current_transfer->transfer_list.next, + struct spi_transfer, transfer_list); + + as->current_transfer = xfer; + len = xfer->len; + } + +if (atmel_spi_use_dma (as, xfer)) { +u32 total = len; +if (!atmel_spi_next_xfer_dma_submit (master, xfer, &len)) { + as->current_remaining_bytes = total - len; +return ; + }else { +dev_err (&msg->spi->dev,"unable to use DMA, fallback to PIO\n" ); + } + } + +/* use PIO if error appened using DMA */ +atmel_spi_next_xfer_pio (master, xfer); +} +static void atmel_spi_next_message (struct spi_master *master) {struct atmel_spi *as =spi_master_get_devdata (master);
@@ -511,7 +799,10 @@ static void atmel_spi_next_message(struct spi_master *master) }else cs_activate (as, spi); -atmel_spi_next_xfer (master, msg); +if (as->use_pdc) +atmel_spi_pdc_next_xfer (master, msg); +else +atmel_spi_dma_next_xfer (master, msg); }/*
@@ -564,6 +855,11 @@ static void atmel_spi_dma_unmap_xfer(struct spi_master *master, xfer->len, DMA_FROM_DEVICE); } +static void atmel_spi_disable_pdc_transfer (struct atmel_spi *as) +{ +spi_writel (as,PTCR ,SPI_BIT (RXTDIS ) |SPI_BIT (TXTDIS )); +} +static void atmel_spi_msg_done (struct spi_master *master,struct atmel_spi *as,struct spi_message *msg,int stay)
@@ -589,14 +885,183 @@ atmel_spi_msg_done(struct spi_master *master, struct atmel_spi *as, as->done_status =0 ;/* continue if needed */ -if (list_empty (&as->queue) || as->stopping) -spi_writel (as,PTCR ,SPI_BIT (RXTDIS ) |SPI_BIT (TXTDIS )); -else +if (list_empty (&as->queue) || as->stopping) { +if (as->use_pdc) +atmel_spi_disable_pdc_transfer (as); + }else {atmel_spi_next_message (master); + } +} + +/* Called from IRQ +* lock is held +* +* Must update "current_remaining_bytes" to keep track of data +* to transfer. +*/ +static void +atmel_spi_pump_pio_data (struct atmel_spi *as,struct spi_transfer *xfer) +{ +u8 *txp; +u8 *rxp; +unsigned long xfer_pos = xfer->len - as->current_remaining_bytes; + +if (xfer->rx_buf) { + rxp = ((u8 *)xfer->rx_buf) + xfer_pos; + *rxp =spi_readl (as,RDR ); + }else { +spi_readl (as,RDR ); + } + + as->current_remaining_bytes--; + +if (as->current_remaining_bytes) { +if (xfer->tx_buf) { + txp = ((u8 *)xfer->tx_buf) + xfer_pos +1 ; +spi_writel (as,TDR , *txp); + }else { +spi_writel (as,TDR ,0 ); + } + } } +/* Tasklet +* Called from DMA callback + pio transfer and overrun IRQ. +*/ +static void atmel_spi_tasklet_func (unsigned long data) +{ +struct spi_master *master = (struct spi_master *)data; +struct atmel_spi *as =spi_master_get_devdata (master); +struct spi_message *msg; +struct spi_transfer *xfer; + +dev_vdbg (master->dev.parent,"atmel_spi_tasklet_func\n" ); + +atmel_spi_lock (as); + + xfer = as->current_transfer; + +if (xfer ==NULL ) +/* already been there */ + goto tasklet_out; + + msg = list_entry(as->queue.next, struct spi_message, queue); + +if (as->current_remaining_bytes ==0 ) { +if (as->done_status <0 ) { +/* error happened (overrun) */ +if (atmel_spi_use_dma (as, xfer)) +atmel_spi_stop_dma (as); + }else { +/* only update length if no error */ + msg->actual_length += xfer->len; + } + +if (atmel_spi_use_dma (as, xfer)) +if (!msg->is_dma_mapped) +atmel_spi_dma_unmap_xfer (master, xfer); + +if (xfer->delay_usecs) +udelay (xfer->delay_usecs); + +if (atmel_spi_xfer_is_last (msg, xfer) || as->done_status <0 ) { +/* report completed (or erroneous) message */ +atmel_spi_msg_done (master, as, msg, xfer->cs_change); + }else { +if (xfer->cs_change) { +cs_deactivate (as, msg->spi); +udelay (1 ); +cs_activate (as, msg->spi); + } + +/* +* Not done yet. Submit the next transfer. +* +* FIXME handle protocol options for xfer +*/ +atmel_spi_dma_next_xfer (master, msg); + } + }else { +/* +* Keep going, we still have data to send in +* the current transfer. +*/ +atmel_spi_dma_next_xfer (master, msg); + } + +tasklet_out: +atmel_spi_unlock (as); +} + +/* Interrupt +* +* No need for locking in this Interrupt handler: done_status is the +* only information modified. What we need is the update of this field +* before tasklet runs. This is ensured by using barrier. +*/ static irqreturn_t -atmel_spi_interrupt (int irq,void *dev_id) +atmel_spi_pio_interrupt (int irq,void *dev_id) +{ +struct spi_master *master = dev_id; +struct atmel_spi *as =spi_master_get_devdata (master); +u32 status, pending, imr; +struct spi_transfer *xfer; +int ret =IRQ_NONE ; + + imr =spi_readl (as,IMR ); + status =spi_readl (as,SR ); + pending = status & imr; + +if (pending &SPI_BIT (OVRES )) { + ret =IRQ_HANDLED ; +spi_writel (as,IDR ,SPI_BIT (OVRES )); +dev_warn (master->dev.parent,"overrun\n" ); + +/* +* When we get an overrun, we disregard the current +* transfer. Data will not be copied back from any +* bounce buffer and msg->actual_len will not be +* updated with the last xfer. +* +* We will also not process any remaning transfers in +* the message. +* +* All actions are done in tasklet with done_status indication +*/ + as->done_status = -EIO ; +smp_wmb (); + +/* Clear any overrun happening while cleaning up */ +spi_readl (as,SR ); + +tasklet_schedule (&as->tasklet); + + }else if (pending &SPI_BIT (RDRF )) { +atmel_spi_lock (as); + +if (as->current_remaining_bytes) { + ret =IRQ_HANDLED ; + xfer = as->current_transfer; +atmel_spi_pump_pio_data (as, xfer); +if (!as->current_remaining_bytes) { +/* no more data to xfer, kick tasklet */ +spi_writel (as,IDR , pending); +tasklet_schedule (&as->tasklet); + } + } + +atmel_spi_unlock (as); + }else { +WARN_ONCE (pending,"IRQ not handled, pending = %x\n" , pending); + ret =IRQ_HANDLED ; +spi_writel (as,IDR , pending); + } + +return ret; +} + +static irqreturn_t +atmel_spi_pdc_interrupt (int irq,void *dev_id) {struct spi_master *master = dev_id;struct atmel_spi *as =spi_master_get_devdata (master);
@@ -697,14 +1162,14 @@ atmel_spi_interrupt(int irq, void *dev_id)* * FIXME handle protocol options for xfer */ -atmel_spi_next_xfer (master, msg); +atmel_spi_pdc_next_xfer (master, msg); } }else {/* * Keep going, we still have data to send in * the current transfer. */ -atmel_spi_next_xfer (master, msg); +atmel_spi_pdc_next_xfer (master, msg); } }
@@ -875,13 +1340,10 @@ static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg)/* * DMA map early, for performance (empties dcache ASAP) and -* better fault reporting. This is a DMA-only driver. -* -* NOTE that if dma_unmap_single() ever starts to do work on -* platforms supported by this driver, we would need to clean -* up mappings for previously-mapped transfers. +* better fault reporting. */ -if (!msg->is_dma_mapped) { +if ((!msg->is_dma_mapped) && (atmel_spi_use_dma (as, xfer) + || as->use_pdc)) {if (atmel_spi_dma_map_xfer (as, xfer) <0 )return -ENOMEM ; }
@@ -1000,6 +1462,7 @@ static int atmel_spi_probe(struct platform_device *pdev)spin_lock_init (&as->lock);INIT_LIST_HEAD (&as->queue); + as->pdev = pdev; as->regs =ioremap (regs->start,resource_size (regs));if (!as->regs)
@@ -1010,8 +1473,28 @@ static int atmel_spi_probe(struct platform_device *pdev)atmel_get_caps (as); - ret =request_irq (irq, atmel_spi_interrupt,0 , -dev_name (&pdev->dev), master); + as->use_dma = false; + as->use_pdc = false; +if (as->caps.has_dma_support) { +if (atmel_spi_configure_dma (as) ==0 ) + as->use_dma = true; + }else { + as->use_pdc = true; + } + +if (as->caps.has_dma_support && !as->use_dma) +dev_info (&pdev->dev,"Atmel SPI Controller using PIO only\n" ); + +if (as->use_pdc) { + ret =request_irq (irq, atmel_spi_pdc_interrupt,0 , +dev_name (&pdev->dev), master); + }else { +tasklet_init (&as->tasklet, atmel_spi_tasklet_func, + (unsigned long )master); + + ret =request_irq (irq, atmel_spi_pio_interrupt,0 , +dev_name (&pdev->dev), master); + }if (ret) goto out_unmap_regs;
@@ -1025,7 +1508,9 @@ static int atmel_spi_probe(struct platform_device *pdev) }else {spi_writel (as,MR ,SPI_BIT (MSTR ) |SPI_BIT (MODFDIS )); } -spi_writel (as,PTCR ,SPI_BIT (RXTDIS ) |SPI_BIT (TXTDIS )); + +if (as->use_pdc) +spi_writel (as,PTCR ,SPI_BIT (RXTDIS ) |SPI_BIT (TXTDIS ));spi_writel (as,CR ,SPI_BIT (SPIEN ));/* go! */
@@ -1034,11 +1519,14 @@ static int atmel_spi_probe(struct platform_device *pdev) ret =spi_register_master (master);if (ret) - goto out_reset_hw; + goto out_free_dma;return 0 ; -out_reset_hw: +out_free_dma: +if (as->use_dma) +atmel_spi_release_dma (as); +spi_writel (as,CR ,SPI_BIT (SWRST ));spi_writel (as,CR ,SPI_BIT (SWRST ));/* AT91SAM9263 Rev B workaround */ clk_disable (clk);
@@ -1046,6 +1534,8 @@ out_reset_hw: out_unmap_regs:iounmap (as->regs); out_free_buffer: +if (!as->use_pdc) +tasklet_kill (&as->tasklet);dma_free_coherent (&pdev->dev,BUFFER_SIZE , as->buffer, as->buffer_dma); out_free:
@@ -1064,6 +1554,11 @@ static int atmel_spi_remove(struct platform_device *pdev)/* reset the hardware and block queue progress */ spin_lock_irq (&as->lock); as->stopping =1 ; +if (as->use_dma) { +atmel_spi_stop_dma (as); +atmel_spi_release_dma (as); + } +spi_writel (as,CR ,SPI_BIT (SWRST ));spi_writel (as,CR ,SPI_BIT (SWRST ));/* AT91SAM9263 Rev B workaround */ spi_readl (as,SR );
@@ -1072,13 +1567,17 @@ static int atmel_spi_remove(struct platform_device *pdev)/* Terminate remaining queued transfers */ list_for_each_entry (msg, &as->queue, queue) {list_for_each_entry (xfer, &msg->transfers, transfer_list) { -if (!msg->is_dma_mapped) +if (!msg->is_dma_mapped + && (atmel_spi_use_dma (as, xfer) + || as->use_pdc))atmel_spi_dma_unmap_xfer (master, xfer); } msg->status = -ESHUTDOWN ; msg->complete (msg->context); } +if (!as->use_pdc) +tasklet_kill (&as->tasklet);dma_free_coherent (&pdev->dev,BUFFER_SIZE , as->buffer, as->buffer_dma);
Signature · 1 line
1.7.9.5
PATCH v7 8/14 spi/spi-atmel: fix spi-atmel driver to adapt to slave_config changes
In reply to Wenyou YangFrom: Richard Genoud <[email protected]>
This is the following of the patch e2b35f3dbfc080f15b72834d08f04f0269dbe9be
--- drivers/spi/spi-atmel.c | 61 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 51 insertions(+), 10 deletions(-)
drivers/spi/spi-atmel.c +51 -10
@@ -387,6 +387,37 @@ static inline int atmel_spi_xfer_can_be_chained(struct spi_transfer *xfer)return xfer->delay_usecs ==0 && !xfer->cs_change; } +static int atmel_spi_dma_slave_config (struct atmel_spi *as, +struct dma_slave_config *slave_config) +{ +int err =0 ; + + slave_config->dst_addr_width =DMA_SLAVE_BUSWIDTH_1_BYTE ; + slave_config->src_addr_width =DMA_SLAVE_BUSWIDTH_1_BYTE ; + + slave_config->dst_addr = (dma_addr_t )as->phybase +SPI_TDR ; + slave_config->src_addr = (dma_addr_t )as->phybase +SPI_RDR ; + slave_config->src_maxburst =1 ; + slave_config->dst_maxburst =1 ; + slave_config->device_fc = false; + + slave_config->direction =DMA_MEM_TO_DEV ; +if (dmaengine_slave_config (as->dma.chan_tx, slave_config)) { +dev_err (&as->pdev->dev, +"failed to configure tx dma channel\n" ); + err = -EINVAL ; + } + + slave_config->direction =DMA_DEV_TO_MEM ; +if (dmaengine_slave_config (as->dma.chan_rx, slave_config)) { +dev_err (&as->pdev->dev, +"failed to configure rx dma channel\n" ); + err = -EINVAL ; + } + +return err; +} +static bool filter (struct dma_chan *chan,void *slave) {struct at_dma_slave *sl = slave;
@@ -402,14 +433,12 @@ static bool filter(struct dma_chan *chan, void *slave)static int atmel_spi_configure_dma (struct atmel_spi *as) {struct at_dma_slave *sdata = &as->dma.dma_slave; +struct dma_slave_config slave_config; +int err;if (sdata && sdata->dma_dev) {dma_cap_mask_t mask; -/* setup DMA addresses */ - sdata->rx_reg = (dma_addr_t )as->phybase +SPI_RDR ; - sdata->tx_reg = (dma_addr_t )as->phybase +SPI_TDR ; -/* Try to grab two DMA channels */ dma_cap_zero (mask);dma_cap_set (DMA_SLAVE , mask);
@@ -419,21 +448,27 @@ static int atmel_spi_configure_dma(struct atmel_spi *as)dma_request_channel (mask, filter, sdata); }if (!as->dma.chan_rx || !as->dma.chan_tx) { -if (as->dma.chan_rx) -dma_release_channel (as->dma.chan_rx); -if (as->dma.chan_tx) -dma_release_channel (as->dma.chan_tx);dev_err (&as->pdev->dev,"DMA channel not available, unable to use SPI\n" ); -return -EBUSY ; + err = -EBUSY ; + goto error; } + err =atmel_spi_dma_slave_config (as, &slave_config); +if (err) + goto error; +dev_info (&as->pdev->dev,"Using %s (tx) and %s (rx) for DMA transfers\n" ,dma_chan_name (as->dma.chan_tx),dma_chan_name (as->dma.chan_rx)); -return 0 ; +error: +if (as->dma.chan_rx) +dma_release_channel (as->dma.chan_rx); +if (as->dma.chan_tx) +dma_release_channel (as->dma.chan_tx); +return err; }static void atmel_spi_stop_dma (struct atmel_spi *as)
@@ -510,6 +545,7 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master,struct dma_chan *txchan = as->dma.chan_tx;struct dma_async_tx_descriptor *rxdesc;struct dma_async_tx_descriptor *txdesc; +struct dma_slave_config slave_config;dma_cookie_t cookie;u32 len = *plen;
@@ -548,6 +584,10 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master, *plen = len; +if (atmel_spi_dma_slave_config (as, &slave_config)) + goto err_exit; + +/* Send both scatterlists */ rxdesc = rxchan->device->device_prep_slave_sg(rxchan, &as->dma.sgrx,
@@ -596,6 +636,7 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master, err_dma:spi_writel (as,IDR ,SPI_BIT (OVRES ));atmel_spi_stop_dma (as); +err_exit:atmel_spi_lock (as);return -ENOMEM ; }
Signature · 1 line
1.7.9.5
Re: [PATCH v7 08/14] spi/spi-atmel: fix spi-atmel driver to adapt to slave_config changes
Quoted 3 lines · Wenyou Yang
From: Richard Genoud <[email protected]>
This is the following of the patch
e2b35f3dbfc080f15b72834d08f04f0269dbe9be
What is this patch actually doing, shouldn't it be part of the previous
commit? The changelog really ought to have a plain text version of the
commit description too.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130401/62034ceb/attachment.sig>
RE: [PATCH v7 08/14] spi/spi-atmel: fix spi-atmel driver to adapt to slave_config changes
Hi, Mark,
Quoted 11 lines
-----Original Message-----
From: Mark Brown [mailto:broonie at opensource.wolfsonmicro.com]
Sent: 2013?4?1? 21:51
To: Yang, Wenyou
Cc: linux-arm-kernel at lists.infradead.org; grant.likely at secretlab.ca; richard.genoud at gmail.com; plagnioj at jcrosoft.com; Ferre, Nicolas; Lin, JM; spi-devel-general at lists.sourceforge.net; linux-kernel at vger.kernel.org
Subject: Re: [PATCH v7 08/14] spi/spi-atmel: fix spi-atmel driver to adapt toslave_configchangesOn Tue, Mar 19, 2013 at 03:47:16PM +0800, Wenyou Yang wrote:
Quoted 8 lines
Quoted 4 lines
From: Richard Genoud <[email protected]>
This is the following of the patch
e2b35f3dbfc080f15b72834d08f04f0269dbe9beWhat is this patch actually doing, shouldn't it be part of the previous commit? The changelog really ought to have a plain text version of the commit description too.
You are right, it isn't the part of the previous commit. I will squash it into the dmaengine patch.
Best Regards,
Wenyou Yang
PATCH v7 9/14 spi/spi-atmel: correct 16 bits transfers using PIO
In reply to Wenyou YangFrom: Richard Genoud <[email protected]>
--- drivers/spi/spi-atmel.c | 47 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 9 deletions(-)
drivers/spi/spi-atmel.c +38 -9
@@ -520,13 +520,17 @@ static void atmel_spi_next_xfer_pio(struct spi_master *master, }if (xfer->tx_buf) -spi_writel (as,TDR , *(u8 *)(xfer->tx_buf)); +if (xfer->bits_per_word >8 ) +spi_writel (as,TDR , *(u16 *)(xfer->tx_buf)); +else +spi_writel (as,TDR , *(u8 *)(xfer->tx_buf));else spi_writel (as,TDR ,0 );dev_dbg (master->dev.parent, -" start pio xfer %p: len %u tx %p rx %p\n" , - xfer, xfer->len, xfer->tx_buf, xfer->rx_buf); +" start pio xfer %p: len %u tx %p rx %p bitpw %d\n" , + xfer, xfer->len, xfer->tx_buf, xfer->rx_buf, + xfer->bits_per_word);/* Enable relevant interrupts */ spi_writel (as,IER ,SPI_BIT (RDRF ) |SPI_BIT (OVRES ));
@@ -945,21 +949,39 @@ atmel_spi_pump_pio_data(struct atmel_spi *as, struct spi_transfer *xfer) {u8 *txp;u8 *rxp; +u16 *txp16; +u16 *rxp16;unsigned long xfer_pos = xfer->len - as->current_remaining_bytes;if (xfer->rx_buf) { - rxp = ((u8 *)xfer->rx_buf) + xfer_pos; - *rxp =spi_readl (as,RDR ); +if (xfer->bits_per_word >8 ) { + rxp16 = (u16 *)(((u8 *)xfer->rx_buf) + xfer_pos); + *rxp16 =spi_readl (as,RDR ); + }else { + rxp = ((u8 *)xfer->rx_buf) + xfer_pos; + *rxp =spi_readl (as,RDR ); + } }else {spi_readl (as,RDR ); } - - as->current_remaining_bytes--; +if (xfer->bits_per_word >8 ) { + as->current_remaining_bytes -=2 ; +if (as->current_remaining_bytes <0 ) + as->current_remaining_bytes =0 ; + }else { + as->current_remaining_bytes--; + }if (as->current_remaining_bytes) {if (xfer->tx_buf) { - txp = ((u8 *)xfer->tx_buf) + xfer_pos +1 ; -spi_writel (as,TDR , *txp); +if (xfer->bits_per_word >8 ) { + txp16 = (u16 *)(((u8 *)xfer->tx_buf) + + xfer_pos +2 ); +spi_writel (as,TDR , *txp16); + }else { + txp = ((u8 *)xfer->tx_buf) + xfer_pos +1 ; +spi_writel (as,TDR , *txp); + } }else {spi_writel (as,TDR ,0 ); }
@@ -1373,6 +1395,13 @@ static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg) } } +if (xfer->bits_per_word >8 ) { +if (xfer->len %2 ) { +dev_dbg (&spi->dev,"buffer len should be 16 bits aligned\n" ); +return -EINVAL ; + } + } +/* FIXME implement these protocol options!! */ if (xfer->speed_hz < spi->max_speed_hz) {dev_dbg (&spi->dev,"can't change speed in transfer\n" );
Signature · 1 line
1.7.9.5
Re: [PATCH v7 09/14] spi/spi-atmel: correct 16 bits transfers using PIO
Quoted 7 lines · Wenyou Yang
From: Richard Genoud <[email protected]>
Signed-off-by Richard Genoud <[email protected]>Cc spi-devel-general at lists.sourceforge.netCc linux-kernel at vger.kernel.org[wenyou.yang at atmel.com: submit the patch]Signed-off-by Wenyou Yang <[email protected]>
This looks like a bug fix to the exiting code rather than something new for dmaengine - it should really have been sent at the start of the series so it can be applied a bug fix and sent to mainline faster.
Some sort of description of what was wrong and how it got fixed would've
been good in the changelog.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130401/6507b9f4/attachment.sig>
PATCH v7 10/14 spi/spi-atmel: correct 16 bits transfers with DMA
In reply to Wenyou YangFrom: Richard Genoud <[email protected]>
--- drivers/spi/spi-atmel.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/spi/spi-atmel.c +11 -6
@@ -388,12 +388,18 @@ static inline int atmel_spi_xfer_can_be_chained(struct spi_transfer *xfer) }static int atmel_spi_dma_slave_config (struct atmel_spi *as, -struct dma_slave_config *slave_config) +struct dma_slave_config *slave_config, +u8 bits_per_word) {int err =0 ; - slave_config->dst_addr_width =DMA_SLAVE_BUSWIDTH_1_BYTE ; - slave_config->src_addr_width =DMA_SLAVE_BUSWIDTH_1_BYTE ; +if (bits_per_word >8 ) { + slave_config->dst_addr_width =DMA_SLAVE_BUSWIDTH_2_BYTES ; + slave_config->src_addr_width =DMA_SLAVE_BUSWIDTH_2_BYTES ; + }else { + slave_config->dst_addr_width =DMA_SLAVE_BUSWIDTH_1_BYTE ; + slave_config->src_addr_width =DMA_SLAVE_BUSWIDTH_1_BYTE ; + } slave_config->dst_addr = (dma_addr_t )as->phybase +SPI_TDR ; slave_config->src_addr = (dma_addr_t )as->phybase +SPI_RDR ;
@@ -454,7 +460,7 @@ static int atmel_spi_configure_dma(struct atmel_spi *as) goto error; } - err =atmel_spi_dma_slave_config (as, &slave_config); + err =atmel_spi_dma_slave_config (as, &slave_config,8 );if (err) goto error;
@@ -588,10 +594,9 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master, *plen = len; -if (atmel_spi_dma_slave_config (as, &slave_config)) +if (atmel_spi_dma_slave_config (as, &slave_config,8 )) goto err_exit; -/* Send both scatterlists */ rxdesc = rxchan->device->device_prep_slave_sg(rxchan, &as->dma.sgrx,
Signature · 1 line
1.7.9.5
Re: [PATCH v7 10/14] spi/spi-atmel: correct 16 bits transfers with DMA
Quoted 7 lines · Wenyou Yang
From: Richard Genoud <[email protected]>
Signed-off-by Richard Genoud <[email protected]>Cc spi-devel-general at lists.sourceforge.netCc linux-kernel at vger.kernel.org[wenyou.yang at atmel.com: submit the patch]Signed-off-by Wenyou Yang <[email protected]>
Shouldn't this be squashed into the dmaengine patch?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130401/46da3b0d/attachment.sig>
RE: [PATCH v7 10/14] spi/spi-atmel: correct 16 bits transfers with DMA
Hi, Mark,
Quoted 12 lines
-----Original Message-----
From: Mark Brown [mailto:broonie at opensource.wolfsonmicro.com]
Sent: 2013?4?1? 21:54
To: Yang, Wenyou
Cc: linux-arm-kernel at lists.infradead.org; grant.likely at secretlab.ca; richard.genoud at gmail.com; plagnioj at jcrosoft.com; Ferre, Nicolas; Lin, JM; spi-devel-general at lists.sourceforge.net; linux-kernel at vger.kernel.org
Subject: Re: [PATCH v7 10/14] spi/spi-atmel: correct 16 bits transfers with DMAQuoted 2 lines · Wenyou Yang
From: Richard Genoud <[email protected]>
Quoted 7 lines
Quoted 5 lines
Signed-off-by Richard Genoud <[email protected]>Cc spi-devel-general at lists.sourceforge.netCc linux-kernel at vger.kernel.org[wenyou.yang at atmel.com: submit the patch]Signed-off-by Wenyou Yang <[email protected]>Shouldn't this be squashed into the dmaengine patch?
OK, I will squash it into the dmaengine patch
Best Regards,
Wenyou Yang
PATCH v7 11/14 ARM: at91: add clocks for spi dt entries
In reply to Wenyou YangFrom: Richard Genoud <[email protected]>
--- arch/arm/mach-at91/at91sam9260.c | 2 ++ arch/arm/mach-at91/at91sam9g45.c | 2 ++ arch/arm/mach-at91/at91sam9n12.c | 2 ++ arch/arm/mach-at91/at91sam9x5.c | 2 ++ 4 files changed, 8 insertions(+)
arch/arm/mach-at91/at91sam9260.c +2 -0
@@ -232,6 +232,8 @@ static struct clk_lookup periph_clocks_lookups[] = {CLKDEV_CON_DEV_ID ("t2_clk" ,"fffdc000.timer" , &tc5_clk),CLKDEV_CON_DEV_ID ("hclk" ,"500000.ohci" , &ohci_clk),CLKDEV_CON_DEV_ID ("mci_clk" ,"fffa8000.mmc" , &mmc_clk), +CLKDEV_CON_DEV_ID ("spi_clk" ,"fffc8000.spi" , &spi0_clk), +CLKDEV_CON_DEV_ID ("spi_clk" ,"fffcc000.spi" , &spi1_clk),/* fake hclk clock */ CLKDEV_CON_DEV_ID ("hclk" ,"at91_ohci" , &ohci_clk), CLKDEV_CON_ID("pioA", &pioA_clk),
arch/arm/mach-at91/at91sam9g45.c +2 -0
@@ -262,6 +262,8 @@ static struct clk_lookup periph_clocks_lookups[] = {CLKDEV_CON_DEV_ID ("mci_clk" ,"fffd0000.mmc" , &mmc1_clk),CLKDEV_CON_DEV_ID (NULL ,"fff84000.i2c" , &twi0_clk),CLKDEV_CON_DEV_ID (NULL ,"fff88000.i2c" , &twi1_clk), +CLKDEV_CON_DEV_ID ("spi_clk" ,"fffa4000.spi" , &spi0_clk), +CLKDEV_CON_DEV_ID ("spi_clk" ,"fffa8000.spi" , &spi1_clk),/* fake hclk clock */ CLKDEV_CON_DEV_ID ("hclk" ,"at91_ohci" , &uhphs_clk), CLKDEV_CON_DEV_ID(NULL, "fffff200.gpio", &pioA_clk),
arch/arm/mach-at91/at91sam9n12.c +2 -0
@@ -172,6 +172,8 @@ static struct clk_lookup periph_clocks_lookups[] = {CLKDEV_CON_DEV_ID ("dma_clk" ,"ffffec00.dma-controller" , &dma_clk),CLKDEV_CON_DEV_ID (NULL ,"f8010000.i2c" , &twi0_clk),CLKDEV_CON_DEV_ID (NULL ,"f8014000.i2c" , &twi1_clk), +CLKDEV_CON_DEV_ID ("spi_clk" ,"f0000000.spi" , &spi0_clk), +CLKDEV_CON_DEV_ID ("spi_clk" ,"f0004000.spi" , &spi1_clk),CLKDEV_CON_DEV_ID (NULL ,"fffff400.gpio" , &pioAB_clk),CLKDEV_CON_DEV_ID (NULL ,"fffff600.gpio" , &pioAB_clk), CLKDEV_CON_DEV_ID(NULL, "fffff800.gpio", &pioCD_clk),
arch/arm/mach-at91/at91sam9x5.c +2 -0
@@ -237,6 +237,8 @@ static struct clk_lookup periph_clocks_lookups[] = {CLKDEV_CON_DEV_ID (NULL ,"f8010000.i2c" , &twi0_clk),CLKDEV_CON_DEV_ID (NULL ,"f8014000.i2c" , &twi1_clk),CLKDEV_CON_DEV_ID (NULL ,"f8018000.i2c" , &twi2_clk), +CLKDEV_CON_DEV_ID ("spi_clk" ,"f0000000.spi" , &spi0_clk), +CLKDEV_CON_DEV_ID ("spi_clk" ,"f0004000.spi" , &spi1_clk),CLKDEV_CON_DEV_ID (NULL ,"fffff400.gpio" , &pioAB_clk),CLKDEV_CON_DEV_ID (NULL ,"fffff600.gpio" , &pioAB_clk), CLKDEV_CON_DEV_ID(NULL, "fffff800.gpio", &pioCD_clk),
Signature · 1 line
1.7.9.5
PATCH v7 12/14 ARM: dts: add spi nodes for atmel SoC
In reply to Wenyou YangFrom: Richard Genoud <[email protected]>
--- arch/arm/boot/dts/at91sam9260.dtsi | 18 ++++++++++++++++++ arch/arm/boot/dts/at91sam9263.dtsi | 18 ++++++++++++++++++ arch/arm/boot/dts/at91sam9g45.dtsi | 18 ++++++++++++++++++ arch/arm/boot/dts/at91sam9n12.dtsi | 18 ++++++++++++++++++ arch/arm/boot/dts/at91sam9x5.dtsi | 18 ++++++++++++++++++ 5 files changed, 90 insertions(+)
arch/arm/boot/dts/at91sam9260.dtsi +18 -0
@@ -471,6 +471,24 @@ status = "disabled"; }; + spi0: spi at fffc8000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "atmel,at91rm9200-spi"; + reg = <0xfffc8000 0x200>; + interrupts = <12 4 3>; + status = "disabled"; + }; + + spi1: spi at fffcc000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "atmel,at91rm9200-spi"; + reg = <0xfffcc000 0x200>; + interrupts = <13 4 3>; + status = "disabled"; + }; + adc0: adc at fffe0000 { compatible = "atmel,at91sam9260-adc"; reg = <0xfffe0000 0x100>;
arch/arm/boot/dts/at91sam9263.dtsi +18 -0
@@ -462,6 +462,24 @@ reg = <0xfffffd40 0x10>; status = "disabled"; }; + + spi0: spi at fffa4000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "atmel,at91rm9200-spi"; + reg = <0xfffa4000 0x200>; + interrupts = <14 4 3>; + status = "disabled"; + }; + + spi1: spi at fffa8000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "atmel,at91rm9200-spi"; + reg = <0xfffa8000 0x200>; + interrupts = <15 4 3>; + status = "disabled"; + }; }; nand0: nand at 40000000 {
arch/arm/boot/dts/at91sam9g45.dtsi +18 -0
@@ -531,6 +531,24 @@ reg = <0xfffffd40 0x10>; status = "disabled"; }; + + spi0: spi at fffa4000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "atmel,at91rm9200-spi"; + reg = <0xfffa4000 0x200>; + interrupts = <14 4 3>; + status = "disabled"; + }; + + spi1: spi at fffa8000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "atmel,at91rm9200-spi"; + reg = <0xfffa8000 0x200>; + interrupts = <15 4 3>; + status = "disabled"; + }; }; nand0: nand at 40000000 {
arch/arm/boot/dts/at91sam9n12.dtsi +18 -0
@@ -373,6 +373,24 @@ #size-cells = <0>; status = "disabled"; }; + + spi0: spi at f0000000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "atmel,at91rm9200-spi"; + reg = <0xf0000000 0x100>; + interrupts = <13 4 3>; + status = "disabled"; + }; + + spi1: spi at f0004000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "atmel,at91rm9200-spi"; + reg = <0xf0004000 0x100>; + interrupts = <14 4 3>; + status = "disabled"; + }; }; nand0: nand at 40000000 {
arch/arm/boot/dts/at91sam9x5.dtsi +18 -0
@@ -505,6 +505,24 @@ trigger-value = <0x6>; }; }; + + spi0: spi at f0000000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "atmel,at91rm9200-spi"; + reg = <0xf0000000 0x100>; + interrupts = <13 4 3>; + status = "disabled"; + }; + + spi1: spi at f0004000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "atmel,at91rm9200-spi"; + reg = <0xf0004000 0x100>; + interrupts = <14 4 3>; + status = "disabled"; + }; }; nand0: nand at 40000000 {
Signature · 1 line
1.7.9.5
PATCH v7 13/14 ARM: dts: add spi nodes for the atmel boards
In reply to Wenyou YangFrom: Richard Genoud <[email protected]>
--- arch/arm/boot/dts/at91sam9263ek.dts | 10 ++++++++++ arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 10 ++++++++++ arch/arm/boot/dts/at91sam9m10g45ek.dts | 10 ++++++++++ arch/arm/boot/dts/at91sam9n12ek.dts | 10 ++++++++++ arch/arm/boot/dts/at91sam9x5ek.dtsi | 10 ++++++++++ 5 files changed, 50 insertions(+)
arch/arm/boot/dts/at91sam9263ek.dts +10 -0
@@ -79,6 +79,16 @@ }; }; }; + + spi0: spi at fffa4000 { + status = "okay"; + cs-gpios = <&pioA 5 0>, <0>, <0>, <0>; + mtd_dataflash at 0 { + compatible = "atmel,at45", "atmel,dataflash"; + spi-max-frequency = <50000000>; + reg = <0>; + }; + }; }; nand0: nand at 40000000 {
arch/arm/boot/dts/at91sam9g20ek_common.dtsi +10 -0
@@ -96,6 +96,16 @@ status = "okay"; pinctrl-0 = <&pinctrl_ssc0_tx>; }; + + spi0: spi at fffc8000 { + status = "okay"; + cs-gpios = <0>, <&pioC 11 0>, <0>, <0>; + mtd_dataflash at 0 { + compatible = "atmel,at45", "atmel,dataflash"; + spi-max-frequency = <50000000>; + reg = <1>; + }; + }; }; nand0: nand at 40000000 {
arch/arm/boot/dts/at91sam9m10g45ek.dts +10 -0
@@ -102,6 +102,16 @@ }; }; }; + + spi0: spi at fffa4000{ + status = "okay"; + cs-gpios = <&pioB 3 0>, <0>, <0>, <0>; + mtd_dataflash at 0 { + compatible = "atmel,at45", "atmel,dataflash"; + spi-max-frequency = <13000000>; + reg = <0>; + }; + }; }; nand0: nand at 40000000 {
arch/arm/boot/dts/at91sam9n12ek.dts +10 -0
@@ -67,6 +67,16 @@ }; }; }; + + spi0: spi at f0000000 { + status = "okay"; + cs-gpios = <&pioA 14 0>, <0>, <0>, <0>; + m25p80 at 0 { + compatible = "atmel,at25df321a"; + spi-max-frequency = <50000000>; + reg = <0>; + }; + }; }; nand0: nand at 40000000 {
arch/arm/boot/dts/at91sam9x5ek.dtsi +10 -0
@@ -84,6 +84,16 @@ }; }; }; + + spi0: spi at f0000000 { + status = "okay"; + cs-gpios = <&pioA 14 0>, <0>, <0>, <0>; + m25p80 at 0 { + compatible = "atmel,at25df321a"; + spi-max-frequency = <50000000>; + reg = <0>; + }; + }; }; usb0: ohci at 00600000 {
Signature · 1 line
1.7.9.5
PATCH v7 14/14 ARM: dts: add pinctrl property for spi node for atmel SoC
In reply to Wenyou Yang--- arch/arm/boot/dts/at91sam9260.dtsi | 22 ++++++++++++++++++++++ arch/arm/boot/dts/at91sam9263.dtsi | 22 ++++++++++++++++++++++ arch/arm/boot/dts/at91sam9g45.dtsi | 22 ++++++++++++++++++++++ arch/arm/boot/dts/at91sam9n12.dtsi | 22 ++++++++++++++++++++++ arch/arm/boot/dts/at91sam9x5.dtsi | 22 ++++++++++++++++++++++ 5 files changed, 110 insertions(+)
arch/arm/boot/dts/at91sam9260.dtsi +22 -0
@@ -322,6 +322,24 @@ }; }; + spi0 { + pinctrl_spi0: spi0-0 { + atmel,pins = + <0 0 0x1 0x0 /* PA0 periph A SPI0_MISO pin */ + 0 1 0x1 0x0 /* PA1 periph A SPI0_MOSI pin */ + 0 2 0x1 0x0>; /* PA2 periph A SPI0_SPCK pin */ + }; + }; + + spi1 { + pinctrl_spi1: spi1-0 { + atmel,pins = + <1 0 0x1 0x0 /* PB0 periph A SPI1_MISO pin */ + 1 1 0x1 0x0 /* PB1 periph A SPI1_MOSI pin */ + 1 2 0x1 0x0>; /* PB2 periph A SPI1_SPCK pin */ + }; + }; + pioA: gpio at fffff400 { compatible = "atmel,at91rm9200-gpio"; reg = <0xfffff400 0x200>;
@@ -477,6 +495,8 @@ compatible = "atmel,at91rm9200-spi"; reg = <0xfffc8000 0x200>; interrupts = <12 4 3>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi0>; status = "disabled"; };
@@ -486,6 +506,8 @@ compatible = "atmel,at91rm9200-spi"; reg = <0xfffcc000 0x200>; interrupts = <13 4 3>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi1>; status = "disabled"; };
arch/arm/boot/dts/at91sam9263.dtsi +22 -0
@@ -303,6 +303,24 @@ }; }; + spi0 { + pinctrl_spi0: spi0-0 { + atmel,pins = + <0 0 0x2 0x0 /* PA0 periph B SPI0_MISO pin */ + 0 1 0x2 0x0 /* PA1 periph B SPI0_MOSI pin */ + 0 2 0x2 0x0>; /* PA2 periph B SPI0_SPCK pin */ + }; + }; + + spi1 { + pinctrl_spi1: spi1-0 { + atmel,pins = + <1 12 0x1 0x0 /* PB12 periph A SPI1_MISO pin */ + 1 13 0x1 0x0 /* PB13 periph A SPI1_MOSI pin */ + 1 14 0x1 0x0>; /* PB14 periph A SPI1_SPCK pin */ + }; + }; + pioA: gpio at fffff200 { compatible = "atmel,at91rm9200-gpio"; reg = <0xfffff200 0x200>;
@@ -469,6 +487,8 @@ compatible = "atmel,at91rm9200-spi"; reg = <0xfffa4000 0x200>; interrupts = <14 4 3>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi0>; status = "disabled"; };
@@ -478,6 +498,8 @@ compatible = "atmel,at91rm9200-spi"; reg = <0xfffa8000 0x200>; interrupts = <15 4 3>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi1>; status = "disabled"; }; };
arch/arm/boot/dts/at91sam9g45.dtsi +22 -0
@@ -322,6 +322,24 @@ }; }; + spi0 { + pinctrl_spi0: spi0-0 { + atmel,pins = + <1 0 0x1 0x0 /* PB0 periph A SPI0_MISO pin */ + 1 1 0x1 0x0 /* PB1 periph A SPI0_MOSI pin */ + 1 2 0x1 0x0>; /* PB2 periph A SPI0_SPCK pin */ + }; + }; + + spi1 { + pinctrl_spi1: spi1-0 { + atmel,pins = + <1 14 0x1 0x0 /* PB14 periph A SPI1_MISO pin */ + 1 15 0x1 0x0 /* PB15 periph A SPI1_MOSI pin */ + 1 16 0x1 0x0>; /* PB16 periph A SPI1_SPCK pin */ + }; + }; + pioA: gpio at fffff200 { compatible = "atmel,at91rm9200-gpio"; reg = <0xfffff200 0x200>;
@@ -538,6 +556,8 @@ compatible = "atmel,at91rm9200-spi"; reg = <0xfffa4000 0x200>; interrupts = <14 4 3>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi0>; status = "disabled"; };
@@ -547,6 +567,8 @@ compatible = "atmel,at91rm9200-spi"; reg = <0xfffa8000 0x200>; interrupts = <15 4 3>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi1>; status = "disabled"; }; };
arch/arm/boot/dts/at91sam9n12.dtsi +22 -0
@@ -261,6 +261,24 @@ }; }; + spi0 { + pinctrl_spi0: spi0-0 { + atmel,pins = + <0 11 0x1 0x0 /* PA11 periph A SPI0_MISO pin */ + 0 12 0x1 0x0 /* PA12 periph A SPI0_MOSI pin */ + 0 13 0x1 0x0>; /* PA13 periph A SPI0_SPCK pin */ + }; + }; + + spi1 { + pinctrl_spi1: spi1-0 { + atmel,pins = + <0 21 0x2 0x0 /* PA21 periph B SPI1_MISO pin */ + 0 22 0x2 0x0 /* PA22 periph B SPI1_MOSI pin */ + 0 23 0x2 0x0>; /* PA23 periph B SPI1_SPCK pin */ + }; + }; + pioA: gpio at fffff400 { compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; reg = <0xfffff400 0x200>;
@@ -380,6 +398,8 @@ compatible = "atmel,at91rm9200-spi"; reg = <0xf0000000 0x100>; interrupts = <13 4 3>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi0>; status = "disabled"; };
@@ -389,6 +409,8 @@ compatible = "atmel,at91rm9200-spi"; reg = <0xf0004000 0x100>; interrupts = <14 4 3>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi1>; status = "disabled"; }; };
arch/arm/boot/dts/at91sam9x5.dtsi +22 -0
@@ -319,6 +319,24 @@ }; }; + spi0 { + pinctrl_spi0: spi0-0 { + atmel,pins = + <0 11 0x1 0x0 /* PA11 periph A SPI0_MISO pin */ + 0 12 0x1 0x0 /* PA12 periph A SPI0_MOSI pin */ + 0 13 0x1 0x0>; /* PA13 periph A SPI0_SPCK pin */ + }; + }; + + spi1 { + pinctrl_spi1: spi1-0 { + atmel,pins = + <0 21 0x2 0x0 /* PA21 periph B SPI1_MISO pin */ + 0 22 0x2 0x0 /* PA22 periph B SPI1_MOSI pin */ + 0 23 0x2 0x0>; /* PA23 periph B SPI1_SPCK pin */ + }; + }; + pioA: gpio at fffff400 { compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; reg = <0xfffff400 0x200>;
@@ -512,6 +530,8 @@ compatible = "atmel,at91rm9200-spi"; reg = <0xf0000000 0x100>; interrupts = <13 4 3>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi0>; status = "disabled"; };
@@ -521,6 +541,8 @@ compatible = "atmel,at91rm9200-spi"; reg = <0xf0004000 0x100>; interrupts = <14 4 3>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi1>; status = "disabled"; }; };
Signature · 1 line
1.7.9.5
v7 cover spi/spi-atmel: add dmaengine support for atmel spi controller and to test the device tree support
In reply to Wenyou YangOn 03/19/2013 08:41 AM, Wenyou Yang :
Quoted 15 lines
Hi All,
This set of patches is to add dmaengine support for atmel spi and to test device tree support.
The work is based on Nicolas and Richard's work.
Because the dma engine device tree support isn't available now, to at91sam9x5ek and at91sam9n12ek with dma support, it doesn't work on the dmaengine mode, only on PIO mode so far.
It has been tested as below:
1./tested on v3.9-rc3, by using mtd utils, "mount", "umount" and "cp" commands. 2./tested on "spi/next" git tree after changingmaster->num_chipselectwhich fixed in v3.9-rc1. 3./tested by usingDocumentation/spi/spidev_test.con "/dev/spidev".
4./tested on on at91sam9x5ek, at91sam9m10g45ek, at91sam9263ek and at91sam9g20ek boards.
Quoted 6 lines
It is based on v3.9-rc3 + Joachim Eastwood's spi/atmel: fix
speed_hzcheck inatmel_spi_transfer().Changelog:
v7:
1./ remove patch: fix probing failure afterxfer->speed_hzset. 2./ remove patch: add pinctrl support for atmel spi.
It it makes sense, you can add my:
on patches that I did not acknowledged yet.
Grant,
Can we move forward with this patch series so that we can build on solid bases for future developments on atmel SPI.
Thanks, best regards.
Quoted 75 lines
v6:
1./ remove: fix master->num_chipselect wrongly set patch which isn't a issue in v3.9-rc1. 2./ fix probing failure after xfer->speed_hz set.v5:
1./ add pinctrl patches.
2./ detect capabilities by reading spi version register to replace multiple compatiles. 3./ change the "cs-gpios" property of spi node.
4./ rebase on v3.8.v4:
1./ Take Joe Perches's adivce, rewriteatmel_spi_is_v2(struct atmel_spi *as)
andatmel_spi_use_dma(struct atmel_spi *as),
and removeatmel_spi_use_pdc(struct atmel_spi *as).
2./ Rebase on v3.8-rc3.V3:
1./ Rebase on v3.8-rc2.
2./ Remove some Jean-Christophe's patches which has been applied on v3.8-rc2. 3./ Remove spi property "cs-gpios" from the SoC dtsi files to the board dts files
to avoid some useless pin conflicts.v2:
1./ Remove the patch :PATCH]mtd: m25p80: change them25p80_readto reading page to page
which purpose to fix the BUG: when run "flashcp/bin/busybox/dev/mtdX" in the at91sam9g25ek with DMA mode, it arises a OOPS. Now fix it in this patch:
[PATHC] spi/atmel_spi: add dmaengine support changing to fix the [BUG].
2./ Remove two patches:
which purpose to read dts property to select SPI IP version and DMA mode Now they will be gat from device tree different compatile.
3./ Fix DMA: when enable both spi0 AND spi1, the spi0 doesn't work BUG.
4./ Rebase v3.7-rc8.Best Regards,
Wenyou Yang.Nicolas Ferre (5):
spi/spi-atmel: add physical base address spi/spi-atmel: call unmapping on transfers buffers spi/spi-atmel: status information passed through controller data spi/spi-atmel: add flag to controller data for lock operations spi/spi-atmel: add dmaengine supportRichard Genoud (6):
spi/spi-atmel: fix spi-atmel driver to adapt toslave_configchanges spi/spi-atmel: correct 16 bits transfers using PIO spi/spi-atmel: correct 16 bits transfers with DMA
ARM: at91: add clocks for spi dt entries
ARM: dts: add spi nodes for atmel SoC
ARM: dts: add spi nodes for the atmel boardsWenyou Yang (3):
spi/spi-atmel: detect the capabilities of SPI core by reading the
VERSION register.
spi/spi-atmel: add support transfer on CS1,2,3, not only on CS0
ARM: dts: add pinctrl property for spi node for atmel SoCarch/arm/boot/dts/at91sam9260.dtsi | 40 ++ arch/arm/boot/dts/at91sam9263.dtsi | 40 ++ arch/arm/boot/dts/at91sam9263ek.dts | 10 + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 10 + arch/arm/boot/dts/at91sam9g45.dtsi | 40 ++ arch/arm/boot/dts/at91sam9m10g45ek.dts | 10 + arch/arm/boot/dts/at91sam9n12.dtsi | 40 ++ arch/arm/boot/dts/at91sam9n12ek.dts | 10 + arch/arm/boot/dts/at91sam9x5.dtsi | 40 ++ arch/arm/boot/dts/at91sam9x5ek.dtsi | 10 + arch/arm/mach-at91/at91sam9260.c | 2 + arch/arm/mach-at91/at91sam9g45.c | 2 + arch/arm/mach-at91/at91sam9n12.c | 2 + arch/arm/mach-at91/at91sam9x5.c | 2 + drivers/spi/spi-atmel.c | 753 ++++++++++++++++++++++++--- 15 files changed, 945 insertions(+), 66 deletions(-)
Signature · 1 line
Nicolas Ferre
v7 cover spi/spi-atmel: add dmaengine support for atmel spi controller and to test the device tree support
On 03/21/2013 10:32 AM, Nicolas Ferre :
Quoted 26 lines
On 03/19/2013 08:41 AM, Wenyou Yang :
Quoted 15 lines
Hi All,
This set of patches is to add dmaengine support for atmel spi and to test device tree support.
The work is based on Nicolas and Richard's work.
Because the dma engine device tree support isn't available now, to at91sam9x5ek and at91sam9n12ek with dma support, it doesn't work on the dmaengine mode, only on PIO mode so far.
It has been tested as below:
1./tested on v3.9-rc3, by using mtd utils, "mount", "umount" and "cp" commands. 2./tested on "spi/next" git tree after changingmaster->num_chipselectwhich fixed in v3.9-rc1. 3./tested by usingDocumentation/spi/spidev_test.con "/dev/spidev".
4./tested on on at91sam9x5ek, at91sam9m10g45ek, at91sam9263ek and at91sam9g20ek boards.Quoted 6 lines
It is based on v3.9-rc3 + Joachim Eastwood's spi/atmel: fix
speed_hzcheck inatmel_spi_transfer().Changelog:
v7:
1./ remove patch: fix probing failure afterxfer->speed_hzset. 2./ remove patch: add pinctrl support for atmel spi.It it makes sense, you can add my:
Quoted 8 lines
Acked-by Nicolas Ferre <[email protected]>on patches that I did not acknowledged yet.
Grant,
Can we move forward with this patch series so that we can build on solid bases for future developments on atmel SPI.
Moreover, if it can ease the process, I can take patches 11, 12, 13 and 14 with at91-dt branch and submit that to arm-soc.
Tell me if you feel it is better...
Bye,
Quoted 77 lines
Quoted 75 lines
v6:
1./ remove: fix master->num_chipselect wrongly set patch which isn't a issue in v3.9-rc1. 2./ fix probing failure after xfer->speed_hz set.v5:
1./ add pinctrl patches.
2./ detect capabilities by reading spi version register to replace multiple compatiles. 3./ change the "cs-gpios" property of spi node.
4./ rebase on v3.8.v4:
1./ Take Joe Perches's adivce, rewriteatmel_spi_is_v2(struct atmel_spi *as)
andatmel_spi_use_dma(struct atmel_spi *as),
and removeatmel_spi_use_pdc(struct atmel_spi *as).
2./ Rebase on v3.8-rc3.V3:
1./ Rebase on v3.8-rc2.
2./ Remove some Jean-Christophe's patches which has been applied on v3.8-rc2. 3./ Remove spi property "cs-gpios" from the SoC dtsi files to the board dts files
to avoid some useless pin conflicts.v2:
1./ Remove the patch :PATCH]mtd: m25p80: change them25p80_readto reading page to page
which purpose to fix the BUG: when run "flashcp/bin/busybox/dev/mtdX" in the at91sam9g25ek with DMA mode, it arises a OOPS. Now fix it in this patch:
[PATHC] spi/atmel_spi: add dmaengine support changing to fix the [BUG].
2./ Remove two patches:
which purpose to read dts property to select SPI IP version and DMA mode Now they will be gat from device tree different compatile.
3./ Fix DMA: when enable both spi0 AND spi1, the spi0 doesn't work BUG.
4./ Rebase v3.7-rc8.Best Regards,
Wenyou Yang.Nicolas Ferre (5):
spi/spi-atmel: add physical base address spi/spi-atmel: call unmapping on transfers buffers spi/spi-atmel: status information passed through controller data spi/spi-atmel: add flag to controller data for lock operations spi/spi-atmel: add dmaengine supportRichard Genoud (6):
spi/spi-atmel: fix spi-atmel driver to adapt toslave_configchanges spi/spi-atmel: correct 16 bits transfers using PIO spi/spi-atmel: correct 16 bits transfers with DMA
ARM: at91: add clocks for spi dt entries
ARM: dts: add spi nodes for atmel SoC
ARM: dts: add spi nodes for the atmel boardsWenyou Yang (3):
spi/spi-atmel: detect the capabilities of SPI core by reading the
VERSION register.
spi/spi-atmel: add support transfer on CS1,2,3, not only on CS0
ARM: dts: add pinctrl property for spi node for atmel SoCarch/arm/boot/dts/at91sam9260.dtsi | 40 ++ arch/arm/boot/dts/at91sam9263.dtsi | 40 ++ arch/arm/boot/dts/at91sam9263ek.dts | 10 + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 10 + arch/arm/boot/dts/at91sam9g45.dtsi | 40 ++ arch/arm/boot/dts/at91sam9m10g45ek.dts | 10 + arch/arm/boot/dts/at91sam9n12.dtsi | 40 ++ arch/arm/boot/dts/at91sam9n12ek.dts | 10 + arch/arm/boot/dts/at91sam9x5.dtsi | 40 ++ arch/arm/boot/dts/at91sam9x5ek.dtsi | 10 + arch/arm/mach-at91/at91sam9260.c | 2 + arch/arm/mach-at91/at91sam9g45.c | 2 + arch/arm/mach-at91/at91sam9n12.c | 2 + arch/arm/mach-at91/at91sam9x5.c | 2 + drivers/spi/spi-atmel.c | 753 ++++++++++++++++++++++++--- 15 files changed, 945 insertions(+), 66 deletions(-)
Signature · 1 line
Nicolas Ferre