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

Commit 0ce5eaf8 authored by Graf Yang's avatar Graf Yang Committed by Bryan Wu
Browse files

Blackfin arch: Fix bug - BF518 port F, G, and H have different mux offset compare to BF527 



[Mike Frysinger <vapier.adi@gmail.com>: keep the ifdef nest down]

Signed-off-by: default avatarGraf Yang <graf.yang@analog.com>
Signed-off-by: default avatarMike Frysinger <vapier.adi@gmail.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent 047481f3

arch/blackfin/kernel/bfin_gpio.c

+12 −5
Original line number Diff line number Diff line
@@ -108,12 +108,19 @@ static unsigned short * const port_mux[] = { 
};



static const

u8 pmux_offset[][16] =

	{{ 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 4, 6, 8, 8, 10, 10 }, /* PORTF */

u8 pmux_offset[][16] = {

#  if defined(BF527_FAMILY)

	{ 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 4, 6, 8, 8, 10, 10 }, /* PORTF */

	{ 0, 0, 0, 0, 0, 2, 2, 4, 4, 6, 8, 10, 10, 10, 12, 12 }, /* PORTG */

	{ 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 4, 4, 4, 4, 4, 4 }, /* PORTH */

#  elif defined(BF518_FAMILY)

	{ 0, 2, 2, 2, 2, 2, 2, 4, 6, 6, 6, 8, 8, 8, 8, 10 }, /* PORTF */

	{ 0, 0, 0, 2, 4, 6, 6, 6, 8, 10, 10, 12, 14, 14, 14, 14 }, /* PORTG */

	{ 0, 0, 0, 0, 2, 2, 4, 6, 10, 10, 10, 10, 10, 10, 10, 10 }, /* PORTH */

#  endif

};

# endif



#endif



static unsigned short reserved_gpio_map[GPIO_BANK_NUM];