OSDN Git Service

blackfin: Fix local <asm/gpio.h> includes
authorLinus Walleij <linus.walleij@linaro.org>
Tue, 17 Oct 2017 09:46:09 +0000 (11:46 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 19 Oct 2017 08:12:49 +0000 (10:12 +0200)
commit350bdb84fda89270703907fb4c4fb482e1edbc31
treecdafa891ddc3a07f7a12b125602b517485ef9ca7
parent1c363531dd814dc4fe10865722bf6b0f72ce4673
blackfin: Fix local <asm/gpio.h> includes

When making the pin control submenu globally visible, all kinds
of oddities appear, in blackfin a few files were #including
<linux/gpio.h> and relying on that to pull in <asm/gpio.h>.

This was not working when pin control but not GPIOLIB was
selected resulting in a breakage in allmodconfig. The code these
files were using was still there and defined in <asm/gpio.h>
just not pulle in from just including <linux/gpio.h>

Simply add the required includes explicitly in the blackfin
kernel core and everything compiles fine.

Delete the use of the incorrect <linux/gpio.h> where possible.

Add stubs to <asm/gpio.h> for the functions called from PM:
these should probably also depend on !PINCTRL but since the
global CONFIG_PM symbol is used to compile PM support,
we need some more intrusive thing here, to be tested by
Blackfin maintainers.

Cc: Steven Miao <realmz6@gmail.com>
Cc: Huanhuan Feng <huanhuan.feng@analog.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
arch/blackfin/include/asm/gpio.h
arch/blackfin/kernel/bfin_gpio.c
arch/blackfin/kernel/debug-mmrs.c
arch/blackfin/mach-common/ints-priority.c
arch/blackfin/mach-common/pm.c