MIPS: TXx9: Add TX4939 ATA support (v2)

Add a helper routine to register tx4939ide driver and use it on
RBTX4939 board.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/include/asm/txx9/tx4939.h b/arch/mips/include/asm/txx9/tx4939.h
index 7ce2dff3b7cc75c41ca8085bd501b207bc25903b..88badb42301066dd22ac9ce4164875cabaadf5cd 100644 (file)
--- a/arch/mips/include/asm/txx9/tx4939.h
+++ b/arch/mips/include/asm/txx9/tx4939.h
@@ -540,5 +540,6 @@ void tx4939_setup_pcierr_irq(void);
 void tx4939_irq_init(void);
 int tx4939_irq(void);
 void tx4939_mtd_init(int ch);
+void tx4939_ata_init(void);
 
 #endif /* __ASM_TXX9_TX4939_H */

diff --git a/arch/mips/txx9/generic/setup_tx4939.c b/arch/mips/txx9/generic/setup_tx4939.c
index f14a497077da3b173fb798a8d32c77c0e7a938b6..6c0049a5bbc145d644a7cfc1636d8b807c6728d9 100644 (file)
--- a/arch/mips/txx9/generic/setup_tx4939.c
+++ b/arch/mips/txx9/generic/setup_tx4939.c
@@ -20,6 +20,7 @@
 #include <linux/param.h>
 #include <linux/ptrace.h>
 #include <linux/mtd/physmap.h>
+#include <linux/platform_device.h>
 #include <asm/bootinfo.h>
 #include <asm/reboot.h>
 #include <asm/traps.h>
@@ -389,6 +390,51 @@ void __init tx4939_mtd_init(int ch)
        txx9_physmap_flash_init(ch, start, size, &pdata);
 }
 
+#define TX4939_ATA_REG_PHYS(ch) (TX4939_ATA_REG(ch) & 0xfffffffffULL)
+void __init tx4939_ata_init(void)
+{
+       static struct resource ata0_res[] = {
+               {
+                       .start = TX4939_ATA_REG_PHYS(0),
+                       .end = TX4939_ATA_REG_PHYS(0) + 0x1000 - 1,
+                       .flags = IORESOURCE_MEM,
+               }, {
+                       .start = TXX9_IRQ_BASE + TX4939_IR_ATA(0),
+                       .flags = IORESOURCE_IRQ,
+               },
+       };
+       static struct resource ata1_res[] = {
+               {
+                       .start = TX4939_ATA_REG_PHYS(1),
+                       .end = TX4939_ATA_REG_PHYS(1) + 0x1000 - 1,
+                       .flags = IORESOURCE_MEM,
+               }, {
+                       .start = TXX9_IRQ_BASE + TX4939_IR_ATA(1),
+                       .flags = IORESOURCE_IRQ,
+               },
+       };
+       static struct platform_device ata0_dev = {
+               .name = "tx4939ide",
+               .id = 0,
+               .num_resources = ARRAY_SIZE(ata0_res),
+               .resource = ata0_res,
+       };
+       static struct platform_device ata1_dev = {
+               .name = "tx4939ide",
+               .id = 1,
+               .num_resources = ARRAY_SIZE(ata1_res),
+               .resource = ata1_res,
+       };
+       __u64 pcfg = __raw_readq(&tx4939_ccfgptr->pcfg);
+
+       if (pcfg & TX4939_PCFG_ATA0MODE)
+               platform_device_register(&ata0_dev);
+       if ((pcfg & (TX4939_PCFG_ATA1MODE |
+                    TX4939_PCFG_ET1MODE |
+                    TX4939_PCFG_ET0MODE)) == TX4939_PCFG_ATA1MODE)
+               platform_device_register(&ata1_dev);
+}
+
 static void __init tx4939_stop_unused_modules(void)
 {
        __u64 pcfg, rst = 0, ckd = 0;

diff --git a/arch/mips/txx9/rbtx4939/setup.c b/arch/mips/txx9/rbtx4939/setup.c
index 277864d5e779592627e5fd6cbb4664c604f153ea..9855d7bccc203f628186d5d2f31fa4e37f67a491 100644 (file)
--- a/arch/mips/txx9/rbtx4939/setup.c
+++ b/arch/mips/txx9/rbtx4939/setup.c
@@ -264,6 +264,7 @@ static void __init rbtx4939_device_init(void)
 #endif
        rbtx4939_led_setup();
        tx4939_wdt_init();
+       tx4939_ata_init();
 }
 
 static void __init rbtx4939_setup(void)