Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 741ecef6 authored by Sonic Zhang's avatar Sonic Zhang Committed by Linus Walleij
Browse files

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: default avatarSonic Zhang <sonic.zhang@analog.com>
Acked-by: default avatarSteven Miao <realmz6@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 7330e345

arch/blackfin/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -324,6 +324,10 @@ config GPIO_ADI 
	def_bool y

	depends on (BF51x || BF52x || BF53x || BF538 || BF539 || BF561)



config PINCTRL

	def_bool y

	depends on BF54x || BF60x



config MEM_MT48LC64M4A2FB_7E

	bool

	depends on (BFIN533_STAMP)

arch/blackfin/include/asm/portmux.h

+17 −2
Original line number Diff line number Diff line
@@ -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

arch/blackfin/mach-bf548/include/mach/portmux.h

+0 −2
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 
#ifndef _MACH_PORTMUX_H_

#define _MACH_PORTMUX_H_



#define MAX_RESOURCES	MAX_BLACKFIN_GPIOS



#define P_SPORT2_TFS	(P_DEFINED | P_IDENT(GPIO_PA0) | P_FUNCT(0))

#define P_SPORT2_DTSEC	(P_DEFINED | P_IDENT(GPIO_PA1) | P_FUNCT(0))

#define P_SPORT2_DTPRI	(P_DEFINED | P_IDENT(GPIO_PA2) | P_FUNCT(0))

arch/blackfin/mach-bf609/include/mach/portmux.h

+0 −2
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 
#ifndef _MACH_PORTMUX_H_

#define _MACH_PORTMUX_H_



#define MAX_RESOURCES	MAX_BLACKFIN_GPIOS



/* EMAC RMII Port Mux */

#define P_MII0_MDC	(P_DEFINED | P_IDENT(GPIO_PC6) | P_FUNCT(0))

#define P_MII0_MDIO	(P_DEFINED | P_IDENT(GPIO_PC7) | P_FUNCT(0))