Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 149198
b: refs/heads/master
c: a886565
h: refs/heads/master
v: v3
  • Loading branch information
Erik Benada authored and Nicolas Pitre committed Jun 8, 2009
1 parent 5b6bb0a commit 0e75eb0
Show file tree
Hide file tree
Showing 7 changed files with 96 additions and 129 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: f14081e109e7074be3052f5410641161b6479abb
refs/heads/master: a88656553d18c324554855fccc730c9644048111
3 changes: 3 additions & 0 deletions trunk/arch/arm/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,7 @@ config ARCH_KIRKWOOD
select CPU_FEROCEON
select PCI
select GENERIC_GPIO
select ARCH_REQUIRE_GPIOLIB
select GENERIC_TIME
select GENERIC_CLOCKEVENTS
select PLAT_ORION
Expand Down Expand Up @@ -441,6 +442,7 @@ config ARCH_MV78XX0
select CPU_FEROCEON
select PCI
select GENERIC_GPIO
select ARCH_REQUIRE_GPIOLIB
select GENERIC_TIME
select GENERIC_CLOCKEVENTS
select PLAT_ORION
Expand All @@ -465,6 +467,7 @@ config ARCH_ORION5X
select CPU_FEROCEON
select PCI
select GENERIC_GPIO
select ARCH_REQUIRE_GPIOLIB
select GENERIC_TIME
select GENERIC_CLOCKEVENTS
select PLAT_ORION
Expand Down
3 changes: 3 additions & 0 deletions trunk/arch/arm/mach-kirkwood/mpp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ void __init kirkwood_mpp_conf(unsigned int *mpp_list)
if (!variant_mask)
return;

/* Initialize gpiolib. */
orion_gpio_init();

