* [PATCH resend] SPI: McSPI: fix D0/D1 direction confusion
@ 2012-11-14 3:14 Daniel Mack
[not found] ` <1352862866-3794-1-git-send-email-zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Mack @ 2012-11-14 3:14 UTC (permalink / raw)
To: spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
Cc: linus.walleij-QSEj5FYQhm4dnm+yROfE0A,
broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E,
rob.herring-bsGFqQB8/DxBDgjK7y7TUQ, Daniel Mack
0384e90b8 ("spi/mcspi: allow configuration of pin directions") did what
it claimed to do the wrong way around. D0/D1 is configured as output by
*clearing* the bits in the conf registers, hence also breaking the
former default behaviour.
Fix this before that change is merged to mainline.
Signed-off-by: Daniel Mack <zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
Resent to apply directly on top of original commit.
Documentation/devicetree/bindings/spi/omap-spi.txt | 6 +++---
drivers/spi/spi-omap2-mcspi.c | 6 +++---
include/linux/platform_data/spi-omap2-mcspi.h | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Documentation/devicetree/bindings/spi/omap-spi.txt b/Documentation/devicetree/bindings/spi/omap-spi.txt
index 2ef0a6b..938809c 100644
--- a/Documentation/devicetree/bindings/spi/omap-spi.txt
+++ b/Documentation/devicetree/bindings/spi/omap-spi.txt
@@ -6,9 +6,9 @@ Required properties:
- "ti,omap4-spi" for OMAP4+.
- ti,spi-num-cs : Number of chipselect supported by the instance.
- ti,hwmods: Name of the hwmod associated to the McSPI
-- ti,pindir-d0-in-d1-out: Select the D0 pin as input and D1 as
- output. The default is D0 as output and
- D1 as input.
+- ti,pindir-d0-out-d1-in: Select the D0 pin as output and D1 as
+ input. The default is D0 as input and
+ D1 as output.
Example:
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 5104633..89f73c4 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -766,7 +766,7 @@ static int omap2_mcspi_setup_transfer(struct spi_device *spi,
/* standard 4-wire master mode: SCK, MOSI/out, MISO/in, nCS
* REVISIT: this controller could support SPI_3WIRE mode.
*/
- if (mcspi->pin_dir == MCSPI_PINDIR_D0_OUT_D1_IN) {
+ if (mcspi->pin_dir == MCSPI_PINDIR_D0_IN_D1_OUT) {
l &= ~OMAP2_MCSPI_CHCONF_IS;
l &= ~OMAP2_MCSPI_CHCONF_DPE1;
l |= OMAP2_MCSPI_CHCONF_DPE0;
@@ -1188,8 +1188,8 @@ static int __devinit omap2_mcspi_probe(struct platform_device *pdev)
of_property_read_u32(node, "ti,spi-num-cs", &num_cs);
master->num_chipselect = num_cs;
master->bus_num = bus_num++;
- if (of_get_property(node, "ti,pindir-d0-in-d1-out", NULL))
- mcspi->pin_dir = MCSPI_PINDIR_D0_IN_D1_OUT;
+ if (of_get_property(node, "ti,pindir-d0-out-d1-in", NULL))
+ mcspi->pin_dir = MCSPI_PINDIR_D0_OUT_D1_IN;
} else {
pdata = pdev->dev.platform_data;
master->num_chipselect = pdata->num_cs;
diff --git a/include/linux/platform_data/spi-omap2-mcspi.h b/include/linux/platform_data/spi-omap2-mcspi.h
index ce70f7b..a65572d 100644
--- a/include/linux/platform_data/spi-omap2-mcspi.h
+++ b/include/linux/platform_data/spi-omap2-mcspi.h
@@ -7,8 +7,8 @@
#define OMAP4_MCSPI_REG_OFFSET 0x100
-#define MCSPI_PINDIR_D0_OUT_D1_IN 0
-#define MCSPI_PINDIR_D0_IN_D1_OUT 1
+#define MCSPI_PINDIR_D0_IN_D1_OUT 0
+#define MCSPI_PINDIR_D0_OUT_D1_IN 1
struct omap2_mcspi_platform_config {
unsigned short num_cs;
--
1.7.11.7
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH resend] SPI: McSPI: fix D0/D1 direction confusion
[not found] ` <1352862866-3794-1-git-send-email-zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2012-11-14 7:17 ` Peter Korsgaard
2012-11-14 9:56 ` Shubhrajyoti Datta
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2012-11-14 7:17 UTC (permalink / raw)
To: Daniel Mack
Cc: spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
linus.walleij-QSEj5FYQhm4dnm+yROfE0A,
broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E,
rob.herring-bsGFqQB8/DxBDgjK7y7TUQ
>>>>> "Daniel" == Daniel Mack <zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> writes:
Daniel> 0384e90b8 ("spi/mcspi: allow configuration of pin directions") did what
Daniel> it claimed to do the wrong way around. D0/D1 is configured as output by
Daniel> *clearing* the bits in the conf registers, hence also breaking the
Daniel> former default behaviour.
Daniel> Fix this before that change is merged to mainline.
Daniel> Signed-off-by: Daniel Mack <zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Acked-by: Peter Korsgaard <jacmet-OfajU3CKLf1/SzgSGea1oA@public.gmane.org>
--
Bye, Peter Korsgaard
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH resend] SPI: McSPI: fix D0/D1 direction confusion
[not found] ` <1352862866-3794-1-git-send-email-zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2012-11-14 7:17 ` Peter Korsgaard
@ 2012-11-14 9:56 ` Shubhrajyoti Datta
1 sibling, 0 replies; 3+ messages in thread
From: Shubhrajyoti Datta @ 2012-11-14 9:56 UTC (permalink / raw)
To: Daniel Mack
Cc: spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
linus.walleij-QSEj5FYQhm4dnm+yROfE0A,
broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E,
rob.herring-bsGFqQB8/DxBDgjK7y7TUQ
On Wed, Nov 14, 2012 at 8:44 AM, Daniel Mack <zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> 0384e90b8 ("spi/mcspi: allow configuration of pin directions") did what
> it claimed to do the wrong way around. D0/D1 is configured as output by
> *clearing* the bits in the conf registers, hence also breaking the
> former default behaviour.
>
> Fix this before that change is merged to mainline.
>
Indeed. Thanks.
Reviewed-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
> Signed-off-by: Daniel Mack <zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
> Resent to apply directly on top of original commit.
>
> Documentation/devicetree/bindings/spi/omap-spi.txt | 6 +++---
> drivers/spi/spi-omap2-mcspi.c | 6 +++---
> include/linux/platform_data/spi-omap2-mcspi.h | 4 ++--
> 3 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/spi/omap-spi.txt b/Documentation/devicetree/bindings/spi/omap-spi.txt
> index 2ef0a6b..938809c 100644
> --- a/Documentation/devicetree/bindings/spi/omap-spi.txt
> +++ b/Documentation/devicetree/bindings/spi/omap-spi.txt
> @@ -6,9 +6,9 @@ Required properties:
> - "ti,omap4-spi" for OMAP4+.
> - ti,spi-num-cs : Number of chipselect supported by the instance.
> - ti,hwmods: Name of the hwmod associated to the McSPI
> -- ti,pindir-d0-in-d1-out: Select the D0 pin as input and D1 as
> - output. The default is D0 as output and
> - D1 as input.
> +- ti,pindir-d0-out-d1-in: Select the D0 pin as output and D1 as
> + input. The default is D0 as input and
> + D1 as output.
>
> Example:
>
> diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
> index 5104633..89f73c4 100644
> --- a/drivers/spi/spi-omap2-mcspi.c
> +++ b/drivers/spi/spi-omap2-mcspi.c
> @@ -766,7 +766,7 @@ static int omap2_mcspi_setup_transfer(struct spi_device *spi,
> /* standard 4-wire master mode: SCK, MOSI/out, MISO/in, nCS
> * REVISIT: this controller could support SPI_3WIRE mode.
> */
> - if (mcspi->pin_dir == MCSPI_PINDIR_D0_OUT_D1_IN) {
> + if (mcspi->pin_dir == MCSPI_PINDIR_D0_IN_D1_OUT) {
> l &= ~OMAP2_MCSPI_CHCONF_IS;
> l &= ~OMAP2_MCSPI_CHCONF_DPE1;
> l |= OMAP2_MCSPI_CHCONF_DPE0;
> @@ -1188,8 +1188,8 @@ static int __devinit omap2_mcspi_probe(struct platform_device *pdev)
> of_property_read_u32(node, "ti,spi-num-cs", &num_cs);
> master->num_chipselect = num_cs;
> master->bus_num = bus_num++;
> - if (of_get_property(node, "ti,pindir-d0-in-d1-out", NULL))
> - mcspi->pin_dir = MCSPI_PINDIR_D0_IN_D1_OUT;
> + if (of_get_property(node, "ti,pindir-d0-out-d1-in", NULL))
> + mcspi->pin_dir = MCSPI_PINDIR_D0_OUT_D1_IN;
> } else {
> pdata = pdev->dev.platform_data;
> master->num_chipselect = pdata->num_cs;
> diff --git a/include/linux/platform_data/spi-omap2-mcspi.h b/include/linux/platform_data/spi-omap2-mcspi.h
> index ce70f7b..a65572d 100644
> --- a/include/linux/platform_data/spi-omap2-mcspi.h
> +++ b/include/linux/platform_data/spi-omap2-mcspi.h
> @@ -7,8 +7,8 @@
>
> #define OMAP4_MCSPI_REG_OFFSET 0x100
>
> -#define MCSPI_PINDIR_D0_OUT_D1_IN 0
> -#define MCSPI_PINDIR_D0_IN_D1_OUT 1
> +#define MCSPI_PINDIR_D0_IN_D1_OUT 0
> +#define MCSPI_PINDIR_D0_OUT_D1_IN 1
>
> struct omap2_mcspi_platform_config {
> unsigned short num_cs;
> --
> 1.7.11.7
>
>
> ------------------------------------------------------------------------------
> Monitor your physical, virtual and cloud infrastructure from a single
> web console. Get in-depth insight into apps, servers, databases, vmware,
> SAP, cloud infrastructure, etc. Download 30-day Free Trial.
> Pricing starts from $795 for 25 servers or applications!
> http://p.sf.net/sfu/zoho_dev2dev_nov
> _______________________________________________
> spi-devel-general mailing list
> spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
> https://lists.sourceforge.net/lists/listinfo/spi-devel-general
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-11-14 9:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-14 3:14 [PATCH resend] SPI: McSPI: fix D0/D1 direction confusion Daniel Mack
[not found] ` <1352862866-3794-1-git-send-email-zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2012-11-14 7:17 ` Peter Korsgaard
2012-11-14 9:56 ` Shubhrajyoti Datta
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.