* [PATCH v2] EXYNOS4_DT fixes for 3.3-rc1+ kernels @ 2012-01-31 16:47 Karol Lewandowski 2012-01-31 16:47 ` [PATCH] ARM: Exynos4: Bring exynos4-dt up to date Karol Lewandowski 0 siblings, 1 reply; 5+ messages in thread From: Karol Lewandowski @ 2012-01-31 16:47 UTC (permalink / raw) To: thomas.abraham Cc: m.szyprowski, linux-samsung-soc, linux-kernel, kgene.kim, kyungmin.park, 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. This commit brings exynos4-dt up to date. Changes since last version (unmarked v1): - Added missing .restart handler spotted by Mr. Kyungmin Park - Reorganized patch a bit as requested by Mr. Kukjin Kim - Squashed all the fixes into one commit [ SMP support has been fixed by Thomas Abraham in separate patch: http://permalink.gmane.org/gmane.linux.kernel.samsung-soc/9184 ] Karol Lewandowski (1): ARM: Exynos4: Bring exynos4-dt up to date arch/arm/mach-exynos/mach-exynos4-dt.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) -- 1.7.8.3 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ARM: Exynos4: Bring exynos4-dt up to date 2012-01-31 16:47 [PATCH v2] EXYNOS4_DT fixes for 3.3-rc1+ kernels Karol Lewandowski @ 2012-01-31 16:47 ` Karol Lewandowski 2012-02-09 9:24 ` Karol Lewandowski 2012-02-09 10:23 ` Kukjin Kim 0 siblings, 2 replies; 5+ messages in thread From: Karol Lewandowski @ 2012-01-31 16:47 UTC (permalink / raw) To: thomas.abraham Cc: m.szyprowski, linux-samsung-soc, linux-kernel, kgene.kim, kyungmin.park, Karol Lewandowski This commit brings exynos4-dt in line with recent changes to mach-exynos tree, specifically: - Fixes build break related to replacing plat/exynos4.h with common.h in commit cc511b8d84d8 ("ARM: 7257/1: EXYNOS: introduce arch/arm/mach-exynos/common.[ch]") - Converts machine to use CONFIG_MULTI_IRQ_HANDLER as done for other machines in commit 4e44d2cb95bd ("ARM: exynos4: convert to CONFIG_MULTI_IRQ_HANDLER") converted all exynos boards but exynos4-dt.c. - Adds restart specifier as done for other machines in commit 9eb4859564d6 ("ARM: 7262/1: restart: EXYNOS: use new restart hook") 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 | 8 ++++++-- 1 files changed, 6 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..e6b02fd 100644 --- a/arch/arm/mach-exynos/mach-exynos4-dt.c +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c @@ -15,11 +15,13 @@ #include <linux/serial_core.h> #include <asm/mach/arch.h> +#include <asm/hardware/gic.h> #include <mach/map.h> #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 +62,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); } @@ -79,7 +81,9 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)") /* Maintainer: Thomas Abraham <thomas.abraham@linaro.org> */ .init_irq = exynos4_init_irq, .map_io = exynos4210_dt_map_io, + .handle_irq = gic_handle_irq, .init_machine = exynos4210_dt_machine_init, .timer = &exynos4_timer, .dt_compat = exynos4210_dt_compat, + .restart = exynos4_restart, MACHINE_END -- 1.7.8.3 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] ARM: Exynos4: Bring exynos4-dt up to date 2012-01-31 16:47 ` [PATCH] ARM: Exynos4: Bring exynos4-dt up to date Karol Lewandowski @ 2012-02-09 9:24 ` Karol Lewandowski 2012-02-09 10:23 ` Kukjin Kim 2012-02-09 10:23 ` Kukjin Kim 1 sibling, 1 reply; 5+ messages in thread From: Karol Lewandowski @ 2012-02-09 9:24 UTC (permalink / raw) To: kgene.kim Cc: thomas.abraham, m.szyprowski, linux-samsung-soc, linux-kernel, kyungmin.park On 31.01.2012 17:47, Karol Lewandowski wrote: > This commit brings exynos4-dt in line with recent changes to > mach-exynos tree, specifically: > > - Fixes build break related to replacing plat/exynos4.h with common.h > in commit cc511b8d84d8 ("ARM: 7257/1: EXYNOS: introduce > arch/arm/mach-exynos/common.[ch]") > - Converts machine to use CONFIG_MULTI_IRQ_HANDLER as done for other > machines in commit 4e44d2cb95bd ("ARM: exynos4: convert to > CONFIG_MULTI_IRQ_HANDLER") converted all exynos boards but > exynos4-dt.c. Minor correction - text from "converted all.." shall be deleted, like: - Converts machine to use CONFIG_MULTI_IRQ_HANDLER as done for other machines in commit 4e44d2cb95bd ("ARM: exynos4: convert to CONFIG_MULTI_IRQ_HANDLER") (It's result of not proofreading it carefully enough after squashing all the patches.) I don't think such a change is worth sending patch again, but I would be grateful if you could fix it while merging. Thanks -- Karol Lewandowski | Samsung Poland R&D Center | Linux/Platform ^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: [PATCH] ARM: Exynos4: Bring exynos4-dt up to date 2012-02-09 9:24 ` Karol Lewandowski @ 2012-02-09 10:23 ` Kukjin Kim 0 siblings, 0 replies; 5+ messages in thread From: Kukjin Kim @ 2012-02-09 10:23 UTC (permalink / raw) To: 'Karol Lewandowski' Cc: thomas.abraham, m.szyprowski, linux-samsung-soc, linux-kernel, kyungmin.park Karol Lewandowski wrote: > > On 31.01.2012 17:47, Karol Lewandowski wrote: > > > This commit brings exynos4-dt in line with recent changes to > > mach-exynos tree, specifically: > > > > - Fixes build break related to replacing plat/exynos4.h with common.h > > in commit cc511b8d84d8 ("ARM: 7257/1: EXYNOS: introduce > > arch/arm/mach-exynos/common.[ch]") > > > > > - Converts machine to use CONFIG_MULTI_IRQ_HANDLER as done for other > > machines in commit 4e44d2cb95bd ("ARM: exynos4: convert to > > CONFIG_MULTI_IRQ_HANDLER") converted all exynos boards but > > exynos4-dt.c. > > > Minor correction - text from "converted all.." shall be deleted, like: > > - Converts machine to use CONFIG_MULTI_IRQ_HANDLER as done for other > machines in commit 4e44d2cb95bd ("ARM: exynos4: convert to > CONFIG_MULTI_IRQ_HANDLER") > > (It's result of not proofreading it carefully enough after squashing all > the patches.) > > I don't think such a change is worth sending patch again, but I would be > grateful if you could fix it while merging. > OK, I did. Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. ^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: [PATCH] ARM: Exynos4: Bring exynos4-dt up to date 2012-01-31 16:47 ` [PATCH] ARM: Exynos4: Bring exynos4-dt up to date Karol Lewandowski 2012-02-09 9:24 ` Karol Lewandowski @ 2012-02-09 10:23 ` Kukjin Kim 1 sibling, 0 replies; 5+ messages in thread From: Kukjin Kim @ 2012-02-09 10:23 UTC (permalink / raw) To: 'Karol Lewandowski', thomas.abraham Cc: m.szyprowski, linux-samsung-soc, linux-kernel, kyungmin.park Karol Lewandowski wrote: > > This commit brings exynos4-dt in line with recent changes to > mach-exynos tree, specifically: > > - Fixes build break related to replacing plat/exynos4.h with common.h > in commit cc511b8d84d8 ("ARM: 7257/1: EXYNOS: introduce > arch/arm/mach-exynos/common.[ch]") > > - Converts machine to use CONFIG_MULTI_IRQ_HANDLER as done for other > machines in commit 4e44d2cb95bd ("ARM: exynos4: convert to > CONFIG_MULTI_IRQ_HANDLER") converted all exynos boards but > exynos4-dt.c. > > - Adds restart specifier as done for other machines in commit > 9eb4859564d6 ("ARM: 7262/1: restart: EXYNOS: use new restart hook") > > 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 | 8 ++++++-- > 1 files changed, 6 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..e6b02fd 100644 > --- a/arch/arm/mach-exynos/mach-exynos4-dt.c > +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c > @@ -15,11 +15,13 @@ > #include <linux/serial_core.h> > > #include <asm/mach/arch.h> > +#include <asm/hardware/gic.h> > #include <mach/map.h> > > #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 +62,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); > } > > @@ -79,7 +81,9 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 > (Flattened Device Tree)") > /* Maintainer: Thomas Abraham <thomas.abraham@linaro.org> */ > .init_irq = exynos4_init_irq, > .map_io = exynos4210_dt_map_io, > + .handle_irq = gic_handle_irq, > .init_machine = exynos4210_dt_machine_init, > .timer = &exynos4_timer, > .dt_compat = exynos4210_dt_compat, > + .restart = exynos4_restart, > MACHINE_END > -- > 1.7.8.3 OK, applied. Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-02-09 10:23 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-01-31 16:47 [PATCH v2] EXYNOS4_DT fixes for 3.3-rc1+ kernels Karol Lewandowski 2012-01-31 16:47 ` [PATCH] ARM: Exynos4: Bring exynos4-dt up to date Karol Lewandowski 2012-02-09 9:24 ` Karol Lewandowski 2012-02-09 10:23 ` Kukjin Kim 2012-02-09 10:23 ` Kukjin Kim
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox