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

Commit fe421052 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge branch 'mcp23s08' into devel

parents bdb18d93 7f38c5b9

arch/arm/configs/lpc32xx_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ CONFIG_GPIO_SX150X=y 
CONFIG_GPIO_74X164=y

CONFIG_GPIO_MAX7301=y

CONFIG_GPIO_MC33880=y

CONFIG_GPIO_MCP23S08=y

CONFIG_PINCTRL_MCP23S08=y

CONFIG_SENSORS_DS620=y

CONFIG_SENSORS_MAX6639=y

CONFIG_WATCHDOG=y

arch/blackfin/configs/BF609-EZKIT_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ CONFIG_SPI=y 
CONFIG_SPI_ADI_V3=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_MCP23S08=y

CONFIG_PINCTRL_MCP23S08=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_BFIN_WDT=y

arch/blackfin/mach-bf527/boards/tll6527m.c

+4 −4
Original line number Diff line number Diff line
@@ -348,14 +348,14 @@ static struct platform_device bfin_i2s = { 
};

#endif



#if IS_ENABLED(CONFIG_GPIO_MCP23S08)

#if IS_ENABLED(CONFIG_PINCTRL_MCP23S08)

#include <linux/spi/mcp23s08.h>

static const struct mcp23s08_platform_data bfin_mcp23s08_sys_gpio_info = {

	.chip[0].is_present = true,

	.spi_present_mask = BIT(0),

	.base = 0x30,

};

static const struct mcp23s08_platform_data bfin_mcp23s08_usr_gpio_info = {

	.chip[2].is_present = true,

	.spi_present_mask = BIT(2),

	.base = 0x38,

};

#endif
@@ -423,7 +423,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.mode = SPI_CPHA | SPI_CPOL,

	},

#endif

#if IS_ENABLED(CONFIG_GPIO_MCP23S08)

#if IS_ENABLED(CONFIG_PINCTRL_MCP23S08)

	{

		.modalias = "mcp23s08",

		.platform_data = &bfin_mcp23s08_sys_gpio_info,

arch/blackfin/mach-bf609/boards/ezkit.c

+2 −2
Original line number Diff line number Diff line
@@ -1887,7 +1887,7 @@ static struct platform_device i2c_bfin_twi1_device = { 
};

#endif



#if IS_ENABLED(CONFIG_GPIO_MCP23S08)

#if IS_ENABLED(CONFIG_PINCTRL_MCP23S08)

#include <linux/spi/mcp23s08.h>

static const struct mcp23s08_platform_data bfin_mcp23s08_soft_switch0 = {

	.base = 120,
@@ -1929,7 +1929,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info0[] = { 
		I2C_BOARD_INFO("ssm2602", 0x1b),

	},

#endif

#if IS_ENABLED(CONFIG_GPIO_MCP23S08)

#if IS_ENABLED(CONFIG_PINCTRL_MCP23S08)

	{

		I2C_BOARD_INFO("mcp23017", 0x21),

		.platform_data = (void *)&bfin_mcp23s08_soft_switch0

drivers/gpio/Kconfig

+0 −17
Original line number Diff line number Diff line
@@ -1237,23 +1237,6 @@ config GPIO_PISOSR 


endmenu



menu "SPI or I2C GPIO expanders"

	depends on (SPI_MASTER && !I2C) || I2C



config GPIO_MCP23S08

	tristate "Microchip MCP23xxx I/O expander"

	depends on OF_GPIO

	select GPIOLIB_IRQCHIP

	select REGMAP_I2C if I2C

	select REGMAP if SPI_MASTER

	help

	  SPI/I2C driver for Microchip MCP23S08/MCP23S17/MCP23008/MCP23017

	  I/O expanders.

	  This provides a GPIO interface supporting inputs and outputs.

	  The I2C versions of the chips can be used as interrupt-controller.



endmenu



menu "USB GPIO expanders"

	depends on USB