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

SVN-Revision: 8366

diff --git a/target/linux/rdc-2.6/Makefile b/target/linux/rdc-2.6/Makefile
index 5953e06ee63e13760d5d7c3f2c86b2dbc2cc9466..4d750378685149aa97b139061b72b38a33dd7260 100644 (file)
--- a/target/linux/rdc-2.6/Makefile
+++ b/target/linux/rdc-2.6/Makefile
@@ -22,12 +22,12 @@ include $(INCLUDE_DIR)/kernel-build.mk
 
 ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
     define Kernel/SetInitramfs
-       echo "r6040 parent=wlan0" > $(BUILD_DIR)/root/etc/modules.d/99-r6040
-       rm -f $(BUILD_DIR)/root/sbin/init
-       ln -s /etc/preinit $(BUILD_DIR)/root/sbin/init
-       sed -i 's,exec /sbin/init,exec /bin/busybox init,g' $(BUILD_DIR)/root/etc/preinit
-       sed -i 's,/sbin/init,/bin/busybox init,g' $(BUILD_DIR)/root/init
-       sed -i 's,eth0,eth1,g' $(BUILD_DIR)/root/etc/config/network
+       echo "r6040 parent=wlan0" > $(TARGET_DIR)/etc/modules.d/99-r6040
+       $(RM) -f $(TARGET_DIR)/sbin/init
+       ln -s /etc/preinit $(TARGET_DIR)/sbin/init
+       sed -i 's,exec /sbin/init,exec /bin/busybox init,g' $(TARGET_DIR)/etc/preinit
+       sed -i 's,/sbin/init,/bin/busybox init,g' $(TARGET_DIR)/init
+       sed -i 's,eth0,eth1,g' $(TARGET_DIR)/etc/config/network
     endef
 endif
 

diff --git a/target/linux/rdc-2.6/files/arch/i386/mach-rdc/gpio.c b/target/linux/rdc-2.6/files/arch/i386/mach-rdc/gpio.c
index eadb15235e8e076437b5b835592e0d78c1e64596..28a33db076eba186f72f1eda551f9a4b34b8749c 100644 (file)
--- a/target/linux/rdc-2.6/files/arch/i386/mach-rdc/gpio.c
+++ b/target/linux/rdc-2.6/files/arch/i386/mach-rdc/gpio.c
@@ -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);
 }

diff --git a/target/linux/rdc-2.6/files/arch/i386/mach-rdc/platform.c b/target/linux/rdc-2.6/files/arch/i386/mach-rdc/platform.c
index aa245a052be09c1088ba0b73b3c5b7fe43a8e728..96a9c9d37fe475067f7319d938f3dff564ff7b92 100644 (file)
--- a/target/linux/rdc-2.6/files/arch/i386/mach-rdc/platform.c
+++ b/target/linux/rdc-2.6/files/arch/i386/mach-rdc/platform.c
@@ -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,
        },
 };

diff --git a/target/linux/rdc-2.6/files/drivers/leds/leds-rdc3211.c b/target/linux/rdc-2.6/files/drivers/leds/leds-rdc3211.c
index 6a15a16ad539607ab12decbdbf9765a4bd974d88..f29047340e412e49f23388504c8ea4251b4f9a1f 100644 (file)
--- a/target/linux/rdc-2.6/files/drivers/leds/leds-rdc3211.c
+++ b/target/linux/rdc-2.6/files/drivers/leds/leds-rdc3211.c
@@ -19,7 +19,7 @@
 #include <asm/gpio.h>
 
 /* This is just for testing purpose */
-int gpio;
+int gpio=-1;
 module_param(gpio, int, 0444);
 MODULE_PARM_DESC(gpio, " GPIO line");
 
@@ -58,7 +58,7 @@ static int __init rdc321x_leds_init(void)
 {
        int ret;
 
-       ret = platform_driver_register(&rdc321x_leds_driver);
+       ret = gpio+1?platform_driver_register(&rdc321x_leds_driver):-EINVAL;
 
        return ret;
 }

diff --git a/target/linux/rdc-2.6/files/include/asm-i386/mach-rdc/rdc321x_defs.h b/target/linux/rdc-2.6/files/include/asm-i386/mach-rdc/rdc321x_defs.h
index c8e6355bce0441be5d141102ab8d7b43f9bf3cd6..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/target/linux/rdc-2.6/files/include/asm-i386/mach-rdc/rdc321x_defs.h
+++ b/target/linux/rdc-2.6/files/include/asm-i386/mach-rdc/rdc321x_defs.h
@@ -1 +0,0 @@
-#define RDC_FLASH_BASE         0xffc00000

diff --git a/target/linux/rdc-2.6/image/Makefile b/target/linux/rdc-2.6/image/Makefile
index 0d53b26d0cf77d90f2b1a809d0e8a0dfd6c62115..74713e2d7d332a8798f888743b7b2ac70b87a9b3 100644 (file)
--- a/target/linux/rdc-2.6/image/Makefile
+++ b/target/linux/rdc-2.6/image/Makefile
@@ -25,7 +25,7 @@ define Image/Build/ar525w
        touch $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1)-$(2).img
        mv $(KDIR)/root.$(1) $(KDIR)/root.tmp
        dd of=$(KDIR)/root.$(1) if=$(KDIR)/root.tmp $(call trxalign/$(1)) conv=sync
-       rm -f $(KDIR)/root.tmp
+       $(RM) -f $(KDIR)/root.tmp
        $(STAGING_DIR_HOST)/bin/airlink -b 1 -j $(shell bash -c 'echo $$[$(3)]') $(KDIR)/bzImage $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1)-$(2).img
 endef