[PATCH] OMAP: MCSPI: Enable mcspi wake-up

[PATCH] OMAP: MCSPI: Enable mcspi wake-up

[Jouni Hogander]

Currently mcspi wake-ups are not enabled. This might cause case where
OMAP is not waking up on mcspi events.

Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com>
---
 drivers/spi/omap2_mcspi.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
index 454a271..4bd330c 100644
--- a/drivers/spi/omap2_mcspi.c
+++ b/drivers/spi/omap2_mcspi.c
@@ -59,6 +59,8 @@
 
 /* per-register bitmasks: */
 
+#define OMAP2_MCSPI_SYSCONFIG_SMARTIDLE	(0x2 << 3)
+#define OMAP2_MCSPI_SYSCONFIG_ENAWAKEUP	(0x1 << 2)
 #define OMAP2_MCSPI_SYSCONFIG_AUTOIDLE	(1 << 0)
 #define OMAP2_MCSPI_SYSCONFIG_SOFTRESET	(1 << 1)
 
@@ -90,6 +92,7 @@
 
 #define OMAP2_MCSPI_CHCTRL_EN		(1 << 0)
 
+#define OMAP2_MCSPI_WAKEUPENABLE_WKEN	(1 << 0)
 
 /* We have 2 DMA channels per CS, one for RX and one for TX */
 struct omap2_mcspi_dma {
@@ -884,8 +887,12 @@ static int __init omap2_mcspi_reset(struct omap2_mcspi *mcspi)
 	} while (!(tmp & OMAP2_MCSPI_SYSSTATUS_RESETDONE));
 
 	mcspi_write_reg(master, OMAP2_MCSPI_SYSCONFIG,
-			/* (3 << 8) | (2 << 3) | */
-			OMAP2_MCSPI_SYSCONFIG_AUTOIDLE);
+			OMAP2_MCSPI_SYSCONFIG_AUTOIDLE |
+			OMAP2_MCSPI_SYSCONFIG_ENAWAKEUP |
+			OMAP2_MCSPI_SYSCONFIG_SMARTIDLE);
+
+	mcspi_write_reg(master, OMAP2_MCSPI_WAKEUPENABLE,
+			OMAP2_MCSPI_WAKEUPENABLE_WKEN);
 
 	omap2_mcspi_set_master_mode(master);
 
-- 
1.6.0.1

Re: [PATCH] OMAP: MCSPI: Enable mcspi wake-up

[Felipe Balbi]

On Tue, Nov 18, 2008 at 03:00:37PM +0200, Jouni Högander wrote:
> Currently mcspi wake-ups are not enabled. This might cause case where
> OMAP is not waking up on mcspi events.
> 
> Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com>
> ---
>  drivers/spi/omap2_mcspi.c |   11 +++++++++--
>  1 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
> index 454a271..4bd330c 100644
> --- a/drivers/spi/omap2_mcspi.c
> +++ b/drivers/spi/omap2_mcspi.c
> @@ -59,6 +59,8 @@
>  
>  /* per-register bitmasks: */
>  
> +#define OMAP2_MCSPI_SYSCONFIG_SMARTIDLE	(0x2 << 3)
> +#define OMAP2_MCSPI_SYSCONFIG_ENAWAKEUP	(0x1 << 2)

could you follow the convention below and use (1 << offset) ??

