Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 182079
b: refs/heads/master
c: 5f3c909
h: refs/heads/master
i:
  182077: b826b54
  182075: 4ea9b38
  182071: 2ba4cf4
  182063: 2bc59f9
  182047: 4b48850
  182015: 2aa4647
v: v3
  • Loading branch information
Florian Fainelli authored and Ralf Baechle committed Feb 27, 2010
1 parent 79a6096 commit 7af2a49
Show file tree
Hide file tree
Showing 5 changed files with 109 additions and 95 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 69b427cd23b6f637763bf49e3e166c1236313f69
refs/heads/master: 5f3c909881d5deebb9a3ddc836a15937e76daefc
2 changes: 1 addition & 1 deletion trunk/arch/mips/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ config AR7
select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_LITTLE_ENDIAN
select SYS_SUPPORTS_ZBOOT_UART16550
select GENERIC_GPIO
select ARCH_REQUIRE_GPIOLIB
select GCD
select VLYNQ
help
Expand Down
113 changes: 98 additions & 15 deletions trunk/arch/mips/ar7/gpio.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* Copyright (C) 2007 Felix Fietkau <nbd@openwrt.org>
* Copyright (C) 2007 Eugene Konev <ejka@openwrt.org>
* Copyright (C) 2009 Florian Fainelli <florian@openwrt.org>
*
* 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
Expand All @@ -18,31 +19,113 @@
*/

#include <linux/module.h>
#include <linux/gpio.h>

#include <asm/mach-ar7/gpio.h>

static const char *ar7_gpio_list[AR7_GPIO_MAX];
struct ar7_gpio_chip {
void __iomem *regs;
struct gpio_chip chip;
};

int gpio_request(unsigned gpio, const char *label)
static int ar7_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
{
if (gpio >= AR7_GPIO_MAX)
return -EINVAL;
struct ar7_gpio_chip *gpch =
container_of(chip, struct ar7_gpio_chip, chip);
void __iomem *gpio_in = gpch->regs + AR7_GPIO_INPUT;

if (ar7_gpio_list[gpio])
return -EBUSY;
return readl(gpio_in) & (1 << gpio);
}

static void ar7_gpio_set_value(struct gpio_chip *chip,
unsigned gpio, int value)
{
struct ar7_gpio_chip *gpch =
container_of(chip, struct ar7_gpio_chip, chip);
void __iomem *gpio_out = gpch->regs + AR7_GPIO_OUTPUT;
unsigned tmp;

tmp = readl(gpio_out) & ~(1 << gpio);
if (value)
tmp |= 1 << gpio;
writel(tmp, gpio_out);
}

static int ar7_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
{
struct ar7_gpio_chip *gpch =
container_of(chip, struct ar7_gpio_chip, chip);
void __iomem *gpio_dir = gpch->regs + AR7_GPIO_DIR;

if (label)
ar7_gpio_list[gpio] = label;
else
ar7_gpio_list[gpio] = "busy";
writel(readl(gpio_dir) | (1 << gpio), gpio_dir);

return 0;
}
EXPORT_SYMBOL(gpio_request);

void gpio_free(unsigned gpio)
static int ar7_gpio_direction_output(struct gpio_chip *chip,
unsigned gpio, int value)
{
BUG_ON(!ar7_gpio_list[gpio]);
ar7_gpio_list[gpio] = NULL;
struct ar7_gpio_chip *gpch =
container_of(chip, struct ar7_gpio_chip, chip);
void __iomem *gpio_dir = gpch->regs + AR7_GPIO_DIR;

ar7_gpio_set_value(chip, gpio, value);
writel(readl(gpio_dir) & ~(1 << gpio), gpio_dir);

return 0;
}

static struct ar7_gpio_chip ar7_gpio_chip = {
.chip = {
.label = "ar7-gpio",
.direction_input = ar7_gpio_direction_input,
.direction_output = ar7_gpio_direction_output,
.set = ar7_gpio_set_value,
.get = ar7_gpio_get_value,
.base = 0,
.ngpio = AR7_GPIO_MAX,
}
};

int ar7_gpio_enable(unsigned gpio)
{
void __iomem *gpio_en = ar7_gpio_chip.regs + AR7_GPIO_ENABLE;

writel(readl(gpio_en) | (1 << gpio), gpio_en);

return 0;
}
EXPORT_SYMBOL(ar7_gpio_enable);

