Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss

[git pull] 2nd batch of SPI changes

0 views
Skip to first unread message

Grant Likely

unread,
Dec 17, 2009, 11:50:02 AM12/17/09
to
Hi Linus,

This is later than I'd like it to be, and I hope it gets to you before
you cut -rc1. There was some slack between Andrew and I on handing
off SPI maintainership. Patches I had picked up in the last batch
conflicted with his stack and we decided it was best if I just take
the remainder of his SPI queue and commit them to my tree.
(Basically, I made the mess, so I got to clean it up). It took me a
bit to get sorted out.

Commits in this batch are either a) from Andrew's tree, b) trivial
fixes from the list, or c) new drivers.

The following changes since commit 718deb6b61e34c200c1f2b706176d9aac334cb2d:
Al Viro (1):
Fix breakage in shmem.c

are available in the git repository at:

git://git.secretlab.ca/git/linux-2.6 next-spi

Ben Dooks (1):
spi_s3c24xx: add FIQ pseudo-DMA support

Ben Nizette (1):
atmel_spi: fix dma addr calculation for len > BUFFER_SIZE

Feng Tang (1):
spi: controller driver for Designware SPI core

Jassi Brar (1):
spi: Add s3c64xx SPI Controller driver

Mike Frysinger (1):
spidev: add proper section markers

Thadeu Lima de Souza Cascardo (1):
spidev: use DECLARE_BITMAP instead of declaring the array

hartleys (5):
spi: atmel_spi.c: use resource_size()
spi: spi_bfin5xx.c: use resource_size()
spi: spi_mpc8xxx.c: use resource_size()
spi: spi_sh_sci.c: use resource_size()
spi: spi_txx9.c: use resource_size()

arch/arm/mach-s3c2410/include/mach/spi.h | 2 +
drivers/spi/Kconfig | 28 +
drivers/spi/Makefile | 10 +-
drivers/spi/atmel_spi.c | 6 +-
drivers/spi/dw_spi.c | 944 +++++++++++++++++++++++
drivers/spi/dw_spi_pci.c | 169 +++++
drivers/spi/spi_bfin5xx.c | 2 +-
drivers/spi/spi_mpc8xxx.c | 2 +-
drivers/spi/spi_s3c24xx.c | 244 ++++++-
drivers/spi/spi_s3c24xx_fiq.S | 116 +++
drivers/spi/spi_s3c24xx_fiq.h | 26 +
drivers/spi/spi_s3c64xx.c | 1196 ++++++++++++++++++++++++++++++
drivers/spi/spi_sh_sci.c | 2 +-
drivers/spi/spi_txx9.c | 6 +-
drivers/spi/spidev.c | 18 +-
include/linux/spi/dw_spi.h | 212 ++++++
16 files changed, 2950 insertions(+), 33 deletions(-)
create mode 100644 drivers/spi/dw_spi.c
create mode 100644 drivers/spi/dw_spi_pci.c
create mode 100644 drivers/spi/spi_s3c24xx_fiq.S
create mode 100644 drivers/spi/spi_s3c24xx_fiq.h
create mode 100644 drivers/spi/spi_s3c64xx.c
create mode 100644 include/linux/spi/dw_spi.h


--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

jassi brar

unread,
Dec 17, 2009, 7:50:02 PM12/17/09
to
On Fri, Dec 18, 2009 at 1:40 AM, Grant Likely <grant....@secretlab.ca> wrote:
> Hi Linus,
>
> This is later than I'd like it to be, and I hope it gets to you before
> you cut -rc1.  There was some slack between Andrew and I on handing
> off SPI maintainership.  Patches I had picked up in the last batch
> conflicted with his stack and we decided it was best if I just take
> the remainder of his SPI queue and commit them to my tree.
> (Basically, I made the mess, so I got to clean it up).  It took me a
> bit to get sorted out.
>
> Commits in this batch are either a) from Andrew's tree, b) trivial
> fixes from the list, or c) new drivers.
>
> The following changes since commit 718deb6b61e34c200c1f2b706176d9aac334cb2d:
>  Al Viro (1):
>        Fix breakage in shmem.c
>
> are available in the git repository at:
>
>  git://git.secretlab.ca/git/linux-2.6 next-spi
>
> Ben Dooks (1):
>      spi_s3c24xx: add FIQ pseudo-DMA support
>
> Ben Nizette (1):
>      atmel_spi: fix dma addr calculation for len > BUFFER_SIZE
>
> Feng Tang (1):
>      spi: controller driver for Designware SPI core
>
> Jassi Brar (1):
>      spi: Add s3c64xx SPI Controller driver
IIRC, I didn't get any final ack of acceptance from you or any other maintainer.
I thought perhaps the patch is lost and was preparing to resend after
including some minor changes suggested by my ARCH maintainer(Ben Dooks).
Though I can just as well send those changes as patches right away.
I apologize, if i messed up.

> ------------------------------------------------------------------------------
> This SF.Net email is sponsored by the Verizon Developer Community
> Take advantage of Verizon's best-in-class app development support
> A streamlined, 14 day to market process makes app distribution fast and easy
> Join now and get one step closer to millions of Verizon customers
> http://p.sf.net/sfu/verizon-dev2dev
> _______________________________________________
> spi-devel-general mailing list
> spi-deve...@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/spi-devel-general

Grant Likely

unread,
Dec 17, 2009, 10:10:01 PM12/17/09
to
On Thu, Dec 17, 2009 at 5:45 PM, jassi brar <jassisi...@gmail.com> wrote:
> On Fri, Dec 18, 2009 at 1:40 AM, Grant Likely <grant....@secretlab.ca> wrote:
>> Jassi Brar (1):
>> � � �spi: Add s3c64xx SPI Controller driver
> IIRC, I didn't get any final ack of acceptance from you or any other maintainer.
> I thought perhaps the patch is lost and was preparing to resend after
> including some minor changes suggested by my ARCH maintainer(Ben Dooks).
> Though I can just as well send those changes as patches right away.
> I apologize, if i messed up.

Don't worry about it, just send an incremental patch. I'm new to the
SPI maintainer job, and I didn't know any of the background or see any
major reason not to merge the driver, especially since it is a new
driver, and not a change to an existing one.

g.

0 new messages