>  #define OMAP2_MCSPI_SYSCONFIG_AUTOIDLE	(1 << 0)
>  #define OMAP2_MCSPI_SYSCONFIG_SOFTRESET	(1 << 1)
>  
> @@ -90,6 +92,7 @@
>  
>  #define OMAP2_MCSPI_CHCTRL_EN		(1 << 0)
>  
> +#define OMAP2_MCSPI_WAKEUPENABLE_WKEN	(1 << 0)
>  
>  /* We have 2 DMA channels per CS, one for RX and one for TX */
>  struct omap2_mcspi_dma {
> @@ -884,8 +887,12 @@ static int __init omap2_mcspi_reset(struct omap2_mcspi *mcspi)
>  	} while (!(tmp & OMAP2_MCSPI_SYSSTATUS_RESETDONE));
>  
>  	mcspi_write_reg(master, OMAP2_MCSPI_SYSCONFIG,
> -			/* (3 << 8) | (2 << 3) | */
> -			OMAP2_MCSPI_SYSCONFIG_AUTOIDLE);
> +			OMAP2_MCSPI_SYSCONFIG_AUTOIDLE |
> +			OMAP2_MCSPI_SYSCONFIG_ENAWAKEUP |
> +			OMAP2_MCSPI_SYSCONFIG_SMARTIDLE);
> +
> +	mcspi_write_reg(master, OMAP2_MCSPI_WAKEUPENABLE,
> +			OMAP2_MCSPI_WAKEUPENABLE_WKEN);
>  
>  	omap2_mcspi_set_master_mode(master);
>  
> -- 
> 1.6.0.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] OMAP: MCSPI: Enable mcspi wake-up

[David Brownell]

On Tuesday 18 November 2008, Felipe Balbi wrote:
> > +#define OMAP2_MCSPI_SYSCONFIG_SMARTIDLE      (0x2 << 3)
> > +#define OMAP2_MCSPI_SYSCONFIG_ENAWAKEUP      (0x1 << 2)
> 
> could you follow the convention below and use (1 << offset) ??

Or even BIT(offset).

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] OMAP: MCSPI: Enable mcspi wake-up

[Felipe Balbi]

On Tue, Nov 18, 2008 at 09:15:34AM -0800, David Brownell wrote:
> On Tuesday 18 November 2008, Felipe Balbi wrote:
> > > +#define OMAP2_MCSPI_SYSCONFIG_SMARTIDLE      (0x2 << 3)
> > > +#define OMAP2_MCSPI_SYSCONFIG_ENAWAKEUP      (0x1 << 2)
> > 
> > could you follow the convention below and use (1 << offset) ??
> 
> Or even BIT(offset).

much better :-)

-- 
balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] OMAP: MCSPI: Enable mcspi wake-up

[Högander Jouni]

Felipe Balbi <felipe.balbi@nokia.com> writes:

> On Tue, Nov 18, 2008 at 03:00:37PM +0200, Jouni Högander wrote:
>> Currently mcspi wake-ups are not enabled. This might cause case where
>> OMAP is not waking up on mcspi events.
>> 
>> Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com>
>> ---
>>  drivers/spi/omap2_mcspi.c |   11 +++++++++--
>>  1 files changed, 9 insertions(+), 2 deletions(-)
>> 
>> diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
>> index 454a271..4bd330c 100644
>> --- a/drivers/spi/omap2_mcspi.c
>> +++ b/drivers/spi/omap2_mcspi.c
>> @@ -59,6 +59,8 @@
>>  
>>  /* per-register bitmasks: */
>>  
>> +#define OMAP2_MCSPI_SYSCONFIG_SMARTIDLE	(0x2 << 3)
>> +#define OMAP2_MCSPI_SYSCONFIG_ENAWAKEUP	(0x1 << 2)
>
> could you follow the convention below and use (1 << offset) ??

There aren't any convention in this driver, but I can change my patch.

-- 
Jouni Högander

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] OMAP: MCSPI: Enable mcspi wake-up v2.

[Jouni Hogander]

Currently mcspi wake-ups are not enabled. This might cause case where
OMAP is not waking up on mcspi events.

Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com>
---
 drivers/spi/omap2_mcspi.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
index 454a271..d7e519c 100644
--- a/drivers/spi/omap2_mcspi.c
+++ b/drivers/spi/omap2_mcspi.c
@@ -59,6 +59,8 @@
 
 /* per-register bitmasks: */
 
+#define OMAP2_MCSPI_SYSCONFIG_SMARTIDLE	(2 << 3)
+#define OMAP2_MCSPI_SYSCONFIG_ENAWAKEUP	(1 << 2)
 #define OMAP2_MCSPI_SYSCONFIG_AUTOIDLE	(1 << 0)
 #define OMAP2_MCSPI_SYSCONFIG_SOFTRESET	(1 << 1)
 
