diff options
| author | Steven Miao <realmz6@gmail.com> | 2014-03-17 13:36:51 +0800 |
|---|---|---|
| committer | Steven Miao <realmz6@gmail.com> | 2014-04-12 08:46:32 +0800 |
| commit | a0c1fb2ea74dedecd303fb0388e21ca869239db2 (patch) | |
| tree | ce4e288c810f36ff1889352ac98e0a96ee6504df /arch/blackfin | |
| parent | fa730d6277a10109d31a8968acc2cbf4f2a0f78e (diff) | |
| download | linux-stable-a0c1fb2ea74dedecd303fb0388e21ca869239db2.tar.gz linux-stable-a0c1fb2ea74dedecd303fb0388e21ca869239db2.tar.bz2 linux-stable-a0c1fb2ea74dedecd303fb0388e21ca869239db2.zip | |
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>
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | arch/blackfin/include/asm/portmux.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/blackfin/include/asm/portmux.h b/arch/blackfin/include/asm/portmux.h index 7aa20436e799..c8f0939419be 100644 --- a/arch/blackfin/include/asm/portmux.h +++ b/arch/blackfin/include/asm/portmux.h @@ -18,16 +18,14 @@ #define P_DONTCARE 0x1000 #ifdef CONFIG_PINCTRL -#include <asm/irq_handler.h> +int bfin_internal_set_wake(unsigned int irq, unsigned int state); #define gpio_pint_regs bfin_pint_regs #define adi_internal_set_wake bfin_internal_set_wake -#define peripheral_request(per, label) 0 +#define peripheral_request(per, label) (0) #define peripheral_free(per) -#define peripheral_request_list(per, label) \ - (pdev ? (IS_ERR(devm_pinctrl_get_select_default(&pdev->dev)) \ - ? -EINVAL : 0) : 0) +#define peripheral_request_list(per, label) (0) #define peripheral_free_list(per) #else int peripheral_request(unsigned short per, const char *label); @@ -39,7 +37,7 @@ void peripheral_free_list(const unsigned short per[]); #include <linux/err.h> #include <linux/pinctrl/pinctrl.h> #include <mach/portmux.h> -#include <linux/gpio.h> +#include <mach/gpio.h> #ifndef P_SPORT2_TFS #define P_SPORT2_TFS P_UNDEF |