* [PATCH] integrator: implement sched_clock across all boards
@ 2012-01-19 21:25 Linus Walleij
2012-01-19 22:47 ` Rob Herring
0 siblings, 1 reply; 2+ messages in thread
From: Linus Walleij @ 2012-01-19 21:25 UTC (permalink / raw)
To: linux-arm-kernel
Now that we can select a sched_clock at runtime, let's implement
it for the Integrator AP, default-select the one found in all
other board it for all plat-versatile boards and make the right
clock kick in at runtime.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
arch/arm/mach-integrator/Kconfig | 1 +
arch/arm/mach-integrator/integrator_ap.c | 7 +++++++
arch/arm/plat-versatile/Kconfig | 2 +-
3 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
index 350e266..5a6148a 100644
--- a/arch/arm/mach-integrator/Kconfig
+++ b/arch/arm/mach-integrator/Kconfig
@@ -5,6 +5,7 @@ menu "Integrator Options"
config ARCH_INTEGRATOR_AP
bool "Support Integrator/AP and Integrator/PP2 platforms"
select CLKSRC_MMIO
+ select HAVE_SCHED_CLOCK
select MIGHT_HAVE_PCI
select SERIAL_AMBA_PL010
select SERIAL_AMBA_PL010_CONSOLE
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index 21a1d6c..4dde28b 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -42,6 +42,7 @@
#include <asm/setup.h>
#include <asm/param.h> /* HZ */
#include <asm/mach-types.h>
+#include <asm/sched_clock.h>
#include <mach/lm.h>
@@ -325,6 +326,11 @@ static void __init ap_init(void)
static unsigned long timer_reload;
+static u32 notrace integrator_read_sched_clock(void)
+{
+ return -readl((void __iomem *) TIMER2_VA_BASE + TIMER_VALUE);
+}
+
static void integrator_clocksource_init(unsigned long inrate)
{
void __iomem *base = (void __iomem *)TIMER2_VA_BASE;
@@ -341,6 +347,7 @@ static void integrator_clocksource_init(unsigned long inrate)
clocksource_mmio_init(base + TIMER_VALUE, "timer2",
rate, 200, 16, clocksource_mmio_readl_down);
+ setup_sched_clock(integrator_read_sched_clock, 16, rate);
}
static void __iomem * const clkevt_base = (void __iomem *)TIMER1_VA_BASE;
diff --git a/arch/arm/plat-versatile/Kconfig b/arch/arm/plat-versatile/Kconfig
index 52353be..aa63f38 100644
--- a/arch/arm/plat-versatile/Kconfig
+++ b/arch/arm/plat-versatile/Kconfig
@@ -11,7 +11,7 @@ config PLAT_VERSATILE_LEDS
depends on ARCH_REALVIEW || ARCH_VERSATILE
config PLAT_VERSATILE_SCHED_CLOCK
- def_bool y if !ARCH_INTEGRATOR_AP
+ def_bool y
select HAVE_SCHED_CLOCK
endif
--
1.7.7.5
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH] integrator: implement sched_clock across all boards
2012-01-19 21:25 [PATCH] integrator: implement sched_clock across all boards Linus Walleij
@ 2012-01-19 22:47 ` Rob Herring
0 siblings, 0 replies; 2+ messages in thread
From: Rob Herring @ 2012-01-19 22:47 UTC (permalink / raw)
To: linux-arm-kernel
On 01/19/2012 03:25 PM, Linus Walleij wrote:
> Now that we can select a sched_clock at runtime, let's implement
> it for the Integrator AP, default-select the one found in all
> other board it for all plat-versatile boards and make the right
> clock kick in at runtime.
>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> arch/arm/mach-integrator/Kconfig | 1 +
> arch/arm/mach-integrator/integrator_ap.c | 7 +++++++
> arch/arm/plat-versatile/Kconfig | 2 +-
> 3 files changed, 9 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
> index 350e266..5a6148a 100644
> --- a/arch/arm/mach-integrator/Kconfig
> +++ b/arch/arm/mach-integrator/Kconfig
> @@ -5,6 +5,7 @@ menu "Integrator Options"
> config ARCH_INTEGRATOR_AP
> bool "Support Integrator/AP and Integrator/PP2 platforms"
> select CLKSRC_MMIO
> + select HAVE_SCHED_CLOCK
This can go away with Marc Z's follow-on series as HAVE_SCHED_CLOCK is
always selected for ARM.
> select MIGHT_HAVE_PCI
> select SERIAL_AMBA_PL010
> select SERIAL_AMBA_PL010_CONSOLE
> diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
> index 21a1d6c..4dde28b 100644
> --- a/arch/arm/mach-integrator/integrator_ap.c
> +++ b/arch/arm/mach-integrator/integrator_ap.c
> @@ -42,6 +42,7 @@
> #include <asm/setup.h>
> #include <asm/param.h> /* HZ */
> #include <asm/mach-types.h>
> +#include <asm/sched_clock.h>
>
> #include <mach/lm.h>
>
> @@ -325,6 +326,11 @@ static void __init ap_init(void)
>
> static unsigned long timer_reload;
>
> +static u32 notrace integrator_read_sched_clock(void)
> +{
> + return -readl((void __iomem *) TIMER2_VA_BASE + TIMER_VALUE);
> +}
> +
> static void integrator_clocksource_init(unsigned long inrate)
> {
> void __iomem *base = (void __iomem *)TIMER2_VA_BASE;
> @@ -341,6 +347,7 @@ static void integrator_clocksource_init(unsigned long inrate)
>
> clocksource_mmio_init(base + TIMER_VALUE, "timer2",
> rate, 200, 16, clocksource_mmio_readl_down);
> + setup_sched_clock(integrator_read_sched_clock, 16, rate);
> }
>
> static void __iomem * const clkevt_base = (void __iomem *)TIMER1_VA_BASE;
> diff --git a/arch/arm/plat-versatile/Kconfig b/arch/arm/plat-versatile/Kconfig
> index 52353be..aa63f38 100644
> --- a/arch/arm/plat-versatile/Kconfig
> +++ b/arch/arm/plat-versatile/Kconfig
> @@ -11,7 +11,7 @@ config PLAT_VERSATILE_LEDS
> depends on ARCH_REALVIEW || ARCH_VERSATILE
>
> config PLAT_VERSATILE_SCHED_CLOCK
> - def_bool y if !ARCH_INTEGRATOR_AP
> + def_bool y
> select HAVE_SCHED_CLOCK
>
> endif
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-01-19 22:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-19 21:25 [PATCH] integrator: implement sched_clock across all boards Linus Walleij
2012-01-19 22:47 ` Rob Herring
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).