linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: S3C64XX: Fix up IRQ mapping for balblair on Cragganmore
@ 2012-11-02 10:38 Dimitris Papastamos
  2012-11-02 12:15 ` Sergei Shtylyov
  0 siblings, 1 reply; 7+ messages in thread
From: Dimitris Papastamos @ 2012-11-02 10:38 UTC (permalink / raw)
  To: linux-arm-kernel

We are using S3C_EINT(4) instead of S3C_EINT(5).

Change-Id: Ia197069ddc736813f2711c763469eaf655ea58ac
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
---
 arch/arm/mach-s3c64xx/mach-crag6410-module.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
index 4744c42..c6d8dba 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
@@ -60,7 +60,7 @@ static struct spi_board_info balblair_devs[] = {
 		.bus_num	= 0,
 		.chip_select	= 0,
 		.mode		= SPI_MODE_0,
-		.irq		= S3C_EINT(5),
+		.irq		= S3C_EINT(4),
 		.controller_data = &wm0010_spi_csinfo,
 		.platform_data = &wm0010_pdata,
 	},
-- 
1.8.0

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH] ARM: S3C64XX: Fix up IRQ mapping for balblair on Cragganmore
  2012-11-02 10:38 [PATCH] ARM: S3C64XX: Fix up IRQ mapping for balblair on Cragganmore Dimitris Papastamos
@ 2012-11-02 12:15 ` Sergei Shtylyov
  2012-11-02 13:02   ` Dimitris Papastamos
  0 siblings, 1 reply; 7+ messages in thread
From: Sergei Shtylyov @ 2012-11-02 12:15 UTC (permalink / raw)
  To: linux-arm-kernel

Hello.

On 02-11-2012 14:38, Dimitris Papastamos wrote:

> We are using S3C_EINT(4) instead of S3C_EINT(5).

> Change-Id: Ia197069ddc736813f2711c763469eaf655ea58ac

    Remove this line please -- it has no place in the upstream patch.

> Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>

WBR, Sergei

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH] ARM: S3C64XX: Fix up IRQ mapping for balblair on Cragganmore
@ 2012-11-02 13:01 Dimitris Papastamos
  2012-11-03 22:08 ` Sergei Shtylyov
  0 siblings, 1 reply; 7+ messages in thread
From: Dimitris Papastamos @ 2012-11-02 13:01 UTC (permalink / raw)
  To: linux-arm-kernel

We are using S3C_EINT(4) instead of S3C_EINT(5).

Change-Id: I84e77fd75d59c6b8fecbcb11e81dc78dbf07f156
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
---
 arch/arm/mach-s3c64xx/mach-crag6410-module.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
index 4744c42..c6d8dba 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
@@ -60,7 +60,7 @@ static struct spi_board_info balblair_devs[] = {
 		.bus_num	= 0,
 		.chip_select	= 0,
 		.mode		= SPI_MODE_0,
-		.irq		= S3C_EINT(5),
+		.irq		= S3C_EINT(4),
 		.controller_data = &wm0010_spi_csinfo,
 		.platform_data = &wm0010_pdata,
 	},
-- 
1.8.0

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH] ARM: S3C64XX: Fix up IRQ mapping for balblair on Cragganmore
  2012-11-02 12:15 ` Sergei Shtylyov
@ 2012-11-02 13:02   ` Dimitris Papastamos
  0 siblings, 0 replies; 7+ messages in thread
From: Dimitris Papastamos @ 2012-11-02 13:02 UTC (permalink / raw)
  To: linux-arm-kernel

On Fri, Nov 02, 2012 at 04:15:30PM +0400, Sergei Shtylyov wrote:
> Hello.
>
> On 02-11-2012 14:38, Dimitris Papastamos wrote:
>
>> We are using S3C_EINT(4) instead of S3C_EINT(5).
>
>> Change-Id: Ia197069ddc736813f2711c763469eaf655ea58ac
>
>    Remove this line please -- it has no place in the upstream patch.
>
>> Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
>
> WBR, Sergei
>

Oops, thanks for catching that.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH] ARM: S3C64XX: Fix up IRQ mapping for balblair on Cragganmore
  2012-11-02 13:01 Dimitris Papastamos
@ 2012-11-03 22:08 ` Sergei Shtylyov
  0 siblings, 0 replies; 7+ messages in thread
From: Sergei Shtylyov @ 2012-11-03 22:08 UTC (permalink / raw)
  To: linux-arm-kernel

Hello.

On 02-11-2012 17:01, Dimitris Papastamos wrote:

> We are using S3C_EINT(4) instead of S3C_EINT(5).

> Change-Id: I84e77fd75d59c6b8fecbcb11e81dc78dbf07f156

    You still hasven't removed this line. :-)

> Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>

WBR, Sergei

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH] ARM: S3C64XX: Fix up IRQ mapping for balblair on Cragganmore
@ 2013-01-12 18:42 Mark Brown
  2013-01-17  0:06 ` Kukjin Kim
  0 siblings, 1 reply; 7+ messages in thread
From: Mark Brown @ 2013-01-12 18:42 UTC (permalink / raw)
  To: linux-arm-kernel

From: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>

We are using S3C_EINT(4) instead of S3C_EINT(5).

Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable at vger.kernel.org
---
 arch/arm/mach-s3c64xx/mach-crag6410-module.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
index 553059f..755c0bb 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
@@ -47,7 +47,7 @@ static struct spi_board_info wm1253_devs[] = {
 		.bus_num	= 0,
 		.chip_select	= 0,
 		.mode		= SPI_MODE_0,
-		.irq		= S3C_EINT(5),
+		.irq		= S3C_EINT(4),
 		.controller_data = &wm0010_spi_csinfo,
 		.platform_data = &wm0010_pdata,
 	},
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH] ARM: S3C64XX: Fix up IRQ mapping for balblair on Cragganmore
  2013-01-12 18:42 Mark Brown
@ 2013-01-17  0:06 ` Kukjin Kim
  0 siblings, 0 replies; 7+ messages in thread
From: Kukjin Kim @ 2013-01-17  0:06 UTC (permalink / raw)
  To: linux-arm-kernel

Mark Brown wrote:
> 
> From: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
> 
> We are using S3C_EINT(4) instead of S3C_EINT(5).
> 
> Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Cc: stable at vger.kernel.org
> ---
>  arch/arm/mach-s3c64xx/mach-crag6410-module.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c
> b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
> index 553059f..755c0bb 100644
> --- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c
> +++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
> @@ -47,7 +47,7 @@ static struct spi_board_info wm1253_devs[] = {
>  		.bus_num	= 0,
>  		.chip_select	= 0,
>  		.mode		= SPI_MODE_0,
> -		.irq		= S3C_EINT(5),
> +		.irq		= S3C_EINT(4),
>  		.controller_data = &wm0010_spi_csinfo,
>  		.platform_data = &wm0010_pdata,
>  	},
> --
> 1.7.10.4

Applied, thanks.

- Kukjin

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2013-01-17  0:06 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-02 10:38 [PATCH] ARM: S3C64XX: Fix up IRQ mapping for balblair on Cragganmore Dimitris Papastamos
2012-11-02 12:15 ` Sergei Shtylyov
2012-11-02 13:02   ` Dimitris Papastamos
  -- strict thread matches above, loose matches on Subject: below --
2012-11-02 13:01 Dimitris Papastamos
2012-11-03 22:08 ` Sergei Shtylyov
2013-01-12 18:42 Mark Brown
2013-01-17  0:06 ` Kukjin Kim

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).