Skip to contentSkip to conversation

ARM: shmobile: r8a7779: Configure IRLM mode via DT

PATCH Superseded Magnus Damm 2 participants 2 messages Feb 18, 2015

Subsystems (5)
Device tree bindings Arm (32-bit) Arm sub-architectures SuperH +1 more subsystems

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Magnus Damm

author maintainer
#0 lore raw

PATCH 1/5 ARM: shmobile: r8a7779: Configure IRLM mode via DT

From: Magnus Damm <[email protected]>

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 <[email protected]>

---

Initially written on top of renesas-devel-20141202-v3.18-rc7 and [PATCH] ARM: shmobile: r8a7779 CCF DTS update
however applies cleanly to renesas-devel-20150215-v3.19

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(-)
arch/arm/boot/dts/r8a7779.dtsi +3 -2
@@ -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
arch/arm/mach-shmobile/board-marzen-reference.c +0 -7
@@ -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
Acked-by on v1 1/5
#1 lore raw
Quoted 6 lines · Magnus Damm

From: Magnus Damm <[email protected]>

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 <[email protected]>
Acked-by Geert Uytterhoeven <[email protected]>

with one minor nit:

arch/arm/boot/dts/r8a7779.dtsi 2014-12-03 20:27:49.000000000 +0900 line 142

Quoted 8 lines
arch/arm/boot/dts/r8a7779.dtsi 2014-12-03 20:27:49.000000000 +0900 renamed from arch/arm/boot/dts/r8a7779.dtsi +1 -1
@@ -139,7 +139,7 @@
                interrupt-controller;
        };
 
-       irqpin0: irqpin@fe780010 {
+       irqpin0: irqpin@fe780000 {

ePAPR says: "The unit-address must match the first address specified in the reg property of the node."

Hence it should be "irqpin0: irqpin@fe78001c {".

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds