lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Blackfin arch: fix PORT_J BUG for BF537/6 EMAC driver reported by Kalle Pokki <kalle.pokki@iki.fi>

Browse Source 
Cc: Kalle Pokki <kalle.pokki@iki.fi>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
This commit is contained in:
Michael Hennerich
2007-10-04 00:36:18 +08:00
committed by Bryan Wu
parent c58c2140f0
commit cda6a20b68
2 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/blackfin/kernel/bfin_gpio.c
View File

@@ -180,11 +180,13 @@ static int cmp_label(unsigned short ident, const char *label)
#ifdef BF537_FAMILY #ifdef BF537_FAMILY
static void port_setup(unsigned short gpio, unsigned short usage) static void port_setup(unsigned short gpio, unsigned short usage)
{ {
if (!check_gpio(gpio)) {
if (usage == GPIO_USAGE) { if (usage == GPIO_USAGE) {
*port_fer[gpio_bank(gpio)] &= ~gpio_bit(gpio); *port_fer[gpio_bank(gpio)] &= ~gpio_bit(gpio);
} else } else
*port_fer[gpio_bank(gpio)] |= gpio_bit(gpio); *port_fer[gpio_bank(gpio)] |= gpio_bit(gpio);
SSYNC(); SSYNC();
}
} }
#else #else
# define port_setup(...) do { } while (0) # define port_setup(...) do { } while (0)
@@ -644,11 +646,10 @@ int peripheral_request(unsigned short per, const char *label)
if (!(per & P_DEFINED)) if (!(per & P_DEFINED))
return -ENODEV; return -ENODEV;
if (check_gpio(ident) < 0)
return -EINVAL;
local_irq_save(flags); local_irq_save(flags);
if (!check_gpio(ident)) {
if (unlikely(reserved_gpio_map[gpio_bank(ident)] & gpio_bit(ident))) { if (unlikely(reserved_gpio_map[gpio_bank(ident)] & gpio_bit(ident))) {
printk(KERN_ERR printk(KERN_ERR
"%s: Peripheral %d is already reserved as GPIO by %s !\n", "%s: Peripheral %d is already reserved as GPIO by %s !\n",
@@ -658,6 +659,8 @@ int peripheral_request(unsigned short per, const char *label)
return -EBUSY; return -EBUSY;
} }
}
if (unlikely(reserved_peri_map[gpio_bank(ident)] & gpio_bit(ident))) { if (unlikely(reserved_peri_map[gpio_bank(ident)] & gpio_bit(ident))) {
/* /*

33
include/asm-blackfin/mach-bf537/portmux.h
View File

@@ -106,4 +106,37 @@
#define P_SPI0_SSEL2 (P_DEFINED | P_IDENT(PORT_PJ11) | P_FUNCT(1)) #define P_SPI0_SSEL2 (P_DEFINED | P_IDENT(PORT_PJ11) | P_FUNCT(1))
#define P_SPI0_SSEL7 (P_DEFINED | P_IDENT(PORT_PJ5) | P_FUNCT(2)) #define P_SPI0_SSEL7 (P_DEFINED | P_IDENT(PORT_PJ5) | P_FUNCT(2))
#define P_MII0 {\
P_MII0_ETxD0, \
P_MII0_ETxD1, \
P_MII0_ETxD2, \
P_MII0_ETxD3, \
P_MII0_ETxEN, \
P_MII0_TxCLK, \
P_MII0_PHYINT, \
P_MII0_COL, \
P_MII0_ERxD0, \
P_MII0_ERxD1, \
P_MII0_ERxD2, \
P_MII0_ERxD3, \
P_MII0_ERxDV, \
P_MII0_ERxCLK, \
P_MII0_ERxER, \
P_MII0_CRS, \
P_MDC, \
P_MDIO, 0}
#define P_RMII0 {\
P_MII0_ETxD0, \
P_MII0_ETxD1, \
P_MII0_ETxEN, \
P_MII0_ERxD0, \
P_MII0_ERxD1, \
P_MII0_ERxER, \
P_RMII0_REF_CLK, \
P_RMII0_MDINT, \
P_RMII0_CRS_DV, \
P_MDC, \
P_MDIO, 0}
#endif /* _MACH_PORTMUX_H_ */ #endif /* _MACH_PORTMUX_H_ */