diff options
| author |   Sonic Zhang <sonic.zhang@analog.com> | 2013-09-03 16:29:01 +0800 |
|---|---|---|
| committer |   Linus Walleij <linus.walleij@linaro.org> | 2013-09-23 11:04:44 +0200 |
| commit | 741ecef62a37bcc368ff8c7282f810327edc3d94 (patch) | |
| tree | 89d07df54b7e427bab46da43a3ada0e615dccc1e /arch/blackfin/include | |
| parent | pinctrl: pinctrl-adi2-bf60x: remove useless and duplicated GPIO definition for PPI2. (diff) | |
| download | linux-dev-741ecef62a37bcc368ff8c7282f810327edc3d94.tar.xz linux-dev-741ecef62a37bcc368ff8c7282f810327edc3d94.zip | |
blackfin: pinctrl-adi2: Enable PINCTRL framework for BF54x and BF60x.
- Remove unused macro MAX_RESOURCES
- Override blackfin legacy peripheral pinmux request and free APIs by
devm_pinctrl_get_select_default() to init the peripheral portmux setting.
v3-chagnes:
- Move pinctrl soc data out of blackfin arch folder.
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Acked-by: Steven Miao <realmz6@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/blackfin/include')
| -rw-r--r-- | arch/blackfin/include/asm/portmux.h | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/arch/blackfin/include/asm/portmux.h b/arch/blackfin/include/asm/portmux.h index 9b1e2c37b324..7aa20436e799 100644 --- a/arch/blackfin/include/asm/portmux.h +++ b/arch/blackfin/include/asm/portmux.h @@ -17,14 +17,29 @@ #define P_MAYSHARE 0x2000 #define P_DONTCARE 0x1000 - +#ifdef CONFIG_PINCTRL +#include <asm/irq_handler.h> + +#define gpio_pint_regs bfin_pint_regs +#define adi_internal_set_wake bfin_internal_set_wake + +#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_free_list(per) +#else int peripheral_request(unsigned short per, const char *label); void peripheral_free(unsigned short per); int peripheral_request_list(const unsigned short per[], const char *label); void peripheral_free_list(const unsigned short per[]); +#endif -#include <asm/gpio.h> +#include <linux/err.h> +#include <linux/pinctrl/pinctrl.h> #include <mach/portmux.h> +#include <linux/gpio.h> #ifndef P_SPORT2_TFS #define P_SPORT2_TFS P_UNDEF |