* [PATCH 1/7] ARM: shmobile: r8a7790: Use SoC-specific 48-bit CMT compat string
2014-09-11 0:57 [GIT PULL] Second Round of Renesas ARM Based SoC DT Timers Updates for v3.18 Simon Horman
@ 2014-09-11 0:56 ` Simon Horman
2014-09-11 0:56 ` [PATCH 2/7] ARM: shmobile: r7s72100: Use SoC-specific MTU2 " Simon Horman
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2014-09-11 0:56 UTC (permalink / raw)
To: linux-arm-kernel
In general Renesas hardware is not documented to the extent
where the relationship between IP blocks on different SoCs can be assumed
although they may appear to operate the same way. Furthermore the
documentation typically does not specify a version for individual
IP blocks. For these reasons a convention of using the SoC name in place
of a version and providing SoC-specific compat strings has been adopted.
Although not universally liked this convention is used in the bindings for
a number of drivers for Renesas hardware. The purpose of this patch is to
make use of the SoC-specific CMT compat string for the r8a7790 48-bit CMT
clock source.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 7218bff..aa146d2 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -207,7 +207,7 @@
};
cmt0: timer at ffca0000 {
- compatible = "renesas,cmt-48-gen2";
+ compatible = "renesas,cmt-48-r8a7790", "renesas,cmt-48-gen2";
reg = <0 0xffca0000 0 0x1004>;
interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>,
<0 143 IRQ_TYPE_LEVEL_HIGH>;
@@ -220,7 +220,7 @@
};
cmt1: timer at e6130000 {
- compatible = "renesas,cmt-48-gen2";
+ compatible = "renesas,cmt-48-r8a7790", "renesas,cmt-48-gen2";
reg = <0 0xe6130000 0 0x1004>;
interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>,
<0 121 IRQ_TYPE_LEVEL_HIGH>,
--
2.0.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/7] ARM: shmobile: r7s72100: Use SoC-specific MTU2 compat string
2014-09-11 0:57 [GIT PULL] Second Round of Renesas ARM Based SoC DT Timers Updates for v3.18 Simon Horman
2014-09-11 0:56 ` [PATCH 1/7] ARM: shmobile: r8a7790: Use SoC-specific 48-bit CMT compat string Simon Horman
@ 2014-09-11 0:56 ` Simon Horman
2014-09-11 0:57 ` [PATCH 3/7] ARM: shmobile: r8a7791: Use SoC-specific 48-bit CMT " Simon Horman
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2014-09-11 0:56 UTC (permalink / raw)
To: linux-arm-kernel
In general Renesas hardware is not documented to the extent
where the relationship between IP blocks on different SoCs can be assumed
although they may appear to operate the same way. Furthermore the
documentation typically does not specify a version for individual
IP blocks. For these reasons a convention of using the SoC name in place
of a version and providing SoC-specific compat strings has been adopted.
Although not universally liked this convention is used in the bindings for
a number of drivers for Renesas hardware. The purpose of this patch is to
make use of the SoC-specific CMT compat string for the r7s72100 MTU2
clock source.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r7s72100.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
index 1d28d01..801a556 100644
--- a/arch/arm/boot/dts/r7s72100.dtsi
+++ b/arch/arm/boot/dts/r7s72100.dtsi
@@ -230,7 +230,7 @@
};
mtu2: timer at fcff0000 {
- compatible = "renesas,mtu2";
+ compatible = "renesas,mtu2-r7s72100", "renesas,mtu2";
reg = <0xfcff0000 0x400>;
interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "tgi0a";
--
2.0.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/7] ARM: shmobile: r8a7791: Use SoC-specific 48-bit CMT compat string
2014-09-11 0:57 [GIT PULL] Second Round of Renesas ARM Based SoC DT Timers Updates for v3.18 Simon Horman
2014-09-11 0:56 ` [PATCH 1/7] ARM: shmobile: r8a7790: Use SoC-specific 48-bit CMT compat string Simon Horman
2014-09-11 0:56 ` [PATCH 2/7] ARM: shmobile: r7s72100: Use SoC-specific MTU2 " Simon Horman
@ 2014-09-11 0:57 ` Simon Horman
2014-09-11 0:57 ` [PATCH 4/7] ARM: shmobile: r8a7779: Use SoC-specific TMU " Simon Horman
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2014-09-11 0:57 UTC (permalink / raw)
To: linux-arm-kernel
In general Renesas hardware is not documented to the extent
where the relationship between IP blocks on different SoCs can be assumed
although they may appear to operate the same way. Furthermore the
documentation typically does not specify a version for individual
IP blocks. For these reasons a convention of using the SoC name in place
of a version and providing SoC-specific compat strings has been adopted.
Although not universally liked this convention is used in the bindings for
a number of drivers for Renesas hardware. The purpose of this patch is to
make use of the SoC-specific CMT compat string for the r8a7791 48-bit CMT
clock source.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index bdb9ac1..e270f38 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -190,7 +190,7 @@
};
cmt0: timer at ffca0000 {
- compatible = "renesas,cmt-48-gen2";
+ compatible = "renesas,cmt-48-r8a7791", "renesas,cmt-48-gen2";
reg = <0 0xffca0000 0 0x1004>;
interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>,
<0 143 IRQ_TYPE_LEVEL_HIGH>;
@@ -203,7 +203,7 @@
};
cmt1: timer at e6130000 {
- compatible = "renesas,cmt-48-gen2";
+ compatible = "renesas,cmt-48-r8a7791", "renesas,cmt-48-gen2";
reg = <0 0xe6130000 0 0x1004>;
interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>,
<0 121 IRQ_TYPE_LEVEL_HIGH>,
--
2.0.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/7] ARM: shmobile: r8a7779: Use SoC-specific TMU compat string
2014-09-11 0:57 [GIT PULL] Second Round of Renesas ARM Based SoC DT Timers Updates for v3.18 Simon Horman
` (2 preceding siblings ...)
2014-09-11 0:57 ` [PATCH 3/7] ARM: shmobile: r8a7791: Use SoC-specific 48-bit CMT " Simon Horman
@ 2014-09-11 0:57 ` Simon Horman
2014-09-11 0:57 ` [PATCH 5/7] ARM: shmobile: r8a7740: Use SoC-specific 48-bit CMT " Simon Horman
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2014-09-11 0:57 UTC (permalink / raw)
To: linux-arm-kernel
In general Renesas hardware is not documented to the extent
where the relationship between IP blocks on different SoCs can be assumed
although they may appear to operate the same way. Furthermore the
documentation typically does not specify a version for individual
IP blocks. For these reasons a convention of using the SoC name in place
of a version and providing SoC-specific compat strings has been adopted.
Although not universally liked this convention is used in the bindings for
a number of drivers for Renesas hardware. The purpose of this patch is to
make use of the SoC-specific CMT compat string for the r8a7779 TMU
clock source.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7779.dtsi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index 463e3fd..72891e5 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -267,7 +267,7 @@
};
tmu0: timer at ffd80000 {
- compatible = "renesas,tmu";
+ compatible = "renesas,tmu-r8a7779", "renesas,tmu";
reg = <0xffd80000 0x30>;
interrupts = <0 32 IRQ_TYPE_LEVEL_HIGH>,
<0 33 IRQ_TYPE_LEVEL_HIGH>,
@@ -281,7 +281,7 @@
};
tmu1: timer at ffd81000 {
- compatible = "renesas,tmu";
+ compatible = "renesas,tmu-r8a7779", "renesas,tmu";
reg = <0xffd81000 0x30>;
interrupts = <0 36 IRQ_TYPE_LEVEL_HIGH>,
<0 37 IRQ_TYPE_LEVEL_HIGH>,
@@ -295,7 +295,7 @@
};
tmu2: timer at ffd82000 {
- compatible = "renesas,tmu";
+ compatible = "renesas,tmu-r8a7779", "renesas,tmu";
reg = <0xffd82000 0x30>;
interrupts = <0 40 IRQ_TYPE_LEVEL_HIGH>,
<0 41 IRQ_TYPE_LEVEL_HIGH>,
--
2.0.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/7] ARM: shmobile: r8a7740: Use SoC-specific 48-bit CMT compat string
2014-09-11 0:57 [GIT PULL] Second Round of Renesas ARM Based SoC DT Timers Updates for v3.18 Simon Horman
` (3 preceding siblings ...)
2014-09-11 0:57 ` [PATCH 4/7] ARM: shmobile: r8a7779: Use SoC-specific TMU " Simon Horman
@ 2014-09-11 0:57 ` Simon Horman
2014-09-11 0:57 ` [PATCH 6/7] ARM: shmobile: sh73a0: Add CMT1 device to DT Simon Horman
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2014-09-11 0:57 UTC (permalink / raw)
To: linux-arm-kernel
In general Renesas hardware is not documented to the extent
where the relationship between IP blocks on different SoCs can be assumed
although they may appear to operate the same way. Furthermore the
documentation typically does not specify a version for individual
IP blocks. For these reasons a convention of using the SoC name in place
of a version and providing SoC-specific compat strings has been adopted.
Although not universally liked this convention is used in the bindings for
a number of drivers for Renesas hardware. The purpose of this patch is to
make use of the SoC-specific CMT compat string for the r8a7740 48-bit CMT
clock source.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7740.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
index 1067a96..d46c213 100644
--- a/arch/arm/boot/dts/r8a7740.dtsi
+++ b/arch/arm/boot/dts/r8a7740.dtsi
@@ -42,7 +42,7 @@
};
cmt1: timer at e6138000 {
- compatible = "renesas,cmt-48";
+ compatible = "renesas,cmt-48-r8a7740", "renesas,cmt-48";
reg = <0xe6138000 0x170>;
interrupts = <0 58 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7740_CLK_CMT1>;
--
2.0.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 6/7] ARM: shmobile: sh73a0: Add CMT1 device to DT
2014-09-11 0:57 [GIT PULL] Second Round of Renesas ARM Based SoC DT Timers Updates for v3.18 Simon Horman
` (4 preceding siblings ...)
2014-09-11 0:57 ` [PATCH 5/7] ARM: shmobile: r8a7740: Use SoC-specific 48-bit CMT " Simon Horman
@ 2014-09-11 0:57 ` Simon Horman
2014-09-11 0:57 ` [PATCH 7/7] ARM: shmobile: kzm9g-reference: Enable CMT1 in device tree Simon Horman
2014-09-11 8:19 ` [GIT PULL] Second Round of Renesas ARM Based SoC DT Timers Updates for v3.18 Arnd Bergmann
7 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2014-09-11 0:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/sh73a0.dtsi | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index 910b790..093e609 100644
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -45,6 +45,16 @@
<0 56 IRQ_TYPE_LEVEL_HIGH>;
};
+ cmt1: timer at e6138000 {
+ compatible = "renesas,cmt-48-sh73a0", "renesas,cmt-48";
+ reg = <0xe6138000 0x200>;
+ interrupts = <0 65 IRQ_TYPE_LEVEL_HIGH>;
+
+ renesas,channels-mask = <0x3f>;
+
+ status = "disabled";
+ };
+
irqpin0: irqpin at e6900000 {
compatible = "renesas,intc-irqpin-sh73a0", "renesas,intc-irqpin";
#interrupt-cells = <2>;
--
2.0.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 7/7] ARM: shmobile: kzm9g-reference: Enable CMT1 in device tree
2014-09-11 0:57 [GIT PULL] Second Round of Renesas ARM Based SoC DT Timers Updates for v3.18 Simon Horman
` (5 preceding siblings ...)
2014-09-11 0:57 ` [PATCH 6/7] ARM: shmobile: sh73a0: Add CMT1 device to DT Simon Horman
@ 2014-09-11 0:57 ` Simon Horman
2014-09-11 8:19 ` [GIT PULL] Second Round of Renesas ARM Based SoC DT Timers Updates for v3.18 Arnd Bergmann
7 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2014-09-11 0:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 4 ++++
arch/arm/mach-shmobile/setup-sh73a0.c | 11 +----------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
index 18662ae..99659db 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
@@ -173,6 +173,10 @@
};
};
+&cmt1 {
+ status = "ok";
+};
+
&i2c0 {
status = "okay";
as3711 at 40 {
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index 2c802ae..928e96a 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -696,10 +696,6 @@ static struct platform_device irqpin3_device = {
},
};
-static struct platform_device *sh73a0_devices_dt[] __initdata = {
- &cmt1_device,
-};
-
static struct platform_device *sh73a0_early_devices[] __initdata = {
&scif0_device,
&scif1_device,
@@ -712,6 +708,7 @@ static struct platform_device *sh73a0_early_devices[] __initdata = {
&scif8_device,
&tmu0_device,
&ipmmu_device,
+ &cmt1_device,
};
static struct platform_device *sh73a0_late_devices[] __initdata = {
@@ -736,8 +733,6 @@ void __init sh73a0_add_standard_devices(void)
/* Clear software reset bit on SY-DMAC module */
__raw_writel(__raw_readl(SRCR2) & ~(1 << 18), SRCR2);
- platform_add_devices(sh73a0_devices_dt,
- ARRAY_SIZE(sh73a0_devices_dt));
platform_add_devices(sh73a0_early_devices,
ARRAY_SIZE(sh73a0_early_devices));
platform_add_devices(sh73a0_late_devices,
@@ -762,8 +757,6 @@ void __init sh73a0_earlytimer_init(void)
void __init sh73a0_add_early_devices(void)
{
- early_platform_add_devices(sh73a0_devices_dt,
- ARRAY_SIZE(sh73a0_devices_dt));
early_platform_add_devices(sh73a0_early_devices,
ARRAY_SIZE(sh73a0_early_devices));
@@ -780,8 +773,6 @@ void __init sh73a0_add_standard_devices_dt(void)
/* clocks are setup late during boot in the case of DT */
sh73a0_clock_init();
- platform_add_devices(sh73a0_devices_dt,
- ARRAY_SIZE(sh73a0_devices_dt));
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
/* Instantiate cpufreq-cpu0 */
--
2.0.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [GIT PULL] Second Round of Renesas ARM Based SoC DT Timers Updates for v3.18
2014-09-11 0:57 [GIT PULL] Second Round of Renesas ARM Based SoC DT Timers Updates for v3.18 Simon Horman
` (6 preceding siblings ...)
2014-09-11 0:57 ` [PATCH 7/7] ARM: shmobile: kzm9g-reference: Enable CMT1 in device tree Simon Horman
@ 2014-09-11 8:19 ` Arnd Bergmann
7 siblings, 0 replies; 9+ messages in thread
From: Arnd Bergmann @ 2014-09-11 8:19 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 11 September 2014 09:57:01 Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these second round of Renesas ARM based SoC DT timers updates for v3.18.
>
> This pull request is based on a merge of:
>
> * The previous round of DT time updates for v3.18,
> tagged as renesas-dt-timers-for-v3.18,
> which you have already merged.
>
> * Renesas ARM Based SoC r8a7740 Multiplatform Updates for v3.18,
> tagged as renesas-r8a7740-ccf-and-timers-for-v3.18,
> which you have previously pulled.
>
>
> The following changes since commit dcc683aba83cd8db964a9a1d4582d4829d6efcb2:
>
> Merge tag 'renesas-r8a7740-ccf-and-timers-for-v3.18' into dt-timers-for-v3.18 (2014-09-09 11:50:00 +0900)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-timers2-for-v3.18
>
> for you to fetch changes up to 48a0d1e07d99ecfd1e5922dd22986d5813f17207:
>
> ARM: shmobile: kzm9g-reference: Enable CMT1 in device tree (2014-09-09 11:53:14 +0900)
>
> ----------------------------------------------------------------
> Second Round of Renesas ARM Based SoC DT Timers Updates for v3.18
>
> * kzm9g-reference: Enable CMT1 in device tree
> * Use SoC-specific timer compat strings
Pulled into next/soc, thanks!
Arnd
^ permalink raw reply [flat|nested] 9+ messages in thread