int ar7_gpio_disable(unsigned gpio)
{
void __iomem *gpio_en = ar7_gpio_chip.regs + AR7_GPIO_ENABLE;

writel(readl(gpio_en) & ~(1 << gpio), gpio_en);

return 0;
}
EXPORT_SYMBOL(ar7_gpio_disable);

static int __init ar7_gpio_init(void)
{
int ret;

ar7_gpio_chip.regs = ioremap_nocache(AR7_REGS_GPIO,
AR7_REGS_GPIO + 0x10);

if (!ar7_gpio_chip.regs) {
printk(KERN_ERR "ar7-gpio: failed to ioremap regs\n");
return -ENOMEM;
}

ret = gpiochip_add(&ar7_gpio_chip.chip);
if (ret) {
printk(KERN_ERR "ar7-gpio: failed to add gpiochip\n");
return ret;
}
printk(KERN_INFO "ar7-gpio: registered %d GPIOs\n",
ar7_gpio_chip.chip.ngpio);
return ret;
}
EXPORT_SYMBOL(gpio_free);
arch_initcall(ar7_gpio_init);
1 change: 1 addition & 0 deletions trunk/arch/mips/ar7/platform.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include <linux/etherdevice.h>
#include <linux/phy.h>
#include <linux/phy_fixed.h>
#include <linux/gpio.h>

#include <asm/addrspace.h>
#include <asm/mach-ar7/ar7.h>
Expand Down
86 changes: 8 additions & 78 deletions trunk/arch/mips/include/asm/mach-ar7/gpio.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2007 Florian Fainelli <florian@openwrt.org>
* Copyright (C) 2007-2009 Florian Fainelli <florian@openwrt.org>
*
* 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
Expand All @@ -22,88 +22,18 @@
#include <asm/mach-ar7/ar7.h>

#define AR7_GPIO_MAX 32
#define NR_BUILTIN_GPIO AR7_GPIO_MAX

extern int gpio_request(unsigned gpio, const char *label);
extern void gpio_free(unsigned gpio);
#define gpio_to_irq(gpio) NULL

/* Common GPIO layer */
static inline int gpio_get_value(unsigned gpio)
{
void __iomem *gpio_in =
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_INPUT);
#define gpio_get_value __gpio_get_value
#define gpio_set_value __gpio_set_value

return readl(gpio_in) & (1 << gpio);
}

static inline void gpio_set_value(unsigned gpio, int value)
{
void __iomem *gpio_out =
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_OUTPUT);
unsigned tmp;

tmp = readl(gpio_out) & ~(1 << gpio);
if (value)
tmp |= 1 << gpio;
writel(tmp, gpio_out);
}

static inline int gpio_direction_input(unsigned gpio)
{
void __iomem *gpio_dir =
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_DIR);

if (gpio >= AR7_GPIO_MAX)
return -EINVAL;

writel(readl(gpio_dir) | (1 << gpio), gpio_dir);

return 0;
}

static inline int gpio_direction_output(unsigned gpio, int value)
{
void __iomem *gpio_dir =
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_DIR);

if (gpio >= AR7_GPIO_MAX)
return -EINVAL;

gpio_set_value(gpio, value);
writel(readl(gpio_dir) & ~(1 << gpio), gpio_dir);

return 0;
}

static inline int gpio_to_irq(unsigned gpio)
{
return -EINVAL;
}

static inline int irq_to_gpio(unsigned irq)
{
return -EINVAL;
}
#define gpio_cansleep __gpio_cansleep

/* Board specific GPIO functions */
static inline int ar7_gpio_enable(unsigned gpio)
{
void __iomem *gpio_en =
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_ENABLE);

writel(readl(gpio_en) | (1 << gpio), gpio_en);

return 0;
}

static inline int ar7_gpio_disable(unsigned gpio)
{
void __iomem *gpio_en =
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_ENABLE);

writel(readl(gpio_en) & ~(1 << gpio), gpio_en);

return 0;
}
int ar7_gpio_enable(unsigned gpio);
int ar7_gpio_disable(unsigned gpio);

#include <asm-generic/gpio.h>

Expand Down

0 comments on commit 7af2a49

Please sign in to comment.