Commit 9569dae7 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Nicolas Pitre

[ARM] Orion: share GPIO handling code

Split off Orion GPIO handling code into plat-orion/, and add
support for multiple sets of (32) GPIO pins.
Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
Signed-off-by: default avatarNicolas Pitre <nico@marvell.com>
parent 6fd7c7fe
obj-y += common.o addr-map.o pci.o gpio.o irq.o mpp.o obj-y += common.o addr-map.o pci.o irq.o mpp.o
obj-$(CONFIG_MACH_DB88F5281) += db88f5281-setup.o obj-$(CONFIG_MACH_DB88F5281) += db88f5281-setup.o
obj-$(CONFIG_MACH_RD88F5182) += rd88f5182-setup.o obj-$(CONFIG_MACH_RD88F5182) += rd88f5182-setup.o
obj-$(CONFIG_MACH_KUROBOX_PRO) += kurobox_pro-setup.o obj-$(CONFIG_MACH_KUROBOX_PRO) += kurobox_pro-setup.o
......
...@@ -51,13 +51,6 @@ int orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys); ...@@ -51,13 +51,6 @@ int orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys);
struct pci_bus *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys); struct pci_bus *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys);
int orion5x_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin); int orion5x_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin);
/*
* Valid GPIO pins according to MPP setup, used by machine-setup.
* (/mach-orion/gpio.c).
*/
void orion5x_gpio_set_valid(unsigned pin, int valid);
void gpio_display(void); /* debug */
struct machine_desc; struct machine_desc;
struct meminfo; struct meminfo;
struct tag; struct tag;
......
...@@ -2,18 +2,23 @@ ...@@ -2,18 +2,23 @@
* arch/arm/mach-orion5x/include/mach/gpio.h * arch/arm/mach-orion5x/include/mach/gpio.h
* *
* This file is licensed under the terms of the GNU General Public * This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
extern int gpio_request(unsigned pin, const char *label); #ifndef __ASM_ARCH_GPIO_H
extern void gpio_free(unsigned pin); #define __ASM_ARCH_GPIO_H
extern int gpio_direction_input(unsigned pin);
extern int gpio_direction_output(unsigned pin, int value); #include <mach/irqs.h>
extern int gpio_get_value(unsigned pin); #include <plat/gpio.h>
extern void gpio_set_value(unsigned pin, int value); #include <asm-generic/gpio.h> /* cansleep wrappers */
extern void orion5x_gpio_set_blink(unsigned pin, int blink);
extern void gpio_display(void); /* debug */ #define GPIO_MAX 32
#define GPIO_OUT(pin) ORION5X_DEV_BUS_REG(0x100)
#define GPIO_IO_CONF(pin) ORION5X_DEV_BUS_REG(0x104)
#define GPIO_BLINK_EN(pin) ORION5X_DEV_BUS_REG(0x108)
#define GPIO_IN_POL(pin) ORION5X_DEV_BUS_REG(0x10c)
#define GPIO_DATA_IN(pin) ORION5X_DEV_BUS_REG(0x110)
static inline int gpio_to_irq(int pin) static inline int gpio_to_irq(int pin)
{ {
...@@ -25,4 +30,5 @@ static inline int irq_to_gpio(int irq) ...@@ -25,4 +30,5 @@ static inline int irq_to_gpio(int irq)
return irq - IRQ_ORION5X_GPIO_START; return irq - IRQ_ORION5X_GPIO_START;
} }
#include <asm-generic/gpio.h> /* cansleep wrappers */
#endif
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
#ifndef __ASM_ARCH_IRQS_H #ifndef __ASM_ARCH_IRQS_H
#define __ASM_ARCH_IRQS_H #define __ASM_ARCH_IRQS_H
#include "orion5x.h" /* need GPIO_MAX */
/* /*
* Orion Main Interrupt Controller * Orion Main Interrupt Controller
*/ */
...@@ -54,7 +52,7 @@ ...@@ -54,7 +52,7 @@
* Orion General Purpose Pins * Orion General Purpose Pins
*/ */
#define IRQ_ORION5X_GPIO_START 32 #define IRQ_ORION5X_GPIO_START 32
#define NR_GPIO_IRQS GPIO_MAX #define NR_GPIO_IRQS 32
#define NR_IRQS (IRQ_ORION5X_GPIO_START + NR_GPIO_IRQS) #define NR_IRQS (IRQ_ORION5X_GPIO_START + NR_GPIO_IRQS)
......
...@@ -134,11 +134,6 @@ ...@@ -134,11 +134,6 @@
#define MPP_16_19_CTRL ORION5X_DEV_BUS_REG(0x050) #define MPP_16_19_CTRL ORION5X_DEV_BUS_REG(0x050)
#define MPP_DEV_CTRL ORION5X_DEV_BUS_REG(0x008) #define MPP_DEV_CTRL ORION5X_DEV_BUS_REG(0x008)
#define MPP_RESET_SAMPLE ORION5X_DEV_BUS_REG(0x010) #define MPP_RESET_SAMPLE ORION5X_DEV_BUS_REG(0x010)
#define GPIO_OUT ORION5X_DEV_BUS_REG(0x100)
#define GPIO_IO_CONF ORION5X_DEV_BUS_REG(0x104)
#define GPIO_BLINK_EN ORION5X_DEV_BUS_REG(0x108)
#define GPIO_IN_POL ORION5X_DEV_BUS_REG(0x10c)
#define GPIO_DATA_IN ORION5X_DEV_BUS_REG(0x110)
#define GPIO_EDGE_CAUSE ORION5X_DEV_BUS_REG(0x114) #define GPIO_EDGE_CAUSE ORION5X_DEV_BUS_REG(0x114)
#define GPIO_EDGE_MASK ORION5X_DEV_BUS_REG(0x118) #define GPIO_EDGE_MASK ORION5X_DEV_BUS_REG(0x118)
#define GPIO_LEVEL_MASK ORION5X_DEV_BUS_REG(0x11c) #define GPIO_LEVEL_MASK ORION5X_DEV_BUS_REG(0x11c)
...@@ -149,7 +144,6 @@ ...@@ -149,7 +144,6 @@
#define DEV_BUS_CTRL ORION5X_DEV_BUS_REG(0x4c0) #define DEV_BUS_CTRL ORION5X_DEV_BUS_REG(0x4c0)
#define DEV_BUS_INT_CAUSE ORION5X_DEV_BUS_REG(0x4d0) #define DEV_BUS_INT_CAUSE ORION5X_DEV_BUS_REG(0x4d0)
#define DEV_BUS_INT_MASK ORION5X_DEV_BUS_REG(0x4d4) #define DEV_BUS_INT_MASK ORION5X_DEV_BUS_REG(0x4d4)
#define GPIO_MAX 32
/*************************************************************************** /***************************************************************************
* Orion CPU Bridge Registers * Orion CPU Bridge Registers
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
/***************************************************************************** /*****************************************************************************
* Orion GPIO IRQ * Orion GPIO IRQ
* *
* GPIO_IN_POL register controlls whether GPIO_DATA_IN will hold the same * GPIO_IN_POL register controls whether GPIO_DATA_IN will hold the same
* value of the line or the opposite value. * value of the line or the opposite value.
* *
* Level IRQ handlers: DATA_IN is used directly as cause register. * Level IRQ handlers: DATA_IN is used directly as cause register.
...@@ -82,7 +82,7 @@ static int orion5x_gpio_set_irq_type(u32 irq, u32 type) ...@@ -82,7 +82,7 @@ static int orion5x_gpio_set_irq_type(u32 irq, u32 type)
int pin = irq_to_gpio(irq); int pin = irq_to_gpio(irq);
struct irq_desc *desc; struct irq_desc *desc;
if ((readl(GPIO_IO_CONF) & (1 << pin)) == 0) { if ((readl(GPIO_IO_CONF(pin)) & (1 << pin)) == 0) {
printk(KERN_ERR "orion5x_gpio_set_irq_type failed " printk(KERN_ERR "orion5x_gpio_set_irq_type failed "
"(irq %d, pin %d).\n", irq, pin); "(irq %d, pin %d).\n", irq, pin);
return -EINVAL; return -EINVAL;
...@@ -94,22 +94,22 @@ static int orion5x_gpio_set_irq_type(u32 irq, u32 type) ...@@ -94,22 +94,22 @@ static int orion5x_gpio_set_irq_type(u32 irq, u32 type)
case IRQ_TYPE_LEVEL_HIGH: case IRQ_TYPE_LEVEL_HIGH:
desc->handle_irq = handle_level_irq; desc->handle_irq = handle_level_irq;
desc->status |= IRQ_LEVEL; desc->status |= IRQ_LEVEL;
orion5x_clrbits(GPIO_IN_POL, (1 << pin)); orion5x_clrbits(GPIO_IN_POL(pin), (1 << pin));
break; break;
case IRQ_TYPE_LEVEL_LOW: case IRQ_TYPE_LEVEL_LOW:
desc->handle_irq = handle_level_irq; desc->handle_irq = handle_level_irq;
desc->status |= IRQ_LEVEL; desc->status |= IRQ_LEVEL;
orion5x_setbits(GPIO_IN_POL, (1 << pin)); orion5x_setbits(GPIO_IN_POL(pin), (1 << pin));
break; break;
case IRQ_TYPE_EDGE_RISING: case IRQ_TYPE_EDGE_RISING:
desc->handle_irq = handle_edge_irq; desc->handle_irq = handle_edge_irq;
desc->status &= ~IRQ_LEVEL; desc->status &= ~IRQ_LEVEL;
orion5x_clrbits(GPIO_IN_POL, (1 << pin)); orion5x_clrbits(GPIO_IN_POL(pin), (1 << pin));
break; break;
case IRQ_TYPE_EDGE_FALLING: case IRQ_TYPE_EDGE_FALLING:
desc->handle_irq = handle_edge_irq; desc->handle_irq = handle_edge_irq;
desc->status &= ~IRQ_LEVEL; desc->status &= ~IRQ_LEVEL;
orion5x_setbits(GPIO_IN_POL, (1 << pin)); orion5x_setbits(GPIO_IN_POL(pin), (1 << pin));
break; break;
case IRQ_TYPE_EDGE_BOTH: case IRQ_TYPE_EDGE_BOTH:
desc->handle_irq = handle_edge_irq; desc->handle_irq = handle_edge_irq;
...@@ -117,11 +117,11 @@ static int orion5x_gpio_set_irq_type(u32 irq, u32 type) ...@@ -117,11 +117,11 @@ static int orion5x_gpio_set_irq_type(u32 irq, u32 type)
/* /*
* set initial polarity based on current input level * set initial polarity based on current input level
*/ */
if ((readl(GPIO_IN_POL) ^ readl(GPIO_DATA_IN)) if ((readl(GPIO_IN_POL(pin)) ^ readl(GPIO_DATA_IN(pin)))
& (1 << pin)) & (1 << pin))
orion5x_setbits(GPIO_IN_POL, (1 << pin)); /* falling */ orion5x_setbits(GPIO_IN_POL(pin), (1 << pin)); /* falling */
else else
orion5x_clrbits(GPIO_IN_POL, (1 << pin)); /* rising */ orion5x_clrbits(GPIO_IN_POL(pin), (1 << pin)); /* rising */
break; break;
default: default:
...@@ -149,7 +149,7 @@ static void orion5x_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) ...@@ -149,7 +149,7 @@ static void orion5x_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
BUG_ON(irq < IRQ_ORION5X_GPIO_0_7 || irq > IRQ_ORION5X_GPIO_24_31); BUG_ON(irq < IRQ_ORION5X_GPIO_0_7 || irq > IRQ_ORION5X_GPIO_24_31);
offs = (irq - IRQ_ORION5X_GPIO_0_7) * 8; offs = (irq - IRQ_ORION5X_GPIO_0_7) * 8;
cause = (readl(GPIO_DATA_IN) & readl(GPIO_LEVEL_MASK)) | cause = (readl(GPIO_DATA_IN(offs)) & readl(GPIO_LEVEL_MASK)) |
(readl(GPIO_EDGE_CAUSE) & readl(GPIO_EDGE_MASK)); (readl(GPIO_EDGE_CAUSE) & readl(GPIO_EDGE_MASK));
for (pin = offs; pin < offs + 8; pin++) { for (pin = offs; pin < offs + 8; pin++) {
...@@ -158,9 +158,9 @@ static void orion5x_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) ...@@ -158,9 +158,9 @@ static void orion5x_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
desc = irq_desc + irq; desc = irq_desc + irq;
if ((desc->status & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH) { if ((desc->status & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH) {
/* Swap polarity (race with GPIO line) */ /* Swap polarity (race with GPIO line) */
u32 polarity = readl(GPIO_IN_POL); u32 polarity = readl(GPIO_IN_POL(pin));
polarity ^= 1 << pin; polarity ^= 1 << pin;
writel(polarity, GPIO_IN_POL); writel(polarity, GPIO_IN_POL(pin));
} }
generic_handle_irq(irq); generic_handle_irq(irq);
} }
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/mbus.h> #include <linux/mbus.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/gpio.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include "common.h" #include "common.h"
#include "mpp.h" #include "mpp.h"
...@@ -152,7 +153,10 @@ void __init orion5x_mpp_conf(struct orion5x_mpp_mode *mode) ...@@ -152,7 +153,10 @@ void __init orion5x_mpp_conf(struct orion5x_mpp_mode *mode)
*reg &= ~(0xf << shift); *reg &= ~(0xf << shift);
*reg |= (num_type & 0xf) << shift; *reg |= (num_type & 0xf) << shift;
orion5x_gpio_set_valid(mode->mpp, !!(mode->type == MPP_GPIO)); if (mode->type == MPP_UNUSED && (mode->mpp < 16 || is_5182()))
orion_gpio_set_unused(mode->mpp);
orion_gpio_set_valid(mode->mpp, !!(mode->type == MPP_GPIO));
mode++; mode++;
} }
......
...@@ -6,3 +6,5 @@ obj-y := irq.o pcie.o time.o ...@@ -6,3 +6,5 @@ obj-y := irq.o pcie.o time.o
obj-m := obj-m :=
obj-n := obj-n :=
obj- := obj- :=
obj-$(CONFIG_GENERIC_GPIO) += gpio.o
/* /*
* arch/arm/mach-orion5x/gpio.c * arch/arm/plat-orion/gpio.c
* *
* GPIO functions for Marvell Orion System On Chip * Marvell Orion SoC GPIO handling.
*
* Maintainer: Tzachi Perelstein <tzachi@marvell.com>
* *
* This file is licensed under the terms of the GNU General Public * This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any
...@@ -17,23 +15,38 @@ ...@@ -17,23 +15,38 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <mach/orion5x.h>
#include "common.h"
static DEFINE_SPINLOCK(gpio_lock); static DEFINE_SPINLOCK(gpio_lock);
static unsigned long gpio_valid[BITS_TO_LONGS(GPIO_MAX)];
static const char *gpio_label[GPIO_MAX]; /* non null for allocated GPIOs */ static const char *gpio_label[GPIO_MAX]; /* non null for allocated GPIOs */
static unsigned long gpio_valid[BITS_TO_LONGS(GPIO_MAX)];
void __init orion5x_gpio_set_valid(unsigned pin, int valid) static inline void __set_direction(unsigned pin, int input)
{ {
if (valid) u32 u;
__set_bit(pin, gpio_valid);
u = readl(GPIO_IO_CONF(pin));
if (input)
u |= 1 << (pin & 31);
else else
__clear_bit(pin, gpio_valid); u &= ~(1 << (pin & 31));
writel(u, GPIO_IO_CONF(pin));
} }
static void __set_level(unsigned pin, int high)
{
u32 u;
u = readl(GPIO_OUT(pin));
if (high)
u |= 1 << (pin & 31);
else
u &= ~(1 << (pin & 31));
writel(u, GPIO_OUT(pin));
}
/* /*
* GENERIC_GPIO primitives * GENERIC_GPIO primitives.
*/ */
int gpio_direction_input(unsigned pin) int gpio_direction_input(unsigned pin)
{ {
...@@ -47,15 +60,19 @@ int gpio_direction_input(unsigned pin) ...@@ -47,15 +60,19 @@ int gpio_direction_input(unsigned pin)
spin_lock_irqsave(&gpio_lock, flags); spin_lock_irqsave(&gpio_lock, flags);
/* /*
* Some callers might have not used the gpio_request(), * Some callers might not have used gpio_request(),
* so flag this pin as requested now. * so flag this pin as requested now.
*/ */
if (!gpio_label[pin]) if (gpio_label[pin] == NULL)
gpio_label[pin] = "?"; gpio_label[pin] = "?";
orion5x_setbits(GPIO_IO_CONF, 1 << pin); /*
* Configure GPIO direction.
*/
__set_direction(pin, 1);
spin_unlock_irqrestore(&gpio_lock, flags); spin_unlock_irqrestore(&gpio_lock, flags);
return 0; return 0;
} }
EXPORT_SYMBOL(gpio_direction_input); EXPORT_SYMBOL(gpio_direction_input);
...@@ -63,7 +80,7 @@ EXPORT_SYMBOL(gpio_direction_input); ...@@ -63,7 +80,7 @@ EXPORT_SYMBOL(gpio_direction_input);
int gpio_direction_output(unsigned pin, int value) int gpio_direction_output(unsigned pin, int value)
{ {
unsigned long flags; unsigned long flags;
int mask; u32 u;
if (pin >= GPIO_MAX || !test_bit(pin, gpio_valid)) { if (pin >= GPIO_MAX || !test_bit(pin, gpio_valid)) {
pr_debug("%s: invalid GPIO %d\n", __func__, pin); pr_debug("%s: invalid GPIO %d\n", __func__, pin);
...@@ -73,76 +90,75 @@ int gpio_direction_output(unsigned pin, int value) ...@@ -73,76 +90,75 @@ int gpio_direction_output(unsigned pin, int value)
spin_lock_irqsave(&gpio_lock, flags); spin_lock_irqsave(&gpio_lock, flags);
/* /*
* Some callers might have not used the gpio_request(), * Some callers might not have used gpio_request(),
* so flag this pin as requested now. * so flag this pin as requested now.
*/ */
if (!gpio_label[pin]) if (gpio_label[pin] == NULL)
gpio_label[pin] = "?"; gpio_label[pin] = "?";
mask = 1 << pin; /*
orion5x_clrbits(GPIO_BLINK_EN, mask); * Disable blinking.
if (value) */
orion5x_setbits(GPIO_OUT, mask); u = readl(GPIO_BLINK_EN(pin));
else u &= ~(1 << (pin & 31));
orion5x_clrbits(GPIO_OUT, mask); writel(u, GPIO_BLINK_EN(pin));
orion5x_clrbits(GPIO_IO_CONF, mask);
/*
* Configure GPIO output value.
*/
__set_level(pin, value);
/*
* Configure GPIO direction.
*/
__set_direction(pin, 0);
spin_unlock_irqrestore(&gpio_lock, flags); spin_unlock_irqrestore(&gpio_lock, flags);
return 0; return 0;
} }
EXPORT_SYMBOL(gpio_direction_output); EXPORT_SYMBOL(gpio_direction_output);
int gpio_get_value(unsigned pin) int gpio_get_value(unsigned pin)
{ {
int val, mask = 1 << pin; int val;
if (readl(GPIO_IO_CONF) & mask) if (readl(GPIO_IO_CONF(pin)) & (1 << (pin & 31)))
val = readl(GPIO_DATA_IN) ^ readl(GPIO_IN_POL); val = readl(GPIO_DATA_IN(pin)) ^ readl(GPIO_IN_POL(pin));
else else
val = readl(GPIO_OUT); val = readl(GPIO_OUT(pin));
return val & mask; return (val >> (pin & 31)) & 1;
} }
EXPORT_SYMBOL(gpio_get_value); EXPORT_SYMBOL(gpio_get_value);
void gpio_set_value(unsigned pin, int value) void gpio_set_value(unsigned pin, int value)
{ {
unsigned long flags; unsigned long flags;
int mask = 1 << pin; u32 u;
spin_lock_irqsave(&gpio_lock, flags); spin_lock_irqsave(&gpio_lock, flags);
orion5x_clrbits(GPIO_BLINK_EN, mask); /*
if (value) * Disable blinking.
orion5x_setbits(GPIO_OUT, mask); */
else u = readl(GPIO_BLINK_EN(pin));
orion5x_clrbits(GPIO_OUT, mask); u &= ~(1 << (pin & 31));
writel(u, GPIO_BLINK_EN(pin));
spin_unlock_irqrestore(&gpio_lock, flags);
}
EXPORT_SYMBOL(gpio_set_value);
void orion5x_gpio_set_blink(unsigned pin, int blink)
{
unsigned long flags;
int mask = 1 << pin;
spin_lock_irqsave(&gpio_lock, flags);
orion5x_clrbits(GPIO_OUT, mask); /*
if (blink) * Configure GPIO output value.
orion5x_setbits(GPIO_BLINK_EN, mask); */
else __set_level(pin, value);
orion5x_clrbits(GPIO_BLINK_EN, mask);
spin_unlock_irqrestore(&gpio_lock, flags); spin_unlock_irqrestore(&gpio_lock, flags);
} }
EXPORT_SYMBOL(orion5x_gpio_set_blink); EXPORT_SYMBOL(gpio_set_value);
int gpio_request(unsigned pin, const char *label) int gpio_request(unsigned pin, const char *label)
{ {
int ret = 0;
unsigned long flags; unsigned long flags;
int ret;
if (pin >= GPIO_MAX || !test_bit(pin, gpio_valid)) { if (pin >= GPIO_MAX || !test_bit(pin, gpio_valid)) {
pr_debug("%s: invalid GPIO %d\n", __func__, pin); pr_debug("%s: invalid GPIO %d\n", __func__, pin);
...@@ -150,82 +166,74 @@ int gpio_request(unsigned pin, const char *label) ...@@ -150,82 +166,74 @@ int gpio_request(unsigned pin, const char *label)
} }
spin_lock_irqsave(&gpio_lock, flags); spin_lock_irqsave(&gpio_lock, flags);
if (gpio_label[pin] == NULL) {
if (gpio_label[pin]) { gpio_label[pin] = label ? label : "?";
ret = 0;
} else {
pr_debug("%s: GPIO %d already used as %s\n", pr_debug("%s: GPIO %d already used as %s\n",
__func__, pin, gpio_label[pin]); __func__, pin, gpio_label[pin]);
ret = -EBUSY; ret = -EBUSY;
} else }
gpio_label[pin] = label ? label : "?";
spin_unlock_irqrestore(&gpio_lock, flags); spin_unlock_irqrestore(&gpio_lock, flags);
return ret; return ret;
} }
EXPORT_SYMBOL(gpio_request); EXPORT_SYMBOL(gpio_request);
void gpio_free(unsigned pin) void gpio_free(unsigned pin)
{ {
might_sleep();
if (pin >= GPIO_MAX || !test_bit(pin, gpio_valid)) { if (pin >= GPIO_MAX || !test_bit(pin, gpio_valid)) {
pr_debug("%s: invalid GPIO %d\n", __func__, pin); pr_debug("%s: invalid GPIO %d\n", __func__, pin);
return; return;
} }
if (!gpio_label[pin]) if (gpio_label[pin] == NULL)
pr_warning("%s: GPIO %d already freed\n", __func__, pin); pr_warning("%s: GPIO %d already freed\n", __func__, pin);
else else
gpio_label[pin] = NULL; gpio_label[pin] = NULL;
} }
EXPORT_SYMBOL(gpio_free); EXPORT_SYMBOL(gpio_free);
/* Debug helper */
void gpio_display(void) /*
* Orion-specific GPIO API extensions.
*/
void __init orion_gpio_set_unused(unsigned pin)
{ {
int i; /*
* Configure as output, drive low.
for (i = 0; i < GPIO_MAX; i++) { */
printk(KERN_DEBUG "Pin-%d: ", i); __set_level(pin, 0);
__set_direction(pin, 0);
if (!test_bit(i, gpio_valid)) { }
printk("non-GPIO\n");
} else if (!gpio_label[i]) {
printk("GPIO, free\n");
} else {
printk("GPIO, used by %s, ", gpio_label[i]);
if (readl(GPIO_IO_CONF) & (1 << i)) {
printk("input, active %s, level %s, edge %s\n",
((readl(GPIO_IN_POL) >> i) & 1) ? "low" : "high",
((readl(GPIO_LEVEL_MASK) >> i) & 1) ? "enabled" : "masked",
((readl(GPIO_EDGE_MASK) >> i) & 1) ? "enabled" : "masked");
} else {
printk("output, val=%d\n", (readl(GPIO_OUT) >> i) & 1);
}
}
}
printk(KERN_DEBUG "MPP_0_7_CTRL (0x%08x) = 0x%08x\n", void __init orion_gpio_set_valid(unsigned pin, int valid)
MPP_0_7_CTRL, readl(MPP_0_7_CTRL)); {
printk(KERN_DEBUG "MPP_8_15_CTRL (0x%08x) = 0x%08x\n", if (valid)
MPP_8_15_CTRL, readl(MPP_8_15_CTRL)); __set_bit(pin, gpio_valid);
printk(KERN_DEBUG "MPP_16_19_CTRL (0x%08x) = 0x%08x\n", else
MPP_16_19_CTRL, readl(MPP_16_19_CTRL)); __clear_bit(pin, gpio_valid);
printk(KERN_DEBUG "MPP_DEV_CTRL (0x%08x) = 0x%08x\n", }
MPP_DEV_CTRL, readl(MPP_DEV_CTRL));
printk(KERN_DEBUG "GPIO_OUT (0x%08x) = 0x%08x\n", void orion_gpio_set_blink(unsigned pin, int blink)
GPIO_OUT, readl(GPIO_OUT)); {
printk(KERN_DEBUG "GPIO_IO_CONF (0x%08x) = 0x%08x\n", unsigned long flags;
GPIO_IO_CONF, readl(GPIO_IO_CONF)); u32 u;
printk(KERN_DEBUG "GPIO_BLINK_EN (0x%08x) = 0x%08x\n",
GPIO_BLINK_EN, readl(GPIO_BLINK_EN)); spin_lock_irqsave(&gpio_lock, flags);
printk(KERN_DEBUG "GPIO_IN_POL (0x%08x) = 0x%08x\n",
GPIO_IN_POL, readl(GPIO_IN_POL)); /*
printk(KERN_DEBUG "GPIO_DATA_IN (0x%08x) = 0x%08x\n", * Set output value to zero.
GPIO_DATA_IN, readl(GPIO_DATA_IN)); */
printk(KERN_DEBUG "GPIO_LEVEL_MASK (0x%08x) = 0x%08x\n", __set_level(pin, 0);
GPIO_LEVEL_MASK, readl(GPIO_LEVEL_MASK));
printk(KERN_DEBUG "GPIO_EDGE_CAUSE (0x%08x) = 0x%08x\n", u = readl(GPIO_BLINK_EN(pin));
GPIO_EDGE_CAUSE, readl(GPIO_EDGE_CAUSE)); if (blink)
printk(KERN_DEBUG "GPIO_EDGE_MASK (0x%08x) = 0x%08x\n", u |= 1 << (pin & 31);
GPIO_EDGE_MASK, readl(GPIO_EDGE_MASK)); else
u &= ~(1 << (pin & 31));
writel(u, GPIO_BLINK_EN(pin));
spin_unlock_irqrestore(&gpio_lock, flags);
} }
EXPORT_SYMBOL(orion_gpio_set_blink);
/*
* arch/arm/plat-orion/include/plat/gpio.h
*
* Marvell Orion SoC GPIO handling.
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
#ifndef __PLAT_GPIO_H
#define __PLAT_GPIO_H
/*
* 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);
/*
* Orion-specific GPIO API extensions.
*/
void orion_gpio_set_unused(unsigned pin);
void orion_gpio_set_valid(unsigned pin, int valid);
void orion_gpio_set_blink(unsigned pin, int blink);
#endif
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