Commit a0c1fb2ea74dedecd303fb0388e21ca869239db2
1 parent
fa730d6277
Exists in
master
and in
13 other branches
blackfin: portmux: cleanup head file
drop unused head file change pinmux request/free macro for backward compatiblity add function declaration Signed-off-by: Steven Miao <realmz6@gmail.com>
Showing 1 changed file with 4 additions and 6 deletions Side-by-side Diff
arch/blackfin/include/asm/portmux.h
| ... | ... | @@ -18,16 +18,14 @@ |
| 18 | 18 | #define P_DONTCARE 0x1000 |
| 19 | 19 | |
| 20 | 20 | #ifdef CONFIG_PINCTRL |
| 21 | -#include <asm/irq_handler.h> | |
| 21 | +int bfin_internal_set_wake(unsigned int irq, unsigned int state); | |
| 22 | 22 | |
| 23 | 23 | #define gpio_pint_regs bfin_pint_regs |
| 24 | 24 | #define adi_internal_set_wake bfin_internal_set_wake |
| 25 | 25 | |
| 26 | -#define peripheral_request(per, label) 0 | |
| 26 | +#define peripheral_request(per, label) (0) | |
| 27 | 27 | #define peripheral_free(per) |
| 28 | -#define peripheral_request_list(per, label) \ | |
| 29 | - (pdev ? (IS_ERR(devm_pinctrl_get_select_default(&pdev->dev)) \ | |
| 30 | - ? -EINVAL : 0) : 0) | |
| 28 | +#define peripheral_request_list(per, label) (0) | |
| 31 | 29 | #define peripheral_free_list(per) |
| 32 | 30 | #else |
| 33 | 31 | int peripheral_request(unsigned short per, const char *label); |
| ... | ... | @@ -39,7 +37,7 @@ |
| 39 | 37 | #include <linux/err.h> |
| 40 | 38 | #include <linux/pinctrl/pinctrl.h> |
| 41 | 39 | #include <mach/portmux.h> |
| 42 | -#include <linux/gpio.h> | |
| 40 | +#include <mach/gpio.h> | |
| 43 | 41 | |
| 44 | 42 | #ifndef P_SPORT2_TFS |
| 45 | 43 | #define P_SPORT2_TFS P_UNDEF |