提交 61e73804 编写于 作者: A Alexander Shiyan 提交者: Linus Walleij

gpio: 74x164: Remove non-DT support

Commit 20bc4d5d
(gpio: 74x164: Add support for the daisy-chaining) introduce check
for DT for the driver, so driver cannot be used without DT.
There are no in-tree users of this driver, so remove non-DT support
completely.
Signed-off-by: NAlexander Shiyan <shc_work@mail.ru>
Acked-by: NMark Brown <broonie@linaro.org>
Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
上级 f57f98a6
...@@ -714,10 +714,10 @@ config GPIO_MC33880 ...@@ -714,10 +714,10 @@ config GPIO_MC33880
config GPIO_74X164 config GPIO_74X164
tristate "74x164 serial-in/parallel-out 8-bits shift register" tristate "74x164 serial-in/parallel-out 8-bits shift register"
depends on SPI_MASTER depends on SPI_MASTER && OF
help help
Platform driver for 74x164 compatible serial-in/parallel-out Driver for 74x164 compatible serial-in/parallel-out 8-outputs
8-outputs shift registers. This driver can be used to provide access shift registers. This driver can be used to provide access
to more gpio outputs. to more gpio outputs.
comment "AC97 GPIO expanders:" comment "AC97 GPIO expanders:"
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/74x164.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/of_gpio.h> #include <linux/of_gpio.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -108,14 +107,8 @@ static int gen_74x164_direction_output(struct gpio_chip *gc, ...@@ -108,14 +107,8 @@ static int gen_74x164_direction_output(struct gpio_chip *gc,
static int gen_74x164_probe(struct spi_device *spi) static int gen_74x164_probe(struct spi_device *spi)
{ {
struct gen_74x164_chip *chip; struct gen_74x164_chip *chip;
struct gen_74x164_chip_platform_data *pdata;
int ret; int ret;
if (!spi->dev.of_node) {
dev_err(&spi->dev, "No device tree data available.\n");
return -EINVAL;
}
/* /*
* bits_per_word cannot be configured in platform data * bits_per_word cannot be configured in platform data
*/ */
...@@ -129,12 +122,6 @@ static int gen_74x164_probe(struct spi_device *spi) ...@@ -129,12 +122,6 @@ static int gen_74x164_probe(struct spi_device *spi)
if (!chip) if (!chip)
return -ENOMEM; return -ENOMEM;
pdata = dev_get_platdata(&spi->dev);
if (pdata && pdata->base)
chip->gpio_chip.base = pdata->base;
else
chip->gpio_chip.base = -1;
mutex_init(&chip->lock); mutex_init(&chip->lock);
spi_set_drvdata(spi, chip); spi_set_drvdata(spi, chip);
...@@ -145,6 +132,7 @@ static int gen_74x164_probe(struct spi_device *spi) ...@@ -145,6 +132,7 @@ static int gen_74x164_probe(struct spi_device *spi)
chip->gpio_chip.direction_output = gen_74x164_direction_output; chip->gpio_chip.direction_output = gen_74x164_direction_output;
chip->gpio_chip.get = gen_74x164_get_value; chip->gpio_chip.get = gen_74x164_get_value;
chip->gpio_chip.set = gen_74x164_set_value; chip->gpio_chip.set = gen_74x164_set_value;
chip->gpio_chip.base = -1;
if (of_property_read_u32(spi->dev.of_node, "registers-number", &chip->registers)) { if (of_property_read_u32(spi->dev.of_node, "registers-number", &chip->registers)) {
dev_err(&spi->dev, "Missing registers-number property in the DT.\n"); dev_err(&spi->dev, "Missing registers-number property in the DT.\n");
......
#ifndef LINUX_SPI_74X164_H
#define LINUX_SPI_74X164_H
struct gen_74x164_chip_platform_data {
/* number assigned to the first GPIO */
unsigned base;
};
#endif
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册