Merge branch 'topic/fix/hda' into for-linus

[linux-2.6-omap-h63xx.git] / arch / mips / rb532 / devices.c

diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
index 82ab395efa337e2eeed09cb20a1380d19d1dbafa..2f22d714d5b09487c5535f49cce0018dcda4d070 100644 (file)
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
@@ -34,21 +34,11 @@
 #include <asm/mach-rc32434/rb.h>
 #include <asm/mach-rc32434/integ.h>
 #include <asm/mach-rc32434/gpio.h>
-
-#define ETH0_DMA_RX_IRQ        (GROUP1_IRQ_BASE + 0)
-#define ETH0_DMA_TX_IRQ        (GROUP1_IRQ_BASE + 1)
-#define ETH0_RX_OVR_IRQ        (GROUP3_IRQ_BASE + 9)
-#define ETH0_TX_UND_IRQ        (GROUP3_IRQ_BASE + 10)
+#include <asm/mach-rc32434/irq.h>
 
 #define ETH0_RX_DMA_ADDR  (DMA0_BASE_ADDR + 0 * DMA_CHAN_OFFSET)
 #define ETH0_TX_DMA_ADDR  (DMA0_BASE_ADDR + 1 * DMA_CHAN_OFFSET)
 
-/* NAND definitions */
-#define GPIO_RDY (1 << 0x08)
-#define GPIO_WPX (1 << 0x09)
-#define GPIO_ALE (1 << 0x0a)
-#define GPIO_CLE (1 << 0x0b)
-
 static struct resource korina_dev0_res[] = {
        {
                .name = "korina_regs",
@@ -94,15 +84,13 @@ static struct korina_device korina_dev0_data = {
 };
 
 static struct platform_device korina_dev0 = {
-       .id = 0,
+       .id = -1,
        .name = "korina",
        .dev.platform_data = &korina_dev0_data,
        .resource = korina_dev0_res,
        .num_resources = ARRAY_SIZE(korina_dev0_res),
 };
 
-#define CF_GPIO_NUM 13
-
 static struct resource cf_slot0_res[] = {
        {
                .name = "cf_membase",
@@ -116,11 +104,11 @@ static struct resource cf_slot0_res[] = {
 };
 
 static struct cf_device cf_slot0_data = {
-       .gpio_pin = 13
+       .gpio_pin = CF_GPIO_NUM
 };
 
 static struct platform_device cf_slot0 = {
-       .id = 0,
+       .id = -1,
        .name = "pata-rb532-cf",
        .dev.platform_data = &cf_slot0_data,
        .resource = cf_slot0_res,
@@ -185,7 +173,7 @@ static struct mtd_partition rb532_partition_info[] = {
 
 static struct platform_device rb532_led = {
        .name = "rb532-led",
-       .id = 0,
+       .id = -1,
 };
 
 static struct gpio_keys_button rb532_gpio_btn[] = {
@@ -292,7 +280,7 @@ static int __init plat_setup_devices(void)
 {
        /* Look for the CF card reader */
        if (!readl(IDT434_REG_BASE + DEV1MASK))
-               rb532_devs[1] = NULL;
+               rb532_devs[2] = NULL;   /* disable cf_slot0 at index 2 */
        else {
                cf_slot0_res[0].start =
                    readl(IDT434_REG_BASE + DEV1BASE);