From: Arnd Bergmann <arnd@arndb.de>
To: Kukjin Kim <kgene.kim@samsung.com>
Cc: 'Olof Johansson' <olof@lixom.net>,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, ben-linux@fluff.org,
Marc Zyngier <marc.zyngier@arm.com>,
Thomas Abraham <thomas.abraham@linaro.org>
Subject: Re: [GIT PULL] Samsung devel-dt for v3.3
Date: Tue, 27 Dec 2011 23:33:17 +0000 [thread overview]
Message-ID: <201112272333.18024.arnd@arndb.de> (raw)
In-Reply-To: <087d01ccc1d5$c6aa8300$53ff8900$%kim@samsung.com>
On Saturday 24 December 2011, Kukjin Kim wrote:
> Hi Arnd and Olof,
>
> Please pull the samsung-devel-dt for v3.3.
> It includes support DT for Samsung EXYNOS4.
Pulled into next/dt, thanks a lot!
Unfortunately, this got two conflicts against "ARM: exynos4: convert to
CONFIG_MULTI_IRQ_HANDLER" from Marc Zyngier, and I suspect my temporary
resolution is incorrect:
--- a/arch/arm/mach-exynos/cpu.c
+++ b/arch/arm/mach-exynos/cpu.c
@@@ -206,6 -209,24 +208,13 @@@ void __init exynos4_init_clocks(int xta
exynos4_setup_clocks();
}
-static void exynos4_gic_irq_fix_base(struct irq_data *d)
-{
- struct gic_chip_data *gic_data = irq_data_get_irq_chip_data(d);
-
- gic_data->cpu_base = S5P_VA_GIC_CPU +
- (gic_bank_offset * smp_processor_id());
-
- gic_data->dist_base = S5P_VA_GIC_DIST +
- (gic_bank_offset * smp_processor_id());
-}
-
+ #ifdef CONFIG_OF
+ static const struct of_device_id exynos4_dt_irq_match[] = {
+ { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, },
+ {},
+ };
+ #endif
+
void __init exynos4_init_irq(void)
{
int irq;
@@@ -213,8 -233,17 +222,13 @@@
gic_bank_offset = soc_is_exynos4412() ? 0x4000 : 0x8000;
- gic_init_bases(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU, gic_bank_offset);
+ if (!of_have_populated_dt())
- gic_init(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU);
++ gic_init_bases(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU, gic_bank_offset);
+ #ifdef CONFIG_OF
+ else
+ of_irq_init(exynos4_dt_irq_match);
+ #endif
- gic_arch_extn.irq_eoi = exynos4_gic_irq_fix_base;
- gic_arch_extn.irq_unmask = exynos4_gic_irq_fix_base;
- gic_arch_extn.irq_mask = exynos4_gic_irq_fix_base;
-
for (irq = 0; irq < MAX_COMBINER_NR; irq++) {
combiner_init(irq, (void __iomem *)S5P_VA_COMBINER(irq),
The other conflict was a one-line change from 1fb3726cf3 "ARM: SAMSUNG: Move timer irq
numbers to end of linux irq space" (from Thomas Abraham) in code that was removed
by Marc's patch, so I kept removing that.
Maybe you can do a merge of your branch with Russell's devel-stable branch and tell me
which conflict resolution you would like.
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] Samsung devel-dt for v3.3
Date: Tue, 27 Dec 2011 23:33:17 +0000 [thread overview]
Message-ID: <201112272333.18024.arnd@arndb.de> (raw)
In-Reply-To: <087d01ccc1d5$c6aa8300$53ff8900$%kim@samsung.com>
On Saturday 24 December 2011, Kukjin Kim wrote:
> Hi Arnd and Olof,
>
> Please pull the samsung-devel-dt for v3.3.
> It includes support DT for Samsung EXYNOS4.
Pulled into next/dt, thanks a lot!
Unfortunately, this got two conflicts against "ARM: exynos4: convert to
CONFIG_MULTI_IRQ_HANDLER" from Marc Zyngier, and I suspect my temporary
resolution is incorrect:
--- a/arch/arm/mach-exynos/cpu.c
+++ b/arch/arm/mach-exynos/cpu.c
@@@ -206,6 -209,24 +208,13 @@@ void __init exynos4_init_clocks(int xta
exynos4_setup_clocks();
}
-static void exynos4_gic_irq_fix_base(struct irq_data *d)
-{
- struct gic_chip_data *gic_data = irq_data_get_irq_chip_data(d);
-
- gic_data->cpu_base = S5P_VA_GIC_CPU +
- (gic_bank_offset * smp_processor_id());
-
- gic_data->dist_base = S5P_VA_GIC_DIST +
- (gic_bank_offset * smp_processor_id());
-}
-
+ #ifdef CONFIG_OF
+ static const struct of_device_id exynos4_dt_irq_match[] = {
+ { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, },
+ {},
+ };
+ #endif
+
void __init exynos4_init_irq(void)
{
int irq;
@@@ -213,8 -233,17 +222,13 @@@
gic_bank_offset = soc_is_exynos4412() ? 0x4000 : 0x8000;
- gic_init_bases(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU, gic_bank_offset);
+ if (!of_have_populated_dt())
- gic_init(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU);
++ gic_init_bases(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU, gic_bank_offset);
+ #ifdef CONFIG_OF
+ else
+ of_irq_init(exynos4_dt_irq_match);
+ #endif
- gic_arch_extn.irq_eoi = exynos4_gic_irq_fix_base;
- gic_arch_extn.irq_unmask = exynos4_gic_irq_fix_base;
- gic_arch_extn.irq_mask = exynos4_gic_irq_fix_base;
-
for (irq = 0; irq < MAX_COMBINER_NR; irq++) {
combiner_init(irq, (void __iomem *)S5P_VA_COMBINER(irq),
The other conflict was a one-line change from 1fb3726cf3 "ARM: SAMSUNG: Move timer irq
numbers to end of linux irq space" (from Thomas Abraham) in code that was removed
by Marc's patch, so I kept removing that.
Maybe you can do a merge of your branch with Russell's devel-stable branch and tell me
which conflict resolution you would like.
Arnd
next prev parent reply other threads:[~2011-12-27 23:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-24 0:48 [GIT PULL] Samsung devel-dt for v3.3 Kukjin Kim
2011-12-24 0:48 ` Kukjin Kim
2011-12-27 23:33 ` Arnd Bergmann [this message]
2011-12-27 23:33 ` Arnd Bergmann
2011-12-28 7:59 ` Kukjin Kim
2011-12-28 7:59 ` Kukjin Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201112272333.18024.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=ben-linux@fluff.org \
--cc=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=olof@lixom.net \
--cc=thomas.abraham@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.