From: Stephen Boyd <sboyd@codeaurora.org>
To: linux-arm-msm@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, David Brown <davidb@codeaurora.org>,
Bryan Huntsman <bryanh@codeaurora.org>,
Daniel Walker <dwalker@fifo99.com>, Arnd Bergmann <arnd@arndb.de>,
Daniel Lezcano <daniel.lezcano@linaro.org>
Subject: [PATCH 07/12] clocksource: qcom: Remove dead code
Date: Fri, 13 Mar 2015 11:09:40 -0700 [thread overview]
Message-ID: <1426270185-19510-8-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <1426270185-19510-1-git-send-email-sboyd@codeaurora.org>
This code is no longer used now that mach-msm has been removed.
Delete it.
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: David Brown <davidb@codeaurora.org>
Cc: Bryan Huntsman <bryanh@codeaurora.org>
Cc: Daniel Walker <dwalker@fifo99.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
This can be acked and go through arm-soc or applied directly to clocksource
tree.
drivers/clocksource/qcom-timer.c | 59 ----------------------------------------
1 file changed, 59 deletions(-)
diff --git a/drivers/clocksource/qcom-timer.c b/drivers/clocksource/qcom-timer.c
index 098c542e5c53..cba2d015564c 100644
--- a/drivers/clocksource/qcom-timer.c
+++ b/drivers/clocksource/qcom-timer.c
@@ -40,8 +40,6 @@
#define GPT_HZ 32768
-#define MSM_DGT_SHIFT 5
-
static void __iomem *event_base;
static void __iomem *sts_base;
@@ -232,7 +230,6 @@ err:
register_current_timer_delay(&msm_delay_timer);
}
-#ifdef CONFIG_ARCH_QCOM
static void __init msm_dt_timer_init(struct device_node *np)
{
u32 freq;
@@ -285,59 +282,3 @@ static void __init msm_dt_timer_init(struct device_node *np)
}
CLOCKSOURCE_OF_DECLARE(kpss_timer, "qcom,kpss-timer", msm_dt_timer_init);
CLOCKSOURCE_OF_DECLARE(scss_timer, "qcom,scss-timer", msm_dt_timer_init);
-#else
-
-static int __init msm_timer_map(phys_addr_t addr, u32 event, u32 source,
- u32 sts)
-{
- void __iomem *base;
-
- base = ioremap(addr, SZ_256);
- if (!base) {
- pr_err("Failed to map timer base\n");
- return -ENOMEM;
- }
- event_base = base + event;
- source_base = base + source;
- if (sts)
- sts_base = base + sts;
-
- return 0;
-}
-
-static notrace cycle_t msm_read_timer_count_shift(struct clocksource *cs)
-{
- /*
- * Shift timer count down by a constant due to unreliable lower bits
- * on some targets.
- */
- return msm_read_timer_count(cs) >> MSM_DGT_SHIFT;
-}
-
-void __init msm7x01_timer_init(void)
-{
- struct clocksource *cs = &msm_clocksource;
-
- if (msm_timer_map(0xc0100000, 0x0, 0x10, 0x0))
- return;
- cs->read = msm_read_timer_count_shift;
- cs->mask = CLOCKSOURCE_MASK((32 - MSM_DGT_SHIFT));
- /* 600 KHz */
- msm_timer_init(19200000 >> MSM_DGT_SHIFT, 32 - MSM_DGT_SHIFT, 7,
- false);
-}
-
-void __init msm7x30_timer_init(void)
-{
- if (msm_timer_map(0xc0100000, 0x4, 0x24, 0x80))
- return;
- msm_timer_init(24576000 / 4, 32, 1, false);
-}
-
-void __init qsd8x50_timer_init(void)
-{
- if (msm_timer_map(0xAC100000, 0x0, 0x10, 0x34))
- return;
- msm_timer_init(19200000 / 4, 32, 7, false);
-}
-#endif
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
WARNING: multiple messages have this Message-ID (diff)
From: sboyd@codeaurora.org (Stephen Boyd)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 07/12] clocksource: qcom: Remove dead code
Date: Fri, 13 Mar 2015 11:09:40 -0700 [thread overview]
Message-ID: <1426270185-19510-8-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <1426270185-19510-1-git-send-email-sboyd@codeaurora.org>
This code is no longer used now that mach-msm has been removed.
Delete it.
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: David Brown <davidb@codeaurora.org>
Cc: Bryan Huntsman <bryanh@codeaurora.org>
Cc: Daniel Walker <dwalker@fifo99.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
This can be acked and go through arm-soc or applied directly to clocksource
tree.
drivers/clocksource/qcom-timer.c | 59 ----------------------------------------
1 file changed, 59 deletions(-)
diff --git a/drivers/clocksource/qcom-timer.c b/drivers/clocksource/qcom-timer.c
index 098c542e5c53..cba2d015564c 100644
--- a/drivers/clocksource/qcom-timer.c
+++ b/drivers/clocksource/qcom-timer.c
@@ -40,8 +40,6 @@
#define GPT_HZ 32768
-#define MSM_DGT_SHIFT 5
-
static void __iomem *event_base;
static void __iomem *sts_base;
@@ -232,7 +230,6 @@ err:
register_current_timer_delay(&msm_delay_timer);
}
-#ifdef CONFIG_ARCH_QCOM
static void __init msm_dt_timer_init(struct device_node *np)
{
u32 freq;
@@ -285,59 +282,3 @@ static void __init msm_dt_timer_init(struct device_node *np)
}
CLOCKSOURCE_OF_DECLARE(kpss_timer, "qcom,kpss-timer", msm_dt_timer_init);
CLOCKSOURCE_OF_DECLARE(scss_timer, "qcom,scss-timer", msm_dt_timer_init);
-#else
-
-static int __init msm_timer_map(phys_addr_t addr, u32 event, u32 source,
- u32 sts)
-{
- void __iomem *base;
-
- base = ioremap(addr, SZ_256);
- if (!base) {
- pr_err("Failed to map timer base\n");
- return -ENOMEM;
- }
- event_base = base + event;
- source_base = base + source;
- if (sts)
- sts_base = base + sts;
-
- return 0;
-}
-
-static notrace cycle_t msm_read_timer_count_shift(struct clocksource *cs)
-{
- /*
- * Shift timer count down by a constant due to unreliable lower bits
- * on some targets.
- */
- return msm_read_timer_count(cs) >> MSM_DGT_SHIFT;
-}
-
-void __init msm7x01_timer_init(void)
-{
- struct clocksource *cs = &msm_clocksource;
-
- if (msm_timer_map(0xc0100000, 0x0, 0x10, 0x0))
- return;
- cs->read = msm_read_timer_count_shift;
- cs->mask = CLOCKSOURCE_MASK((32 - MSM_DGT_SHIFT));
- /* 600 KHz */
- msm_timer_init(19200000 >> MSM_DGT_SHIFT, 32 - MSM_DGT_SHIFT, 7,
- false);
-}
-
-void __init msm7x30_timer_init(void)
-{
- if (msm_timer_map(0xc0100000, 0x4, 0x24, 0x80))
- return;
- msm_timer_init(24576000 / 4, 32, 1, false);
-}
-
-void __init qsd8x50_timer_init(void)
-{
- if (msm_timer_map(0xAC100000, 0x0, 0x10, 0x34))
- return;
- msm_timer_init(19200000 / 4, 32, 7, false);
-}
-#endif
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2015-03-13 18:09 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-13 18:09 [PATCH 00/12] Remove mach-msm and associated code Stephen Boyd
2015-03-13 18:09 ` Stephen Boyd
2015-03-13 18:09 ` [PATCH 01/12] ARM: Remove mach-msm and associated ARM architecture code Stephen Boyd
2015-03-13 19:36 ` Paul Bolle
2015-03-13 19:36 ` Paul Bolle
2015-03-13 20:44 ` Stephen Boyd
2015-03-13 20:44 ` Stephen Boyd
2015-03-13 18:09 ` [PATCH 02/12] gpio: Remove gpio-msm-v1 driver Stephen Boyd
2015-03-13 18:09 ` Stephen Boyd
2015-03-18 12:02 ` Linus Walleij
2015-03-18 12:02 ` Linus Walleij
2015-03-13 18:09 ` [PATCH 03/12] tty: serial: Remove orphaned serial driver Stephen Boyd
2015-03-13 18:09 ` Stephen Boyd
2015-03-13 18:09 ` Stephen Boyd
2015-03-13 18:09 ` [PATCH 04/12] tty: serial: msm_serial: Remove dead code Stephen Boyd
2015-03-13 18:09 ` Stephen Boyd
2015-03-13 18:09 ` [PATCH 05/12] net: smc91x: " Stephen Boyd
2015-03-13 18:09 ` Stephen Boyd
2015-03-13 19:52 ` Arnd Bergmann
2015-03-13 19:52 ` Arnd Bergmann
2015-03-13 18:09 ` [PATCH 06/12] mmc: Remove msm_sdcc driver Stephen Boyd
2015-03-13 18:09 ` Stephen Boyd
2015-03-16 11:04 ` Ulf Hansson
2015-03-16 11:04 ` Ulf Hansson
2015-03-13 18:09 ` Stephen Boyd [this message]
2015-03-13 18:09 ` [PATCH 07/12] clocksource: qcom: Remove dead code Stephen Boyd
2015-03-13 18:14 ` Daniel Lezcano
2015-03-13 18:14 ` Daniel Lezcano
2015-03-13 18:22 ` Stephen Boyd
2015-03-13 18:22 ` Stephen Boyd
2015-03-13 21:11 ` Daniel Lezcano
2015-03-13 21:11 ` Daniel Lezcano
2015-03-13 18:09 ` [PATCH 08/12] ehci-msm: Remove dead dependency Stephen Boyd
2015-03-13 18:09 ` Stephen Boyd
[not found] ` <1426270185-19510-1-git-send-email-sboyd-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2015-03-13 18:09 ` [PATCH 09/12] usb: phy: msm: Remove dead code Stephen Boyd
2015-03-13 18:09 ` Stephen Boyd
2015-03-13 18:09 ` Stephen Boyd
2015-03-13 18:09 ` [PATCH 10/12] phy: qcom-ufs: Switch dependency to ARCH_QCOM Stephen Boyd
2015-03-13 18:09 ` Stephen Boyd
2015-03-13 18:09 ` [PATCH 11/12] ufs-qcom: " Stephen Boyd
2015-03-13 18:09 ` Stephen Boyd
2015-03-13 18:09 ` [PATCH 12/12] msm: msm_fb: Remove dead code Stephen Boyd
2015-03-13 18:51 ` Jean-Christophe PLAGNIOL-VILLARD
2015-04-10 23:07 ` Stephen Boyd
2015-04-10 23:07 ` Stephen Boyd
2015-06-16 18:43 ` Stephen Boyd
2015-06-16 23:27 ` Kevin Hilman
2015-06-16 23:27 ` Kevin Hilman
2015-06-16 23:27 ` Kevin Hilman
2015-06-17 9:56 ` Tomi Valkeinen
2015-06-17 9:56 ` Tomi Valkeinen
2015-06-17 9:56 ` Tomi Valkeinen
2015-06-17 19:24 ` Stephen Boyd
2015-06-17 19:24 ` Stephen Boyd
2015-06-18 6:58 ` Tomi Valkeinen
2015-06-18 6:58 ` Tomi Valkeinen
2015-06-18 6:58 ` Tomi Valkeinen
2015-03-13 19:55 ` [PATCH 00/12] Remove mach-msm and associated code Arnd Bergmann
2015-03-13 19:55 ` Arnd Bergmann
2015-03-13 19:56 ` Arnd Bergmann
2015-03-13 19:56 ` Arnd Bergmann
2015-03-13 19:56 ` Arnd Bergmann
2015-03-13 20:45 ` Stephen Boyd
2015-03-13 20:45 ` Stephen Boyd
2015-03-17 16:18 ` dwalker
2015-03-17 16:18 ` dwalker at fifo99.com
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=1426270185-19510-8-git-send-email-sboyd@codeaurora.org \
--to=sboyd@codeaurora.org \
--cc=arnd@arndb.de \
--cc=bryanh@codeaurora.org \
--cc=daniel.lezcano@linaro.org \
--cc=davidb@codeaurora.org \
--cc=dwalker@fifo99.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.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.