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

Commit 4fdb1039 authored by Linus Walleij's avatar Linus Walleij Committed by Greg Kroah-Hartman
Browse files

pinctrl: adi2: Fix Kconfig build problem




[ Upstream commit 1c363531dd814dc4fe10865722bf6b0f72ce4673 ]

The build robot is complaining on Blackfin:

drivers/pinctrl/pinctrl-adi2.c: In function 'port_setup':
>> drivers/pinctrl/pinctrl-adi2.c:221:21: error: dereferencing
   pointer to incomplete type 'struct gpio_port_t'
      writew(readw(&regs->port_fer) & ~BIT(offset),
                        ^~
drivers/pinctrl/pinctrl-adi2.c: In function 'adi_gpio_ack_irq':
>> drivers/pinctrl/pinctrl-adi2.c:266:18: error: dereferencing
pointer to incomplete type 'struct bfin_pint_regs'
      if (readl(&regs->invert_set) & pintbit)
                     ^~
It seems the driver need to include <asm/gpio.h> and <asm/irq.h>
to compile.

The Blackfin architecture was re-defining the Kconfig
PINCTRL symbol which is not OK, so replaced this with
PINCTRL_BLACKFIN_ADI2 which selects PINCTRL and PINCTRL_ADI2
just like most arches do.

Further, the old GPIO driver symbol GPIO_ADI was possible to
select at the same time as selecting PINCTRL. This was not
working because the arch-local <asm/gpio.h> header contains
an explicit #ifndef PINCTRL clause making compilation break
if you combine them. The same is true for DEBUG_MMRS.

Make sure the ADI2 pinctrl driver is not selected at the same
time as the old GPIO implementation. (This should be converted
to use gpiolib or pincontrol and move to drivers/...) Also make
sure the old GPIO_ADI driver or DEBUG_MMRS is not selected at
the same time as the new PINCTRL implementation, and only make
PINCTRL_ADI2 selectable for the Blackfin families that actually
have it.

This way it is still possible to add e.g. I2C-based pin
control expanders on the Blackfin.

Cc: Steven Miao <realmz6@gmail.com>
Cc: Huanhuan Feng <huanhuan.feng@analog.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent afeeff4d
Loading
Loading
Loading
Loading
+5 −2
Original line number Original line Diff line number Diff line
@@ -319,11 +319,14 @@ config BF53x


config GPIO_ADI
config GPIO_ADI
	def_bool y
	def_bool y
	depends on !PINCTRL
	depends on (BF51x || BF52x || BF53x || BF538 || BF539 || BF561)
	depends on (BF51x || BF52x || BF53x || BF538 || BF539 || BF561)


config PINCTRL
config PINCTRL_BLACKFIN_ADI2
	def_bool y
	def_bool y
	depends on BF54x || BF60x
	depends on (BF54x || BF60x)
	select PINCTRL
	select PINCTRL_ADI2


config MEM_MT48LC64M4A2FB_7E
config MEM_MT48LC64M4A2FB_7E
	bool
	bool
+1 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ config DEBUG_VERBOSE


config DEBUG_MMRS
config DEBUG_MMRS
	tristate "Generate Blackfin MMR tree"
	tristate "Generate Blackfin MMR tree"
	depends on !PINCTRL
	select DEBUG_FS
	select DEBUG_FS
	help
	help
	  Create a tree of Blackfin MMRs via the debugfs tree.  If
	  Create a tree of Blackfin MMRs via the debugfs tree.  If
+2 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,8 @@ config DEBUG_PINCTRL


config PINCTRL_ADI2
config PINCTRL_ADI2
	bool "ADI pin controller driver"
	bool "ADI pin controller driver"
	depends on BLACKFIN
	depends on (BF54x || BF60x)
	depends on !GPIO_ADI
	select PINMUX
	select PINMUX
	select IRQ_DOMAIN
	select IRQ_DOMAIN
	help
	help