From: 谢修鑫 Date: Tue, 25 May 2010 16:17:30 +0000 (+0000) Subject: edit pca9554.c X-Git-Tag: firefly_0821_release~11467 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d24f40eadc3935e81b92e8f8b461fdc79cbbe188;p=firefly-linux-kernel-4.4.55.git edit pca9554.c --- diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 04383183cf57..91baae369d7c 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -230,19 +230,19 @@ config GPIO_UCB1400 To compile this driver as a module, choose M here: the module will be called ucb1400_gpio. -config GPIO_TCA6424 - bool "TCA6424 extend GPIO" +config GPIO_PCA9554 + bool "GPIO EXPANDER PCA9554" depends on I2C help - Say yes here to access the TCA6424 extend GPIO + Say yes here to access the PCA9554 GPIO EXPANDER -config ARCH_EXTEND_GPIOS - int - default 24 if GPIO_TCA6424 - default 0 +config EXPANDED_GPIO_NUM + int "setting the amount of expanded gpios" + default 8 if GPIO_PCA9554 + default 0 -config EXTEND_GPIO_IRQ - int - default 3 if GPIO_TCA6424 +config EXPANDED_GPIO_IRQ_NUM + int "setting the amount of expanded gpio irqs" + default 8 if GPIO_PCA9554 default 0 endif diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 00a532c9a1e2..8fef4c219b7b 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -19,3 +19,4 @@ obj-$(CONFIG_GPIO_XILINX) += xilinx_gpio.o obj-$(CONFIG_GPIO_BT8XX) += bt8xxgpio.o obj-$(CONFIG_GPIO_VR41XX) += vr41xx_giu.o obj-$(CONFIG_GPIO_WM831X) += wm831x-gpio.o +obj-$(CONFIG_GPIO_PCA9554) += pca9554.o diff --git a/drivers/gpio/pca9554.c b/drivers/gpio/pca9554.c index e6813e2a003f..6ff0a260c482 100644 --- a/drivers/gpio/pca9554.c +++ b/drivers/gpio/pca9554.c @@ -100,7 +100,7 @@ struct pca9554_chip { }; -#if 1 +#if 0 #define DBG(x...) printk(KERN_INFO x) #else #define DBG(x...) @@ -906,7 +906,7 @@ static int __devinit pca9554_probe(struct i2c_client *client,const struct i2c_de chip->client = client; - pca9554_test(chip); + //pca9554_test(chip); return 0;