diff options
author | Bitan Biswas <bbiswas@nvidia.com> | 2012-05-29 22:15:25 +0530 |
---|---|---|
committer | Simone Willett <swillett@nvidia.com> | 2012-06-01 13:01:48 -0700 |
commit | 773da060718b51d261a9f7cfa69b15e079d1f0a5 (patch) | |
tree | 21c9abbda534a46c573ac51863f4e38429ed1603 /arch | |
parent | 55db34e0da158683fedb346fd70d08988052f9f1 (diff) |
ARM: tegra: cleanup wake header usage
Removed unused wake header file from Tegra board files
bug 980993
Change-Id: I61d919a2dc5b98caaca612b990fd1a7d06e76ae2
Signed-off-by: Bitan Biswas <bbiswas@nvidia.com>
Reviewed-on: http://git-master/r/103622
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-tegra/board-aruba-power.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-cardhu-pm299-power-rails.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-cardhu-power.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-enterprise-power.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-kai-power.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-ventana-power.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-ventana.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-whistler-power.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-tegra/p852/board-p852.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-tegra/wakeups-t2.h | 62 | ||||
-rw-r--r-- | arch/arm/mach-tegra/wakeups-t3.h | 76 |
12 files changed, 71 insertions, 79 deletions
diff --git a/arch/arm/mach-tegra/board-aruba-power.c b/arch/arm/mach-tegra/board-aruba-power.c index 4391f6f19b51..b72b82fc144a 100644 --- a/arch/arm/mach-tegra/board-aruba-power.c +++ b/arch/arm/mach-tegra/board-aruba-power.c @@ -26,7 +26,6 @@ #include "pm.h" #include "board.h" -#include "wakeups-t3.h" static int ac_online(void) { diff --git a/arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c b/arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c index f0dc8afa56fe..26c77770d228 100644 --- a/arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c +++ b/arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c @@ -37,7 +37,6 @@ #include "board.h" #include "board-cardhu.h" #include "pm.h" -#include "wakeups-t3.h" #define PMC_CTRL 0x0 #define PMC_CTRL_INTR_LOW BIT(17) diff --git a/arch/arm/mach-tegra/board-cardhu-pm299-power-rails.c b/arch/arm/mach-tegra/board-cardhu-pm299-power-rails.c index 6d4db73b6ecd..ab9798b0f080 100644 --- a/arch/arm/mach-tegra/board-cardhu-pm299-power-rails.c +++ b/arch/arm/mach-tegra/board-cardhu-pm299-power-rails.c @@ -37,7 +37,6 @@ #include "gpio-names.h" #include "board.h" #include "board-cardhu.h" -#include "wakeups-t3.h" #define PMC_CTRL 0x0 #define PMC_CTRL_INTR_LOW (1 << 17) diff --git a/arch/arm/mach-tegra/board-cardhu-power.c b/arch/arm/mach-tegra/board-cardhu-power.c index 61b5a15ed5c7..fa9299e10ba4 100644 --- a/arch/arm/mach-tegra/board-cardhu-power.c +++ b/arch/arm/mach-tegra/board-cardhu-power.c @@ -42,7 +42,6 @@ #include "board.h" #include "board-cardhu.h" #include "pm.h" -#include "wakeups-t3.h" #include "tegra3_tsensor.h" #define PMC_CTRL 0x0 diff --git a/arch/arm/mach-tegra/board-enterprise-power.c b/arch/arm/mach-tegra/board-enterprise-power.c index c7598ab56139..8aefa7f97d9d 100644 --- a/arch/arm/mach-tegra/board-enterprise-power.c +++ b/arch/arm/mach-tegra/board-enterprise-power.c @@ -44,7 +44,6 @@ #include "board.h" #include "board-enterprise.h" #include "pm.h" -#include "wakeups-t3.h" #include "tegra3_tsensor.h" #define PMC_CTRL 0x0 diff --git a/arch/arm/mach-tegra/board-kai-power.c b/arch/arm/mach-tegra/board-kai-power.c index 22cf7937047e..cc3b35608c98 100644 --- a/arch/arm/mach-tegra/board-kai-power.c +++ b/arch/arm/mach-tegra/board-kai-power.c @@ -40,7 +40,6 @@ #include "board.h" #include "board-kai.h" #include "pm.h" -#include "wakeups-t3.h" #include "tegra3_tsensor.h" #define PMC_CTRL 0x0 diff --git a/arch/arm/mach-tegra/board-ventana-power.c b/arch/arm/mach-tegra/board-ventana-power.c index 987d0180e7ba..aa6f4be203ad 100644 --- a/arch/arm/mach-tegra/board-ventana-power.c +++ b/arch/arm/mach-tegra/board-ventana-power.c @@ -34,7 +34,6 @@ #include "gpio-names.h" #include "fuse.h" #include "pm.h" -#include "wakeups-t2.h" #include "board.h" #include "board-ventana.h" diff --git a/arch/arm/mach-tegra/board-ventana.c b/arch/arm/mach-tegra/board-ventana.c index 30c2d486b4f7..942ca44e2a13 100644 --- a/arch/arm/mach-tegra/board-ventana.c +++ b/arch/arm/mach-tegra/board-ventana.c @@ -324,7 +324,8 @@ static int ventana_wakeup_key(void) unsigned long status = readl(IO_ADDRESS(TEGRA_PMC_BASE) + PMC_WAKE_STATUS); - return status & TEGRA_WAKE_GPIO_PV2 ? KEY_POWER : KEY_RESERVED; + return (status & (1 << TEGRA_WAKE_GPIO_PV2)) ? + KEY_POWER : KEY_RESERVED; } static struct gpio_keys_platform_data ventana_keys_platform_data = { diff --git a/arch/arm/mach-tegra/board-whistler-power.c b/arch/arm/mach-tegra/board-whistler-power.c index a0eb6686b0db..67663252e0d9 100644 --- a/arch/arm/mach-tegra/board-whistler-power.c +++ b/arch/arm/mach-tegra/board-whistler-power.c @@ -31,7 +31,6 @@ #include "gpio-names.h" #include "fuse.h" #include "pm.h" -#include "wakeups-t2.h" #include "board.h" #define PMC_CTRL 0x0 diff --git a/arch/arm/mach-tegra/p852/board-p852.h b/arch/arm/mach-tegra/p852/board-p852.h index bb43febb4a2c..8e8f1444029c 100644 --- a/arch/arm/mach-tegra/p852/board-p852.h +++ b/arch/arm/mach-tegra/p852/board-p852.h @@ -55,7 +55,6 @@ #include "../pm.h" #include "../devices.h" #include "../gpio-names.h" -#include "../wakeups-t2.h" #define P852_SKU3 0x030000UL diff --git a/arch/arm/mach-tegra/wakeups-t2.h b/arch/arm/mach-tegra/wakeups-t2.h index eb193c0aaf9e..955b351a71fa 100644 --- a/arch/arm/mach-tegra/wakeups-t2.h +++ b/arch/arm/mach-tegra/wakeups-t2.h @@ -30,36 +30,36 @@ int tegra_irq_to_wake(int irq); int tegra_wake_to_irq(int wake); -#define TEGRA_WAKE_GPIO_PO5 (1 << 0) -#define TEGRA_WAKE_GPIO_PV3 (1 << 1) -#define TEGRA_WAKE_GPIO_PL1 (1 << 2) -#define TEGRA_WAKE_GPIO_PB6 (1 << 3) -#define TEGRA_WAKE_GPIO_PN7 (1 << 4) -#define TEGRA_WAKE_GPIO_PA0 (1 << 5) -#define TEGRA_WAKE_GPIO_PU5 (1 << 6) -#define TEGRA_WAKE_GPIO_PU6 (1 << 7) -#define TEGRA_WAKE_GPIO_PC7 (1 << 8) -#define TEGRA_WAKE_GPIO_PS2 (1 << 9) -#define TEGRA_WAKE_GPIO_PAA1 (1 << 10) -#define TEGRA_WAKE_GPIO_PW3 (1 << 11) -#define TEGRA_WAKE_GPIO_PW2 (1 << 12) -#define TEGRA_WAKE_GPIO_PY6 (1 << 13) -#define TEGRA_WAKE_GPIO_PV6 (1 << 14) -#define TEGRA_WAKE_GPIO_PJ7 (1 << 15) -#define TEGRA_WAKE_RTC_ALARM (1 << 16) -#define TEGRA_WAKE_KBC_EVENT (1 << 17) -#define TEGRA_WAKE_PWR_INT (1 << 18) -#define TEGRA_WAKE_USB1_VBUS (1 << 19) -#define TEGRA_WAKE_USB3_VBUS (1 << 20) -#define TEGRA_WAKE_USB1_ID (1 << 21) -#define TEGRA_WAKE_USB3_ID (1 << 22) -#define TEGRA_WAKE_GPIO_PI5 (1 << 23) -#define TEGRA_WAKE_GPIO_PV2 (1 << 24) -#define TEGRA_WAKE_GPIO_PS4 (1 << 25) -#define TEGRA_WAKE_GPIO_PS5 (1 << 26) -#define TEGRA_WAKE_GPIO_PS0 (1 << 27) -#define TEGRA_WAKE_GPIO_PQ6 (1 << 28) -#define TEGRA_WAKE_GPIO_PQ7 (1 << 29) -#define TEGRA_WAKE_GPIO_PN2 (1 << 30) +#define TEGRA_WAKE_GPIO_PO5 0 +#define TEGRA_WAKE_GPIO_PV3 1 +#define TEGRA_WAKE_GPIO_PL1 2 +#define TEGRA_WAKE_GPIO_PB6 3 +#define TEGRA_WAKE_GPIO_PN7 4 +#define TEGRA_WAKE_GPIO_PA0 5 +#define TEGRA_WAKE_GPIO_PU5 6 +#define TEGRA_WAKE_GPIO_PU6 7 +#define TEGRA_WAKE_GPIO_PC7 8 +#define TEGRA_WAKE_GPIO_PS2 9 +#define TEGRA_WAKE_GPIO_PAA1 10 +#define TEGRA_WAKE_GPIO_PW3 11 +#define TEGRA_WAKE_GPIO_PW2 12 +#define TEGRA_WAKE_GPIO_PY6 13 +#define TEGRA_WAKE_GPIO_PV6 14 +#define TEGRA_WAKE_GPIO_PJ7 15 +#define TEGRA_WAKE_RTC_ALARM 16 +#define TEGRA_WAKE_KBC_EVENT 17 +#define TEGRA_WAKE_PWR_INT 18 +#define TEGRA_WAKE_USB1_VBUS 19 +#define TEGRA_WAKE_USB3_VBUS 20 +#define TEGRA_WAKE_USB1_ID 21 +#define TEGRA_WAKE_USB3_ID 22 +#define TEGRA_WAKE_GPIO_PI5 23 +#define TEGRA_WAKE_GPIO_PV2 24 +#define TEGRA_WAKE_GPIO_PS4 25 +#define TEGRA_WAKE_GPIO_PS5 26 +#define TEGRA_WAKE_GPIO_PS0 27 +#define TEGRA_WAKE_GPIO_PQ6 28 +#define TEGRA_WAKE_GPIO_PQ7 29 +#define TEGRA_WAKE_GPIO_PN2 30 #endif diff --git a/arch/arm/mach-tegra/wakeups-t3.h b/arch/arm/mach-tegra/wakeups-t3.h index f811d8939387..6c051270cc93 100644 --- a/arch/arm/mach-tegra/wakeups-t3.h +++ b/arch/arm/mach-tegra/wakeups-t3.h @@ -27,45 +27,45 @@ #error "Tegra 3 wakeup sources valid only for CONFIG_ARCH_TEGRA_3x_SOC" #endif -#define TEGRA_WAKE_GPIO_PO5 (1ull << 0) -#define TEGRA_WAKE_GPIO_PV1 (1ull << 1) -#define TEGRA_WAKE_GPIO_PL1 (1ull << 2) -#define TEGRA_WAKE_GPIO_PB6 (1ull << 3) -#define TEGRA_WAKE_GPIO_PN7 (1ull << 4) -#define TEGRA_WAKE_GPIO_PBB6 (1ull << 5) -#define TEGRA_WAKE_GPIO_PU5 (1ull << 6) -#define TEGRA_WAKE_GPIO_PU6 (1ull << 7) -#define TEGRA_WAKE_GPIO_PC7 (1ull << 8) -#define TEGRA_WAKE_GPIO_PS2 (1ull << 9) -#define TEGRA_WAKE_GPIO_PAA1 (1ull << 10) -#define TEGRA_WAKE_GPIO_PW3 (1ull << 11) -#define TEGRA_WAKE_GPIO_PW2 (1ull << 12) -#define TEGRA_WAKE_GPIO_PY6 (1ull << 13) -#define TEGRA_WAKE_GPIO_PDD3 (1ull << 14) -#define TEGRA_WAKE_GPIO_PJ2 (1ull << 15) -#define TEGRA_WAKE_RTC_ALARM (1ull << 16) -#define TEGRA_WAKE_KBC_EVENT (1ull << 17) -#define TEGRA_WAKE_PWR_INT (1ull << 18) -#define TEGRA_WAKE_USB1_VBUS (1ull << 19) -#define TEGRA_WAKE_USB2_VBUS (1ull << 20) -#define TEGRA_WAKE_USB1_ID (1ull << 21) -#define TEGRA_WAKE_USB2_ID (1ull << 22) -#define TEGRA_WAKE_GPIO_PI5 (1ull << 23) -#define TEGRA_WAKE_GPIO_PV0 (1ull << 24) -#define TEGRA_WAKE_GPIO_PS4 (1ull << 25) -#define TEGRA_WAKE_GPIO_PS5 (1ull << 26) -#define TEGRA_WAKE_GPIO_PS0 (1ull << 27) -#define TEGRA_WAKE_GPIO_PS6 (1ull << 28) -#define TEGRA_WAKE_GPIO_PS7 (1ull << 29) -#define TEGRA_WAKE_GPIO_PN2 (1ull << 30) +#define TEGRA_WAKE_GPIO_PO5 0 +#define TEGRA_WAKE_GPIO_PV1 1 +#define TEGRA_WAKE_GPIO_PL1 2 +#define TEGRA_WAKE_GPIO_PB6 3 +#define TEGRA_WAKE_GPIO_PN7 4 +#define TEGRA_WAKE_GPIO_PBB6 5 +#define TEGRA_WAKE_GPIO_PU5 6 +#define TEGRA_WAKE_GPIO_PU6 7 +#define TEGRA_WAKE_GPIO_PC7 8 +#define TEGRA_WAKE_GPIO_PS2 9 +#define TEGRA_WAKE_GPIO_PAA1 10 +#define TEGRA_WAKE_GPIO_PW3 11 +#define TEGRA_WAKE_GPIO_PW2 12 +#define TEGRA_WAKE_GPIO_PY6 13 +#define TEGRA_WAKE_GPIO_PDD3 14 +#define TEGRA_WAKE_GPIO_PJ2 15 +#define TEGRA_WAKE_RTC_ALARM 16 +#define TEGRA_WAKE_KBC_EVENT 17 +#define TEGRA_WAKE_PWR_INT 18 +#define TEGRA_WAKE_USB1_VBUS 19 +#define TEGRA_WAKE_USB2_VBUS 20 +#define TEGRA_WAKE_USB1_ID 21 +#define TEGRA_WAKE_USB2_ID 22 +#define TEGRA_WAKE_GPIO_PI5 23 +#define TEGRA_WAKE_GPIO_PV0 24 +#define TEGRA_WAKE_GPIO_PS4 25 +#define TEGRA_WAKE_GPIO_PS5 26 +#define TEGRA_WAKE_GPIO_PS0 27 +#define TEGRA_WAKE_GPIO_PS6 28 +#define TEGRA_WAKE_GPIO_PS7 29 +#define TEGRA_WAKE_GPIO_PN2 30 /* bit 31 is unused */ -#define TEGRA_WAKE_GPIO_PO4 (1ull << 32) -#define TEGRA_WAKE_GPIO_PJ0 (1ull << 33) -#define TEGRA_WAKE_GPIO_PK2 (1ull << 34) -#define TEGRA_WAKE_GPIO_PI6 (1ull << 35) -#define TEGRA_WAKE_GPIO_PBB1 (1ull << 36) -#define TEGRA_WAKE_USB3_ID (1ull << 37) -#define TEGRA_WAKE_USB3_VBUS (1ull << 38) +#define TEGRA_WAKE_GPIO_PO4 32 +#define TEGRA_WAKE_GPIO_PJ0 33 +#define TEGRA_WAKE_GPIO_PK2 34 +#define TEGRA_WAKE_GPIO_PI6 35 +#define TEGRA_WAKE_GPIO_PBB1 36 +#define TEGRA_WAKE_USB3_ID 37 +#define TEGRA_WAKE_USB3_VBUS 38 #endif |