--- zzzz-none-000/linux-3.10.107/drivers/gpio/gpio-pcf857x.c 2017-06-27 09:49:32.000000000 +0000 +++ scorpion-7490-727/linux-3.10.107/drivers/gpio/gpio-pcf857x.c 2021-02-04 17:41:59.000000000 +0000 @@ -18,17 +18,18 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include -#include #include #include #include #include #include #include +#include #include +#include +#include +#include #include -#include static const struct i2c_device_id pcf857x_id[] = { @@ -50,6 +51,27 @@ }; MODULE_DEVICE_TABLE(i2c, pcf857x_id); +#ifdef CONFIG_OF +static const struct of_device_id pcf857x_of_table[] = { + { .compatible = "nxp,pcf8574" }, + { .compatible = "nxp,pcf8574a" }, + { .compatible = "nxp,pca8574" }, + { .compatible = "nxp,pca9670" }, + { .compatible = "nxp,pca9672" }, + { .compatible = "nxp,pca9674" }, + { .compatible = "nxp,pcf8575" }, + { .compatible = "nxp,pca8575" }, + { .compatible = "nxp,pca9671" }, + { .compatible = "nxp,pca9673" }, + { .compatible = "nxp,pca9675" }, + { .compatible = "maxim,max7328" }, + { .compatible = "maxim,max7329" }, + { .compatible = "ti,tca9554" }, + { } +}; +MODULE_DEVICE_TABLE(of, pcf857x_of_table); +#endif + /* * The pcf857x, pca857x, and pca967x chips only expose one read and one * write register. Writing a "one" bit (to match the reset state) lets @@ -66,12 +88,10 @@ struct gpio_chip chip; struct i2c_client *client; struct mutex lock; /* protect 'out' */ - struct work_struct work; /* irq demux work */ - struct irq_domain *irq_domain; /* for irq demux */ - spinlock_t slock; /* protect irq demux */ unsigned out; /* software latch */ unsigned status; /* current status */ - int irq; /* real irq number */ + unsigned int irq_parent; + unsigned irq_enabled; /* enabled irqs */ int (*write)(struct i2c_client *client, unsigned data); int (*read)(struct i2c_client *client); @@ -161,111 +181,108 @@ /*-------------------------------------------------------------------------*/ -static int pcf857x_to_irq(struct gpio_chip *chip, unsigned offset) +static irqreturn_t pcf857x_irq(int irq, void *data) { - struct pcf857x *gpio = container_of(chip, struct pcf857x, chip); - - return irq_create_mapping(gpio->irq_domain, offset); -} - -static void pcf857x_irq_demux_work(struct work_struct *work) -{ - struct pcf857x *gpio = container_of(work, - struct pcf857x, - work); - unsigned long change, i, status, flags; + struct pcf857x *gpio = data; + unsigned long change, i, status; status = gpio->read(gpio->client); - spin_lock_irqsave(&gpio->slock, flags); + /* + * call the interrupt handler iff gpio is used as + * interrupt source, just to avoid bad irqs + */ + mutex_lock(&gpio->lock); + change = (gpio->status ^ status) & gpio->irq_enabled; + gpio->status = status; + mutex_unlock(&gpio->lock); - change = gpio->status ^ status; for_each_set_bit(i, &change, gpio->chip.ngpio) - generic_handle_irq(irq_find_mapping(gpio->irq_domain, i)); - gpio->status = status; + handle_nested_irq(irq_find_mapping(gpio->chip.irqdomain, i)); - spin_unlock_irqrestore(&gpio->slock, flags); + return IRQ_HANDLED; } -static irqreturn_t pcf857x_irq_demux(int irq, void *data) +/* + * NOP functions + */ +static void noop(struct irq_data *data) { } + +static int pcf857x_irq_set_wake(struct irq_data *data, unsigned int on) { - struct pcf857x *gpio = data; + struct pcf857x *gpio = irq_data_get_irq_chip_data(data); - /* - * pcf857x can't read/write data here, - * since i2c data access might go to sleep. - */ - schedule_work(&gpio->work); + int error = 0; - return IRQ_HANDLED; + if (gpio->irq_parent) { + error = irq_set_irq_wake(gpio->irq_parent, on); + if (error) { + dev_dbg(&gpio->client->dev, + "irq %u doesn't support irq_set_wake\n", + gpio->irq_parent); + gpio->irq_parent = 0; + } + } + return error; } -static int pcf857x_irq_domain_map(struct irq_domain *domain, unsigned int virq, - irq_hw_number_t hw) +static void pcf857x_irq_enable(struct irq_data *data) { - irq_set_chip_and_handler(virq, - &dummy_irq_chip, - handle_level_irq); - return 0; -} + struct pcf857x *gpio = irq_data_get_irq_chip_data(data); -static struct irq_domain_ops pcf857x_irq_domain_ops = { - .map = pcf857x_irq_domain_map, -}; + gpio->irq_enabled |= (1 << data->hwirq); +} -static void pcf857x_irq_domain_cleanup(struct pcf857x *gpio) +static void pcf857x_irq_disable(struct irq_data *data) { - if (gpio->irq_domain) - irq_domain_remove(gpio->irq_domain); + struct pcf857x *gpio = irq_data_get_irq_chip_data(data); - if (gpio->irq) - free_irq(gpio->irq, gpio); + gpio->irq_enabled &= ~(1 << data->hwirq); } -static int pcf857x_irq_domain_init(struct pcf857x *gpio, - struct pcf857x_platform_data *pdata, - struct i2c_client *client) +static void pcf857x_irq_bus_lock(struct irq_data *data) { - int status; - - gpio->irq_domain = irq_domain_add_linear(client->dev.of_node, - gpio->chip.ngpio, - &pcf857x_irq_domain_ops, - NULL); - if (!gpio->irq_domain) - goto fail; - - /* enable real irq */ - status = request_irq(client->irq, pcf857x_irq_demux, 0, - dev_name(&client->dev), gpio); - if (status) - goto fail; + struct pcf857x *gpio = irq_data_get_irq_chip_data(data); - /* enable gpio_to_irq() */ - INIT_WORK(&gpio->work, pcf857x_irq_demux_work); - gpio->chip.to_irq = pcf857x_to_irq; - gpio->irq = client->irq; + mutex_lock(&gpio->lock); +} - return 0; +static void pcf857x_irq_bus_sync_unlock(struct irq_data *data) +{ + struct pcf857x *gpio = irq_data_get_irq_chip_data(data); -fail: - pcf857x_irq_domain_cleanup(gpio); - return -EINVAL; + mutex_unlock(&gpio->lock); } +static struct irq_chip pcf857x_irq_chip = { + .name = "pcf857x", + .irq_enable = pcf857x_irq_enable, + .irq_disable = pcf857x_irq_disable, + .irq_ack = noop, + .irq_mask = noop, + .irq_unmask = noop, + .irq_set_wake = pcf857x_irq_set_wake, + .irq_bus_lock = pcf857x_irq_bus_lock, + .irq_bus_sync_unlock = pcf857x_irq_bus_sync_unlock, +}; + /*-------------------------------------------------------------------------*/ static int pcf857x_probe(struct i2c_client *client, const struct i2c_device_id *id) { - struct pcf857x_platform_data *pdata; + struct pcf857x_platform_data *pdata = dev_get_platdata(&client->dev); + struct device_node *np = client->dev.of_node; struct pcf857x *gpio; + unsigned int n_latch = 0; int status; - pdata = client->dev.platform_data; - if (!pdata) { + if (IS_ENABLED(CONFIG_OF) && np) + of_property_read_u32(np, "lines-initial-states", &n_latch); + else if (pdata) + n_latch = pdata->n_latch; + else dev_dbg(&client->dev, "no platform data\n"); - } /* Allocate, initialize, and register this gpio_chip. */ gpio = devm_kzalloc(&client->dev, sizeof(*gpio), GFP_KERNEL); @@ -273,10 +290,9 @@ return -ENOMEM; mutex_init(&gpio->lock); - spin_lock_init(&gpio->slock); gpio->chip.base = pdata ? pdata->gpio_base : -1; - gpio->chip.can_sleep = 1; + gpio->chip.can_sleep = true; gpio->chip.dev = &client->dev; gpio->chip.owner = THIS_MODULE; gpio->chip.get = pcf857x_get; @@ -285,15 +301,6 @@ gpio->chip.direction_output = pcf857x_output; gpio->chip.ngpio = id->driver_data; - /* enable gpio_to_irq() if platform has settings */ - if (pdata && client->irq) { - status = pcf857x_irq_domain_init(gpio, pdata, client); - if (status < 0) { - dev_err(&client->dev, "irq_domain init failed\n"); - goto fail; - } - } - /* NOTE: the OnSemi jlc1562b is also largely compatible with * these parts, notably for output. It has a low-resolution * DAC instead of pin change IRQs; and its inputs can be the @@ -358,17 +365,39 @@ * may cause transient glitching since it can't know the last value * written (some pins may need to be driven low). * - * Using pdata->n_latch avoids that trouble. When left initialized - * to zero, our software copy of the "latch" then matches the chip's - * all-ones reset state. Otherwise it flags pins to be driven low. + * Using n_latch avoids that trouble. When left initialized to zero, + * our software copy of the "latch" then matches the chip's all-ones + * reset state. Otherwise it flags pins to be driven low. */ - gpio->out = pdata ? ~pdata->n_latch : ~0; + gpio->out = ~n_latch; gpio->status = gpio->out; status = gpiochip_add(&gpio->chip); if (status < 0) goto fail; + /* Enable irqchip if we have an interrupt */ + if (client->irq) { + status = gpiochip_irqchip_add(&gpio->chip, &pcf857x_irq_chip, + 0, handle_level_irq, + IRQ_TYPE_NONE); + if (status) { + dev_err(&client->dev, "cannot add irqchip\n"); + goto fail_irq; + } + + status = devm_request_threaded_irq(&client->dev, client->irq, + NULL, pcf857x_irq, IRQF_ONESHOT | + IRQF_TRIGGER_FALLING | IRQF_SHARED, + dev_name(&client->dev), gpio); + if (status) + goto fail_irq; + + gpiochip_set_chained_irqchip(&gpio->chip, &pcf857x_irq_chip, + client->irq, NULL); + gpio->irq_parent = client->irq; + } + /* Let platform code set up the GPIOs and their users. * Now is the first time anyone could use them. */ @@ -384,19 +413,19 @@ return 0; -fail: - dev_dbg(&client->dev, "probe error %d for '%s'\n", - status, client->name); +fail_irq: + gpiochip_remove(&gpio->chip); - if (pdata && client->irq) - pcf857x_irq_domain_cleanup(gpio); +fail: + dev_dbg(&client->dev, "probe error %d for '%s'\n", status, + client->name); return status; } static int pcf857x_remove(struct i2c_client *client) { - struct pcf857x_platform_data *pdata = client->dev.platform_data; + struct pcf857x_platform_data *pdata = dev_get_platdata(&client->dev); struct pcf857x *gpio = i2c_get_clientdata(client); int status = 0; @@ -411,12 +440,7 @@ } } - if (pdata && client->irq) - pcf857x_irq_domain_cleanup(gpio); - - status = gpiochip_remove(&gpio->chip); - if (status) - dev_err(&client->dev, "%s --> %d\n", "remove", status); + gpiochip_remove(&gpio->chip); return status; } @@ -424,6 +448,7 @@ .driver = { .name = "pcf857x", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(pcf857x_of_table), }, .probe = pcf857x_probe, .remove = pcf857x_remove,