diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2011-09-13 13:32:39 +0200 |
|---|---|---|
| committer | Jonas ABERG <jonas.aberg@stericsson.com> | 2011-09-29 08:34:43 +0200 |
| commit | 0cddfb2b35dbb6f054bfdbc486a4f84dfe8efd1a (patch) | |
| tree | 92f5496786ff9c69b70863cab991792d81e0bfee /arch/arm/mach-ux500/include | |
| parent | 2c1d6edf73274e56e3194dac75c59e82e88688bd (diff) | |
ARM: ux500: Remove powersave
Since we don't know really the status of powersave related
feature on this development track, let's remove everything,
except:
- prcmu driver: New location, which is the same as linux-next
- cpufreq: new location, same as linux-next
- regulator: keep as is for the moment, needed for the system to work.
- clocks: same as for regulator.
- pm-runtime: keep it as is.
Later patches will re-add powersave, based upon what exists on SI
u8500-android-2.3_v3.15
MTU from plat-nomadik is now used instead of own copy in mach.
Change-Id: I8ceaa65e5e0905fcd85bf8e793b4a5ab2d2df64c
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32048
Diffstat (limited to 'arch/arm/mach-ux500/include')
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/scu.h | 25 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/suspend.h | 19 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/timex.h | 1 |
3 files changed, 0 insertions, 45 deletions
diff --git a/arch/arm/mach-ux500/include/mach/scu.h b/arch/arm/mach-ux500/include/mach/scu.h deleted file mode 100644 index a09e86a9d3c..00000000000 --- a/arch/arm/mach-ux500/include/mach/scu.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2009 ST-Ericsson SA - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -#ifndef __ASMARM_ARCH_SCU_H -#define __ASMARM_ARCH_SCU_H - -#include <mach/hardware.h> - -#define SCU_BASE U8500_SCU_BASE -/* - * * SCU registers - * */ -#define SCU_CTRL 0x00 -#define SCU_CONFIG 0x04 -#define SCU_CPU_STATUS 0x08 -#define SCU_INVALIDATE 0x0c -#define SCU_FPGA_REVISION 0x10 - -#endif diff --git a/arch/arm/mach-ux500/include/mach/suspend.h b/arch/arm/mach-ux500/include/mach/suspend.h deleted file mode 100644 index 5c9e1c48605..00000000000 --- a/arch/arm/mach-ux500/include/mach/suspend.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) ST-Ericsson SA 2010 - * - * License terms: GNU General Public License (GPL) version 2 - */ -#ifndef __MACH_SUSPEND_H -#define __MACH_SUSPEND_H - -void suspend_block_sleep(void); -void suspend_unblock_sleep(void); - -#ifdef CONFIG_UX500_SUSPEND -void suspend_set_pins_force_fn(void (*force)(void), void (*force_mux)(void)); -#else -static inline void suspend_set_pins_force_fn(void (*force)(void), - void (*force_mux)(void)) { } -#endif - -#endif /* __MACH_SUSPEND_H */ diff --git a/arch/arm/mach-ux500/include/mach/timex.h b/arch/arm/mach-ux500/include/mach/timex.h index 0ba497bd9d7..d0942c17401 100644 --- a/arch/arm/mach-ux500/include/mach/timex.h +++ b/arch/arm/mach-ux500/include/mach/timex.h @@ -2,6 +2,5 @@ #define __ASM_ARCH_TIMEX_H #define CLOCK_TICK_RATE 110000000 -#define ARCH_HAS_READ_CURRENT_TIMER #endif |