diff options
author | Sonic Zhang <sonic.zhang@analog.com> | 2015-02-03 20:12:17 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-15 19:06:27 -0500 |
commit | 1ea74014aba7cd3ddcc3cf3eef92270d2e8429e8 (patch) | |
tree | f2bcfc4688d8ced765a974c5d8f0e5ba43f60b9e | |
parent | 5ec662e7a6b8bd266382c8e7a3f236ffc8e1acf9 (diff) |
Input: bfin_rotary - move platform header to linux/platform_data
The platform data definition of the rotary driver should be generic for all
architectures.
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ad7160eval.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezkit.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/boards/ezkit.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf609/boards/ezkit.c | 2 | ||||
-rw-r--r-- | drivers/input/misc/bfin_rotary.c | 2 | ||||
-rw-r--r-- | include/linux/platform_data/bfin_rotary.h (renamed from arch/blackfin/include/asm/bfin_rotary.h) | 0 |
6 files changed, 5 insertions, 5 deletions
diff --git a/arch/blackfin/mach-bf527/boards/ad7160eval.c b/arch/blackfin/mach-bf527/boards/ad7160eval.c index 9501bd8d9cd1..beb011b6d2b3 100644 --- a/arch/blackfin/mach-bf527/boards/ad7160eval.c +++ b/arch/blackfin/mach-bf527/boards/ad7160eval.c | |||
@@ -666,7 +666,7 @@ static struct platform_device bfin_sport1_uart_device = { | |||
666 | #endif | 666 | #endif |
667 | 667 | ||
668 | #if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY) | 668 | #if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY) |
669 | #include <asm/bfin_rotary.h> | 669 | #include <linux/platform_data/bfin_rotary.h> |
670 | 670 | ||
671 | static struct bfin_rotary_platform_data bfin_rotary_data = { | 671 | static struct bfin_rotary_platform_data bfin_rotary_data = { |
672 | /*.rotary_up_key = KEY_UP,*/ | 672 | /*.rotary_up_key = KEY_UP,*/ |
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index d64f565dc2a0..728cda469952 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
@@ -1092,7 +1092,7 @@ static struct platform_device bfin_device_gpiokeys = { | |||
1092 | #endif | 1092 | #endif |
1093 | 1093 | ||
1094 | #if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY) | 1094 | #if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY) |
1095 | #include <asm/bfin_rotary.h> | 1095 | #include <linux/platform_data/bfin_rotary.h> |
1096 | 1096 | ||
1097 | static struct bfin_rotary_platform_data bfin_rotary_data = { | 1097 | static struct bfin_rotary_platform_data bfin_rotary_data = { |
1098 | /*.rotary_up_key = KEY_UP,*/ | 1098 | /*.rotary_up_key = KEY_UP,*/ |
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index 1fe7ff286619..8f70f83d0a42 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c | |||
@@ -159,7 +159,7 @@ static struct platform_device bf54x_kpad_device = { | |||
159 | #endif | 159 | #endif |
160 | 160 | ||
161 | #if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY) | 161 | #if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY) |
162 | #include <asm/bfin_rotary.h> | 162 | #include <linux/platform_data/bfin_rotary.h> |
163 | 163 | ||
164 | static struct bfin_rotary_platform_data bfin_rotary_data = { | 164 | static struct bfin_rotary_platform_data bfin_rotary_data = { |
165 | /*.rotary_up_key = KEY_UP,*/ | 165 | /*.rotary_up_key = KEY_UP,*/ |
diff --git a/arch/blackfin/mach-bf609/boards/ezkit.c b/arch/blackfin/mach-bf609/boards/ezkit.c index e2c0b024ce88..f9dc64d00d0b 100644 --- a/arch/blackfin/mach-bf609/boards/ezkit.c +++ b/arch/blackfin/mach-bf609/boards/ezkit.c | |||
@@ -75,7 +75,7 @@ static struct platform_device bfin_isp1760_device = { | |||
75 | #endif | 75 | #endif |
76 | 76 | ||
77 | #if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY) | 77 | #if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY) |
78 | #include <asm/bfin_rotary.h> | 78 | #include <linux/platform_data/bfin_rotary.h> |
79 | 79 | ||
80 | static struct bfin_rotary_platform_data bfin_rotary_data = { | 80 | static struct bfin_rotary_platform_data bfin_rotary_data = { |
81 | /*.rotary_up_key = KEY_UP,*/ | 81 | /*.rotary_up_key = KEY_UP,*/ |
diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c index 994f7b0119fe..35ead69521a0 100644 --- a/drivers/input/misc/bfin_rotary.c +++ b/drivers/input/misc/bfin_rotary.c | |||
@@ -12,9 +12,9 @@ | |||
12 | #include <linux/platform_device.h> | 12 | #include <linux/platform_device.h> |
13 | #include <linux/input.h> | 13 | #include <linux/input.h> |
14 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
15 | #include <linux/platform_data/bfin_rotary.h> | ||
15 | 16 | ||
16 | #include <asm/portmux.h> | 17 | #include <asm/portmux.h> |
17 | #include <asm/bfin_rotary.h> | ||
18 | 18 | ||
19 | static const u16 per_cnt[] = { | 19 | static const u16 per_cnt[] = { |
20 | P_CNT_CUD, | 20 | P_CNT_CUD, |
diff --git a/arch/blackfin/include/asm/bfin_rotary.h b/include/linux/platform_data/bfin_rotary.h index 8895a750c70c..8895a750c70c 100644 --- a/arch/blackfin/include/asm/bfin_rotary.h +++ b/include/linux/platform_data/bfin_rotary.h | |||