@@ -90,6 +92,7 @@
 
 #define OMAP2_MCSPI_CHCTRL_EN		(1 << 0)
 
+#define OMAP2_MCSPI_WAKEUPENABLE_WKEN	(1 << 0)
 
 /* We have 2 DMA channels per CS, one for RX and one for TX */
 struct omap2_mcspi_dma {
@@ -884,8 +887,12 @@ static int __init omap2_mcspi_reset(struct omap2_mcspi *mcspi)
 	} while (!(tmp & OMAP2_MCSPI_SYSSTATUS_RESETDONE));
 
 	mcspi_write_reg(master, OMAP2_MCSPI_SYSCONFIG,
-			/* (3 << 8) | (2 << 3) | */
-			OMAP2_MCSPI_SYSCONFIG_AUTOIDLE);
+			OMAP2_MCSPI_SYSCONFIG_AUTOIDLE |
+			OMAP2_MCSPI_SYSCONFIG_ENAWAKEUP |
+			OMAP2_MCSPI_SYSCONFIG_SMARTIDLE);
+
+	mcspi_write_reg(master, OMAP2_MCSPI_WAKEUPENABLE,
+			OMAP2_MCSPI_WAKEUPENABLE_WKEN);
 
 	omap2_mcspi_set_master_mode(master);
 
-- 
1.6.0.1

Re: [PATCH] OMAP: MCSPI: Enable mcspi wake-up

[Högander Jouni]

"ext David Brownell" <david-b@pacbell.net> writes:

> On Tuesday 18 November 2008, Felipe Balbi wrote:
>> > +#define OMAP2_MCSPI_SYSCONFIG_SMARTIDLE      (0x2 << 3)
>> > +#define OMAP2_MCSPI_SYSCONFIG_ENAWAKEUP      (0x1 << 2)
>> 
>> could you follow the convention below and use (1 << offset) ??
>
> Or even BIT(offset).

I'm usually not too willing to do changes more than what is needed to
do the job. Just to reduce amount of patch versions from me:)
Average for me is something like 0.2 version/changed line:) Patch below
would mean something like 6 versions:

From 721bf914c53feb4fbcc9cd1d5dcc8597067519c9 Mon Sep 17 00:00:00 2001
From: Jouni Hogander <jouni.hogander@nokia.com>
Date: Wed, 19 Nov 2008 09:41:11 +0200
Subject: [PATCH] OMAP: MCSPI: Convert bit shifted values into BIT format


Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com>
---
 drivers/spi/omap2_mcspi.c |   50 ++++++++++++++++++++++----------------------
 1 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
index d7e519c..aa93e46 100644
--- a/drivers/spi/omap2_mcspi.c
+++ b/drivers/spi/omap2_mcspi.c
@@ -59,40 +59,40 @@
 
 /* per-register bitmasks: */
 
-#define OMAP2_MCSPI_SYSCONFIG_SMARTIDLE	(2 << 3)
-#define OMAP2_MCSPI_SYSCONFIG_ENAWAKEUP	(1 << 2)
-#define OMAP2_MCSPI_SYSCONFIG_AUTOIDLE	(1 << 0)
-#define OMAP2_MCSPI_SYSCONFIG_SOFTRESET	(1 << 1)
+#define OMAP2_MCSPI_SYSCONFIG_SMARTIDLE	BIT(4)
+#define OMAP2_MCSPI_SYSCONFIG_ENAWAKEUP	BIT(2)
+#define OMAP2_MCSPI_SYSCONFIG_AUTOIDLE	BIT(0)
+#define OMAP2_MCSPI_SYSCONFIG_SOFTRESET	BIT(1)
 
-#define OMAP2_MCSPI_SYSSTATUS_RESETDONE	(1 << 0)
+#define OMAP2_MCSPI_SYSSTATUS_RESETDONE	BIT(0)
 
