diff options
author | Michael Hennerich <michael.hennerich@analog.com> | 2008-08-05 05:38:41 -0400 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2008-08-05 05:38:41 -0400 |
commit | 4a88d0ce494034fbb8dd0076d80e71b38abf5748 (patch) | |
tree | c9c560f0314e3d494ae1b9020921128fa1e3e9f5 /arch/blackfin/Kconfig | |
parent | 5400c5aa2de41501be7529831c9df36c729bf371 (diff) |
Blackfin arch: Functional power management support
Merge VR Regulator Hibernate wakeups into set_irq_wake for internal
interrupts.
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin/Kconfig')
-rw-r--r-- | arch/blackfin/Kconfig | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 5a097c46bc46..cc2add7e39e7 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
@@ -933,13 +933,6 @@ endchoice | |||
933 | comment "Possible Suspend Mem / Hibernate Wake-Up Sources" | 933 | comment "Possible Suspend Mem / Hibernate Wake-Up Sources" |
934 | depends on PM | 934 | depends on PM |
935 | 935 | ||
936 | config PM_BFIN_WAKE_RTC | ||
937 | bool "Allow Wake-Up from RESET and on-chip RTC" | ||
938 | depends on PM | ||
939 | default n | ||
940 | help | ||
941 | Enable RTC Wake-Up (Voltage Regulator Power-Up) | ||
942 | |||
943 | config PM_BFIN_WAKE_PH6 | 936 | config PM_BFIN_WAKE_PH6 |
944 | bool "Allow Wake-Up from on-chip PHY or PH6 GP" | 937 | bool "Allow Wake-Up from on-chip PHY or PH6 GP" |
945 | depends on PM && (BF52x || BF534 || BF536 || BF537) | 938 | depends on PM && (BF52x || BF534 || BF536 || BF537) |
@@ -947,41 +940,12 @@ config PM_BFIN_WAKE_PH6 | |||
947 | help | 940 | help |
948 | Enable PHY and PH6 GP Wake-Up (Voltage Regulator Power-Up) | 941 | Enable PHY and PH6 GP Wake-Up (Voltage Regulator Power-Up) |
949 | 942 | ||
950 | config PM_BFIN_WAKE_CAN | ||
951 | bool "Allow Wake-Up from on-chip CAN0/1" | ||
952 | depends on PM && (BF54x || BF534 || BF536 || BF537) | ||
953 | default n | ||
954 | help | ||
955 | Enable CAN0/1 Wake-Up (Voltage Regulator Power-Up) | ||
956 | |||
957 | config PM_BFIN_WAKE_GP | 943 | config PM_BFIN_WAKE_GP |
958 | bool "Allow Wake-Up from GPIOs" | 944 | bool "Allow Wake-Up from GPIOs" |
959 | depends on PM && BF54x | 945 | depends on PM && BF54x |
960 | default n | 946 | default n |
961 | help | 947 | help |
962 | Enable General-Purpose Wake-Up (Voltage Regulator Power-Up) | 948 | Enable General-Purpose Wake-Up (Voltage Regulator Power-Up) |
963 | |||
964 | config PM_BFIN_WAKE_USB | ||
965 | bool "Allow Wake-Up from on-chip USB" | ||
966 | depends on PM && (BF54x || BF52x) | ||
967 | default n | ||
968 | help | ||
969 | Enable USB Wake-Up (Voltage Regulator Power-Up) | ||
970 | |||
971 | config PM_BFIN_WAKE_KEYPAD | ||
972 | bool "Allow Wake-Up from on-chip Keypad" | ||
973 | depends on PM && BF54x | ||
974 | default n | ||
975 | help | ||
976 | Enable Keypad Wake-Up (Voltage Regulator Power-Up) | ||
977 | |||
978 | config PM_BFIN_WAKE_ROTARY | ||
979 | bool "Allow Wake-Up from on-chip Rotary" | ||
980 | depends on PM && BF54x | ||
981 | default n | ||
982 | help | ||
983 | Enable Rotary Wake-Up (Voltage Regulator Power-Up) | ||
984 | |||
985 | endmenu | 949 | endmenu |
986 | 950 | ||
987 | menu "CPU Frequency scaling" | 951 | menu "CPU Frequency scaling" |