aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120/files
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2007-10-23 10:46:19 +0000
committerFlorian Fainelli <florian@openwrt.org>2007-10-23 10:46:19 +0000
commit2514d7f79927c8e3935c594c9ec4fa007333ade8 (patch)
tree004a11649aa8c4173752faa9820bbc525081d40c /target/linux/adm5120/files
parent486492b407f7e979b3cac1a23d3ace14f80112f0 (diff)
downloadupstream-2514d7f79927c8e3935c594c9ec4fa007333ade8.tar.gz
upstream-2514d7f79927c8e3935c594c9ec4fa007333ade8.tar.bz2
upstream-2514d7f79927c8e3935c594c9ec4fa007333ade8.zip
The RB513 CF driver is now a module, enable it by default for the RB1xx profile. Fix the membase of the CF driver.
SVN-Revision: 9416
Diffstat (limited to 'target/linux/adm5120/files')
-rw-r--r--target/linux/adm5120/files/arch/mips/adm5120/boards/mikrotik.c6
-rw-r--r--target/linux/adm5120/files/drivers/block/rb1xx/Makefile3
-rw-r--r--target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_defs.h1
3 files changed, 7 insertions, 3 deletions
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/boards/mikrotik.c b/target/linux/adm5120/files/arch/mips/adm5120/boards/mikrotik.c
index 74dd860dc3..1ed420e0c7 100644
--- a/target/linux/adm5120/files/arch/mips/adm5120/boards/mikrotik.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/boards/mikrotik.c
@@ -182,11 +182,13 @@ static void rb150_nand_cmd_ctrl(struct mtd_info *mtd, int cmd,
static struct resource cf_slot0_res[] = {
{
.name = "cf_membase",
+ .start = ADM5120_EXTIO0_BASE,
+ .end = ADM5120_EXTIO0_BASE + ADM5120_MPMC_SIZE-1 ,
.flags = IORESOURCE_MEM
}, {
.name = "cf_irq",
- .start = INTC_IRQ_GPIO4, /* 5 */
- .end = INTC_IRQ_GPIO4,
+ .start = ADM5120_IRQ_GPIO4, /* 5 */
+ .end = ADM5120_IRQ_GPIO4,
.flags = IORESOURCE_IRQ
}
};
diff --git a/target/linux/adm5120/files/drivers/block/rb1xx/Makefile b/target/linux/adm5120/files/drivers/block/rb1xx/Makefile
index 672aaa6974..9e46301e83 100644
--- a/target/linux/adm5120/files/drivers/block/rb1xx/Makefile
+++ b/target/linux/adm5120/files/drivers/block/rb1xx/Makefile
@@ -1,2 +1,3 @@
## Makefile for the RB1xx CF port
-obj-y += bdev.o ata.o
+obj-$(CONFIG_BLK_DEV_CF_MIPS) += rb153-cf.o
+rb153-cf-objs := bdev.o ata.o
diff --git a/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_defs.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_defs.h
index d39620aabb..2f92a4564a 100644
--- a/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_defs.h
+++ b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_defs.h
@@ -30,6 +30,7 @@
#define ADM5120_SDRAM1_BASE 0x01000000
#define ADM5120_SRAM1_BASE 0x10000000
#define ADM5120_NAND_BASE ADM5120_SRAM1_BASE
+#define ADM5120_EXTIO0_BASE 0x10C00000
#define ADM5120_MPMC_BASE 0x11000000
#define ADM5120_USBC_BASE 0x11200000
#define ADM5120_PCIMEM_BASE 0x11400000