From: Felipe Balbi <balbi@ti.com>
To: Tony Lindgren <tony@atomide.com>
Cc: Linux OMAP Mailing List <linux-omap@vger.kernel.org>,
Linux ARM Kernel Mailing List
<linux-arm-kernel@lists.infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
<daniel.lezcano@linaro.org>, <tglx@linutronix.de>,
Felipe Balbi <balbi@ti.com>
Subject: [RFC/PATCH 07/11] arm: omap2: timer: remove omap4_local_timer_init
Date: Tue, 29 Sep 2015 15:44:02 -0500 [thread overview]
Message-ID: <1443559446-26969-8-git-send-email-balbi@ti.com> (raw)
In-Reply-To: <1443559446-26969-1-git-send-email-balbi@ti.com>
We're now always calling clocksource_of_init()
whenever booting with DT, so we can use the
generic omap_sync32k_timer_init() (which will
be renamed in a follow-up patch) for OMAP4
as well.
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
arch/arm/mach-omap2/board-generic.c | 4 ++--
arch/arm/mach-omap2/common.h | 1 -
arch/arm/mach-omap2/timer.c | 8 --------
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index d08191ffabd9..13f7df92baf4 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -235,7 +235,7 @@ DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)")
.init_irq = omap_gic_of_init,
.init_machine = omap_generic_init,
.init_late = omap4430_init_late,
- .init_time = omap4_local_timer_init,
+ .init_time = omap_sync32k_timer_init,
.dt_compat = omap4_boards_compat,
.restart = omap44xx_restart,
MACHINE_END
@@ -279,7 +279,7 @@ DT_MACHINE_START(AM43_DT, "Generic AM43 (Flattened Device Tree)")
.init_late = am43xx_init_late,
.init_irq = omap_gic_of_init,
.init_machine = omap_generic_init,
- .init_time = omap4_local_timer_init,
+ .init_time = omap_sync32k_timer_init,
.dt_compat = am43_boards_compat,
.restart = omap44xx_restart,
MACHINE_END
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index 844ad031f7f0..bf42fc4e78f4 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -91,7 +91,6 @@ extern void omap2_init_common_infrastructure(void);
extern void omap_sync32k_timer_init(void);
extern void omap3_secure_sync32k_timer_init(void);
extern void omap3_gptimer_timer_init(void);
-extern void omap4_local_timer_init(void);
#ifdef CONFIG_CACHE_L2X0
int omap_l2_cache_init(void);
#define OMAP_L2C_AUX_CTRL (L2C_AUX_CTRL_SHARED_OVERRIDE | \
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 1ae563736b12..86c726ba2dd9 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -521,14 +521,6 @@ void __init omap3_gptimer_timer_init(void)
}
#endif
-#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \
- defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX)
-void __init omap4_local_timer_init(void)
-{
- omap_sync32k_timer_init();
-}
-#endif
-
#if defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX)
/*
--
2.5.3
WARNING: multiple messages have this Message-ID (diff)
From: Felipe Balbi <balbi@ti.com>
To: Tony Lindgren <tony@atomide.com>
Cc: Linux OMAP Mailing List <linux-omap@vger.kernel.org>,
Linux ARM Kernel Mailing List
<linux-arm-kernel@lists.infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
daniel.lezcano@linaro.org, tglx@linutronix.de,
Felipe Balbi <balbi@ti.com>
Subject: [RFC/PATCH 07/11] arm: omap2: timer: remove omap4_local_timer_init
Date: Tue, 29 Sep 2015 15:44:02 -0500 [thread overview]
Message-ID: <1443559446-26969-8-git-send-email-balbi@ti.com> (raw)
In-Reply-To: <1443559446-26969-1-git-send-email-balbi@ti.com>
We're now always calling clocksource_of_init()
whenever booting with DT, so we can use the
generic omap_sync32k_timer_init() (which will
be renamed in a follow-up patch) for OMAP4
as well.
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
arch/arm/mach-omap2/board-generic.c | 4 ++--
arch/arm/mach-omap2/common.h | 1 -
arch/arm/mach-omap2/timer.c | 8 --------
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index d08191ffabd9..13f7df92baf4 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -235,7 +235,7 @@ DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)")
.init_irq = omap_gic_of_init,
.init_machine = omap_generic_init,
.init_late = omap4430_init_late,
- .init_time = omap4_local_timer_init,
+ .init_time = omap_sync32k_timer_init,
.dt_compat = omap4_boards_compat,
.restart = omap44xx_restart,
MACHINE_END
@@ -279,7 +279,7 @@ DT_MACHINE_START(AM43_DT, "Generic AM43 (Flattened Device Tree)")
.init_late = am43xx_init_late,
.init_irq = omap_gic_of_init,
.init_machine = omap_generic_init,
- .init_time = omap4_local_timer_init,
+ .init_time = omap_sync32k_timer_init,
.dt_compat = am43_boards_compat,
.restart = omap44xx_restart,
MACHINE_END
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index 844ad031f7f0..bf42fc4e78f4 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -91,7 +91,6 @@ extern void omap2_init_common_infrastructure(void);
extern void omap_sync32k_timer_init(void);
extern void omap3_secure_sync32k_timer_init(void);
extern void omap3_gptimer_timer_init(void);
-extern void omap4_local_timer_init(void);
#ifdef CONFIG_CACHE_L2X0
int omap_l2_cache_init(void);
#define OMAP_L2C_AUX_CTRL (L2C_AUX_CTRL_SHARED_OVERRIDE | \
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 1ae563736b12..86c726ba2dd9 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -521,14 +521,6 @@ void __init omap3_gptimer_timer_init(void)
}
#endif
-#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \
- defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX)
-void __init omap4_local_timer_init(void)
-{
- omap_sync32k_timer_init();
-}
-#endif
-
#if defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX)
/*
--
2.5.3
WARNING: multiple messages have this Message-ID (diff)
From: balbi@ti.com (Felipe Balbi)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC/PATCH 07/11] arm: omap2: timer: remove omap4_local_timer_init
Date: Tue, 29 Sep 2015 15:44:02 -0500 [thread overview]
Message-ID: <1443559446-26969-8-git-send-email-balbi@ti.com> (raw)
In-Reply-To: <1443559446-26969-1-git-send-email-balbi@ti.com>
We're now always calling clocksource_of_init()
whenever booting with DT, so we can use the
generic omap_sync32k_timer_init() (which will
be renamed in a follow-up patch) for OMAP4
as well.
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
arch/arm/mach-omap2/board-generic.c | 4 ++--
arch/arm/mach-omap2/common.h | 1 -
arch/arm/mach-omap2/timer.c | 8 --------
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index d08191ffabd9..13f7df92baf4 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -235,7 +235,7 @@ DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)")
.init_irq = omap_gic_of_init,
.init_machine = omap_generic_init,
.init_late = omap4430_init_late,
- .init_time = omap4_local_timer_init,
+ .init_time = omap_sync32k_timer_init,
.dt_compat = omap4_boards_compat,
.restart = omap44xx_restart,
MACHINE_END
@@ -279,7 +279,7 @@ DT_MACHINE_START(AM43_DT, "Generic AM43 (Flattened Device Tree)")
.init_late = am43xx_init_late,
.init_irq = omap_gic_of_init,
.init_machine = omap_generic_init,
- .init_time = omap4_local_timer_init,
+ .init_time = omap_sync32k_timer_init,
.dt_compat = am43_boards_compat,
.restart = omap44xx_restart,
MACHINE_END
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index 844ad031f7f0..bf42fc4e78f4 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -91,7 +91,6 @@ extern void omap2_init_common_infrastructure(void);
extern void omap_sync32k_timer_init(void);
extern void omap3_secure_sync32k_timer_init(void);
extern void omap3_gptimer_timer_init(void);
-extern void omap4_local_timer_init(void);
#ifdef CONFIG_CACHE_L2X0
int omap_l2_cache_init(void);
#define OMAP_L2C_AUX_CTRL (L2C_AUX_CTRL_SHARED_OVERRIDE | \
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 1ae563736b12..86c726ba2dd9 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -521,14 +521,6 @@ void __init omap3_gptimer_timer_init(void)
}
#endif
-#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \
- defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX)
-void __init omap4_local_timer_init(void)
-{
- omap_sync32k_timer_init();
-}
-#endif
-
#if defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX)
/*
--
2.5.3
next prev parent reply other threads:[~2015-09-29 20:46 UTC|newest]
Thread overview: 127+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-29 20:43 [RFC/PATCH 00/11] arm: omap: counter32k rework Felipe Balbi
2015-09-29 20:43 ` Felipe Balbi
2015-09-29 20:43 ` Felipe Balbi
2015-09-29 20:43 ` [RFC/PATCH 01/11] arm: omap2: timer: get rid of obfuscating macros Felipe Balbi
2015-09-29 20:43 ` Felipe Balbi
2015-09-29 20:43 ` Felipe Balbi
2015-09-29 20:43 ` [RFC/PATCH 02/11] arm: omap2: timer: add a gptimer argument to sync32k_timer_init() Felipe Balbi
2015-09-29 20:43 ` Felipe Balbi
2015-09-29 20:43 ` Felipe Balbi
2015-09-29 20:43 ` [RFC/PATCH 03/11] arm: omap2: timer: remove __omap_gptimer_init() Felipe Balbi
2015-09-29 20:43 ` Felipe Balbi
2015-09-29 20:43 ` Felipe Balbi
2015-10-05 11:01 ` Tony Lindgren
2015-10-05 11:01 ` Tony Lindgren
2015-10-05 11:01 ` Tony Lindgren
2015-10-05 15:24 ` Felipe Balbi
2015-10-05 15:24 ` Felipe Balbi
2015-10-05 15:24 ` Felipe Balbi
2015-10-05 16:02 ` Tony Lindgren
2015-10-05 16:02 ` Tony Lindgren
2015-10-05 16:02 ` Tony Lindgren
2015-10-05 16:08 ` Felipe Balbi
2015-10-05 16:08 ` Felipe Balbi
2015-10-05 16:08 ` Felipe Balbi
2015-10-05 16:30 ` Tony Lindgren
2015-10-05 16:30 ` Tony Lindgren
2015-10-05 16:30 ` Tony Lindgren
2015-09-29 20:43 ` [RFC/PATCH 04/11] arm: omap2: timer: provide generic sync32k_timer_init function Felipe Balbi
2015-09-29 20:43 ` Felipe Balbi
2015-09-29 20:43 ` Felipe Balbi
2015-09-29 20:44 ` [RFC/PATCH 05/11] arm: omap2: timer: move realtime_counter_init() around Felipe Balbi
2015-09-29 20:44 ` Felipe Balbi
2015-09-29 20:44 ` Felipe Balbi
2015-09-29 20:44 ` [RFC/PATCH 06/11] arm: omap2: timer: always call clocksource_of_init() when DT Felipe Balbi
2015-09-29 20:44 ` Felipe Balbi
2015-09-29 20:44 ` Felipe Balbi
2015-09-29 20:44 ` Felipe Balbi [this message]
2015-09-29 20:44 ` [RFC/PATCH 07/11] arm: omap2: timer: remove omap4_local_timer_init Felipe Balbi
2015-09-29 20:44 ` Felipe Balbi
2015-09-29 20:44 ` [RFC/PATCH 08/11] arm: omap2: timer: rename omap_sync32k_timer_init() Felipe Balbi
2015-09-29 20:44 ` Felipe Balbi
2015-09-29 20:44 ` Felipe Balbi
2015-09-29 20:44 ` [RFC/PATCH 09/11] clocksource: add TI 32.768 Hz counter driver Felipe Balbi
2015-09-29 20:44 ` Felipe Balbi
2015-09-29 20:44 ` Felipe Balbi
2015-10-01 21:58 ` John Stultz
2015-10-01 21:58 ` John Stultz
2015-10-01 21:58 ` John Stultz
2015-10-01 21:59 ` Daniel Lezcano
2015-10-01 21:59 ` Daniel Lezcano
2015-10-01 21:59 ` Daniel Lezcano
2015-10-05 10:50 ` Tony Lindgren
2015-10-05 10:50 ` Tony Lindgren
2015-10-05 10:50 ` Tony Lindgren
2015-10-05 11:03 ` Tony Lindgren
2015-10-05 11:03 ` Tony Lindgren
2015-10-05 11:03 ` Tony Lindgren
2015-10-01 22:20 ` John Stultz
2015-10-01 22:20 ` John Stultz
2015-10-01 22:20 ` John Stultz
2015-10-01 22:30 ` Felipe Balbi
2015-10-01 22:30 ` Felipe Balbi
2015-10-01 22:30 ` Felipe Balbi
2015-09-29 20:44 ` [RFC/PATCH 10/11] arm: omap2: timer: limit hwmod usage to non-DT boots Felipe Balbi
2015-09-29 20:44 ` Felipe Balbi
2015-09-29 20:44 ` Felipe Balbi
2015-09-29 20:44 ` [RFC/PATCH 11/11] arm: boot: dts: omap: add missing default status for 32k counter Felipe Balbi
2015-09-29 20:44 ` Felipe Balbi
2015-09-29 20:44 ` Felipe Balbi
2015-09-30 8:15 ` Arnd Bergmann
2015-09-30 8:15 ` Arnd Bergmann
2015-09-30 14:12 ` Felipe Balbi
2015-09-30 14:12 ` Felipe Balbi
2015-09-30 14:12 ` Felipe Balbi
2015-09-30 21:58 ` Arnd Bergmann
2015-09-30 21:58 ` Arnd Bergmann
2015-10-05 17:52 ` Felipe Balbi
2015-10-05 17:52 ` Felipe Balbi
2015-10-05 17:52 ` Felipe Balbi
2015-10-05 19:41 ` Felipe Balbi
2015-10-05 19:41 ` Felipe Balbi
2015-10-05 19:41 ` Felipe Balbi
2015-10-06 8:08 ` Arnd Bergmann
2015-10-06 8:08 ` Arnd Bergmann
2015-10-06 14:57 ` Felipe Balbi
2015-10-06 14:57 ` Felipe Balbi
2015-10-06 14:57 ` Felipe Balbi
2015-10-06 15:18 ` Tony Lindgren
2015-10-06 15:18 ` Tony Lindgren
2015-10-06 15:29 ` Felipe Balbi
2015-10-06 15:29 ` Felipe Balbi
2015-10-06 15:29 ` Felipe Balbi
2015-10-05 10:45 ` Tony Lindgren
2015-10-05 10:45 ` Tony Lindgren
2015-10-05 10:45 ` Tony Lindgren
2015-09-30 8:22 ` [RFC/PATCH 00/11] arm: omap: counter32k rework Arnd Bergmann
2015-09-30 8:22 ` Arnd Bergmann
2015-09-30 14:13 ` Felipe Balbi
2015-09-30 14:13 ` Felipe Balbi
2015-09-30 14:13 ` Felipe Balbi
[not found] ` <20150930141338.GC31865-HgARHv6XitJaoMGHk7MhZQC/G2K4zDHf@public.gmane.org>
2015-09-30 14:42 ` Arnd Bergmann
2015-09-30 14:42 ` Arnd Bergmann
2015-09-30 14:42 ` Arnd Bergmann
2015-09-30 14:49 ` Arnd Bergmann
2015-09-30 14:49 ` Arnd Bergmann
2015-09-30 14:49 ` Arnd Bergmann
2015-09-30 14:57 ` Felipe Balbi
2015-09-30 14:57 ` Felipe Balbi
2015-09-30 14:57 ` Felipe Balbi
2015-09-30 15:03 ` Thierry Reding
2015-09-30 15:03 ` Thierry Reding
2015-09-30 15:03 ` Thierry Reding
2015-10-01 22:12 ` Daniel Lezcano
2015-10-01 22:12 ` Daniel Lezcano
2015-10-01 22:12 ` Daniel Lezcano
[not found] ` <560DAFC5.50003-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2015-10-05 10:55 ` Tony Lindgren
2015-10-05 10:55 ` Tony Lindgren
2015-10-05 10:55 ` Tony Lindgren
[not found] ` <20151005105554.GV23801-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2015-10-05 11:03 ` Arnd Bergmann
2015-10-05 11:03 ` Arnd Bergmann
2015-10-05 11:03 ` Arnd Bergmann
2015-10-05 11:13 ` Tony Lindgren
2015-10-05 11:13 ` Tony Lindgren
2015-10-05 11:13 ` Tony Lindgren
[not found] ` <20151005111341.GY23801-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2015-10-05 12:19 ` Arnd Bergmann
2015-10-05 12:19 ` Arnd Bergmann
2015-10-05 12:19 ` Arnd Bergmann
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=1443559446-26969-8-git-send-email-balbi@ti.com \
--to=balbi@ti.com \
--cc=daniel.lezcano@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=tony@atomide.com \
/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.