* [PATCH 1/8] ARM: shmobile: r8a7790: Add CMT devices to DT
2014-07-17 0:40 [GIT PULL] Renesas ARM Based SoC DT Timers Updates for v3.17 Simon Horman
@ 2014-07-17 0:40 ` Simon Horman
2014-07-17 0:40 ` [PATCH 2/8] ARM: shmobile: r8a7791: " Simon Horman
` (7 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2014-07-17 0:40 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Add the CMT0 and CMT1 counters to the r8a7790 device tree and make them
disabled by default.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790.dtsi | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index d9ddecb..7218bff 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -206,6 +206,38 @@
<1 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
};
+ cmt0: timer at ffca0000 {
+ compatible = "renesas,cmt-48-gen2";
+ reg = <0 0xffca0000 0 0x1004>;
+ interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>,
+ <0 143 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp1_clks R8A7790_CLK_CMT0>;
+ clock-names = "fck";
+
+ renesas,channels-mask = <0x60>;
+
+ status = "disabled";
+ };
+
+ cmt1: timer at e6130000 {
+ compatible = "renesas,cmt-48-gen2";
+ reg = <0 0xe6130000 0 0x1004>;
+ interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>,
+ <0 121 IRQ_TYPE_LEVEL_HIGH>,
+ <0 122 IRQ_TYPE_LEVEL_HIGH>,
+ <0 123 IRQ_TYPE_LEVEL_HIGH>,
+ <0 124 IRQ_TYPE_LEVEL_HIGH>,
+ <0 125 IRQ_TYPE_LEVEL_HIGH>,
+ <0 126 IRQ_TYPE_LEVEL_HIGH>,
+ <0 127 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp3_clks R8A7790_CLK_CMT1>;
+ clock-names = "fck";
+
+ renesas,channels-mask = <0xff>;
+
+ status = "disabled";
+ };
+
irqc0: interrupt-controller at e61c0000 {
compatible = "renesas,irqc-r8a7790", "renesas,irqc";
#interrupt-cells = <2>;
--
2.0.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 2/8] ARM: shmobile: r8a7791: Add CMT devices to DT
2014-07-17 0:40 [GIT PULL] Renesas ARM Based SoC DT Timers Updates for v3.17 Simon Horman
2014-07-17 0:40 ` [PATCH 1/8] ARM: shmobile: r8a7790: Add CMT devices to DT Simon Horman
@ 2014-07-17 0:40 ` Simon Horman
2014-07-17 0:40 ` [PATCH 3/8] ARM: shmobile: r8a7779: Add TMU " Simon Horman
` (6 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2014-07-17 0:40 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Add the CMT0 and CMT1 counters to the r8a7791 device tree and make them
disabled by default.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791.dtsi | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 6e9a556..56841d3 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -189,6 +189,38 @@
<1 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
};
+ cmt0: timer at ffca0000 {
+ compatible = "renesas,cmt-48-gen2";
+ reg = <0 0xffca0000 0 0x1004>;
+ interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>,
+ <0 143 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp1_clks R8A7791_CLK_CMT0>;
+ clock-names = "fck";
+
+ renesas,channels-mask = <0x60>;
+
+ status = "disabled";
+ };
+
+ cmt1: timer at e6130000 {
+ compatible = "renesas,cmt-48-gen2";
+ reg = <0 0xe6130000 0 0x1004>;
+ interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>,
+ <0 121 IRQ_TYPE_LEVEL_HIGH>,
+ <0 122 IRQ_TYPE_LEVEL_HIGH>,
+ <0 123 IRQ_TYPE_LEVEL_HIGH>,
+ <0 124 IRQ_TYPE_LEVEL_HIGH>,
+ <0 125 IRQ_TYPE_LEVEL_HIGH>,
+ <0 126 IRQ_TYPE_LEVEL_HIGH>,
+ <0 127 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp3_clks R8A7791_CLK_CMT1>;
+ clock-names = "fck";
+
+ renesas,channels-mask = <0xff>;
+
+ status = "disabled";
+ };
+
irqc0: interrupt-controller at e61c0000 {
compatible = "renesas,irqc-r8a7791", "renesas,irqc";
#interrupt-cells = <2>;
--
2.0.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 3/8] ARM: shmobile: r8a7779: Add TMU devices to DT
2014-07-17 0:40 [GIT PULL] Renesas ARM Based SoC DT Timers Updates for v3.17 Simon Horman
2014-07-17 0:40 ` [PATCH 1/8] ARM: shmobile: r8a7790: Add CMT devices to DT Simon Horman
2014-07-17 0:40 ` [PATCH 2/8] ARM: shmobile: r8a7791: " Simon Horman
@ 2014-07-17 0:40 ` Simon Horman
2014-07-17 0:40 ` [PATCH 4/8] ARM: shmobile: lager-reference: Enable CMT0 in device tree Simon Horman
` (5 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2014-07-17 0:40 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Add the TMU0, TMU1 and TMU2 counters to the r8a7779 device tree and make
them disabled by default.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7779.dtsi | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index 58d0d95..463e3fd 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -266,6 +266,48 @@
reg = <0xffc48000 0x38>;
};
+ tmu0: timer at ffd80000 {
+ compatible = "renesas,tmu";
+ reg = <0xffd80000 0x30>;
+ interrupts = <0 32 IRQ_TYPE_LEVEL_HIGH>,
+ <0 33 IRQ_TYPE_LEVEL_HIGH>,
+ <0 34 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp0_clks R8A7779_CLK_TMU0>;
+ clock-names = "fck";
+
+ #renesas,channels = <3>;
+
+ status = "disabled";
+ };
+
+ tmu1: timer at ffd81000 {
+ compatible = "renesas,tmu";
+ reg = <0xffd81000 0x30>;
+ interrupts = <0 36 IRQ_TYPE_LEVEL_HIGH>,
+ <0 37 IRQ_TYPE_LEVEL_HIGH>,
+ <0 38 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp0_clks R8A7779_CLK_TMU1>;
+ clock-names = "fck";
+
+ #renesas,channels = <3>;
+
+ status = "disabled";
+ };
+
+ tmu2: timer at ffd82000 {
+ compatible = "renesas,tmu";
+ reg = <0xffd82000 0x30>;
+ interrupts = <0 40 IRQ_TYPE_LEVEL_HIGH>,
+ <0 41 IRQ_TYPE_LEVEL_HIGH>,
+ <0 42 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp0_clks R8A7779_CLK_TMU2>;
+ clock-names = "fck";
+
+ #renesas,channels = <3>;
+
+ status = "disabled";
+ };
+
sata: sata at fc600000 {
compatible = "renesas,rcar-sata";
reg = <0xfc600000 0x2000>;
--
2.0.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 4/8] ARM: shmobile: lager-reference: Enable CMT0 in device tree
2014-07-17 0:40 [GIT PULL] Renesas ARM Based SoC DT Timers Updates for v3.17 Simon Horman
` (2 preceding siblings ...)
2014-07-17 0:40 ` [PATCH 3/8] ARM: shmobile: r8a7779: Add TMU " Simon Horman
@ 2014-07-17 0:40 ` Simon Horman
2014-07-17 0:40 ` [PATCH 5/8] ARM: shmobile: koelsch-reference: " Simon Horman
` (4 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2014-07-17 0:40 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
No more device needs to be added from platform code when booting the
reference platform, remove the now empty r8a7790_add_dt_devices()
function completely.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790-lager.dts | 4 ++++
arch/arm/mach-shmobile/board-lager-reference.c | 2 --
arch/arm/mach-shmobile/r8a7790.h | 1 -
arch/arm/mach-shmobile/setup-r8a7790.c | 7 +------
4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 856b423..7853c2c 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -252,6 +252,10 @@
};
};
+&cmt0 {
+ status = "ok";
+};
+
&mmcif1 {
pinctrl-0 = <&mmc1_pins>;
pinctrl-names = "default";
diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c
index 41c808e..2a05c02 100644
--- a/arch/arm/mach-shmobile/board-lager-reference.c
+++ b/arch/arm/mach-shmobile/board-lager-reference.c
@@ -92,7 +92,6 @@ static void __init lager_add_du_device(void)
* devices until they get moved to DT.
*/
static const struct clk_name clk_names[] __initconst = {
- { "cmt0", "fck", "sh-cmt-48-gen2.0" },
{ "du0", "du.0", "rcar-du-r8a7790" },
{ "du1", "du.1", "rcar-du-r8a7790" },
{ "du2", "du.2", "rcar-du-r8a7790" },
@@ -103,7 +102,6 @@ static const struct clk_name clk_names[] __initconst = {
static void __init lager_add_standard_devices(void)
{
shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
- r8a7790_add_dt_devices();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
lager_add_du_device();
diff --git a/arch/arm/mach-shmobile/r8a7790.h b/arch/arm/mach-shmobile/r8a7790.h
index 459827f..388f051 100644
--- a/arch/arm/mach-shmobile/r8a7790.h
+++ b/arch/arm/mach-shmobile/r8a7790.h
@@ -27,7 +27,6 @@ enum {
};
void r8a7790_add_standard_devices(void);
-void r8a7790_add_dt_devices(void);
void r8a7790_clock_init(void);
void r8a7790_pinmux_init(void);
void r8a7790_pm_init(void);
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index c37d82d..4795c98 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -282,11 +282,6 @@ static struct resource cmt0_resources[] = {
&cmt##idx##_platform_data, \
sizeof(struct sh_timer_config))
-void __init r8a7790_add_dt_devices(void)
-{
- r8a7790_register_cmt(0);
-}
-
void __init r8a7790_add_standard_devices(void)
{
r8a7790_register_scif(0);
@@ -299,7 +294,7 @@ void __init r8a7790_add_standard_devices(void)
r8a7790_register_scif(7);
r8a7790_register_scif(8);
r8a7790_register_scif(9);
- r8a7790_add_dt_devices();
+ r8a7790_register_cmt(0);
r8a7790_register_irqc(0);
r8a7790_register_thermal();
r8a7790_register_i2c(0);
--
2.0.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 5/8] ARM: shmobile: koelsch-reference: Enable CMT0 in device tree
2014-07-17 0:40 [GIT PULL] Renesas ARM Based SoC DT Timers Updates for v3.17 Simon Horman
` (3 preceding siblings ...)
2014-07-17 0:40 ` [PATCH 4/8] ARM: shmobile: lager-reference: Enable CMT0 in device tree Simon Horman
@ 2014-07-17 0:40 ` Simon Horman
2014-07-17 0:40 ` [PATCH 6/8] ARM: shmobile: marzen-reference: Enable TMU0 " Simon Horman
` (3 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2014-07-17 0:40 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
No more device needs to be added from platform code when booting the
reference platform, remove the now empty r8a7791_add_dt_devices()
function completely.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791-koelsch.dts | 4 ++++
arch/arm/mach-shmobile/board-koelsch-reference.c | 2 --
arch/arm/mach-shmobile/r8a7791.h | 1 -
arch/arm/mach-shmobile/setup-r8a7791.c | 7 +------
4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 23486c0..8f36d4f 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -307,6 +307,10 @@
};
};
+&cmt0 {
+ status = "ok";
+};
+
&sata0 {
status = "okay";
};
diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c
index 3ff88c1..9db5e67 100644
--- a/arch/arm/mach-shmobile/board-koelsch-reference.c
+++ b/arch/arm/mach-shmobile/board-koelsch-reference.c
@@ -88,7 +88,6 @@ static void __init koelsch_add_du_device(void)
* devices until they get moved to DT.
*/
static const struct clk_name clk_names[] __initconst = {
- { "cmt0", "fck", "sh-cmt-48-gen2.0" },
{ "du0", "du.0", "rcar-du-r8a7791" },
{ "du1", "du.1", "rcar-du-r8a7791" },
{ "lvds0", "lvds.0", "rcar-du-r8a7791" },
@@ -97,7 +96,6 @@ static const struct clk_name clk_names[] __initconst = {
static void __init koelsch_add_standard_devices(void)
{
shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
- r8a7791_add_dt_devices();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
koelsch_add_du_device();
diff --git a/arch/arm/mach-shmobile/r8a7791.h b/arch/arm/mach-shmobile/r8a7791.h
index 86eae7b..c1bf7ab 100644
--- a/arch/arm/mach-shmobile/r8a7791.h
+++ b/arch/arm/mach-shmobile/r8a7791.h
@@ -2,7 +2,6 @@
#define __ASM_R8A7791_H__
void r8a7791_add_standard_devices(void);
-void r8a7791_add_dt_devices(void);
void r8a7791_clock_init(void);
void r8a7791_pinmux_init(void);
void r8a7791_pm_init(void);
diff --git a/arch/arm/mach-shmobile/setup-r8a7791.c b/arch/arm/mach-shmobile/setup-r8a7791.c
index 8823324..64cb1d7 100644
--- a/arch/arm/mach-shmobile/setup-r8a7791.c
+++ b/arch/arm/mach-shmobile/setup-r8a7791.c
@@ -182,11 +182,6 @@ static const struct resource thermal_resources[] __initconst = {
thermal_resources, \
ARRAY_SIZE(thermal_resources))
-void __init r8a7791_add_dt_devices(void)
-{
- r8a7791_register_cmt(0);
-}
-
void __init r8a7791_add_standard_devices(void)
{
r8a7791_register_scif(0);
@@ -204,7 +199,7 @@ void __init r8a7791_add_standard_devices(void)
r8a7791_register_scif(12);
r8a7791_register_scif(13);
r8a7791_register_scif(14);
- r8a7791_add_dt_devices();
+ r8a7791_register_cmt(0);
r8a7791_register_irqc(0);
r8a7791_register_thermal();
}
--
2.0.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 6/8] ARM: shmobile: marzen-reference: Enable TMU0 in device tree
2014-07-17 0:40 [GIT PULL] Renesas ARM Based SoC DT Timers Updates for v3.17 Simon Horman
` (4 preceding siblings ...)
2014-07-17 0:40 ` [PATCH 5/8] ARM: shmobile: koelsch-reference: " Simon Horman
@ 2014-07-17 0:40 ` Simon Horman
2014-07-17 0:40 ` [PATCH 7/8] ARM: shmobile: r7s72100: Add MTU2 device to DT Simon Horman
` (2 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2014-07-17 0:40 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
No more device needs to be added from platform code when booting the
reference platform, remove the now empty
r8a7779_add_standard_devices_dt() function completely.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7779-marzen.dts | 4 ++++
arch/arm/mach-shmobile/board-marzen-reference.c | 10 ----------
arch/arm/mach-shmobile/r8a7779.h | 1 -
arch/arm/mach-shmobile/setup-r8a7779.c | 17 +++++------------
4 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts
index 5745555..c160404 100644
--- a/arch/arm/boot/dts/r8a7779-marzen.dts
+++ b/arch/arm/boot/dts/r8a7779-marzen.dts
@@ -78,6 +78,10 @@
clock-frequency = <31250000>;
};
+&tmu0 {
+ status = "okay";
+};
+
&pfc {
lan0_pins: lan0 {
intc {
diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c
index 21b3e1c..f671003 100644
--- a/arch/arm/mach-shmobile/board-marzen-reference.c
+++ b/arch/arm/mach-shmobile/board-marzen-reference.c
@@ -37,18 +37,8 @@ static void __init marzen_init_timer(void)
clocksource_of_init();
}
-/*
- * This is a really crude hack to provide clkdev support to platform
- * devices until they get moved to DT.
- */
-static const struct clk_name clk_names[] __initconst = {
- { "tmu0", "fck", "sh-tmu.0" },
-};
-
static void __init marzen_init(void)
{
- shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
- r8a7779_add_standard_devices_dt();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
r8a7779_init_irq_extpin_dt(1); /* IRQ1 as individual interrupt */
}
diff --git a/arch/arm/mach-shmobile/r8a7779.h b/arch/arm/mach-shmobile/r8a7779.h
index 5415c71..19f9704 100644
--- a/arch/arm/mach-shmobile/r8a7779.h
+++ b/arch/arm/mach-shmobile/r8a7779.h
@@ -17,7 +17,6 @@ extern void r8a7779_map_io(void);
extern void r8a7779_earlytimer_init(void);
extern void r8a7779_add_early_devices(void);
extern void r8a7779_add_standard_devices(void);
-extern void r8a7779_add_standard_devices_dt(void);
extern void r8a7779_init_late(void);
extern u32 r8a7779_read_mode_pins(void);
extern void r8a7779_clock_init(void);
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index 8dbc407..8c0530d 100644
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -641,7 +641,7 @@ static void __init r8a7779_register_hpb_dmae(void)
sizeof(dma_platform_data));
}
-static struct platform_device *r8a7779_devices_dt[] __initdata = {
+static struct platform_device *r8a7779_early_devices[] __initdata = {
&tmu0_device,
};
@@ -669,8 +669,8 @@ void __init r8a7779_add_standard_devices(void)
r8a7779_init_pm_domains();
- platform_add_devices(r8a7779_devices_dt,
- ARRAY_SIZE(r8a7779_devices_dt));
+ platform_add_devices(r8a7779_early_devices,
+ ARRAY_SIZE(r8a7779_early_devices));
platform_add_devices(r8a7779_standard_devices,
ARRAY_SIZE(r8a7779_standard_devices));
r8a7779_register_hpb_dmae();
@@ -678,8 +678,8 @@ void __init r8a7779_add_standard_devices(void)
void __init r8a7779_add_early_devices(void)
{
- early_platform_add_devices(r8a7779_devices_dt,
- ARRAY_SIZE(r8a7779_devices_dt));
+ early_platform_add_devices(r8a7779_early_devices,
+ ARRAY_SIZE(r8a7779_early_devices));
/* Early serial console setup is not included here due to
* memory map collisions. The SCIF serial ports in r8a7779
@@ -739,12 +739,6 @@ void __init r8a7779_init_irq_dt(void)
__raw_writel(0x003fee3f, INT2SMSKCR4);
}
-void __init r8a7779_add_standard_devices_dt(void)
-{
- platform_add_devices(r8a7779_devices_dt,
- ARRAY_SIZE(r8a7779_devices_dt));
-}
-
#define MODEMR 0xffcc0020
u32 __init r8a7779_read_mode_pins(void)
@@ -773,7 +767,6 @@ DT_MACHINE_START(R8A7779_DT, "Generic R8A7779 (Flattened Device Tree)")
.init_early = shmobile_init_delay,
.nr_irqs = NR_IRQS_LEGACY,
.init_irq = r8a7779_init_irq_dt,
- .init_machine = r8a7779_add_standard_devices_dt,
.init_late = r8a7779_init_late,
.dt_compat = r8a7779_compat_dt,
MACHINE_END
--
2.0.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 7/8] ARM: shmobile: r7s72100: Add MTU2 device to DT
2014-07-17 0:40 [GIT PULL] Renesas ARM Based SoC DT Timers Updates for v3.17 Simon Horman
` (5 preceding siblings ...)
2014-07-17 0:40 ` [PATCH 6/8] ARM: shmobile: marzen-reference: Enable TMU0 " Simon Horman
@ 2014-07-17 0:40 ` Simon Horman
2014-07-17 0:40 ` [PATCH 8/8] ARM: shmobile: genmai-reference: Enable MTU2 in device tree Simon Horman
2014-07-19 5:27 ` [GIT PULL] Renesas ARM Based SoC DT Timers Updates for v3.17 Olof Johansson
8 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2014-07-17 0:40 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Add the MTU2 counter to the r7s72100 device tree and make it disabled by
default.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
[horms+renesas at verge.net.au correct irq number]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r7s72100.dtsi | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
index bdee225..1d28d01 100644
--- a/arch/arm/boot/dts/r7s72100.dtsi
+++ b/arch/arm/boot/dts/r7s72100.dtsi
@@ -229,6 +229,16 @@
status = "disabled";
};
+ mtu2: timer at fcff0000 {
+ compatible = "renesas,mtu2";
+ reg = <0xfcff0000 0x400>;
+ interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "tgi0a";
+ clocks = <&mstp3_clks R7S72100_CLK_MTU2>;
+ clock-names = "fck";
+ status = "disabled";
+ };
+
scif0: serial at e8007000 {
compatible = "renesas,scif-r7s72100", "renesas,scif";
reg = <0xe8007000 64>;
--
2.0.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 8/8] ARM: shmobile: genmai-reference: Enable MTU2 in device tree
2014-07-17 0:40 [GIT PULL] Renesas ARM Based SoC DT Timers Updates for v3.17 Simon Horman
` (6 preceding siblings ...)
2014-07-17 0:40 ` [PATCH 7/8] ARM: shmobile: r7s72100: Add MTU2 device to DT Simon Horman
@ 2014-07-17 0:40 ` Simon Horman
2014-07-19 5:27 ` [GIT PULL] Renesas ARM Based SoC DT Timers Updates for v3.17 Olof Johansson
8 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2014-07-17 0:40 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
No more device needs to be added from platform code when booting the
reference platform, move MTU2 registration from setup-r7s72100.c to
board-genmai.c and remove the now empty r7s72100_add_dt_devices()
function.
As the genmai_add_standard_devices() function is now identical to the
default init_machine implementation, remove it as well.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r7s72100-genmai.dts | 4 ++++
arch/arm/mach-shmobile/board-genmai-reference.c | 20 --------------------
arch/arm/mach-shmobile/board-genmai.c | 14 +++++++++++++-
arch/arm/mach-shmobile/r7s72100.h | 1 -
arch/arm/mach-shmobile/setup-r7s72100.c | 21 ---------------------
5 files changed, 17 insertions(+), 43 deletions(-)
diff --git a/arch/arm/boot/dts/r7s72100-genmai.dts b/arch/arm/boot/dts/r7s72100-genmai.dts
index 2070546..a3ed23c 100644
--- a/arch/arm/boot/dts/r7s72100-genmai.dts
+++ b/arch/arm/boot/dts/r7s72100-genmai.dts
@@ -43,6 +43,10 @@
clock-frequency = <48000000>;
};
+&mtu2 {
+ status = "ok";
+};
+
&i2c2 {
status = "okay";
clock-frequency = <400000>;
diff --git a/arch/arm/mach-shmobile/board-genmai-reference.c b/arch/arm/mach-shmobile/board-genmai-reference.c
index e5448f7..bc52677 100644
--- a/arch/arm/mach-shmobile/board-genmai-reference.c
+++ b/arch/arm/mach-shmobile/board-genmai-reference.c
@@ -19,29 +19,10 @@
*/
#include <linux/kernel.h>
-#include <linux/of_platform.h>
-#include <asm/mach-types.h>
#include <asm/mach/arch.h>
-#include "clock.h"
#include "common.h"
-#include "r7s72100.h"
-
-/*
- * This is a really crude hack to provide clkdev support to platform
- * devices until they get moved to DT.
- */
-static const struct clk_name clk_names[] = {
- { "mtu2", "fck", "sh-mtu2" },
-};
-
-static void __init genmai_add_standard_devices(void)
-{
- shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), true);
- r7s72100_add_dt_devices();
- of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-}
static const char * const genmai_boards_compat_dt[] __initconst = {
"renesas,genmai",
@@ -50,6 +31,5 @@ static const char * const genmai_boards_compat_dt[] __initconst = {
DT_MACHINE_START(GENMAI_DT, "genmai")
.init_early = shmobile_init_delay,
- .init_machine = genmai_add_standard_devices,
.dt_compat = genmai_boards_compat_dt,
MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-genmai.c b/arch/arm/mach-shmobile/board-genmai.c
index e2a3ba4..b5dee53 100644
--- a/arch/arm/mach-shmobile/board-genmai.c
+++ b/arch/arm/mach-shmobile/board-genmai.c
@@ -23,6 +23,7 @@
#include <linux/platform_device.h>
#include <linux/serial_sci.h>
#include <linux/sh_eth.h>
+#include <linux/sh_timer.h>
#include <linux/spi/rspi.h>
#include <linux/spi/spi.h>
@@ -126,10 +127,21 @@ R7S72100_SCIF(7, 0xe800a800, gic_iid(249));
&scif##index##_platform_data, \
sizeof(scif##index##_platform_data))
+static struct resource mtu2_resources[] __initdata = {
+ DEFINE_RES_MEM(0xfcff0000, 0x400),
+ DEFINE_RES_IRQ_NAMED(gic_iid(139), "tgi0a"),
+};
+
+#define r7s72100_register_mtu2() \
+ platform_device_register_resndata(&platform_bus, "sh-mtu2", \
+ -1, mtu2_resources, \
+ ARRAY_SIZE(mtu2_resources), \
+ NULL, 0)
+
static void __init genmai_add_standard_devices(void)
{
r7s72100_clock_init();
- r7s72100_add_dt_devices();
+ r7s72100_register_mtu2();
platform_device_register_full(ðer_info);
diff --git a/arch/arm/mach-shmobile/r7s72100.h b/arch/arm/mach-shmobile/r7s72100.h
index efb723c..321ae4e 100644
--- a/arch/arm/mach-shmobile/r7s72100.h
+++ b/arch/arm/mach-shmobile/r7s72100.h
@@ -1,7 +1,6 @@
#ifndef __ASM_R7S72100_H__
#define __ASM_R7S72100_H__
-void r7s72100_add_dt_devices(void);
void r7s72100_clock_init(void);
#endif /* __ASM_R7S72100_H__ */
diff --git a/arch/arm/mach-shmobile/setup-r7s72100.c b/arch/arm/mach-shmobile/setup-r7s72100.c
index 4a98b23..d898cef 100644
--- a/arch/arm/mach-shmobile/setup-r7s72100.c
+++ b/arch/arm/mach-shmobile/setup-r7s72100.c
@@ -18,32 +18,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <linux/irq.h>
#include <linux/kernel.h>
-#include <linux/of_platform.h>
-#include <linux/sh_timer.h>
#include <asm/mach/arch.h>
#include "common.h"
-#include "irqs.h"
-#include "r7s72100.h"
-
-static struct resource mtu2_resources[] __initdata = {
- DEFINE_RES_MEM(0xfcff0000, 0x400),
- DEFINE_RES_IRQ_NAMED(gic_iid(139), "tgi0a"),
-};
-
-#define r7s72100_register_mtu2() \
- platform_device_register_resndata(&platform_bus, "sh-mtu2", \
- -1, mtu2_resources, \
- ARRAY_SIZE(mtu2_resources), \
- NULL, 0)
-
-void __init r7s72100_add_dt_devices(void)
-{
- r7s72100_register_mtu2();
-}
#ifdef CONFIG_USE_OF
static const char *r7s72100_boards_compat_dt[] __initdata = {
--
2.0.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [GIT PULL] Renesas ARM Based SoC DT Timers Updates for v3.17
2014-07-17 0:40 [GIT PULL] Renesas ARM Based SoC DT Timers Updates for v3.17 Simon Horman
` (7 preceding siblings ...)
2014-07-17 0:40 ` [PATCH 8/8] ARM: shmobile: genmai-reference: Enable MTU2 in device tree Simon Horman
@ 2014-07-19 5:27 ` Olof Johansson
2014-07-20 13:51 ` Simon Horman
8 siblings, 1 reply; 15+ messages in thread
From: Olof Johansson @ 2014-07-19 5:27 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 17, 2014 at 09:40:20AM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Renesas ARM based SoC DT Timers updates for v3.17.
>
> This pull request is based on a merge of the following to provide
> all dependencies and try to eliminate conflicts. It turns out the changes
> in this pull requests are a nexus for dependencies due to modifying DT,
> SoC, board and recently moved header files as well as requiring driver
> changes.
>
> * The clockevents/renesas-timers-dt branch of Daniel Lezcano's tree.
> He has indicated that this branch has stable commit ids and will
> be included in v3.17. Olof and arm at kernel.org were CCed on the
> thread where he, Laurent Pinchart and I discussed the use of that branch.
>
> The clockevents/renesas-timers-dt's branch is in turn based on v3.16-rc3.
>
> * "Third Round of Renesas ARM Based SoC DT Updates for v3.17",
> tagged as renesas-dt3-for-v3.17, which I have sent a pull request for.
>
> * "Renesas ARM Based SoC Clock Updates for v3.17",
> tagged as renesas-clock-for-v3.17, which you have merged
> into next/soc
>
> * "Second Round of Renesas ARM Based SoC soc-cleanup Updates for v3.17",
> tagged as renesas-soc-cleanup2-for-v3.17, which you have merged
> into next/cleanup.
>
> * "Third Round of Renesas ARM Based SoC r8a7779 Multiplatform Updates for
> v3.17", tagged as renesas-r8a7779-multiplatform3-for-v3.17, which
> you have merged into next/soc
>
> * "Renesas ARM Based SoC Boards Updates for v3.17",
> tagged as renesas-boards-for-v3.17, which you have merged
> into next/boards
>
> * "Third Round of Renesas ARM Based SoC Updates for v3.17",
> tagged as renesas-soc3-for-v3.17, which you have merged
> into next/soc
>
>
> The following changes since commit 5c174afd407acc7a90701900b279578151bc007f:
>
> Merge branch 'clockevents/renesas-timers-dt' of git://git.linaro.org/people/daniel.lezcano/linux into dt-timers-for-v3.17.base (2014-07-15 16:31:45 +0900)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-timers-for-v3.17
>
> for you to fetch changes up to 9394af4314554d15762585a3464cefaa2e6d0420:
>
> ARM: shmobile: genmai-reference: Enable MTU2 in device tree (2014-07-15 21:26:42 +0900)
>
> ----------------------------------------------------------------
> Renesas ARM Based SoC DT Timers Updates for v3.17
>
> * Enable timers using DT when booting boards without Legacy-C code
>
> ----------------------------------------------------------------
> Laurent Pinchart (8):
> ARM: shmobile: r8a7790: Add CMT devices to DT
> ARM: shmobile: r8a7791: Add CMT devices to DT
> ARM: shmobile: r8a7779: Add TMU devices to DT
> ARM: shmobile: lager-reference: Enable CMT0 in device tree
> ARM: shmobile: koelsch-reference: Enable CMT0 in device tree
> ARM: shmobile: marzen-reference: Enable TMU0 in device tree
> ARM: shmobile: r7s72100: Add MTU2 device to DT
> ARM: shmobile: genmai-reference: Enable MTU2 in device tree
Ok, this branch definitely contains a lot more than this. For dependent
external branches such as clocksource, we still prefer to see a pull request so
that we can merge in the dependency and get a clean diffstat when we do the
merge of your branch, otherwise it gets awkward to compare that what we're
getting is what you thought you sent (which is one of the things we check on
merges).
Please regenerate this pull request as appropriate.
-Olof
^ permalink raw reply [flat|nested] 15+ messages in thread* [GIT PULL] Renesas ARM Based SoC DT Timers Updates for v3.17
2014-07-19 5:27 ` [GIT PULL] Renesas ARM Based SoC DT Timers Updates for v3.17 Olof Johansson
@ 2014-07-20 13:51 ` Simon Horman
2014-07-23 23:54 ` Simon Horman
0 siblings, 1 reply; 15+ messages in thread
From: Simon Horman @ 2014-07-20 13:51 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jul 18, 2014 at 10:27:58PM -0700, Olof Johansson wrote:
> On Thu, Jul 17, 2014 at 09:40:20AM +0900, Simon Horman wrote:
> > Hi Olof, Hi Kevin, Hi Arnd,
> >
> > Please consider these Renesas ARM based SoC DT Timers updates for v3.17.
> >
> > This pull request is based on a merge of the following to provide
> > all dependencies and try to eliminate conflicts. It turns out the changes
> > in this pull requests are a nexus for dependencies due to modifying DT,
> > SoC, board and recently moved header files as well as requiring driver
> > changes.
> >
> > * The clockevents/renesas-timers-dt branch of Daniel Lezcano's tree.
> > He has indicated that this branch has stable commit ids and will
> > be included in v3.17. Olof and arm at kernel.org were CCed on the
> > thread where he, Laurent Pinchart and I discussed the use of that branch.
> >
> > The clockevents/renesas-timers-dt's branch is in turn based on v3.16-rc3.
> >
> > * "Third Round of Renesas ARM Based SoC DT Updates for v3.17",
> > tagged as renesas-dt3-for-v3.17, which I have sent a pull request for.
> >
> > * "Renesas ARM Based SoC Clock Updates for v3.17",
> > tagged as renesas-clock-for-v3.17, which you have merged
> > into next/soc
> >
> > * "Second Round of Renesas ARM Based SoC soc-cleanup Updates for v3.17",
> > tagged as renesas-soc-cleanup2-for-v3.17, which you have merged
> > into next/cleanup.
> >
> > * "Third Round of Renesas ARM Based SoC r8a7779 Multiplatform Updates for
> > v3.17", tagged as renesas-r8a7779-multiplatform3-for-v3.17, which
> > you have merged into next/soc
> >
> > * "Renesas ARM Based SoC Boards Updates for v3.17",
> > tagged as renesas-boards-for-v3.17, which you have merged
> > into next/boards
> >
> > * "Third Round of Renesas ARM Based SoC Updates for v3.17",
> > tagged as renesas-soc3-for-v3.17, which you have merged
> > into next/soc
> >
> >
> > The following changes since commit 5c174afd407acc7a90701900b279578151bc007f:
> >
> > Merge branch 'clockevents/renesas-timers-dt' of git://git.linaro.org/people/daniel.lezcano/linux into dt-timers-for-v3.17.base (2014-07-15 16:31:45 +0900)
> >
> > are available in the git repository at:
> >
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-timers-for-v3.17
> >
> > for you to fetch changes up to 9394af4314554d15762585a3464cefaa2e6d0420:
> >
> > ARM: shmobile: genmai-reference: Enable MTU2 in device tree (2014-07-15 21:26:42 +0900)
> >
> > ----------------------------------------------------------------
> > Renesas ARM Based SoC DT Timers Updates for v3.17
> >
> > * Enable timers using DT when booting boards without Legacy-C code
> >
> > ----------------------------------------------------------------
> > Laurent Pinchart (8):
> > ARM: shmobile: r8a7790: Add CMT devices to DT
> > ARM: shmobile: r8a7791: Add CMT devices to DT
> > ARM: shmobile: r8a7779: Add TMU devices to DT
> > ARM: shmobile: lager-reference: Enable CMT0 in device tree
> > ARM: shmobile: koelsch-reference: Enable CMT0 in device tree
> > ARM: shmobile: marzen-reference: Enable TMU0 in device tree
> > ARM: shmobile: r7s72100: Add MTU2 device to DT
> > ARM: shmobile: genmai-reference: Enable MTU2 in device tree
>
> Ok, this branch definitely contains a lot more than this. For dependent
> external branches such as clocksource, we still prefer to see a pull request so
> that we can merge in the dependency and get a clean diffstat when we do the
> merge of your branch, otherwise it gets awkward to compare that what we're
> getting is what you thought you sent (which is one of the things we check on
> merges).
>
> Please regenerate this pull request as appropriate.
Hi Olof,
FWIW, I believe that that the diffstat between
5c174afd407acc7a90701900b279578151bc007f and
9394af4314554d15762585a3464cefaa2e6d0420 is what was included in the
pull-request. But I guess that all the merged-in branches are hampering
your verification process.
Would it help if things were arranged as follows?
1. Use the clocksource branch as a base and then;
2. Merge in each of my branches (the ones listed above) and then;
3. Add the patches on top
^ permalink raw reply [flat|nested] 15+ messages in thread
* [GIT PULL] Renesas ARM Based SoC DT Timers Updates for v3.17
2014-07-20 13:51 ` Simon Horman
@ 2014-07-23 23:54 ` Simon Horman
2014-07-24 0:00 ` Olof Johansson
0 siblings, 1 reply; 15+ messages in thread
From: Simon Horman @ 2014-07-23 23:54 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof,
I'd value your feedback on this if you have a moment.
On Sun, Jul 20, 2014 at 10:51:25PM +0900, Simon Horman wrote:
> On Fri, Jul 18, 2014 at 10:27:58PM -0700, Olof Johansson wrote:
> > On Thu, Jul 17, 2014 at 09:40:20AM +0900, Simon Horman wrote:
> > > Hi Olof, Hi Kevin, Hi Arnd,
> > >
> > > Please consider these Renesas ARM based SoC DT Timers updates for v3.17.
> > >
> > > This pull request is based on a merge of the following to provide
> > > all dependencies and try to eliminate conflicts. It turns out the changes
> > > in this pull requests are a nexus for dependencies due to modifying DT,
> > > SoC, board and recently moved header files as well as requiring driver
> > > changes.
> > >
> > > * The clockevents/renesas-timers-dt branch of Daniel Lezcano's tree.
> > > He has indicated that this branch has stable commit ids and will
> > > be included in v3.17. Olof and arm at kernel.org were CCed on the
> > > thread where he, Laurent Pinchart and I discussed the use of that branch.
> > >
> > > The clockevents/renesas-timers-dt's branch is in turn based on v3.16-rc3.
> > >
> > > * "Third Round of Renesas ARM Based SoC DT Updates for v3.17",
> > > tagged as renesas-dt3-for-v3.17, which I have sent a pull request for.
> > >
> > > * "Renesas ARM Based SoC Clock Updates for v3.17",
> > > tagged as renesas-clock-for-v3.17, which you have merged
> > > into next/soc
> > >
> > > * "Second Round of Renesas ARM Based SoC soc-cleanup Updates for v3.17",
> > > tagged as renesas-soc-cleanup2-for-v3.17, which you have merged
> > > into next/cleanup.
> > >
> > > * "Third Round of Renesas ARM Based SoC r8a7779 Multiplatform Updates for
> > > v3.17", tagged as renesas-r8a7779-multiplatform3-for-v3.17, which
> > > you have merged into next/soc
> > >
> > > * "Renesas ARM Based SoC Boards Updates for v3.17",
> > > tagged as renesas-boards-for-v3.17, which you have merged
> > > into next/boards
> > >
> > > * "Third Round of Renesas ARM Based SoC Updates for v3.17",
> > > tagged as renesas-soc3-for-v3.17, which you have merged
> > > into next/soc
> > >
> > >
> > > The following changes since commit 5c174afd407acc7a90701900b279578151bc007f:
> > >
> > > Merge branch 'clockevents/renesas-timers-dt' of git://git.linaro.org/people/daniel.lezcano/linux into dt-timers-for-v3.17.base (2014-07-15 16:31:45 +0900)
> > >
> > > are available in the git repository at:
> > >
> > >
> > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-timers-for-v3.17
> > >
> > > for you to fetch changes up to 9394af4314554d15762585a3464cefaa2e6d0420:
> > >
> > > ARM: shmobile: genmai-reference: Enable MTU2 in device tree (2014-07-15 21:26:42 +0900)
> > >
> > > ----------------------------------------------------------------
> > > Renesas ARM Based SoC DT Timers Updates for v3.17
> > >
> > > * Enable timers using DT when booting boards without Legacy-C code
> > >
> > > ----------------------------------------------------------------
> > > Laurent Pinchart (8):
> > > ARM: shmobile: r8a7790: Add CMT devices to DT
> > > ARM: shmobile: r8a7791: Add CMT devices to DT
> > > ARM: shmobile: r8a7779: Add TMU devices to DT
> > > ARM: shmobile: lager-reference: Enable CMT0 in device tree
> > > ARM: shmobile: koelsch-reference: Enable CMT0 in device tree
> > > ARM: shmobile: marzen-reference: Enable TMU0 in device tree
> > > ARM: shmobile: r7s72100: Add MTU2 device to DT
> > > ARM: shmobile: genmai-reference: Enable MTU2 in device tree
> >
> > Ok, this branch definitely contains a lot more than this. For dependent
> > external branches such as clocksource, we still prefer to see a pull request so
> > that we can merge in the dependency and get a clean diffstat when we do the
> > merge of your branch, otherwise it gets awkward to compare that what we're
> > getting is what you thought you sent (which is one of the things we check on
> > merges).
> >
> > Please regenerate this pull request as appropriate.
>
> Hi Olof,
>
> FWIW, I believe that that the diffstat between
> 5c174afd407acc7a90701900b279578151bc007f and
> 9394af4314554d15762585a3464cefaa2e6d0420 is what was included in the
> pull-request. But I guess that all the merged-in branches are hampering
> your verification process.
>
> Would it help if things were arranged as follows?
>
> 1. Use the clocksource branch as a base and then;
> 2. Merge in each of my branches (the ones listed above) and then;
> 3. Add the patches on top
^ permalink raw reply [flat|nested] 15+ messages in thread
* [GIT PULL] Renesas ARM Based SoC DT Timers Updates for v3.17
2014-07-23 23:54 ` Simon Horman
@ 2014-07-24 0:00 ` Olof Johansson
2014-07-24 2:05 ` Simon Horman
0 siblings, 1 reply; 15+ messages in thread
From: Olof Johansson @ 2014-07-24 0:00 UTC (permalink / raw)
To: linux-arm-kernel
Ah, sorry. Got lost in the other pull requests.
On Wed, Jul 23, 2014 at 4:54 PM, Simon Horman <horms@verge.net.au> wrote:
> Hi Olof,
>
> I'd value your feedback on this if you have a moment.
>
> On Sun, Jul 20, 2014 at 10:51:25PM +0900, Simon Horman wrote:
>> On Fri, Jul 18, 2014 at 10:27:58PM -0700, Olof Johansson wrote:
>> > On Thu, Jul 17, 2014 at 09:40:20AM +0900, Simon Horman wrote:
>> > > Hi Olof, Hi Kevin, Hi Arnd,
>> > >
>> > > Please consider these Renesas ARM based SoC DT Timers updates for v3.17.
>> > >
>> > > This pull request is based on a merge of the following to provide
>> > > all dependencies and try to eliminate conflicts. It turns out the changes
>> > > in this pull requests are a nexus for dependencies due to modifying DT,
>> > > SoC, board and recently moved header files as well as requiring driver
>> > > changes.
>> > >
>> > > * The clockevents/renesas-timers-dt branch of Daniel Lezcano's tree.
>> > > He has indicated that this branch has stable commit ids and will
>> > > be included in v3.17. Olof and arm at kernel.org were CCed on the
>> > > thread where he, Laurent Pinchart and I discussed the use of that branch.
>> > >
>> > > The clockevents/renesas-timers-dt's branch is in turn based on v3.16-rc3.
>> > >
>> > > * "Third Round of Renesas ARM Based SoC DT Updates for v3.17",
>> > > tagged as renesas-dt3-for-v3.17, which I have sent a pull request for.
>> > >
>> > > * "Renesas ARM Based SoC Clock Updates for v3.17",
>> > > tagged as renesas-clock-for-v3.17, which you have merged
>> > > into next/soc
>> > >
>> > > * "Second Round of Renesas ARM Based SoC soc-cleanup Updates for v3.17",
>> > > tagged as renesas-soc-cleanup2-for-v3.17, which you have merged
>> > > into next/cleanup.
>> > >
>> > > * "Third Round of Renesas ARM Based SoC r8a7779 Multiplatform Updates for
>> > > v3.17", tagged as renesas-r8a7779-multiplatform3-for-v3.17, which
>> > > you have merged into next/soc
>> > >
>> > > * "Renesas ARM Based SoC Boards Updates for v3.17",
>> > > tagged as renesas-boards-for-v3.17, which you have merged
>> > > into next/boards
>> > >
>> > > * "Third Round of Renesas ARM Based SoC Updates for v3.17",
>> > > tagged as renesas-soc3-for-v3.17, which you have merged
>> > > into next/soc
>> > >
>> > >
>> > > The following changes since commit 5c174afd407acc7a90701900b279578151bc007f:
>> > >
>> > > Merge branch 'clockevents/renesas-timers-dt' of git://git.linaro.org/people/daniel.lezcano/linux into dt-timers-for-v3.17.base (2014-07-15 16:31:45 +0900)
>> > >
>> > > are available in the git repository at:
>> > >
>> > >
>> > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-timers-for-v3.17
>> > >
>> > > for you to fetch changes up to 9394af4314554d15762585a3464cefaa2e6d0420:
>> > >
>> > > ARM: shmobile: genmai-reference: Enable MTU2 in device tree (2014-07-15 21:26:42 +0900)
>> > >
>> > > ----------------------------------------------------------------
>> > > Renesas ARM Based SoC DT Timers Updates for v3.17
>> > >
>> > > * Enable timers using DT when booting boards without Legacy-C code
>> > >
>> > > ----------------------------------------------------------------
>> > > Laurent Pinchart (8):
>> > > ARM: shmobile: r8a7790: Add CMT devices to DT
>> > > ARM: shmobile: r8a7791: Add CMT devices to DT
>> > > ARM: shmobile: r8a7779: Add TMU devices to DT
>> > > ARM: shmobile: lager-reference: Enable CMT0 in device tree
>> > > ARM: shmobile: koelsch-reference: Enable CMT0 in device tree
>> > > ARM: shmobile: marzen-reference: Enable TMU0 in device tree
>> > > ARM: shmobile: r7s72100: Add MTU2 device to DT
>> > > ARM: shmobile: genmai-reference: Enable MTU2 in device tree
>> >
>> > Ok, this branch definitely contains a lot more than this. For dependent
>> > external branches such as clocksource, we still prefer to see a pull request so
>> > that we can merge in the dependency and get a clean diffstat when we do the
>> > merge of your branch, otherwise it gets awkward to compare that what we're
>> > getting is what you thought you sent (which is one of the things we check on
>> > merges).
>> >
>> > Please regenerate this pull request as appropriate.
>>
>> Hi Olof,
>>
>> FWIW, I believe that that the diffstat between
>> 5c174afd407acc7a90701900b279578151bc007f and
>> 9394af4314554d15762585a3464cefaa2e6d0420 is what was included in the
>> pull-request. But I guess that all the merged-in branches are hampering
>> your verification process.
>>
>> Would it help if things were arranged as follows?
>>
>> 1. Use the clocksource branch as a base and then;
>> 2. Merge in each of my branches (the ones listed above) and then;
>> 3. Add the patches on top
So there's nothing wrong per se with the way you arranged it, even
though it is more convenient for us from a review perspective to get
merges of branches at the tips of previous branch heads (i.e.
tags/merge requests). It just makes it easier to spot "Oh, that side
of the merge is from this branch that we've already reviewed", etc.
For generating pull requests for these complex merges, what we do when
sending stuff upstream is that we generate a dummy merge and
"manually" (through a script) generate the diffstat and shortlog from
that. Git can get confused about what is actually the merge-base
otherwise, which is what happened in this case for you.
-Olof
^ permalink raw reply [flat|nested] 15+ messages in thread
* [GIT PULL] Renesas ARM Based SoC DT Timers Updates for v3.17
2014-07-24 0:00 ` Olof Johansson
@ 2014-07-24 2:05 ` Simon Horman
0 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2014-07-24 2:05 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd,
I understand from Olof that you are handling pull-requests at this time.
I would like you to consider this one in light of the extra
information that I have provided below.
On Wed, Jul 23, 2014 at 05:00:21PM -0700, Olof Johansson wrote:
> Ah, sorry. Got lost in the other pull requests.
>
> On Wed, Jul 23, 2014 at 4:54 PM, Simon Horman <horms@verge.net.au> wrote:
> > Hi Olof,
> >
> > I'd value your feedback on this if you have a moment.
> >
> > On Sun, Jul 20, 2014 at 10:51:25PM +0900, Simon Horman wrote:
> >> On Fri, Jul 18, 2014 at 10:27:58PM -0700, Olof Johansson wrote:
> >> > On Thu, Jul 17, 2014 at 09:40:20AM +0900, Simon Horman wrote:
> >> > > Hi Olof, Hi Kevin, Hi Arnd,
> >> > >
> >> > > Please consider these Renesas ARM based SoC DT Timers updates for v3.17.
> >> > >
> >> > > This pull request is based on a merge of the following to provide
> >> > > all dependencies and try to eliminate conflicts. It turns out the changes
> >> > > in this pull requests are a nexus for dependencies due to modifying DT,
> >> > > SoC, board and recently moved header files as well as requiring driver
> >> > > changes.
> >> > >
> >> > > * The clockevents/renesas-timers-dt branch of Daniel Lezcano's tree.
> >> > > He has indicated that this branch has stable commit ids and will
> >> > > be included in v3.17. Olof and arm at kernel.org were CCed on the
> >> > > thread where he, Laurent Pinchart and I discussed the use of that branch.
> >> > >
> >> > > The clockevents/renesas-timers-dt's branch is in turn based on v3.16-rc3.
> >> > >
> >> > > * "Third Round of Renesas ARM Based SoC DT Updates for v3.17",
> >> > > tagged as renesas-dt3-for-v3.17, which I have sent a pull request for.
> >> > >
> >> > > * "Renesas ARM Based SoC Clock Updates for v3.17",
> >> > > tagged as renesas-clock-for-v3.17, which you have merged
> >> > > into next/soc
This should have been :
* "Third Round of Renesas ARM Based SoC Clock Updates for v3.17",
tagged as renesas-clock3-for-v3.17.
I somehow forgot to tag that branch and send a pull-request.
I have done so now.
> >> > > * "Second Round of Renesas ARM Based SoC soc-cleanup Updates for v3.17",
> >> > > tagged as renesas-soc-cleanup2-for-v3.17, which you have merged
> >> > > into next/cleanup.
> >> > >
> >> > > * "Third Round of Renesas ARM Based SoC r8a7779 Multiplatform Updates for
> >> > > v3.17", tagged as renesas-r8a7779-multiplatform3-for-v3.17, which
> >> > > you have merged into next/soc
> >> > >
> >> > > * "Renesas ARM Based SoC Boards Updates for v3.17",
> >> > > tagged as renesas-boards-for-v3.17, which you have merged
> >> > > into next/boards
> >> > >
> >> > > * "Third Round of Renesas ARM Based SoC Updates for v3.17",
> >> > > tagged as renesas-soc3-for-v3.17, which you have merged
> >> > > into next/soc
> >> > >
> >> > >
> >> > > The following changes since commit 5c174afd407acc7a90701900b279578151bc007f:
> >> > >
> >> > > Merge branch 'clockevents/renesas-timers-dt' of git://git.linaro.org/people/daniel.lezcano/linux into dt-timers-for-v3.17.base (2014-07-15 16:31:45 +0900)
> >> > >
> >> > > are available in the git repository at:
> >> > >
> >> > >
> >> > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-timers-for-v3.17
> >> > >
> >> > > for you to fetch changes up to 9394af4314554d15762585a3464cefaa2e6d0420:
> >> > >
> >> > > ARM: shmobile: genmai-reference: Enable MTU2 in device tree (2014-07-15 21:26:42 +0900)
> >> > >
> >> > > ----------------------------------------------------------------
> >> > > Renesas ARM Based SoC DT Timers Updates for v3.17
> >> > >
> >> > > * Enable timers using DT when booting boards without Legacy-C code
> >> > >
> >> > > ----------------------------------------------------------------
> >> > > Laurent Pinchart (8):
> >> > > ARM: shmobile: r8a7790: Add CMT devices to DT
> >> > > ARM: shmobile: r8a7791: Add CMT devices to DT
> >> > > ARM: shmobile: r8a7779: Add TMU devices to DT
> >> > > ARM: shmobile: lager-reference: Enable CMT0 in device tree
> >> > > ARM: shmobile: koelsch-reference: Enable CMT0 in device tree
> >> > > ARM: shmobile: marzen-reference: Enable TMU0 in device tree
> >> > > ARM: shmobile: r7s72100: Add MTU2 device to DT
> >> > > ARM: shmobile: genmai-reference: Enable MTU2 in device tree
> >> >
> >> > Ok, this branch definitely contains a lot more than this. For dependent
> >> > external branches such as clocksource, we still prefer to see a pull request so
> >> > that we can merge in the dependency and get a clean diffstat when we do the
> >> > merge of your branch, otherwise it gets awkward to compare that what we're
> >> > getting is what you thought you sent (which is one of the things we check on
> >> > merges).
> >> >
> >> > Please regenerate this pull request as appropriate.
> >>
> >> Hi Olof,
> >>
> >> FWIW, I believe that that the diffstat between
> >> 5c174afd407acc7a90701900b279578151bc007f and
> >> 9394af4314554d15762585a3464cefaa2e6d0420 is what was included in the
> >> pull-request. But I guess that all the merged-in branches are hampering
> >> your verification process.
> >>
> >> Would it help if things were arranged as follows?
> >>
> >> 1. Use the clocksource branch as a base and then;
> >> 2. Merge in each of my branches (the ones listed above) and then;
> >> 3. Add the patches on top
>
> So there's nothing wrong per se with the way you arranged it, even
> though it is more convenient for us from a review perspective to get
> merges of branches at the tips of previous branch heads (i.e.
> tags/merge requests). It just makes it easier to spot "Oh, that side
> of the merge is from this branch that we've already reviewed", etc.
>
> For generating pull requests for these complex merges, what we do when
> sending stuff upstream is that we generate a dummy merge and
> "manually" (through a script) generate the diffstat and shortlog from
> that. Git can get confused about what is actually the merge-base
> otherwise, which is what happened in this case for you.
Thanks. I believe that the cause of this problem is the missing
renesas-clocks3-for-v3.17 pull-request that I noted above.
As discussed off-list, I think that with that taken into account this
pull-request should match its description.
^ permalink raw reply [flat|nested] 15+ messages in thread