[GIT PULL] Samsung fixes-2 for v3.9

[GIT PULL] Samsung fixes-2 for v3.9

[Kukjin Kim]

The following changes since commit 31880c37c11e28cb81c70757e38392b42e695dc6:

   Linux 3.9-rc6 (2013-04-07 20:49:54 -0700)

are available in the git repository at:

   git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git 
tags/samsung-fixes-for-v3.9

for you to fetch changes up to 646dd2f0a980949b05042792fbadd72b735c3eda:

   ARM: S3C24XX: Fix interrupt pending register offset of the EINT 
controller (2013-04-10 00:09:30 +0900)

----------------------------------------------------------------
samsung fixes can support s3c24xx for v3.9

----------------------------------------------------------------
Sylwester Nawrocki (2):
       ARM: S3C24XX: Correct NR_IRQS definition for s3c2440
       ARM: S3C24XX: Fix interrupt pending register offset of the EINT 
controller

  arch/arm/mach-s3c24xx/include/mach/irqs.h | 4 +---
  arch/arm/mach-s3c24xx/irq.c               | 2 +-
  2 files changed, 2 insertions(+), 4 deletions(-)

[GIT PULL] Samsung fixes-2 for v3.9

[Arnd Bergmann]

On Tuesday 09 April 2013, Kukjin Kim wrote:
> The following changes since commit 31880c37c11e28cb81c70757e38392b42e695dc6:
> 
>    Linux 3.9-rc6 (2013-04-07 20:49:54 -0700)
> 
> are available in the git repository at:
> 
>    git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git 
> tags/samsung-fixes-for-v3.9
> 
> for you to fetch changes up to 646dd2f0a980949b05042792fbadd72b735c3eda:
> 
>    ARM: S3C24XX: Fix interrupt pending register offset of the EINT 
> controller (2013-04-10 00:09:30 +0900)
> 
> ----------------------------------------------------------------
> samsung fixes can support s3c24xx for v3.9

Pulled into fixes branch, thanks!

	Arnd

[GIT PULL] Samsung fixes-2 for v3.9

[Arnd Bergmann]

On Tuesday 09 April 2013, Kukjin Kim wrote:
> The following changes since commit 31880c37c11e28cb81c70757e38392b42e695dc6:

> ----------------------------------------------------------------
> Sylwester Nawrocki (2):
>        ARM: S3C24XX: Correct NR_IRQS definition for s3c2440
>        ARM: S3C24XX: Fix interrupt pending register offset of the EINT 
> controller


I got a conflict merging this into the for-next branch, which has earlier
patches. Please confirm that the resolution below is correct.

	Arnd

diff --cc arch/arm/mach-s3c24xx/irq.c
index 8296d94,d8ba9be..7f56a93
--- a/arch/arm/mach-s3c24xx/irq.c
+++ b/arch/arm/mach-s3c24xx/irq.c
@@@ -498,9 -500,10 +498,9 @@@ struct s3c_irq_intc *s3c24xx_init_intc(
                base = (void *)0xfd000000;
  
                intc->reg_mask = base + 0xa4;
-               intc->reg_pending = base + 0x08;
+               intc->reg_pending = base + 0xa8;
 -              irq_num = 20;
 +              irq_num = 24;
                irq_start = S3C2410_IRQ(32);
 -              irq_offset = 4;
                break;
        default:
                pr_err("irq: unsupported controller address\n");

[GIT PULL] Samsung fixes-2 for v3.9

[Kukjin Kim]

On 04/10/13 00:34, Arnd Bergmann wrote:
> On Tuesday 09 April 2013, Kukjin Kim wrote:
>> The following changes since commit 31880c37c11e28cb81c70757e38392b42e695dc6:
>
>> ----------------------------------------------------------------
>> Sylwester Nawrocki (2):
>>         ARM: S3C24XX: Correct NR_IRQS definition for s3c2440
>>         ARM: S3C24XX: Fix interrupt pending register offset of the EINT
>> controller
>
>
> I got a conflict merging this into the for-next branch, which has earlier
> patches. Please confirm that the resolution below is correct.
>
Yes, your resolution is correct.

Thanks.

- Kukjin

>
> diff --cc arch/arm/mach-s3c24xx/irq.c
> index 8296d94,d8ba9be..7f56a93
> --- a/arch/arm/mach-s3c24xx/irq.c
> +++ b/arch/arm/mach-s3c24xx/irq.c
> @@@ -498,9 -500,10 +498,9 @@@ struct s3c_irq_intc *s3c24xx_init_intc(
>                  base = (void *)0xfd000000;
>
>                  intc->reg_mask = base + 0xa4;
> -               intc->reg_pending = base + 0x08;
> +               intc->reg_pending = base + 0xa8;
>   -              irq_num = 20;
>   +              irq_num = 24;
>                  irq_start = S3C2410_IRQ(32);
>   -              irq_offset = 4;
>                  break;
>          default:
>                  pr_err("irq: unsupported controller address\n");
>
> --