1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00

Fix the gpio handling and flash resource declaration, thanks to Daniel Gimpelevich

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8366 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian
2007-08-07 09:12:09 +00:00
parent 8ae34a4329
commit 96455c222d
6 changed files with 19 additions and 20 deletions

View File

@@ -22,14 +22,14 @@ static unsigned int rdc_gpio_read(unsigned gpio)
{
unsigned int val;
val = 0x80000000 | (7 << 11) | ((0x48));
val = 0x80000000 | (7 << 11) | ((gpio&0x20?0x84:0x48));
outl(val, RDC3210_CFGREG_ADDR);
udelay(10);
val = inl(RDC3210_CFGREG_DATA);
val |= (0x1 << gpio);
val |= (0x1 << (gpio & 0x1F));
outl(val, RDC3210_CFGREG_DATA);
udelay(10);
val = 0x80000000 | (7 << 11) | ((0x4C));
val = 0x80000000 | (7 << 11) | ((gpio&0x20?0x88:0x4C));
outl(val, RDC3210_CFGREG_ADDR);
udelay(10);
val = inl(RDC3210_CFGREG_DATA);
@@ -37,7 +37,7 @@ static unsigned int rdc_gpio_read(unsigned gpio)
return val;
}
void rdc_gpio_write(unsigned int val)
static void rdc_gpio_write(unsigned int val)
{
if (val) {
outl(val, RDC3210_CFGREG_DATA);
@@ -47,7 +47,7 @@ void rdc_gpio_write(unsigned int val)
int rdc_gpio_get_value(unsigned gpio)
{
return ((int)rdc_gpio_read(gpio));
return (gpio>0x3A?-EINVAL:(int)rdc_gpio_read(gpio));
}
EXPORT_SYMBOL(rdc_gpio_get_value);
@@ -55,12 +55,13 @@ void rdc_gpio_set_value(unsigned gpio, int value)
{
unsigned int val;
if (gpio > 0x3A) return;
val = rdc_gpio_read(gpio);
if (value)
val &= ~(0x1 << gpio);
val &= ~(0x1 << (gpio & 0x1F));
else
val |= (0x1 << gpio);
val |= (0x1 << (gpio & 0x1F));
rdc_gpio_write(val);
}

View File

@@ -30,13 +30,12 @@
#include <linux/platform_device.h>
#include <asm/gpio.h>
#include <asm/mach-rdc/rdc321x_defs.h>
/* FIXME : Flash */
static struct resource rdc_flash_resource[] = {
[0] = {
.start = RDC_FLASH_BASE,
.end = RDC_FLASH_BASE+CONFIG_MTD_RDC3210_SIZE-1,
.start = (u32)-CONFIG_MTD_RDC3210_SIZE,
.end = (u32)-1,
.flags = IORESOURCE_MEM,
},
};