* [Patch] atmel_spi.c - let transfers through if not changing bits_per_word
@ 2010-10-13 15:51 ` Matthias Brugger
0 siblings, 0 replies; 4+ messages in thread
From: Matthias Brugger @ 2010-10-13 15:51 UTC (permalink / raw)
To: Jonathan Cameron
Cc: Grant Likely, drivers, David Brownell, linux-iio, Nicolas Ferre,
matthias, spi-devel-general, kernel
- bits_per_word option in spi_transfer are allowed if it does not change
the csr register.
This is necessary for the driver in
drivers/staging/iio/adis16260_core.c, as it uses this option.
Signed-off-by: Matthias Brugger <mensch0815@gmail.com>
---
drivers/spi/atmel_spi.c | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index c4e0442..5c03a5b 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -654,6 +654,8 @@ static int atmel_spi_transfer(struct spi_device
*spi, struct spi_message *msg)
struct spi_transfer *xfer;
unsigned long flags;
struct device *controller = spi->master->dev.parent;
+ u8 bits;
+ struct atmel_spi_device *asd;
as = spi_master_get_devdata(spi->master);
@@ -672,8 +674,18 @@ static int atmel_spi_transfer(struct spi_device
*spi, struct spi_message *msg)
return -EINVAL;
}
+ if (xfer->bits_per_word) {
+ asd = spi->controller_state;
+ bits = (asd->csr >> 4) & 0xf;
+ if (bits != xfer->bits_per_word - 8) {
+ dev_dbg(&spi->dev, "you can't yet change "
+ "bit_per_word in transfers\n");
+ return -ENOPROTOOPT;
+ }
+ }
+
/* FIXME implement these protocol options!! */
- if (xfer->bits_per_word || xfer->speed_hz) {
+ if (xfer->speed_hz) {
dev_dbg(&spi->dev, "no protocol options yet\n");
return -ENOPROTOOPT;
}
--
1.5.6.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Patch] atmel_spi.c - let transfers through if not changing bits_per_word
@ 2010-10-13 15:51 ` Matthias Brugger
0 siblings, 0 replies; 4+ messages in thread
From: Matthias Brugger @ 2010-10-13 15:51 UTC (permalink / raw)
To: Jonathan Cameron
Cc: drivers-OyLXuOCK7orQT0dZR+AlfA, David Brownell,
kernel-o2ulR9ObcgE/ohRxsw7f2g, linux-iio-u79uwXL29TY76Z2rM5mHXA,
Nicolas Ferre, matthias,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
- bits_per_word option in spi_transfer are allowed if it does not change
the csr register.
This is necessary for the driver in
drivers/staging/iio/adis16260_core.c, as it uses this option.
Signed-off-by: Matthias Brugger <mensch0815-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
drivers/spi/atmel_spi.c | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index c4e0442..5c03a5b 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -654,6 +654,8 @@ static int atmel_spi_transfer(struct spi_device
*spi, struct spi_message *msg)
struct spi_transfer *xfer;
unsigned long flags;
struct device *controller = spi->master->dev.parent;
+ u8 bits;
+ struct atmel_spi_device *asd;
as = spi_master_get_devdata(spi->master);
@@ -672,8 +674,18 @@ static int atmel_spi_transfer(struct spi_device
*spi, struct spi_message *msg)
return -EINVAL;
}
+ if (xfer->bits_per_word) {
+ asd = spi->controller_state;
+ bits = (asd->csr >> 4) & 0xf;
+ if (bits != xfer->bits_per_word - 8) {
+ dev_dbg(&spi->dev, "you can't yet change "
+ "bit_per_word in transfers\n");
+ return -ENOPROTOOPT;
+ }
+ }
+
/* FIXME implement these protocol options!! */
- if (xfer->bits_per_word || xfer->speed_hz) {
+ if (xfer->speed_hz) {
dev_dbg(&spi->dev, "no protocol options yet\n");
return -ENOPROTOOPT;
}
--
1.5.6.5
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Patch] atmel_spi.c - let transfers through if not changing bits_per_word
@ 2010-10-14 5:16 ` Grant Likely
0 siblings, 0 replies; 4+ messages in thread
From: Grant Likely @ 2010-10-14 5:16 UTC (permalink / raw)
To: Matthias Brugger
Cc: Jonathan Cameron, drivers, David Brownell, linux-iio,
Nicolas Ferre, matthias, spi-devel-general, kernel
On Wed, Oct 13, 2010 at 05:51:02PM +0200, Matthias Brugger wrote:
> - bits_per_word option in spi_transfer are allowed if it does not change
> the csr register.
>
> This is necessary for the driver in
> drivers/staging/iio/adis16260_core.c, as it uses this option.
>
> Signed-off-by: Matthias Brugger <mensch0815@gmail.com>
Applied, thanks.
However, the patch is line-wrap damaged and I needed to fix it up by
hand. Please check your email client configuration.
g.
> ---
> drivers/spi/atmel_spi.c | 14 +++++++++++++-
> 1 files changed, 13 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
> index c4e0442..5c03a5b 100644
> --- a/drivers/spi/atmel_spi.c
> +++ b/drivers/spi/atmel_spi.c
> @@ -654,6 +654,8 @@ static int atmel_spi_transfer(struct spi_device
> *spi, struct spi_message *msg)
> struct spi_transfer *xfer;
> unsigned long flags;
> struct device *controller = spi->master->dev.parent;
> + u8 bits;
> + struct atmel_spi_device *asd;
>
> as = spi_master_get_devdata(spi->master);
>
> @@ -672,8 +674,18 @@ static int atmel_spi_transfer(struct spi_device
> *spi, struct spi_message *msg)
> return -EINVAL;
> }
>
> + if (xfer->bits_per_word) {
> + asd = spi->controller_state;
> + bits = (asd->csr >> 4) & 0xf;
> + if (bits != xfer->bits_per_word - 8) {
> + dev_dbg(&spi->dev, "you can't yet change "
> + "bit_per_word in transfers\n");
> + return -ENOPROTOOPT;
> + }
> + }
> +
> /* FIXME implement these protocol options!! */
> - if (xfer->bits_per_word || xfer->speed_hz) {
> + if (xfer->speed_hz) {
> dev_dbg(&spi->dev, "no protocol options yet\n");
> return -ENOPROTOOPT;
> }
> --
> 1.5.6.5
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Patch] atmel_spi.c - let transfers through if not changing bits_per_word
@ 2010-10-14 5:16 ` Grant Likely
0 siblings, 0 replies; 4+ messages in thread
From: Grant Likely @ 2010-10-14 5:16 UTC (permalink / raw)
To: Matthias Brugger
Cc: drivers-OyLXuOCK7orQT0dZR+AlfA, David Brownell,
kernel-o2ulR9ObcgE/ohRxsw7f2g, linux-iio-u79uwXL29TY76Z2rM5mHXA,
matthias, Nicolas Ferre, Jonathan Cameron,
spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
On Wed, Oct 13, 2010 at 05:51:02PM +0200, Matthias Brugger wrote:
> - bits_per_word option in spi_transfer are allowed if it does not change
> the csr register.
>
> This is necessary for the driver in
> drivers/staging/iio/adis16260_core.c, as it uses this option.
>
> Signed-off-by: Matthias Brugger <mensch0815-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Applied, thanks.
However, the patch is line-wrap damaged and I needed to fix it up by
hand. Please check your email client configuration.
g.
> ---
> drivers/spi/atmel_spi.c | 14 +++++++++++++-
> 1 files changed, 13 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
> index c4e0442..5c03a5b 100644
> --- a/drivers/spi/atmel_spi.c
> +++ b/drivers/spi/atmel_spi.c
> @@ -654,6 +654,8 @@ static int atmel_spi_transfer(struct spi_device
> *spi, struct spi_message *msg)
> struct spi_transfer *xfer;
> unsigned long flags;
> struct device *controller = spi->master->dev.parent;
> + u8 bits;
> + struct atmel_spi_device *asd;
>
> as = spi_master_get_devdata(spi->master);
>
> @@ -672,8 +674,18 @@ static int atmel_spi_transfer(struct spi_device
> *spi, struct spi_message *msg)
> return -EINVAL;
> }
>
> + if (xfer->bits_per_word) {
> + asd = spi->controller_state;
> + bits = (asd->csr >> 4) & 0xf;
> + if (bits != xfer->bits_per_word - 8) {
> + dev_dbg(&spi->dev, "you can't yet change "
> + "bit_per_word in transfers\n");
> + return -ENOPROTOOPT;
> + }
> + }
> +
> /* FIXME implement these protocol options!! */
> - if (xfer->bits_per_word || xfer->speed_hz) {
> + if (xfer->speed_hz) {
> dev_dbg(&spi->dev, "no protocol options yet\n");
> return -ENOPROTOOPT;
> }
> --
> 1.5.6.5
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-10-14 5:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-13 15:51 [Patch] atmel_spi.c - let transfers through if not changing bits_per_word Matthias Brugger
2010-10-13 15:51 ` Matthias Brugger
2010-10-14 5:16 ` Grant Likely
2010-10-14 5:16 ` Grant Likely
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.