diff options
author | Sonic Zhang <sonic.zhang@analog.com> | 2012-05-08 03:41:18 -0400 |
---|---|---|
committer | Bob Liu <lliubbo@gmail.com> | 2012-05-21 02:54:43 -0400 |
commit | 5b8163a3f906a007ecb0d261fe6e943ebfe6f14b (patch) | |
tree | 5f83023e69825019a74e96157aff5f41a4e8c00b | |
parent | ec98e6b836aff86fe764e28934e56a2f522a07dc (diff) |
blackfin: rotary: Add pm_wakeup flag to platform data structure.
Rotary can't be used as a wakeup source in all platform.
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bob Liu <lliubbo@gmail.com>
-rw-r--r-- | arch/blackfin/include/asm/bfin_rotary.h | 1 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ad7160eval.c | 1 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezkit.c | 1 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/boards/ezkit.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/bfin_rotary.h b/arch/blackfin/include/asm/bfin_rotary.h index 0b6910bdc57f..8895a750c70c 100644 --- a/arch/blackfin/include/asm/bfin_rotary.h +++ b/arch/blackfin/include/asm/bfin_rotary.h | |||
@@ -39,6 +39,7 @@ struct bfin_rotary_platform_data { | |||
39 | unsigned int rotary_rel_code; | 39 | unsigned int rotary_rel_code; |
40 | unsigned short debounce; /* 0..17 */ | 40 | unsigned short debounce; /* 0..17 */ |
41 | unsigned short mode; | 41 | unsigned short mode; |
42 | unsigned short pm_wakeup; | ||
42 | }; | 43 | }; |
43 | 44 | ||
44 | /* CNT_CONFIG bitmasks */ | 45 | /* CNT_CONFIG bitmasks */ |
diff --git a/arch/blackfin/mach-bf527/boards/ad7160eval.c b/arch/blackfin/mach-bf527/boards/ad7160eval.c index fad7fea1b0bf..423381da08b2 100644 --- a/arch/blackfin/mach-bf527/boards/ad7160eval.c +++ b/arch/blackfin/mach-bf527/boards/ad7160eval.c | |||
@@ -681,6 +681,7 @@ static struct bfin_rotary_platform_data bfin_rotary_data = { | |||
681 | .rotary_button_key = KEY_ENTER, | 681 | .rotary_button_key = KEY_ENTER, |
682 | .debounce = 10, /* 0..17 */ | 682 | .debounce = 10, /* 0..17 */ |
683 | .mode = ROT_QUAD_ENC | ROT_DEBE, | 683 | .mode = ROT_QUAD_ENC | ROT_DEBE, |
684 | .pm_wakeup = 1, | ||
684 | }; | 685 | }; |
685 | 686 | ||
686 | static struct resource bfin_rotary_resources[] = { | 687 | static struct resource bfin_rotary_resources[] = { |
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index 2f9a2bd83ce4..3196683e0f2c 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
@@ -1105,6 +1105,7 @@ static struct bfin_rotary_platform_data bfin_rotary_data = { | |||
1105 | .rotary_button_key = KEY_ENTER, | 1105 | .rotary_button_key = KEY_ENTER, |
1106 | .debounce = 10, /* 0..17 */ | 1106 | .debounce = 10, /* 0..17 */ |
1107 | .mode = ROT_QUAD_ENC | ROT_DEBE, | 1107 | .mode = ROT_QUAD_ENC | ROT_DEBE, |
1108 | .pm_wakeup = 1, | ||
1108 | }; | 1109 | }; |
1109 | 1110 | ||
1110 | static struct resource bfin_rotary_resources[] = { | 1111 | static struct resource bfin_rotary_resources[] = { |
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index 4cadaf8d0b56..4f4bd918566c 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c | |||
@@ -165,6 +165,7 @@ static struct bfin_rotary_platform_data bfin_rotary_data = { | |||
165 | .rotary_button_key = KEY_ENTER, | 165 | .rotary_button_key = KEY_ENTER, |
166 | .debounce = 10, /* 0..17 */ | 166 | .debounce = 10, /* 0..17 */ |
167 | .mode = ROT_QUAD_ENC | ROT_DEBE, | 167 | .mode = ROT_QUAD_ENC | ROT_DEBE, |
168 | .pm_wakeup = 1, | ||
168 | }; | 169 | }; |
169 | 170 | ||
170 | static struct resource bfin_rotary_resources[] = { | 171 | static struct resource bfin_rotary_resources[] = { |