From: David Brown <davidb@codeaurora.org>
To: David Brown <davidb@codeaurora.org>,
Daniel Walker <dwalker@fifo99.com>,
Bryan Huntsman <bryanh@codeaurora.org>,
Russell King <linux@arm.linux.org.uk>
Cc: Stephen Boyd <sboyd@codeaurora.org>,
linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org
Subject: [PATCH 03/24] ARM: msm: Remove unused idle.c
Date: Wed, 12 Sep 2012 09:58:39 -0700 [thread overview]
Message-ID: <1347469140-25069-4-git-send-email-davidb@codeaurora.org> (raw)
In-Reply-To: <1347469140-25069-1-git-send-email-davidb@codeaurora.org>
From: Stephen Boyd <sboyd@codeaurora.org>
Forcing arm_pm_idle to be msm_idle() doesn't make sense in
configurations that don't have CONFIG_MSM7X00A_IDLE=y (i.e. any
targets that aren't 7x00a). Furthermore, that config doesn't even
exist, so this entire file is dead code. Just remove it so we can
use the default idle support on MSM.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
---
arch/arm/mach-msm/Makefile | 2 +-
arch/arm/mach-msm/idle.c | 49 ----------------------------------------------
2 files changed, 1 insertion(+), 50 deletions(-)
delete mode 100644 arch/arm/mach-msm/idle.c
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 4ad3969..5fd0464 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -1,4 +1,4 @@
-obj-y += io.o idle.o timer.o
+obj-y += io.o timer.o
obj-y += clock.o
obj-$(CONFIG_DEBUG_FS) += clock-debug.o
diff --git a/arch/arm/mach-msm/idle.c b/arch/arm/mach-msm/idle.c
deleted file mode 100644
index 0c9e13c..0000000
--- a/arch/arm/mach-msm/idle.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* arch/arm/mach-msm/idle.c
- *
- * Idle processing for MSM7K - work around bugs with SWFI.
- *
- * Copyright (c) 2007 QUALCOMM Incorporated.
- * Copyright (C) 2007 Google, Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-#include <linux/init.h>
-#include <asm/system.h>
-
-static void msm_idle(void)
-{
-#ifdef CONFIG_MSM7X00A_IDLE
- asm volatile (
-
- "mrc p15, 0, r1, c1, c0, 0 /* read current CR */ \n\t"
- "bic r0, r1, #(1 << 2) /* clear dcache bit */ \n\t"
- "bic r0, r0, #(1 << 12) /* clear icache bit */ \n\t"
- "mcr p15, 0, r0, c1, c0, 0 /* disable d/i cache */ \n\t"
-
- "mov r0, #0 /* prepare wfi value */ \n\t"
- "mcr p15, 0, r0, c7, c10, 0 /* flush the cache */ \n\t"
- "mcr p15, 0, r0, c7, c10, 4 /* memory barrier */ \n\t"
- "mcr p15, 0, r0, c7, c0, 4 /* wait for interrupt */ \n\t"
-
- "mcr p15, 0, r1, c1, c0, 0 /* restore d/i cache */ \n\t"
-
- : : : "r0","r1" );
-#endif
-}
-
-static int __init msm_idle_init(void)
-{
- arm_pm_idle = msm_idle;
- return 0;
-}
-
-arch_initcall(msm_idle_init);
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
next prev parent reply other threads:[~2012-09-12 17:10 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1347469140-25069-1-git-send-email-davidb@codeaurora.org>
2012-09-12 16:58 ` [PATCH 01/24] ARM: msm: Remove msm_hw_reset_hook David Brown
2012-09-12 17:09 ` [GIT PULL] msm-core changes for v3.7 David Brown
2012-09-12 16:58 ` [PATCH 02/24] ARM: msm: clock-pcom: Mark functions static David Brown
2012-09-12 16:58 ` David Brown [this message]
2012-09-12 16:58 ` [PATCH 04/24] ARM: msm: Fix early debug uart mapping on some memory configs David Brown
2012-09-12 16:58 ` [PATCH 05/24] ARM: msm: io: Remove 7x30 iomap region from 7x00 David Brown
2012-09-12 16:58 ` [PATCH 06/24] ARM: msm: io: Change the default static iomappings to be shared David Brown
2012-09-12 16:58 ` [PATCH 07/24] ARM: msm: Add handle_irq handler for 8660 DT machine David Brown
2012-09-12 16:58 ` [PATCH 08/24] ARM: msm: Add msm8660-surf.dts to Makefile.boot David Brown
2012-09-12 16:58 ` [PATCH 09/24] ARM: msm: Remove call to missing FPGA init on 8660 David Brown
2012-09-12 16:58 ` [PATCH 10/24] ARM: msm: Fix sparse warnings due to incorrect type David Brown
2012-09-12 16:58 ` [PATCH 11/24] ARM: msm: Don't touch GIC registers outside of GIC code David Brown
2012-09-12 16:58 ` [PATCH 12/24] ARM: msm: Allow timer.c to compile on multiple targets David Brown
2012-09-12 16:58 ` [PATCH 13/24] ARM: msm: Add DT support to msm_timer David Brown
2012-09-12 16:58 ` [PATCH 14/24] ARM: msm: Move 8660 to DT timer David Brown
2012-09-12 16:58 ` [PATCH 15/24] ARM: msm: Make 8660 a DT only target David Brown
2012-09-12 16:58 ` [PATCH 16/24] ARM: msm: Rename board-msm8x60 to signify its DT only status David Brown
2012-09-12 16:58 ` [PATCH 17/24] ARM: msm: Move io mapping prototypes to common.h David Brown
2012-09-12 16:58 ` [PATCH 18/24] ARM: msm: Add DT support for 8960 David Brown
2012-09-12 16:58 ` [PATCH 19/24] ARM: msm: Remove non-DT targets from 8960 David Brown
2012-09-12 16:58 ` [PATCH 20/24] ARM: msm: dma: use list_move_tail instead of list_del/list_add_tail David Brown
2012-09-12 16:58 ` [PATCH 21/24] ARM: msm: Remove unused acpuclock-arm11 David Brown
2012-09-12 16:58 ` [PATCH 22/24] ARM: msm: Remove uncompiled board-msm7x27 David Brown
2012-09-12 16:58 ` [PATCH 23/24] ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist David Brown
2012-09-12 16:59 ` [PATCH 24/24] ARM: msm: Allow 8960 and 8660 to compile together David Brown
2012-09-17 0:38 ` Olof Johansson
2012-09-13 6:36 ` [GIT PULL] msm-core changes for v3.7 Olof Johansson
2012-09-13 7:31 ` David Brown
2012-09-13 7:33 ` Olof Johansson
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=1347469140-25069-4-git-send-email-davidb@codeaurora.org \
--to=davidb@codeaurora.org \
--cc=bryanh@codeaurora.org \
--cc=dwalker@fifo99.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=sboyd@codeaurora.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 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).