The platform data definition of the rotary driver should be generic for all architectures.
Unified · Split
| @@ -666,7 +666,7 @@ static struct platform_device bfin_sport1_uart_device = { · 665 unmodified lines | |||
| 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,*/ |
| @@ -1092,7 +1092,7 @@ static struct platform_device bfin_device_gpiokeys = { · 1091 unmodified lines | |||
| 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,*/ |
| @@ -159,7 +159,7 @@ static struct platform_device bf54x_kpad_device = { · 158 unmodified lines | |||
| 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,*/ |
| @@ -75,7 +75,7 @@ static struct platform_device bfin_isp1760_device = { · 74 unmodified lines | |||
| 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,*/ |
| @@ -12,9 +12,9 @@ · 11 unmodified lines | |||
| 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, |
File renamed without changes.