| Message ID | 1390205344-15194-1-git-send-email-linus.walleij@linaro.org |
|---|---|
| State | Accepted |
| Commit | 01d7004181c8ff6d63bf5e8e2b771022c4f78289 |
| Headers | show |
On Wed, Jan 22, 2014 at 4:05 PM, Lars Poeschel <poeschel@lemonage.de> wrote: > After I read Torvalds mail, I > realized that mcp23s08 driver now depends on OF_GPIO. I wonder if your patch > was the best way to fix this. I did this: depends on (SPI_MASTER && !I2C) || I2C && OF_GPIO But Torvalds realized we have to do it like this: depends on OF_GPIO depends on (SPI_MASTER && !I2C) || I2C Due to some funny business in Kconfig. > I think a better way would be to not explicitly > depend on OF_GPIO rather than disabling interrupt functionality if OF_GPIO is > not selected. What I am a bit concerned about is, that we locked out non-OF > users from being able to use this driver from now on. OK you need to think of something, if it's not causing any regressions on some board it's no problem. So user stories are needed to justify this as a regression fix. > I seems since Linus Torvalds now pulled our patches and fixed them up, it is a > bit too late, but should we do another patch third patch, that reenables the > non-OF usage of the driver ? What do you think ? That will be for the next merge window in that case. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 2d49784109b5..d5bd9eece408 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -717,7 +717,7 @@ config GPIO_MAX7301 config GPIO_MCP23S08 tristate "Microchip MCP23xxx I/O expander" - depends on (SPI_MASTER && !I2C) || I2C + depends on (SPI_MASTER && !I2C) || I2C && OF_GPIO help SPI/I2C driver for Microchip MCP23S08/MCP23S17/MCP23008/MCP23017 I/O expanders.
The MCP drivers fails to compile on trial builds due to missing Kconfig dependency on OF_GPIO. Fix it. Cc: Lars Poeschel <poeschel@lemonage.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/gpio/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)