0f4630f372
The separate struct bgpio_chip has been a pain to handle, both by being confusingly similar in name to struct gpio_chip and for being contained inside a struct so that struct gpio_chip is contained in a struct contained in a struct, making several steps of dereferencing necessary. Make things simpler: include the fields directly into <linux/gpio/driver.h>, #ifdef:ed for CONFIG_GENERIC_GPIO, and get rid of the <linux/basic_mmio_gpio.h> altogether. Prefix some of the member variables with bgpio_* and add proper kerneldoc while we're at it. Modify all users to handle the change and use a struct gpio_chip directly. And while we're at it: replace all container_of() dereferencing by gpiochip_get_data() and registering the gpio_chip with gpiochip_add_data(). Cc: arm@kernel.org Cc: Alexander Shiyan <shc_work@mail.ru> Cc: Shawn Guo <shawnguo@kernel.org> Cc: Sascha Hauer <kernel@pengutronix.de> Cc: Kukjin Kim <kgene@kernel.org> Cc: Alexandre Courbot <gnurou@gmail.com> Cc: Brian Norris <computersforpeace@gmail.com> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: Sudeep Holla <sudeep.holla@arm.com> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Nicolas Pitre <nicolas.pitre@linaro.org> Cc: Olof Johansson <olof@lixom.net> Cc: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> Cc: Rabin Vincent <rabin@rab.in> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-omap@vger.kernel.org Cc: linux-samsung-soc@vger.kernel.org Cc: bcm-kernel-feedback-list@broadcom.com Acked-by: Gregory Fong <gregory.0xf0@gmail.com> Acked-by: Liviu Dudau <Liviu.Dudau@arm.com> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
100 lines
2.3 KiB
C
100 lines
2.3 KiB
C
/*
|
|
* CLPS711X GPIO driver
|
|
*
|
|
* Copyright (C) 2012,2013 Alexander Shiyan <shc_work@mail.ru>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*/
|
|
|
|
#include <linux/err.h>
|
|
#include <linux/module.h>
|
|
#include <linux/gpio/driver.h>
|
|
#include <linux/platform_device.h>
|
|
|
|
static int clps711x_gpio_probe(struct platform_device *pdev)
|
|
{
|
|
struct device_node *np = pdev->dev.of_node;
|
|
void __iomem *dat, *dir;
|
|
struct gpio_chip *gc;
|
|
struct resource *res;
|
|
int err, id = np ? of_alias_get_id(np, "gpio") : pdev->id;
|
|
|
|
if ((id < 0) || (id > 4))
|
|
return -ENODEV;
|
|
|
|
gc = devm_kzalloc(&pdev->dev, sizeof(*gc), GFP_KERNEL);
|
|
if (!gc)
|
|
return -ENOMEM;
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
dat = devm_ioremap_resource(&pdev->dev, res);
|
|
if (IS_ERR(dat))
|
|
return PTR_ERR(dat);
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
|
|
dir = devm_ioremap_resource(&pdev->dev, res);
|
|
if (IS_ERR(dir))
|
|
return PTR_ERR(dir);
|
|
|
|
switch (id) {
|
|
case 3:
|
|
/* PORTD is inverted logic for direction register */
|
|
err = bgpio_init(gc, &pdev->dev, 1, dat, NULL, NULL,
|
|
NULL, dir, 0);
|
|
break;
|
|
default:
|
|
err = bgpio_init(gc, &pdev->dev, 1, dat, NULL, NULL,
|
|
dir, NULL, 0);
|
|
break;
|
|
}
|
|
|
|
if (err)
|
|
return err;
|
|
|
|
switch (id) {
|
|
case 4:
|
|
/* PORTE is 3 lines only */
|
|
gc->ngpio = 3;
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
gc->base = id * 8;
|
|
gc->owner = THIS_MODULE;
|
|
platform_set_drvdata(pdev, gc);
|
|
|
|
return gpiochip_add_data(gc, NULL);
|
|
}
|
|
|
|
static int clps711x_gpio_remove(struct platform_device *pdev)
|
|
{
|
|
struct gpio_chip *gc = platform_get_drvdata(pdev);
|
|
|
|
gpiochip_remove(gc);
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id __maybe_unused clps711x_gpio_ids[] = {
|
|
{ .compatible = "cirrus,clps711x-gpio" },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, clps711x_gpio_ids);
|
|
|
|
static struct platform_driver clps711x_gpio_driver = {
|
|
.driver = {
|
|
.name = "clps711x-gpio",
|
|
.of_match_table = of_match_ptr(clps711x_gpio_ids),
|
|
},
|
|
.probe = clps711x_gpio_probe,
|
|
.remove = clps711x_gpio_remove,
|
|
};
|
|
module_platform_driver(clps711x_gpio_driver);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_AUTHOR("Alexander Shiyan <shc_work@mail.ru>");
|
|
MODULE_DESCRIPTION("CLPS711X GPIO driver");
|
|
MODULE_ALIAS("platform:clps711x-gpio");
|