From: Magnus Damm <magnus.damm@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 02/04] ARM: shmobile: Make r8a7790 Arch timer optional
Date: Fri, 28 Jun 2013 11:27:13 +0000 [thread overview]
Message-ID: <20130628112713.23809.67187.sendpatchset@w520> (raw)
In-Reply-To: <20130628112655.23809.39115.sendpatchset@w520>
From: Magnus Damm <damm@opensource.se>
Update the r8a7790 code to allow using other
timers than Arch timer for clock events.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/Kconfig | 1 -
arch/arm/mach-shmobile/board-lager.c | 1 +
arch/arm/mach-shmobile/include/mach/r8a7790.h | 1 +
arch/arm/mach-shmobile/setup-r8a7790.c | 8 ++++++++
4 files changed, 10 insertions(+), 1 deletion(-)
--- 0001/arch/arm/mach-shmobile/Kconfig
+++ work/arch/arm/mach-shmobile/Kconfig 2013-06-28 15:30:59.000000000 +0900
@@ -61,7 +61,6 @@ config ARCH_R8A7790
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
select CPU_V7
- select ARM_ARCH_TIMER
select SH_CLK_CPG
select RENESAS_IRQC
--- 0001/arch/arm/mach-shmobile/board-lager.c
+++ work/arch/arm/mach-shmobile/board-lager.c 2013-06-28 15:31:47.000000000 +0900
@@ -103,6 +103,7 @@ static const char *lager_boards_compat_d
};
DT_MACHINE_START(LAGER_DT, "lager")
+ .init_early = r8a7790_init_delay,
.init_irq = irqchip_init,
.init_time = r8a7790_timer_init,
.init_machine = lager_add_standard_devices,
--- 0001/arch/arm/mach-shmobile/include/mach/r8a7790.h
+++ work/arch/arm/mach-shmobile/include/mach/r8a7790.h 2013-06-28 15:31:21.000000000 +0900
@@ -4,6 +4,7 @@
void r8a7790_add_standard_devices(void);
void r8a7790_clock_init(void);
void r8a7790_pinmux_init(void);
+void r8a7790_init_delay(void);
void r8a7790_timer_init(void);
#endif /* __ASM_R8A7790_H__ */
--- 0003/arch/arm/mach-shmobile/setup-r8a7790.c
+++ work/arch/arm/mach-shmobile/setup-r8a7790.c 2013-06-28 15:34:37.000000000 +0900
@@ -209,6 +209,13 @@ void __init r8a7790_timer_init(void)
shmobile_timer_init();
}
+void __init r8a7790_init_delay(void)
+{
+#ifndef CONFIG_ARM_ARCH_TIMER
+ shmobile_setup_delay(1300, 2, 4); /* Cortex-A15 @ 1300MHz */
+#endif
+}
+
#ifdef CONFIG_USE_OF
void __init r8a7790_add_standard_devices_dt(void)
{
@@ -221,6 +228,7 @@ static const char *r8a7790_boards_compat
};
DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
+ .init_early = r8a7790_init_delay,
.init_irq = irqchip_init,
.init_machine = r8a7790_add_standard_devices_dt,
.init_time = r8a7790_timer_init,
WARNING: multiple messages have this Message-ID (diff)
From: magnus.damm@gmail.com (Magnus Damm)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 02/04] ARM: shmobile: Make r8a7790 Arch timer optional
Date: Fri, 28 Jun 2013 20:27:13 +0900 [thread overview]
Message-ID: <20130628112713.23809.67187.sendpatchset@w520> (raw)
In-Reply-To: <20130628112655.23809.39115.sendpatchset@w520>
From: Magnus Damm <damm@opensource.se>
Update the r8a7790 code to allow using other
timers than Arch timer for clock events.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/Kconfig | 1 -
arch/arm/mach-shmobile/board-lager.c | 1 +
arch/arm/mach-shmobile/include/mach/r8a7790.h | 1 +
arch/arm/mach-shmobile/setup-r8a7790.c | 8 ++++++++
4 files changed, 10 insertions(+), 1 deletion(-)
--- 0001/arch/arm/mach-shmobile/Kconfig
+++ work/arch/arm/mach-shmobile/Kconfig 2013-06-28 15:30:59.000000000 +0900
@@ -61,7 +61,6 @@ config ARCH_R8A7790
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
select CPU_V7
- select ARM_ARCH_TIMER
select SH_CLK_CPG
select RENESAS_IRQC
--- 0001/arch/arm/mach-shmobile/board-lager.c
+++ work/arch/arm/mach-shmobile/board-lager.c 2013-06-28 15:31:47.000000000 +0900
@@ -103,6 +103,7 @@ static const char *lager_boards_compat_d
};
DT_MACHINE_START(LAGER_DT, "lager")
+ .init_early = r8a7790_init_delay,
.init_irq = irqchip_init,
.init_time = r8a7790_timer_init,
.init_machine = lager_add_standard_devices,
--- 0001/arch/arm/mach-shmobile/include/mach/r8a7790.h
+++ work/arch/arm/mach-shmobile/include/mach/r8a7790.h 2013-06-28 15:31:21.000000000 +0900
@@ -4,6 +4,7 @@
void r8a7790_add_standard_devices(void);
void r8a7790_clock_init(void);
void r8a7790_pinmux_init(void);
+void r8a7790_init_delay(void);
void r8a7790_timer_init(void);
#endif /* __ASM_R8A7790_H__ */
--- 0003/arch/arm/mach-shmobile/setup-r8a7790.c
+++ work/arch/arm/mach-shmobile/setup-r8a7790.c 2013-06-28 15:34:37.000000000 +0900
@@ -209,6 +209,13 @@ void __init r8a7790_timer_init(void)
shmobile_timer_init();
}
+void __init r8a7790_init_delay(void)
+{
+#ifndef CONFIG_ARM_ARCH_TIMER
+ shmobile_setup_delay(1300, 2, 4); /* Cortex-A15 @ 1300MHz */
+#endif
+}
+
#ifdef CONFIG_USE_OF
void __init r8a7790_add_standard_devices_dt(void)
{
@@ -221,6 +228,7 @@ static const char *r8a7790_boards_compat
};
DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
+ .init_early = r8a7790_init_delay,
.init_irq = irqchip_init,
.init_machine = r8a7790_add_standard_devices_dt,
.init_time = r8a7790_timer_init,
next prev parent reply other threads:[~2013-06-28 11:27 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-28 11:26 [PATCH 00/04] ARM: shmobile: r8a73a4/r8a7790 CMT and Arch timer update Magnus Damm
2013-06-28 11:26 ` Magnus Damm
2013-06-28 11:27 ` [PATCH 01/04] ARM: shmobile: Add r8a7790 CMT00 clock event Magnus Damm
2013-06-28 11:27 ` Magnus Damm
2013-06-28 11:27 ` Magnus Damm [this message]
2013-06-28 11:27 ` [PATCH 02/04] ARM: shmobile: Make r8a7790 Arch timer optional Magnus Damm
2013-06-28 11:27 ` [PATCH 03/04] ARM: shmobile: Add r8a73a4 CMT10 clock event Magnus Damm
2013-06-28 11:27 ` Magnus Damm
2013-06-28 11:27 ` [PATCH 04/04] ARM: shmobile: Make r8a73a4 Arch timer optional Magnus Damm
2013-06-28 11:27 ` Magnus Damm
2013-07-01 2:02 ` [PATCH 00/04] ARM: shmobile: r8a73a4/r8a7790 CMT and Arch timer update Simon Horman
2013-07-01 2:02 ` Simon Horman
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=20130628112713.23809.67187.sendpatchset@w520 \
--to=magnus.damm@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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.