-#define OMAP2_MCSPI_MODULCTRL_SINGLE	(1 << 0)
-#define OMAP2_MCSPI_MODULCTRL_MS	(1 << 2)
-#define OMAP2_MCSPI_MODULCTRL_STEST	(1 << 3)
+#define OMAP2_MCSPI_MODULCTRL_SINGLE	BIT(0)
+#define OMAP2_MCSPI_MODULCTRL_MS	BIT(2)
+#define OMAP2_MCSPI_MODULCTRL_STEST	BIT(3)
 
-#define OMAP2_MCSPI_CHCONF_PHA		(1 << 0)
-#define OMAP2_MCSPI_CHCONF_POL		(1 << 1)
+#define OMAP2_MCSPI_CHCONF_PHA		BIT(0)
+#define OMAP2_MCSPI_CHCONF_POL		BIT(1)
 #define OMAP2_MCSPI_CHCONF_CLKD_MASK	(0x0f << 2)
-#define OMAP2_MCSPI_CHCONF_EPOL		(1 << 6)
+#define OMAP2_MCSPI_CHCONF_EPOL		BIT(6)
 #define OMAP2_MCSPI_CHCONF_WL_MASK	(0x1f << 7)
-#define OMAP2_MCSPI_CHCONF_TRM_RX_ONLY	(0x01 << 12)
-#define OMAP2_MCSPI_CHCONF_TRM_TX_ONLY	(0x02 << 12)
+#define OMAP2_MCSPI_CHCONF_TRM_RX_ONLY	BIT(12)
+#define OMAP2_MCSPI_CHCONF_TRM_TX_ONLY	BIT(13)
 #define OMAP2_MCSPI_CHCONF_TRM_MASK	(0x03 << 12)
-#define OMAP2_MCSPI_CHCONF_DMAW		(1 << 14)
-#define OMAP2_MCSPI_CHCONF_DMAR		(1 << 15)
-#define OMAP2_MCSPI_CHCONF_DPE0		(1 << 16)
-#define OMAP2_MCSPI_CHCONF_DPE1		(1 << 17)
-#define OMAP2_MCSPI_CHCONF_IS		(1 << 18)
-#define OMAP2_MCSPI_CHCONF_TURBO	(1 << 19)
-#define OMAP2_MCSPI_CHCONF_FORCE	(1 << 20)
+#define OMAP2_MCSPI_CHCONF_DMAW		BIT(14)
+#define OMAP2_MCSPI_CHCONF_DMAR		BIT(15)
+#define OMAP2_MCSPI_CHCONF_DPE0		BIT(16)
+#define OMAP2_MCSPI_CHCONF_DPE1		BIT(17)
+#define OMAP2_MCSPI_CHCONF_IS		BIT(18)
+#define OMAP2_MCSPI_CHCONF_TURBO	BIT(19)
+#define OMAP2_MCSPI_CHCONF_FORCE	BIT(20)
 
-#define OMAP2_MCSPI_CHSTAT_RXS		(1 << 0)
-#define OMAP2_MCSPI_CHSTAT_TXS		(1 << 1)
-#define OMAP2_MCSPI_CHSTAT_EOT		(1 << 2)
+#define OMAP2_MCSPI_CHSTAT_RXS		BIT(0)
+#define OMAP2_MCSPI_CHSTAT_TXS		BIT(1)
+#define OMAP2_MCSPI_CHSTAT_EOT		BIT(2)
 
-#define OMAP2_MCSPI_CHCTRL_EN		(1 << 0)
+#define OMAP2_MCSPI_CHCTRL_EN		BIT(0)
 
-#define OMAP2_MCSPI_WAKEUPENABLE_WKEN	(1 << 0)
+#define OMAP2_MCSPI_WAKEUPENABLE_WKEN	BIT(0)
 
 /* We have 2 DMA channels per CS, one for RX and one for TX */
 struct omap2_mcspi_dma {
-- 
1.6.0.1

 

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] OMAP: MCSPI: Enable mcspi wake-up v2.

[Tony Lindgren]

* Jouni Hogander <jouni.hogander@nokia.com> [081118 23:48]:
> Currently mcspi wake-ups are not enabled. This might cause case where
> OMAP is not waking up on mcspi events.

