* [PATCH 1/4] ARM: shmobile: r8a73a4: Add CMT1 node
2014-10-29 4:59 [GIT PULL] Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19 Simon Horman
@ 2014-10-29 4:59 ` Simon Horman
2014-10-29 4:59 ` [PATCH 2/4] ARM: shmobile: r8a73a4: Rename cmt registration helper Simon Horman
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-10-29 4:59 UTC (permalink / raw)
To: linux-arm-kernel
This describes all of the CMT1 hardware of the r8a73a4.
The node is disabled and may be enabled as necessary by board DTS files.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a73a4.dtsi | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
index c17afef..8093967 100644
--- a/arch/arm/boot/dts/r8a73a4.dtsi
+++ b/arch/arm/boot/dts/r8a73a4.dtsi
@@ -109,6 +109,17 @@
compatible = "renesas,rmobile-iic";
reg = <0 0xe60b0000 0 0x428>;
interrupts = <0 179 IRQ_TYPE_LEVEL_HIGH>;
+
+ status = "disabled";
+ };
+
+ cmt1: timer at e6130000 {
+ compatible = "renesas,cmt-48-gen2";
+ reg = <0 0xe6130000 0 0x1004>;
+ interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>;
+
+ renesas,channels-mask = <0xff>;
+
status = "disabled";
};
--
2.1.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/4] ARM: shmobile: r8a73a4: Rename cmt registration helper
2014-10-29 4:59 [GIT PULL] Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19 Simon Horman
2014-10-29 4:59 ` [PATCH 1/4] ARM: shmobile: r8a73a4: Add CMT1 node Simon Horman
@ 2014-10-29 4:59 ` Simon Horman
2014-10-29 4:59 ` [PATCH 3/4] ARM: shmobile: ape6evm-reference: Initialise CMT1 device using DT Simon Horman
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-10-29 4:59 UTC (permalink / raw)
To: linux-arm-kernel
Rename r8a7790_register_cmt() as r8a73a4_register_cmt() to
reflect name of the SoC in use. The use of r8a7790 appears
to be due to historical sharing of code from that SoC.
Shared code is no longer used.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-r8a73a4.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c
index 53f40b7..7a7df71 100644
--- a/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ b/arch/arm/mach-shmobile/setup-r8a73a4.c
@@ -180,7 +180,7 @@ static struct resource cmt1_resources[] = {
DEFINE_RES_IRQ(gic_spi(120)),
};
-#define r8a7790_register_cmt(idx) \
+#define r8a73a4_register_cmt(idx) \
platform_device_register_resndata(NULL, "sh-cmt-48-gen2", \
idx, cmt##idx##_resources, \
ARRAY_SIZE(cmt##idx##_resources), \
@@ -189,7 +189,7 @@ static struct resource cmt1_resources[] = {
void __init r8a73a4_add_dt_devices(void)
{
- r8a7790_register_cmt(1);
+ r8a73a4_register_cmt(1);
}
/* DMA */
--
2.1.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [GIT PULL] Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19
@ 2014-10-29 4:59 Simon Horman
2014-10-29 4:59 ` [PATCH 1/4] ARM: shmobile: r8a73a4: Add CMT1 node Simon Horman
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Simon Horman @ 2014-10-29 4:59 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Kevin, Hi Arnd,
Please consider these Renesas ARM based SoC r8a73a4 DT timers updates for v3.19.
This pull-request is based on "[GIT PULL] Renesas ARM Based SoC DT Cleanups
for v3.19", tagged as dt-cleanups-for-v3.19, which I have also sent a
pull-request for.
The reason for this base is to avoid conflicts.
This pull-request is in a stand-alone branch as it includes
an board, SoC and DT changes that depend on each other in
an order other than the way branches dependencies are usually arranged.
The following changes since commit 120f038cf04b95dc895cba503a7516ff75561438:
ARM: shmobile: kzm9d dts: Add chosen/stdout-path (2014-10-24 10:44:10 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-r8a73a4-dt-timers-for-v3.19
for you to fetch changes up to fd3edcbe9f7bf24b13cadca7616f8e10bbe7e2b3:
ARM: shmobile: r8a73a4: Remove empty r8a73a4_add_dt_devices (2014-10-24 11:54:49 +0900)
----------------------------------------------------------------
Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19
* Initialise CMT1 timer using DT
----------------------------------------------------------------
Simon Horman (4):
ARM: shmobile: r8a73a4: Add CMT1 node
ARM: shmobile: r8a73a4: Rename cmt registration helper
ARM: shmobile: ape6evm-reference: Initialise CMT1 device using DT
ARM: shmobile: r8a73a4: Remove empty r8a73a4_add_dt_devices
arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 4 ++++
arch/arm/boot/dts/r8a73a4.dtsi | 11 +++++++++++
arch/arm/mach-shmobile/board-ape6evm-reference.c | 1 -
arch/arm/mach-shmobile/r8a73a4.h | 1 -
arch/arm/mach-shmobile/setup-r8a73a4.c | 9 ++-------
5 files changed, 17 insertions(+), 9 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/4] ARM: shmobile: ape6evm-reference: Initialise CMT1 device using DT
2014-10-29 4:59 [GIT PULL] Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19 Simon Horman
2014-10-29 4:59 ` [PATCH 1/4] ARM: shmobile: r8a73a4: Add CMT1 node Simon Horman
2014-10-29 4:59 ` [PATCH 2/4] ARM: shmobile: r8a73a4: Rename cmt registration helper Simon Horman
@ 2014-10-29 4:59 ` Simon Horman
2014-10-29 4:59 ` [PATCH 4/4] ARM: shmobile: r8a73a4: Remove empty r8a73a4_add_dt_devices Simon Horman
2014-11-04 22:39 ` [GIT PULL] Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19 Olof Johansson
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-10-29 4:59 UTC (permalink / raw)
To: linux-arm-kernel
Initialise CMT1 device using DT when booting ape6evm
using DT-reference.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 4 ++++
arch/arm/mach-shmobile/setup-r8a73a4.c | 3 +--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
index 2bcf691..84e05f7 100644
--- a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
+++ b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
@@ -94,6 +94,10 @@
voltage-tolerance = <1>; /* 1% */
};
+&cmt1 {
+ status = "okay";
+};
+
&pfc {
scifa0_pins: serial0 {
renesas,groups = "scifa0_data";
diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c
index 7a7df71..3b7efc0 100644
--- a/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ b/arch/arm/mach-shmobile/setup-r8a73a4.c
@@ -189,7 +189,6 @@ static struct resource cmt1_resources[] = {
void __init r8a73a4_add_dt_devices(void)
{
- r8a73a4_register_cmt(1);
}
/* DMA */
@@ -282,7 +281,7 @@ static struct resource dma_resources[] = {
void __init r8a73a4_add_standard_devices(void)
{
- r8a73a4_add_dt_devices();
+ r8a73a4_register_cmt(1);
r8a73a4_register_scif(0);
r8a73a4_register_scif(1);
r8a73a4_register_scif(2);
--
2.1.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/4] ARM: shmobile: r8a73a4: Remove empty r8a73a4_add_dt_devices
2014-10-29 4:59 [GIT PULL] Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19 Simon Horman
` (2 preceding siblings ...)
2014-10-29 4:59 ` [PATCH 3/4] ARM: shmobile: ape6evm-reference: Initialise CMT1 device using DT Simon Horman
@ 2014-10-29 4:59 ` Simon Horman
2014-11-04 22:39 ` [GIT PULL] Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19 Olof Johansson
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-10-29 4:59 UTC (permalink / raw)
To: linux-arm-kernel
r8a73a4_add_dt_devices() no longer enables any devices
so remove it.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-ape6evm-reference.c | 1 -
arch/arm/mach-shmobile/r8a73a4.h | 1 -
arch/arm/mach-shmobile/setup-r8a73a4.c | 4 ----
3 files changed, 6 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-ape6evm-reference.c b/arch/arm/mach-shmobile/board-ape6evm-reference.c
index a6503d8..7c7c6f7 100644
--- a/arch/arm/mach-shmobile/board-ape6evm-reference.c
+++ b/arch/arm/mach-shmobile/board-ape6evm-reference.c
@@ -48,7 +48,6 @@ static void __init ape6evm_add_standard_devices(void)
clk_put(parent);
clk_put(mp);
- r8a73a4_add_dt_devices();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
diff --git a/arch/arm/mach-shmobile/r8a73a4.h b/arch/arm/mach-shmobile/r8a73a4.h
index 5fafd6f..70dcd84 100644
--- a/arch/arm/mach-shmobile/r8a73a4.h
+++ b/arch/arm/mach-shmobile/r8a73a4.h
@@ -11,7 +11,6 @@ enum {
};
void r8a73a4_add_standard_devices(void);
-void r8a73a4_add_dt_devices(void);
void r8a73a4_clock_init(void);
void r8a73a4_pinmux_init(void);
diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c
index 3b7efc0..179f28a 100644
--- a/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ b/arch/arm/mach-shmobile/setup-r8a73a4.c
@@ -187,10 +187,6 @@ static struct resource cmt1_resources[] = {
&cmt##idx##_platform_data, \
sizeof(struct sh_timer_config))
-void __init r8a73a4_add_dt_devices(void)
-{
-}
-
/* DMA */
static const struct sh_dmae_slave_config dma_slaves[] = {
{
--
2.1.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [GIT PULL] Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19
2014-10-29 4:59 [GIT PULL] Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19 Simon Horman
` (3 preceding siblings ...)
2014-10-29 4:59 ` [PATCH 4/4] ARM: shmobile: r8a73a4: Remove empty r8a73a4_add_dt_devices Simon Horman
@ 2014-11-04 22:39 ` Olof Johansson
4 siblings, 0 replies; 6+ messages in thread
From: Olof Johansson @ 2014-11-04 22:39 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Oct 29, 2014 at 01:59:53PM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Renesas ARM based SoC r8a73a4 DT timers updates for v3.19.
>
> This pull-request is based on "[GIT PULL] Renesas ARM Based SoC DT Cleanups
> for v3.19", tagged as dt-cleanups-for-v3.19, which I have also sent a
> pull-request for.
>
> The reason for this base is to avoid conflicts.
>
>
> This pull-request is in a stand-alone branch as it includes
> an board, SoC and DT changes that depend on each other in
> an order other than the way branches dependencies are usually arranged.
>
>
> The following changes since commit 120f038cf04b95dc895cba503a7516ff75561438:
>
> ARM: shmobile: kzm9d dts: Add chosen/stdout-path (2014-10-24 10:44:10 +0900)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-r8a73a4-dt-timers-for-v3.19
>
> for you to fetch changes up to fd3edcbe9f7bf24b13cadca7616f8e10bbe7e2b3:
>
> ARM: shmobile: r8a73a4: Remove empty r8a73a4_add_dt_devices (2014-10-24 11:54:49 +0900)
Merged into next/dt.
-Olof
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-11-04 22:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-29 4:59 [GIT PULL] Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19 Simon Horman
2014-10-29 4:59 ` [PATCH 1/4] ARM: shmobile: r8a73a4: Add CMT1 node Simon Horman
2014-10-29 4:59 ` [PATCH 2/4] ARM: shmobile: r8a73a4: Rename cmt registration helper Simon Horman
2014-10-29 4:59 ` [PATCH 3/4] ARM: shmobile: ape6evm-reference: Initialise CMT1 device using DT Simon Horman
2014-10-29 4:59 ` [PATCH 4/4] ARM: shmobile: r8a73a4: Remove empty r8a73a4_add_dt_devices Simon Horman
2014-11-04 22:39 ` [GIT PULL] Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19 Olof Johansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).