Skip to content

L
linux
Commit 9dacc6de authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Linus Walleij
Browse files
Options

gpio: ge: Convert to platform driver 

This patch converts GE I/O FPGA GPIO driver to platform driver.
Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent ccd9726e
Show whitespace changes
Inline Side-by-side
Showing with 53 additions and 121 deletions
drivers/gpio/gpio-ge.c
View file @ 9dacc6de
...@@ -18,15 +18,9 @@ ...@@ -18,15 +18,9 @@
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/compiler.h>
#include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/of.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_platform.h>
#include <linux/of_gpio.h> #include <linux/of_gpio.h>
#include <linux/gpio.h>
#include <linux/slab.h>
#include <linux/module.h> #include <linux/module.h>
#define GEF_GPIO_DIRECT 0x00 #define GEF_GPIO_DIRECT 0x00
...@@ -39,28 +33,26 @@ ...@@ -39,28 +33,26 @@
#define GEF_GPIO_OVERRUN 0x1C #define GEF_GPIO_OVERRUN 0x1C
#define GEF_GPIO_MODE 0x20 #define GEF_GPIO_MODE 0x20
static void _gef_gpio_set(void __iomem *reg, unsigned int offset, int value) static void gef_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
{ {
struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip);
unsigned int data; unsigned int data;
data = ioread32be(reg); data = ioread32be(mmchip->regs + GEF_GPIO_OUT);
/* value: 0=low; 1=high */ if (value)
if (value & 0x1) data = data | BIT(offset);
data = data | (0x1 << offset);
else else
data = data & ~(0x1 << offset); data = data & ~BIT(offset);
iowrite32be(data, mmchip->regs + GEF_GPIO_OUT);
iowrite32be(data, reg);
} }
static int gef_gpio_dir_in(struct gpio_chip *chip, unsigned offset) static int gef_gpio_dir_in(struct gpio_chip *chip, unsigned offset)
{ {
unsigned int data; unsigned int data;
struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip); struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip);
data = ioread32be(mmchip->regs + GEF_GPIO_DIRECT); data = ioread32be(mmchip->regs + GEF_GPIO_DIRECT);
data = data | (0x1 << offset); data = data | BIT(offset);
iowrite32be(data, mmchip->regs + GEF_GPIO_DIRECT); iowrite32be(data, mmchip->regs + GEF_GPIO_DIRECT);
return 0; return 0;
...@@ -71,11 +63,11 @@ static int gef_gpio_dir_out(struct gpio_chip *chip, unsigned offset, int value) ...@@ -71,11 +63,11 @@ static int gef_gpio_dir_out(struct gpio_chip *chip, unsigned offset, int value)
unsigned int data; unsigned int data;
struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip); struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip);
/* Set direction before switching to input */ /* Set value before switching to output */
_gef_gpio_set(mmchip->regs + GEF_GPIO_OUT, offset, value); gef_gpio_set(mmchip->regs + GEF_GPIO_OUT, offset, value);
data = ioread32be(mmchip->regs + GEF_GPIO_DIRECT); data = ioread32be(mmchip->regs + GEF_GPIO_DIRECT);
data = data & ~(0x1 << offset); data = data & ~BIT(offset);
iowrite32be(data, mmchip->regs + GEF_GPIO_DIRECT); iowrite32be(data, mmchip->regs + GEF_GPIO_DIRECT);
return 0; return 0;
...@@ -83,116 +75,56 @@ static int gef_gpio_dir_out(struct gpio_chip *chip, unsigned offset, int value) ...@@ -83,116 +75,56 @@ static int gef_gpio_dir_out(struct gpio_chip *chip, unsigned offset, int value)
static int gef_gpio_get(struct gpio_chip *chip, unsigned offset) static int gef_gpio_get(struct gpio_chip *chip, unsigned offset)
{ {
unsigned int data;
int state = 0;
struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip); struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip);
data = ioread32be(mmchip->regs + GEF_GPIO_IN); return !!(ioread32be(mmchip->regs + GEF_GPIO_IN) & BIT(offset));
state = (int)((data >> offset) & 0x1);
return state;
} }
static void gef_gpio_set(struct gpio_chip *chip, unsigned offset, int value) static const struct of_device_id gef_gpio_ids[] = {
{ {
struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip); .compatible = "gef,sbc610-gpio",
.data = (void *)19,
_gef_gpio_set(mmchip->regs + GEF_GPIO_OUT, offset, value); }, {
} .compatible = "gef,sbc310-gpio",
.data = (void *)6,
}, {
.compatible = "ge,imp3a-gpio",
.data = (void *)16,
},
{ }
};
MODULE_DEVICE_TABLE(of, gef_gpio_ids);
static int __init gef_gpio_init(void) static int __init gef_gpio_probe(struct platform_device *pdev)
{ {
struct device_node *np; const struct of_device_id *of_id =
int retval; of_match_device(gef_gpio_ids, &pdev->dev);
struct of_mm_gpio_chip *gef_gpio_chip; struct of_mm_gpio_chip *mmchip;
for_each_compatible_node(np, NULL, "gef,sbc610-gpio") {
pr_debug("%s: Initialising GEF GPIO\n", np->full_name);
/* Allocate chip structure */
gef_gpio_chip = kzalloc(sizeof(*gef_gpio_chip), GFP_KERNEL);
if (!gef_gpio_chip) {
pr_err("%s: Unable to allocate structure\n",
np->full_name);
continue;
}
/* Setup pointers to chip functions */ mmchip = devm_kzalloc(&pdev->dev, sizeof(*mmchip), GFP_KERNEL);
gef_gpio_chip->gc.of_gpio_n_cells = 2; if (!mmchip)
gef_gpio_chip->gc.ngpio = 19; return -ENOMEM;
gef_gpio_chip->gc.direction_input = gef_gpio_dir_in;
gef_gpio_chip->gc.direction_output = gef_gpio_dir_out;
gef_gpio_chip->gc.get = gef_gpio_get;
gef_gpio_chip->gc.set = gef_gpio_set;
/* This function adds a memory mapped GPIO chip */
retval = of_mm_gpiochip_add(np, gef_gpio_chip);
if (retval) {
kfree(gef_gpio_chip);
pr_err("%s: Unable to add GPIO\n", np->full_name);
}
}
for_each_compatible_node(np, NULL, "gef,sbc310-gpio") {
pr_debug("%s: Initialising GEF GPIO\n", np->full_name);
/* Allocate chip structure */
gef_gpio_chip = kzalloc(sizeof(*gef_gpio_chip), GFP_KERNEL);
if (!gef_gpio_chip) {
pr_err("%s: Unable to allocate structure\n",
np->full_name);
continue;
}
/* Setup pointers to chip functions */ /* Setup pointers to chip functions */
gef_gpio_chip->gc.of_gpio_n_cells = 2; mmchip->gc.ngpio = (u16)(uintptr_t)of_id->data;
gef_gpio_chip->gc.ngpio = 6; mmchip->gc.of_gpio_n_cells = 2;
gef_gpio_chip->gc.direction_input = gef_gpio_dir_in; mmchip->gc.direction_input = gef_gpio_dir_in;
gef_gpio_chip->gc.direction_output = gef_gpio_dir_out; mmchip->gc.direction_output = gef_gpio_dir_out;
gef_gpio_chip->gc.get = gef_gpio_get; mmchip->gc.get = gef_gpio_get;
gef_gpio_chip->gc.set = gef_gpio_set; mmchip->gc.set = gef_gpio_set;
/* This function adds a memory mapped GPIO chip */ /* This function adds a memory mapped GPIO chip */
retval = of_mm_gpiochip_add(np, gef_gpio_chip); return of_mm_gpiochip_add(pdev->dev.of_node, mmchip);
if (retval) { };
kfree(gef_gpio_chip);
pr_err("%s: Unable to add GPIO\n", np->full_name);
}
}
for_each_compatible_node(np, NULL, "ge,imp3a-gpio") {
pr_debug("%s: Initialising GE GPIO\n", np->full_name);
/* Allocate chip structure */
gef_gpio_chip = kzalloc(sizeof(*gef_gpio_chip), GFP_KERNEL);
if (!gef_gpio_chip) {
pr_err("%s: Unable to allocate structure\n",
np->full_name);
continue;
}
/* Setup pointers to chip functions */
gef_gpio_chip->gc.of_gpio_n_cells = 2;
gef_gpio_chip->gc.ngpio = 16;
gef_gpio_chip->gc.direction_input = gef_gpio_dir_in;
gef_gpio_chip->gc.direction_output = gef_gpio_dir_out;
gef_gpio_chip->gc.get = gef_gpio_get;
gef_gpio_chip->gc.set = gef_gpio_set;
/* This function adds a memory mapped GPIO chip */
retval = of_mm_gpiochip_add(np, gef_gpio_chip);
if (retval) {
kfree(gef_gpio_chip);
pr_err("%s: Unable to add GPIO\n", np->full_name);
}
}
return 0; static struct platform_driver gef_gpio_driver = {
.driver = {
.name = "gef-gpio",
.owner = THIS_MODULE,
.of_match_table = gef_gpio_ids,
},
}; };
arch_initcall(gef_gpio_init); module_platform_driver_probe(gef_gpio_driver, gef_gpio_probe);
MODULE_DESCRIPTION("GE I/O FPGA GPIO driver"); MODULE_DESCRIPTION("GE I/O FPGA GPIO driver");
MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com"); MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7