Dave, I assume you're picking these for your SPI queue? Will only
apply to l-o if you ack and tell me so.

Tony


> Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com>
> ---
>  drivers/spi/omap2_mcspi.c |   11 +++++++++--
>  1 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
> index 454a271..d7e519c 100644
> --- a/drivers/spi/omap2_mcspi.c
> +++ b/drivers/spi/omap2_mcspi.c
> @@ -59,6 +59,8 @@
>  
>  /* per-register bitmasks: */
>  
> +#define OMAP2_MCSPI_SYSCONFIG_SMARTIDLE	(2 << 3)
> +#define OMAP2_MCSPI_SYSCONFIG_ENAWAKEUP	(1 << 2)
>  #define OMAP2_MCSPI_SYSCONFIG_AUTOIDLE	(1 << 0)
>  #define OMAP2_MCSPI_SYSCONFIG_SOFTRESET	(1 << 1)
>  
> @@ -90,6 +92,7 @@
>  
>  #define OMAP2_MCSPI_CHCTRL_EN		(1 << 0)
>  
> +#define OMAP2_MCSPI_WAKEUPENABLE_WKEN	(1 << 0)
>  
>  /* We have 2 DMA channels per CS, one for RX and one for TX */
>  struct omap2_mcspi_dma {
> @@ -884,8 +887,12 @@ static int __init omap2_mcspi_reset(struct omap2_mcspi *mcspi)
>  	} while (!(tmp & OMAP2_MCSPI_SYSSTATUS_RESETDONE));
>  
>  	mcspi_write_reg(master, OMAP2_MCSPI_SYSCONFIG,
> -			/* (3 << 8) | (2 << 3) | */
> -			OMAP2_MCSPI_SYSCONFIG_AUTOIDLE);
> +			OMAP2_MCSPI_SYSCONFIG_AUTOIDLE |
> +			OMAP2_MCSPI_SYSCONFIG_ENAWAKEUP |
> +			OMAP2_MCSPI_SYSCONFIG_SMARTIDLE);
> +
> +	mcspi_write_reg(master, OMAP2_MCSPI_WAKEUPENABLE,
> +			OMAP2_MCSPI_WAKEUPENABLE_WKEN);
>  
>  	omap2_mcspi_set_master_mode(master);
>  
> -- 
> 1.6.0.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] OMAP: MCSPI: Enable mcspi wake-up v2.

[David Brownell]

On Wednesday 26 November 2008, Tony Lindgren wrote:
> * Jouni Hogander <jouni.hogander@nokia.com> [081118 23:48]:
> > Currently mcspi wake-ups are not enabled. This might cause case where
> > OMAP is not waking up on mcspi events.
> 
> Dave, I assume you're picking these for your SPI queue? Will only
> apply to l-o if you ack and tell me so.

OK... I'm not totally caught up there.  Is this needed for
a 2.6.28-final merge?  I'm guessing not; so it'd be OK to
queue for 2.6.29-final and have it in l-o until 29-rc1 gets
pulled down.

- Dave

Re: [PATCH] OMAP: MCSPI: Enable mcspi wake-up v2.

[Tony Lindgren]

* David Brownell <david-b@pacbell.net> [081126 10:41]:
> On Wednesday 26 November 2008, Tony Lindgren wrote:
> > * Jouni Hogander <jouni.hogander@nokia.com> [081118 23:48]:
> > > Currently mcspi wake-ups are not enabled. This might cause case where
> > > OMAP is not waking up on mcspi events.
> > 
> > Dave, I assume you're picking these for your SPI queue? Will only
> > apply to l-o if you ack and tell me so.
> 
> OK... I'm not totally caught up there.  Is this needed for
> a 2.6.28-final merge?  I'm guessing not; so it'd be OK to
> queue for 2.6.29-final and have it in l-o until 29-rc1 gets
> pulled down.

Yes 2.6.29 timeline sounds fine to me at least. I'll apply these to
l-o then.

Tony