[PATCH 0/2] EXYNOS4_DT fixes for 3.3-rc1+ kernels

[PATCH 0/2] EXYNOS4_DT fixes for 3.3-rc1+ kernels

[Karol Lewandowski]

Device Tree-based Exynos4 machine prepared by Thomas Abraham and
included in 3.3-rc1 hasn't been adjusted to changes that have happened
to mach-exynos during 3.3 merge window.

Following patch series fixes one build and one boot error making it
possible to boot system with SMP disabled.

SMP support is still broken for unknown reason, though.

[ To use it it's also required to cherry-pick "ARM: EXYNOS: fix
  non-SMP builds for EXYNOS4" already found in kgene's
  linux-samsung.git (branch v3.3-samsung-fixes-2) ]


Karol Lewandowski (2):
  ARM: Exynos4: Make exynos4-dt compile again
  ARM: Exynos4: Convert exynos4-dt to CONFIG_MULTI_IRQ_HANDLER

 arch/arm/mach-exynos/mach-exynos4-dt.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
-- 
1.7.8.3

[PATCH 1/2] ARM: Exynos4: Make exynos4-dt compile again

[Karol Lewandowski]

Commit cc511b8d84d8 ("ARM: 7257/1: EXYNOS: introduce
arch/arm/mach-exynos/common.[ch]") replaced plat/exynos4.h with
common.h, requiring all boards to be adjusted appropriately.

This commit fixes exynos4-dt.c, missed out in original patch.

Signed-off-by: Karol Lewandowski <k.lewandowsk@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Thomas Abraham <thomas.abraham@linaro.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
---
 arch/arm/mach-exynos/mach-exynos4-dt.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c
index 85fa027..98e79c9 100644
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@ -19,7 +19,8 @@
 
 #include <plat/cpu.h>
 #include <plat/regs-serial.h>
-#include <plat/exynos4.h>
+
+#include "common.h"
 
 /*
  * The following lookup table is used to override device names when devices
@@ -60,7 +61,7 @@ static const struct of_dev_auxdata exynos4210_auxdata_lookup[] __initconst = {
 
 static void __init exynos4210_dt_map_io(void)
 {
-	s5p_init_io(NULL, 0, S5P_VA_CHIPID);
+	exynos_init_io(NULL, 0);
 	s3c24xx_init_clocks(24000000);
 }
 
-- 
1.7.8.3

[PATCH 2/2] ARM: Exynos4: Convert exynos4-dt to CONFIG_MULTI_IRQ_HANDLER

[Karol Lewandowski]

Commit 4e44d2cb95bd ("ARM: exynos4: convert to CONFIG_MULTI_IRQ_HANDLER")
converted all exynos boards but exynos4-dt.c.

This commit fixes that omission.

Signed-off-by: Karol Lewandowski <k.lewandowsk@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Thomas Abraham <thomas.abraham@linaro.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
---
 arch/arm/mach-exynos/mach-exynos4-dt.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c
index 98e79c9..8aef6aa 100644
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@ -15,6 +15,7 @@
 #include <linux/serial_core.h>
 
 #include <asm/mach/arch.h>
+#include <asm/hardware/gic.h>
 #include <mach/map.h>
 
 #include <plat/cpu.h>
@@ -83,4 +84,5 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)")
 	.init_machine	= exynos4210_dt_machine_init,
 	.timer		= &exynos4_timer,
 	.dt_compat	= exynos4210_dt_compat,
+	.handle_irq	= gic_handle_irq,
 MACHINE_END
-- 
1.7.8.3

Re: [PATCH 2/2] ARM: Exynos4: Convert exynos4-dt to CONFIG_MULTI_IRQ_HANDLER

[Kyungmin Park]

restart is also required.

On 1/31/12, Karol Lewandowski <k.lewandowsk@samsung.com> wrote:
> Commit 4e44d2cb95bd ("ARM: exynos4: convert to CONFIG_MULTI_IRQ_HANDLER")
> converted all exynos boards but exynos4-dt.c.
>
> This commit fixes that omission.
>
> Signed-off-by: Karol Lewandowski <k.lewandowsk@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Thomas Abraham <thomas.abraham@linaro.org>
> Cc: Kukjin Kim <kgene.kim@samsung.com>
> Cc: Marc Zyngier <marc.zyngier@arm.com>
> ---
>  arch/arm/mach-exynos/mach-exynos4-dt.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c
> b/arch/arm/mach-exynos/mach-exynos4-dt.c
> index 98e79c9..8aef6aa 100644
> --- a/arch/arm/mach-exynos/mach-exynos4-dt.c
> +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
> @@ -15,6 +15,7 @@
>  #include <linux/serial_core.h>
>
>  #include <asm/mach/arch.h>
> +#include <asm/hardware/gic.h>
>  #include <mach/map.h>
>
>  #include <plat/cpu.h>
> @@ -83,4 +84,5 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4
> (Flattened Device Tree)")
>  	.init_machine	= exynos4210_dt_machine_init,
>  	.timer		= &exynos4_timer,
>  	.dt_compat	= exynos4210_dt_compat,
> +	.handle_irq	= gic_handle_irq,
>  MACHINE_END
> --
> 1.7.8.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc"
> in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

Re: [PATCH 2/2] ARM: Exynos4: Convert exynos4-dt to CONFIG_MULTI_IRQ_HANDLER

[Karol Lewandowski]

On 31.01.2012 11:39, Kyungmin Park wrote:

Dear Mr Park

> restart is also required.

Thanks for this catching this omission. I'll add it in next patch.

Regards,

> On 1/31/12, Karol Lewandowski<k.lewandowsk@samsung.com>  wrote:
>> Commit 4e44d2cb95bd ("ARM: exynos4: convert to CONFIG_MULTI_IRQ_HANDLER")
>> converted all exynos boards but exynos4-dt.c.
>>
>> This commit fixes that omission.
>>
>> Signed-off-by: Karol Lewandowski<k.lewandowsk@samsung.com>
>> Signed-off-by: Kyungmin Park<kyungmin.park@samsung.com>
>> Cc: Thomas Abraham<thomas.abraham@linaro.org>
>> Cc: Kukjin Kim<kgene.kim@samsung.com>
>> Cc: Marc Zyngier<marc.zyngier@arm.com>
>> ---
>>   arch/arm/mach-exynos/mach-exynos4-dt.c |    2 ++
>>   1 files changed, 2 insertions(+), 0 deletions(-)
>>
>> diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c
>> b/arch/arm/mach-exynos/mach-exynos4-dt.c
>> index 98e79c9..8aef6aa 100644
>> --- a/arch/arm/mach-exynos/mach-exynos4-dt.c
>> +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
>> @@ -15,6 +15,7 @@
>>   #include<linux/serial_core.h>
>>
>>   #include<asm/mach/arch.h>
>> +#include<asm/hardware/gic.h>
>>   #include<mach/map.h>
>>
>>   #include<plat/cpu.h>
>> @@ -83,4 +84,5 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4
>> (Flattened Device Tree)")
>>   	.init_machine	= exynos4210_dt_machine_init,
>>   	.timer		=&exynos4_timer,
>>   	.dt_compat	= exynos4210_dt_compat,
>> +	.handle_irq	= gic_handle_irq,
>>   MACHINE_END
>> --
>> 1.7.8.3

-- 
Karol Lewandowski | Samsung Poland R&D Center | Linux/Platform

Re: [PATCH 1/2] ARM: Exynos4: Make exynos4-dt compile again

[Kukjin Kim]

On 01/31/12 19:36, Karol Lewandowski wrote:
> Commit cc511b8d84d8 ("ARM: 7257/1: EXYNOS: introduce
> arch/arm/mach-exynos/common.[ch]") replaced plat/exynos4.h with
> common.h, requiring all boards to be adjusted appropriately.
>
> This commit fixes exynos4-dt.c, missed out in original patch.
>
> Signed-off-by: Karol Lewandowski<k.lewandowsk@samsung.com>
> Signed-off-by: Kyungmin Park<kyungmin.park@samsung.com>
> Cc: Thomas Abraham<thomas.abraham@linaro.org>
> Cc: Kukjin Kim<kgene.kim@samsung.com>
> ---
>   arch/arm/mach-exynos/mach-exynos4-dt.c |    5 +++--
>   1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c
> index 85fa027..98e79c9 100644
> --- a/arch/arm/mach-exynos/mach-exynos4-dt.c
> +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
> @@ -19,7 +19,8 @@
>
>   #include<plat/cpu.h>
>   #include<plat/regs-serial.h>
> -#include<plat/exynos4.h>
> +
> +#include "common.h"
>
>   /*
>    * The following lookup table is used to override device names when devices
> @@ -60,7 +61,7 @@ static const struct of_dev_auxdata exynos4210_auxdata_lookup[] __initconst = {
>
>   static void __init exynos4210_dt_map_io(void)
>   {
> -	s5p_init_io(NULL, 0, S5P_VA_CHIPID);
> +	exynos_init_io(NULL, 0);
>   	s3c24xx_init_clocks(24000000);
>   }
>
Looks ok to me, will apply.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

Re: [PATCH 1/2] ARM: Exynos4: Make exynos4-dt compile again

[Thomas Abraham]

On 31 January 2012 16:06, Karol Lewandowski <k.lewandowsk@samsung.com> wrote:
> Commit cc511b8d84d8 ("ARM: 7257/1: EXYNOS: introduce
> arch/arm/mach-exynos/common.[ch]") replaced plat/exynos4.h with
> common.h, requiring all boards to be adjusted appropriately.
>
> This commit fixes exynos4-dt.c, missed out in original patch.
>
> Signed-off-by: Karol Lewandowski <k.lewandowsk@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Thomas Abraham <thomas.abraham@linaro.org>
> Cc: Kukjin Kim <kgene.kim@samsung.com>
> ---
>  arch/arm/mach-exynos/mach-exynos4-dt.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c
> index 85fa027..98e79c9 100644
> --- a/arch/arm/mach-exynos/mach-exynos4-dt.c
> +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
> @@ -19,7 +19,8 @@
>
>  #include <plat/cpu.h>
>  #include <plat/regs-serial.h>
> -#include <plat/exynos4.h>
> +
> +#include "common.h"
>
>  /*
>  * The following lookup table is used to override device names when devices
> @@ -60,7 +61,7 @@ static const struct of_dev_auxdata exynos4210_auxdata_lookup[] __initconst = {
>
>  static void __init exynos4210_dt_map_io(void)
>  {
> -       s5p_init_io(NULL, 0, S5P_VA_CHIPID);
> +       exynos_init_io(NULL, 0);
>        s3c24xx_init_clocks(24000000);
>  }

Tested-by: Thomas Abraham <thomas.abraham@linaro.org>

Thanks,
Thomas.

>
> --
> 1.7.8.3
>

Re: [PATCH 2/2] ARM: Exynos4: Convert exynos4-dt to CONFIG_MULTI_IRQ_HANDLER

[Thomas Abraham]

On 31 January 2012 16:06, Karol Lewandowski <k.lewandowsk@samsung.com> wrote:
> Commit 4e44d2cb95bd ("ARM: exynos4: convert to CONFIG_MULTI_IRQ_HANDLER")
> converted all exynos boards but exynos4-dt.c.
>
> This commit fixes that omission.
>
> Signed-off-by: Karol Lewandowski <k.lewandowsk@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Thomas Abraham <thomas.abraham@linaro.org>
> Cc: Kukjin Kim <kgene.kim@samsung.com>
> Cc: Marc Zyngier <marc.zyngier@arm.com>
> ---
>  arch/arm/mach-exynos/mach-exynos4-dt.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c
> index 98e79c9..8aef6aa 100644
> --- a/arch/arm/mach-exynos/mach-exynos4-dt.c
> +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
> @@ -15,6 +15,7 @@
>  #include <linux/serial_core.h>
>
>  #include <asm/mach/arch.h>
> +#include <asm/hardware/gic.h>
>  #include <mach/map.h>
>
>  #include <plat/cpu.h>
> @@ -83,4 +84,5 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)")
>        .init_machine   = exynos4210_dt_machine_init,
>        .timer          = &exynos4_timer,
>        .dt_compat      = exynos4210_dt_compat,
> +       .handle_irq     = gic_handle_irq,
>  MACHINE_END

Tested along with the restart hook as suggested by Mr. Park.

Tested-by: Thomas Abraham@linaro.org

Thanks,
Thomas.

> --
> 1.7.8.3
>

Re: [PATCH 2/2] ARM: Exynos4: Convert exynos4-dt to CONFIG_MULTI_IRQ_HANDLER

[Kukjin Kim]

On 01/31/12 19:36, Karol Lewandowski wrote:
> Commit 4e44d2cb95bd ("ARM: exynos4: convert to CONFIG_MULTI_IRQ_HANDLER")
> converted all exynos boards but exynos4-dt.c.
>
> This commit fixes that omission.
>
> Signed-off-by: Karol Lewandowski<k.lewandowsk@samsung.com>
> Signed-off-by: Kyungmin Park<kyungmin.park@samsung.com>
> Cc: Thomas Abraham<thomas.abraham@linaro.org>
> Cc: Kukjin Kim<kgene.kim@samsung.com>
> Cc: Marc Zyngier<marc.zyngier@arm.com>
> ---
>   arch/arm/mach-exynos/mach-exynos4-dt.c |    2 ++
>   1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c
> index 98e79c9..8aef6aa 100644
> --- a/arch/arm/mach-exynos/mach-exynos4-dt.c
> +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
> @@ -15,6 +15,7 @@
>   #include<linux/serial_core.h>
>
>   #include<asm/mach/arch.h>
> +#include<asm/hardware/gic.h>
>   #include<mach/map.h>
>
>   #include<plat/cpu.h>
> @@ -83,4 +84,5 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)")
>   	.init_machine	= exynos4210_dt_machine_init,
>   	.timer		=&exynos4_timer,
>   	.dt_compat	= exynos4210_dt_compat,
> +	.handle_irq	= gic_handle_irq,

This should be added after map_io.

>   MACHINE_END

And as Kyungmin said, we need to fix about restart too. I will apply 
this series together after your submitting.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

Re: [PATCH 0/2] EXYNOS4_DT fixes for 3.3-rc1+ kernels

[Thomas Abraham]

Hi Karol,

On 31 January 2012 16:06, Karol Lewandowski <k.lewandowsk@samsung.com> wrote:
> Device Tree-based Exynos4 machine prepared by Thomas Abraham and
> included in 3.3-rc1 hasn't been adjusted to changes that have happened
> to mach-exynos during 3.3 merge window.
>
> Following patch series fixes one build and one boot error making it
> possible to boot system with SMP disabled.
>
> SMP support is still broken for unknown reason, though.
>
> [ To use it it's also required to cherry-pick "ARM: EXYNOS: fix
>  non-SMP builds for EXYNOS4" already found in kgene's
>  linux-samsung.git (branch v3.3-samsung-fixes-2) ]
>
>
> Karol Lewandowski (2):
>  ARM: Exynos4: Make exynos4-dt compile again
>  ARM: Exynos4: Convert exynos4-dt to CONFIG_MULTI_IRQ_HANDLER
>
>  arch/arm/mach-exynos/mach-exynos4-dt.c |    7 +++++--
>  1 files changed, 5 insertions(+), 2 deletions(-)

Thanks for these patches and identifying the issue.

Regards,
Thomas.

> --
> 1.7.8.3
>