From 1a951c294f76d886e76733b89a891edb6b4f54ff Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Mon, 19 Jan 2009 23:42:54 +0100 Subject: [PATCH] --- yaml --- r: 130575 b: refs/heads/master c: 1c4db8e82808a804751be906e8c14bbe0a264a9c h: refs/heads/master i: 130573: 06440e2eb9bfb3ebe261dcfba66a4e7a2f6390c5 130571: 991b2464bec380c4054ebe6f5df4e154271c700b 130567: 57ca58220d878aa9d1cf41f165a555ba68db7f33 130559: 8813e85455b51189188fd60e81270afea0483bca v: v3 --- [refs] | 2 +- trunk/arch/mips/rb532/devices.c | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 06f34398d229..74bfff38ce34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ca3803f81bca9081f17ef67ffca8b11790f608d +refs/heads/master: 1c4db8e82808a804751be906e8c14bbe0a264a9c diff --git a/trunk/arch/mips/rb532/devices.c b/trunk/arch/mips/rb532/devices.c index 1a0209eca789..4a5f05b662ae 100644 --- a/trunk/arch/mips/rb532/devices.c +++ b/trunk/arch/mips/rb532/devices.c @@ -63,13 +63,6 @@ unsigned char get_latch_u5(void) } EXPORT_SYMBOL(get_latch_u5); -static struct resource rb532_dev3_ctl_res[] = { - { - .name = "dev3_ctl", - .flags = IORESOURCE_MEM, - } -}; - static struct resource korina_dev0_res[] = { { .name = "korina_regs", @@ -342,11 +335,8 @@ static int __init plat_setup_devices(void) nand_slot0_res[0].start = readl(IDT434_REG_BASE + DEV2BASE); nand_slot0_res[0].end = nand_slot0_res[0].start + 0x1000; - /* Read the third (multi purpose) resources from the DC */ - rb532_dev3_ctl_res[0].start = readl(IDT434_REG_BASE + DEV3BASE); - rb532_dev3_ctl_res[0].end = rb532_dev3_ctl_res[0].start + 0x1000; - - dev3.base = ioremap_nocache(rb532_dev3_ctl_res[0].start, 0x1000); + /* Read and map device controller 3 */ + dev3.base = ioremap_nocache(readl(IDT434_REG_BASE + DEV3BASE), 1); if (!dev3.base) { printk(KERN_ERR "rb532: cannot remap device controller 3\n");