Skip to content

L
linux
Commit 49a5bd88 authored by Alban Bedel's avatar Alban Bedel Committed by Linus Walleij
Browse files
Options

gpio: ath79: Convert to the state container design pattern 

Turn the ath79 driver into a true driver supporting multiple
instances. While at it also removed unneed includes and make use of
the BIT() macro.
Signed-off-by: default avatarAlban Bedel <albeu@free.fr>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 9f353828
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 59 deletions
drivers/gpio/gpio-ath79.c
View file @ 49a5bd88
...@@ -12,61 +12,51 @@ ...@@ -12,61 +12,51 @@
* by the Free Software Foundation. * by the Free Software Foundation.
*/ */
#include <linux/kernel.h> #include <linux/gpio/driver.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/spinlock.h>
#include <linux/io.h>
#include <linux/ioport.h>
#include <linux/gpio.h>
#include <linux/platform_data/gpio-ath79.h> #include <linux/platform_data/gpio-ath79.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <asm/mach-ath79/ar71xx_regs.h> #include <asm/mach-ath79/ar71xx_regs.h>
static void __iomem *ath79_gpio_base; struct ath79_gpio_ctrl {
static u32 ath79_gpio_count; struct gpio_chip chip;
static DEFINE_SPINLOCK(ath79_gpio_lock); void __iomem *base;
spinlock_t lock;
};
#define to_ath79_gpio_ctrl(c) container_of(c, struct ath79_gpio_ctrl, chip)
static void __ath79_gpio_set_value(unsigned gpio, int value) static void ath79_gpio_set_value(struct gpio_chip *chip,
unsigned gpio, int value)
{ {
void __iomem *base = ath79_gpio_base; struct ath79_gpio_ctrl *ctrl = to_ath79_gpio_ctrl(chip);
if (value) if (value)
__raw_writel(1 << gpio, base + AR71XX_GPIO_REG_SET); __raw_writel(BIT(gpio), ctrl->base + AR71XX_GPIO_REG_SET);
else else
__raw_writel(1 << gpio, base + AR71XX_GPIO_REG_CLEAR); __raw_writel(BIT(gpio), ctrl->base + AR71XX_GPIO_REG_CLEAR);
}
static int __ath79_gpio_get_value(unsigned gpio)
{
return (__raw_readl(ath79_gpio_base + AR71XX_GPIO_REG_IN) >> gpio) & 1;
} }
static int ath79_gpio_get_value(struct gpio_chip *chip, unsigned offset) static int ath79_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
{ {
return __ath79_gpio_get_value(offset); struct ath79_gpio_ctrl *ctrl = to_ath79_gpio_ctrl(chip);
}
static void ath79_gpio_set_value(struct gpio_chip *chip, return (__raw_readl(ctrl->base + AR71XX_GPIO_REG_IN) >> gpio) & 1;
unsigned offset, int value)
{
__ath79_gpio_set_value(offset, value);
} }
static int ath79_gpio_direction_input(struct gpio_chip *chip, static int ath79_gpio_direction_input(struct gpio_chip *chip,
unsigned offset) unsigned offset)
{ {
void __iomem *base = ath79_gpio_base; struct ath79_gpio_ctrl *ctrl = to_ath79_gpio_ctrl(chip);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&ath79_gpio_lock, flags); spin_lock_irqsave(&ctrl->lock, flags);
__raw_writel(__raw_readl(base + AR71XX_GPIO_REG_OE) & ~(1 << offset), __raw_writel(
base + AR71XX_GPIO_REG_OE); __raw_readl(ctrl->base + AR71XX_GPIO_REG_OE) & ~BIT(offset),
ctrl->base + AR71XX_GPIO_REG_OE);
spin_unlock_irqrestore(&ath79_gpio_lock, flags); spin_unlock_irqrestore(&ctrl->lock, flags);
return 0; return 0;
} }
...@@ -74,35 +64,37 @@ static int ath79_gpio_direction_input(struct gpio_chip *chip, ...@@ -74,35 +64,37 @@ static int ath79_gpio_direction_input(struct gpio_chip *chip,
static int ath79_gpio_direction_output(struct gpio_chip *chip, static int ath79_gpio_direction_output(struct gpio_chip *chip,
unsigned offset, int value) unsigned offset, int value)
{ {
void __iomem *base = ath79_gpio_base; struct ath79_gpio_ctrl *ctrl = to_ath79_gpio_ctrl(chip);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&ath79_gpio_lock, flags); spin_lock_irqsave(&ctrl->lock, flags);
if (value) if (value)
__raw_writel(1 << offset, base + AR71XX_GPIO_REG_SET); __raw_writel(BIT(offset), ctrl->base + AR71XX_GPIO_REG_SET);
else else
__raw_writel(1 << offset, base + AR71XX_GPIO_REG_CLEAR); __raw_writel(BIT(offset), ctrl->base + AR71XX_GPIO_REG_CLEAR);
__raw_writel(__raw_readl(base + AR71XX_GPIO_REG_OE) | (1 << offset), __raw_writel(
base + AR71XX_GPIO_REG_OE); __raw_readl(ctrl->base + AR71XX_GPIO_REG_OE) | BIT(offset),
ctrl->base + AR71XX_GPIO_REG_OE);
spin_unlock_irqrestore(&ath79_gpio_lock, flags); spin_unlock_irqrestore(&ctrl->lock, flags);
return 0; return 0;
} }
static int ar934x_gpio_direction_input(struct gpio_chip *chip, unsigned offset) static int ar934x_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
{ {
void __iomem *base = ath79_gpio_base; struct ath79_gpio_ctrl *ctrl = to_ath79_gpio_ctrl(chip);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&ath79_gpio_lock, flags); spin_lock_irqsave(&ctrl->lock, flags);
__raw_writel(__raw_readl(base + AR71XX_GPIO_REG_OE) | (1 << offset), __raw_writel(
base + AR71XX_GPIO_REG_OE); __raw_readl(ctrl->base + AR71XX_GPIO_REG_OE) | BIT(offset),
ctrl->base + AR71XX_GPIO_REG_OE);
spin_unlock_irqrestore(&ath79_gpio_lock, flags); spin_unlock_irqrestore(&ctrl->lock, flags);
return 0; return 0;
} }
...@@ -110,25 +102,26 @@ static int ar934x_gpio_direction_input(struct gpio_chip *chip, unsigned offset) ...@@ -110,25 +102,26 @@ static int ar934x_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
static int ar934x_gpio_direction_output(struct gpio_chip *chip, unsigned offset, static int ar934x_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
int value) int value)
{ {
void __iomem *base = ath79_gpio_base; struct ath79_gpio_ctrl *ctrl = to_ath79_gpio_ctrl(chip);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&ath79_gpio_lock, flags); spin_lock_irqsave(&ctrl->lock, flags);
if (value) if (value)
__raw_writel(1 << offset, base + AR71XX_GPIO_REG_SET); __raw_writel(BIT(offset), ctrl->base + AR71XX_GPIO_REG_SET);
else else
__raw_writel(1 << offset, base + AR71XX_GPIO_REG_CLEAR); __raw_writel(BIT(offset), ctrl->base + AR71XX_GPIO_REG_CLEAR);
__raw_writel(__raw_readl(base + AR71XX_GPIO_REG_OE) & ~(1 << offset), __raw_writel(
base + AR71XX_GPIO_REG_OE); __raw_readl(ctrl->base + AR71XX_GPIO_REG_OE) & BIT(offset),
ctrl->base + AR71XX_GPIO_REG_OE);
spin_unlock_irqrestore(&ath79_gpio_lock, flags); spin_unlock_irqrestore(&ctrl->lock, flags);
return 0; return 0;
} }
static struct gpio_chip ath79_gpio_chip = { static const struct gpio_chip ath79_gpio_chip = {
.label = "ath79", .label = "ath79",
.get = ath79_gpio_get_value, .get = ath79_gpio_get_value,
.set = ath79_gpio_set_value, .set = ath79_gpio_set_value,
...@@ -147,10 +140,16 @@ static int ath79_gpio_probe(struct platform_device *pdev) ...@@ -147,10 +140,16 @@ static int ath79_gpio_probe(struct platform_device *pdev)
{ {
struct ath79_gpio_platform_data *pdata = pdev->dev.platform_data; struct ath79_gpio_platform_data *pdata = pdev->dev.platform_data;
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct ath79_gpio_ctrl *ctrl;
struct resource *res; struct resource *res;
u32 ath79_gpio_count;
bool oe_inverted; bool oe_inverted;
int err; int err;
ctrl = devm_kzalloc(&pdev->dev, sizeof(*ctrl), GFP_KERNEL);
if (!ctrl)
return -ENOMEM;
if (np) { if (np) {
err = of_property_read_u32(np, "ngpios", &ath79_gpio_count); err = of_property_read_u32(np, "ngpios", &ath79_gpio_count);
if (err) { if (err) {
...@@ -171,19 +170,21 @@ static int ath79_gpio_probe(struct platform_device *pdev) ...@@ -171,19 +170,21 @@ static int ath79_gpio_probe(struct platform_device *pdev)
} }
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
ath79_gpio_base = devm_ioremap_nocache( ctrl->base = devm_ioremap_nocache(
&pdev->dev, res->start, resource_size(res)); &pdev->dev, res->start, resource_size(res));
if (!ath79_gpio_base) if (!ctrl->base)
return -ENOMEM; return -ENOMEM;
ath79_gpio_chip.dev = &pdev->dev; spin_lock_init(&ctrl->lock);
ath79_gpio_chip.ngpio = ath79_gpio_count; memcpy(&ctrl->chip, &ath79_gpio_chip, sizeof(ctrl->chip));
ctrl->chip.dev = &pdev->dev;
ctrl->chip.ngpio = ath79_gpio_count;
if (oe_inverted) { if (oe_inverted) {
ath79_gpio_chip.direction_input = ar934x_gpio_direction_input; ctrl->chip.direction_input = ar934x_gpio_direction_input;
ath79_gpio_chip.direction_output = ar934x_gpio_direction_output; ctrl->chip.direction_output = ar934x_gpio_direction_output;
} }
err = gpiochip_add(&ath79_gpio_chip); err = gpiochip_add(&ctrl->chip);
if (err) { if (err) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"cannot add AR71xx GPIO chip, error=%d", err); "cannot add AR71xx GPIO chip, error=%d", err);
......
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