From: Magnus Damm <magnus.damm@gmail.com>
To: Magnus Damm <magnus.damm@gmail.com>, linux-sh@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, horms@verge.net.au,
tglx@linutronix.de, jason@lakedaemon.net
Subject: [PATCH 02/02] ARM: shmobile: marzen-reference: Remove IRLM workaround
Date: Wed, 03 Dec 2014 12:18:13 +0000 [thread overview]
Message-ID: <20141203121813.5936.17433.sendpatchset@w520> (raw)
In-Reply-To: <20141203121753.5936.36253.sendpatchset@w520>
From: Magnus Damm <damm+renesas@opensource.se>
Adjust the r8a7779 SoC DTS and the Marzen Reference
C board code to use DTS only for INTC-IRQPIN IRLM setup.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---
Written on top of renesas-devel-20141202-v3.18-rc7 and
[PATCH] ARM: shmobile: r8a7779 CCF DTS update
Has a runtime dependency on:
[PATCH 01/02] irqchip: renesas-intc-irqpin: r8a7779 IRLM setup support
arch/arm/boot/dts/r8a7779.dtsi | 5 +++--
arch/arm/mach-shmobile/board-marzen-reference.c | 7 -------
2 files changed, 3 insertions(+), 9 deletions(-)
--- 0002/arch/arm/boot/dts/r8a7779.dtsi
+++ work/arch/arm/boot/dts/r8a7779.dtsi 2014-12-03 20:27:49.000000000 +0900
@@ -139,7 +139,7 @@
interrupt-controller;
};
- irqpin0: irqpin@fe780010 {
+ irqpin0: irqpin@fe780000 {
compatible = "renesas,intc-irqpin-r8a7779", "renesas,intc-irqpin";
#interrupt-cells = <2>;
status = "disabled";
@@ -148,7 +148,8 @@
<0xfe780010 4>,
<0xfe780024 4>,
<0xfe780044 4>,
- <0xfe780064 4>;
+ <0xfe780064 4>,
+ <0xfe780000 4>;
interrupts = <0 27 IRQ_TYPE_LEVEL_HIGH
0 28 IRQ_TYPE_LEVEL_HIGH
0 29 IRQ_TYPE_LEVEL_HIGH
--- 0001/arch/arm/mach-shmobile/board-marzen-reference.c
+++ work/arch/arm/mach-shmobile/board-marzen-reference.c 2014-12-03 20:28:37.000000000 +0900
@@ -32,12 +32,6 @@ static void __init marzen_init_timer(voi
clocksource_of_init();
}
-static void __init marzen_init(void)
-{
- of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
- r8a7779_init_irq_extpin_dt(1); /* IRQ1 as individual interrupt */
-}
-
static const char *marzen_boards_compat_dt[] __initdata = {
"renesas,marzen",
"renesas,marzen-reference",
@@ -50,7 +44,6 @@ DT_MACHINE_START(MARZEN, "marzen")
.init_early = shmobile_init_delay,
.init_time = marzen_init_timer,
.init_irq = r8a7779_init_irq_dt,
- .init_machine = marzen_init,
.init_late = shmobile_init_late,
.dt_compat = marzen_boards_compat_dt,
MACHINE_END
WARNING: multiple messages have this Message-ID (diff)
From: Magnus Damm <magnus.damm@gmail.com>
To: Magnus Damm <magnus.damm@gmail.com>, linux-sh@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Magnus Damm <magnus.damm@gmail.com>,
horms@verge.net.au, tglx@linutronix.de, jason@lakedaemon.net
Subject: [PATCH 02/02] ARM: shmobile: marzen-reference: Remove IRLM workaround
Date: Wed, 03 Dec 2014 21:18:13 +0900 [thread overview]
Message-ID: <20141203121813.5936.17433.sendpatchset@w520> (raw)
In-Reply-To: <20141203121753.5936.36253.sendpatchset@w520>
From: Magnus Damm <damm+renesas@opensource.se>
Adjust the r8a7779 SoC DTS and the Marzen Reference
C board code to use DTS only for INTC-IRQPIN IRLM setup.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---
Written on top of renesas-devel-20141202-v3.18-rc7 and
[PATCH] ARM: shmobile: r8a7779 CCF DTS update
Has a runtime dependency on:
[PATCH 01/02] irqchip: renesas-intc-irqpin: r8a7779 IRLM setup support
arch/arm/boot/dts/r8a7779.dtsi | 5 +++--
arch/arm/mach-shmobile/board-marzen-reference.c | 7 -------
2 files changed, 3 insertions(+), 9 deletions(-)
--- 0002/arch/arm/boot/dts/r8a7779.dtsi
+++ work/arch/arm/boot/dts/r8a7779.dtsi 2014-12-03 20:27:49.000000000 +0900
@@ -139,7 +139,7 @@
interrupt-controller;
};
- irqpin0: irqpin@fe780010 {
+ irqpin0: irqpin@fe780000 {
compatible = "renesas,intc-irqpin-r8a7779", "renesas,intc-irqpin";
#interrupt-cells = <2>;
status = "disabled";
@@ -148,7 +148,8 @@
<0xfe780010 4>,
<0xfe780024 4>,
<0xfe780044 4>,
- <0xfe780064 4>;
+ <0xfe780064 4>,
+ <0xfe780000 4>;
interrupts = <0 27 IRQ_TYPE_LEVEL_HIGH
0 28 IRQ_TYPE_LEVEL_HIGH
0 29 IRQ_TYPE_LEVEL_HIGH
--- 0001/arch/arm/mach-shmobile/board-marzen-reference.c
+++ work/arch/arm/mach-shmobile/board-marzen-reference.c 2014-12-03 20:28:37.000000000 +0900
@@ -32,12 +32,6 @@ static void __init marzen_init_timer(voi
clocksource_of_init();
}
-static void __init marzen_init(void)
-{
- of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
- r8a7779_init_irq_extpin_dt(1); /* IRQ1 as individual interrupt */
-}
-
static const char *marzen_boards_compat_dt[] __initdata = {
"renesas,marzen",
"renesas,marzen-reference",
@@ -50,7 +44,6 @@ DT_MACHINE_START(MARZEN, "marzen")
.init_early = shmobile_init_delay,
.init_time = marzen_init_timer,
.init_irq = r8a7779_init_irq_dt,
- .init_machine = marzen_init,
.init_late = shmobile_init_late,
.dt_compat = marzen_boards_compat_dt,
MACHINE_END
next prev parent reply other threads:[~2014-12-03 12:18 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-03 12:17 [PATCH 00/02] r8a7779 renesas-intc-irqpin IRLM configuration patches Magnus Damm
2014-12-03 12:17 ` Magnus Damm
2014-12-03 12:18 ` [PATCH 01/02] irqchip: renesas-intc-irqpin: r8a7779 IRLM setup support Magnus Damm
2014-12-03 12:18 ` Magnus Damm
2014-12-04 7:18 ` Simon Horman
2014-12-04 7:18 ` Simon Horman
2014-12-04 7:29 ` Magnus Damm
2014-12-04 7:29 ` Magnus Damm
2014-12-04 7:51 ` Simon Horman
2014-12-04 7:51 ` Simon Horman
2015-01-26 10:43 ` [tip:irq/core] " tip-bot for Magnus Damm
2014-12-03 12:18 ` Magnus Damm [this message]
2014-12-03 12:18 ` [PATCH 02/02] ARM: shmobile: marzen-reference: Remove IRLM workaround Magnus Damm
2014-12-04 7:21 ` Simon Horman
2014-12-04 7:21 ` Simon Horman
2014-12-04 7:33 ` Magnus Damm
2014-12-04 7:33 ` Magnus Damm
2014-12-04 7:52 ` Simon Horman
2014-12-04 7:52 ` Simon Horman
2014-12-04 9:19 ` Geert Uytterhoeven
2014-12-04 9:19 ` Geert Uytterhoeven
2014-12-04 9:24 ` Magnus Damm
2014-12-04 9:24 ` Magnus Damm
2014-12-04 9:31 ` Geert Uytterhoeven
2014-12-04 9:31 ` Geert Uytterhoeven
2014-12-04 10:20 ` Magnus Damm
2014-12-04 10:20 ` Magnus Damm
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=20141203121813.5936.17433.sendpatchset@w520 \
--to=magnus.damm@gmail.com \
--cc=horms@verge.net.au \
--cc=jason@lakedaemon.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=tglx@linutronix.de \
/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.