printk(KERN_DEBUG "initial MPP regs:");
for (i = 0; i < MPP_NR_REGS; i++) {
mpp_ctrl[i] = readl(MPP_CTRL(i));
Expand Down
3 changes: 3 additions & 0 deletions trunk/arch/arm/mach-mv78xx0/irq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ void __init mv78xx0_init_irq(void)
{
int i;

/* Initialize gpiolib. */
orion_gpio_init();

orion_irq_init(0, (void __iomem *)(IRQ_VIRT_BASE + IRQ_MASK_LOW_OFF));
orion_irq_init(32, (void __iomem *)(IRQ_VIRT_BASE + IRQ_MASK_HIGH_OFF));
orion_irq_init(64, (void __iomem *)(IRQ_VIRT_BASE + IRQ_MASK_ERR_OFF));
Expand Down
3 changes: 3 additions & 0 deletions trunk/arch/arm/mach-orion5x/mpp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,9 @@ void __init orion5x_mpp_conf(struct orion5x_mpp_mode *mode)
u32 mpp_8_15_ctrl = readl(MPP_8_15_CTRL);
u32 mpp_16_19_ctrl = readl(MPP_16_19_CTRL);

/* Initialize gpiolib. */
orion_gpio_init();

while (mode->mpp >= 0) {
u32 *reg;
int num_type;
Expand Down
194 changes: 75 additions & 119 deletions trunk/arch/arm/plat-orion/gpio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
#include <linux/spinlock.h>
#include <linux/bitops.h>
#include <linux/io.h>
#include <asm/gpio.h>
#include <linux/gpio.h>

static DEFINE_SPINLOCK(gpio_lock);
static const char *gpio_label[GPIO_MAX]; /* non null for allocated GPIOs */
static unsigned long gpio_valid_input[BITS_TO_LONGS(GPIO_MAX)];
static unsigned long gpio_valid_output[BITS_TO_LONGS(GPIO_MAX)];

Expand Down Expand Up @@ -46,82 +45,54 @@ static void __set_level(unsigned pin, int high)
writel(u, GPIO_OUT(pin));
}


/*
* GENERIC_GPIO primitives.
*/
int gpio_direction_input(unsigned pin)
static inline void __set_blinking(unsigned pin, int blink)
{
unsigned long flags;

if (pin >= GPIO_MAX || !test_bit(pin, gpio_valid_input)) {
pr_debug("%s: invalid GPIO %d\n", __func__, pin);
return -EINVAL;
}

spin_lock_irqsave(&gpio_lock, flags);

/*
* Some callers might not have used gpio_request(),
* so flag this pin as requested now.
*/
if (gpio_label[pin] == NULL)
gpio_label[pin] = "?";
u32 u;

/*
* Configure GPIO direction.
*/
__set_direction(pin, 1);
u = readl(GPIO_BLINK_EN(pin));
if (blink)
u |= 1 << (pin & 31);
else
u &= ~(1 << (pin & 31));
writel(u, GPIO_BLINK_EN(pin));
}

spin_unlock_irqrestore(&gpio_lock, flags);
static inline int orion_gpio_is_valid(unsigned pin, int mode)
{
if (pin < GPIO_MAX) {
if ((mode & GPIO_INPUT_OK) && !test_bit(pin, gpio_valid_input))
goto err_out;
if ((mode & GPIO_OUTPUT_OK) && !test_bit(pin, gpio_valid_output))
goto err_out;
return true;
}

return 0;
err_out:
pr_debug("%s: invalid GPIO %d\n", __func__, pin);
return false;
}
EXPORT_SYMBOL(gpio_direction_input);

int gpio_direction_output(unsigned pin, int value)
/*
* GENERIC_GPIO primitives.
*/
static int orion_gpio_direction_input(struct gpio_chip *chip, unsigned pin)
{
unsigned long flags;
u32 u;

if (pin >= GPIO_MAX || !test_bit(pin, gpio_valid_output)) {
pr_debug("%s: invalid GPIO %d\n", __func__, pin);
if (!orion_gpio_is_valid(pin, GPIO_INPUT_OK))
return -EINVAL;
}

spin_lock_irqsave(&gpio_lock, flags);

/*
* Some callers might not have used gpio_request(),
* so flag this pin as requested now.
*/
if (gpio_label[pin] == NULL)
gpio_label[pin] = "?";

/*
* Disable blinking.
*/
u = readl(GPIO_BLINK_EN(pin));
u &= ~(1 << (pin & 31));
writel(u, GPIO_BLINK_EN(pin));

/*
* Configure GPIO output value.
*/
__set_level(pin, value);

/*
* Configure GPIO direction.
*/
__set_direction(pin, 0);
/* Configure GPIO direction. */
__set_direction(pin, 1);

spin_unlock_irqrestore(&gpio_lock, flags);

return 0;
}
EXPORT_SYMBOL(gpio_direction_output);

int gpio_get_value(unsigned pin)
static int orion_gpio_get_value(struct gpio_chip *chip, unsigned pin)
{
int val;

Expand All @@ -132,83 +103,75 @@ int gpio_get_value(unsigned pin)

return (val >> (pin & 31)) & 1;
}
EXPORT_SYMBOL(gpio_get_value);

void gpio_set_value(unsigned pin, int value)
static int orion_gpio_direction_output(struct gpio_chip *chip, unsigned pin,
int value)
{
unsigned long flags;
u32 u;

if (!orion_gpio_is_valid(pin, GPIO_OUTPUT_OK))
return -EINVAL;

spin_lock_irqsave(&gpio_lock, flags);

/*
* Disable blinking.
*/
u = readl(GPIO_BLINK_EN(pin));
u &= ~(1 << (pin & 31));
writel(u, GPIO_BLINK_EN(pin));
/* Disable blinking. */
__set_blinking(pin, 0);

/*
* Configure GPIO output value.
*/
/* Configure GPIO output value. */
__set_level(pin, value);

/* Configure GPIO direction. */
__set_direction(pin, 0);

spin_unlock_irqrestore(&gpio_lock, flags);

return 0;
}
EXPORT_SYMBOL(gpio_set_value);

int gpio_request(unsigned pin, const char *label)
static void orion_gpio_set_value(struct gpio_chip *chip, unsigned pin,
int value)
{
unsigned long flags;
int ret;

if (pin >= GPIO_MAX ||
!(test_bit(pin, gpio_valid_input) ||
test_bit(pin, gpio_valid_output))) {
pr_debug("%s: invalid GPIO %d\n", __func__, pin);
return -EINVAL;
}

spin_lock_irqsave(&gpio_lock, flags);
if (gpio_label[pin] == NULL) {
gpio_label[pin] = label ? label : "?";
ret = 0;
} else {
pr_debug("%s: GPIO %d already used as %s\n",
__func__, pin, gpio_label[pin]);
ret = -EBUSY;
}
spin_unlock_irqrestore(&gpio_lock, flags);

return ret;
/* Configure GPIO output value. */
__set_level(pin, value);

spin_unlock_irqrestore(&gpio_lock, flags);
}
EXPORT_SYMBOL(gpio_request);

void gpio_free(unsigned pin)
static int orion_gpio_request(struct gpio_chip *chip, unsigned pin)
{
if (pin >= GPIO_MAX ||
!(test_bit(pin, gpio_valid_input) ||
test_bit(pin, gpio_valid_output))) {
pr_debug("%s: invalid GPIO %d\n", __func__, pin);
return;
}

if (gpio_label[pin] == NULL)
pr_warning("%s: GPIO %d already freed\n", __func__, pin);
else
gpio_label[pin] = NULL;
if (orion_gpio_is_valid(pin, GPIO_INPUT_OK) ||
orion_gpio_is_valid(pin, GPIO_OUTPUT_OK))
return 0;
return -EINVAL;
}
EXPORT_SYMBOL(gpio_free);

static struct gpio_chip orion_gpiochip = {
.label = "orion_gpio",
.direction_input = orion_gpio_direction_input,
.get = orion_gpio_get_value,
.direction_output = orion_gpio_direction_output,
.set = orion_gpio_set_value,
.request = orion_gpio_request,
.base = 0,
.ngpio = GPIO_MAX,
.can_sleep = 0,
};

void __init orion_gpio_init(void)
{
gpiochip_add(&orion_gpiochip);
}

/*
* Orion-specific GPIO API extensions.
*/
void __init orion_gpio_set_unused(unsigned pin)
{
/*
* Configure as output, drive low.
*/
/* Configure as output, drive low. */
__set_level(pin, 0);
__set_direction(pin, 0);
}
Expand All @@ -230,21 +193,14 @@ void __init orion_gpio_set_valid(unsigned pin, int mode)
void orion_gpio_set_blink(unsigned pin, int blink)
{
unsigned long flags;
u32 u;

spin_lock_irqsave(&gpio_lock, flags);

/*
* Set output value to zero.
*/
/* Set output value to zero. */
__set_level(pin, 0);

u = readl(GPIO_BLINK_EN(pin));
if (blink)
u |= 1 << (pin & 31);
else
u &= ~(1 << (pin & 31));
writel(u, GPIO_BLINK_EN(pin));
/* Set blinking. */
__set_blinking(pin, blink);

spin_unlock_irqrestore(&gpio_lock, flags);
}
Expand Down Expand Up @@ -368,7 +324,7 @@ static int gpio_irq_set_type(u32 irq, u32 type)
}

struct irq_chip orion_gpio_irq_chip = {
.name = "orion_gpio",
.name = "orion_gpio_irq",
.ack = gpio_irq_ack,
.mask = gpio_irq_mask,
.unmask = gpio_irq_unmask,
Expand Down
17 changes: 8 additions & 9 deletions trunk/arch/arm/plat-orion/include/plat/gpio.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,23 @@
/*
* GENERIC_GPIO primitives.
*/
int gpio_request(unsigned pin, const char *label);
void gpio_free(unsigned pin);
int gpio_direction_input(unsigned pin);
int gpio_direction_output(unsigned pin, int value);
int gpio_get_value(unsigned pin);
void gpio_set_value(unsigned pin, int value);
#define gpio_get_value __gpio_get_value
#define gpio_set_value __gpio_set_value
#define gpio_cansleep __gpio_cansleep

/*
* Orion-specific GPIO API extensions.
*/
void orion_gpio_set_unused(unsigned pin);
void orion_gpio_set_blink(unsigned pin, int blink);

#define GPIO_BIDI_OK (1 << 0)
#define GPIO_INPUT_OK (1 << 1)
#define GPIO_OUTPUT_OK (1 << 2)
#define GPIO_INPUT_OK (1 << 0)
#define GPIO_OUTPUT_OK (1 << 1)
void orion_gpio_set_valid(unsigned pin, int mode);

/* Initialize gpiolib. */
void __init orion_gpio_init(void);

/*
* GPIO interrupt handling.
*/
Expand Down

0 comments on commit 0e75eb0

Please sign in to comment.