TXx9: Add TX4938 ATA support (v3)

Add a helper routine to register tx4938ide driver and use it on
RBTX4938 board.

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

diff --git a/arch/mips/include/asm/txx9/tx4938.h b/arch/mips/include/asm/txx9/tx4938.h
index 989e7751135a7a9c77f36cb40d5d720ec054ab46..0b068154054cb897c628651b74b7d58c84b0e31a 100644 (file)
--- a/arch/mips/include/asm/txx9/tx4938.h
+++ b/arch/mips/include/asm/txx9/tx4938.h
@@ -292,4 +292,17 @@ void tx4938_setup_pcierr_irq(void);
 void tx4938_irq_init(void);
 void tx4938_mtd_init(int ch);
 
+struct tx4938ide_platform_info {
+       /*
+        * I/O port shift, for platforms with ports that are
+        * constantly spaced and need larger than the 1-byte
+        * spacing used by ata_std_ports().
+        */
+       unsigned int ioport_shift;
+       unsigned int gbus_clock;        /*  0 means no PIO mode tuning. */
+       unsigned int ebus_ch;
+};
+
+void tx4938_ata_init(unsigned int irq, unsigned int shift, int tune);
+
 #endif

diff --git a/arch/mips/txx9/generic/setup_tx4938.c b/arch/mips/txx9/generic/setup_tx4938.c
index af724e53ef9134b905b64e98fcd723ec43365dee..25819ff1c3507310b0edad65559afbe14afddf63 100644 (file)
--- a/arch/mips/txx9/generic/setup_tx4938.c
+++ b/arch/mips/txx9/generic/setup_tx4938.c
@@ -16,6 +16,7 @@
 #include <linux/param.h>
 #include <linux/ptrace.h>
 #include <linux/mtd/physmap.h>
+#include <linux/platform_device.h>
 #include <asm/reboot.h>
 #include <asm/traps.h>
 #include <asm/txx9irq.h>
@@ -335,6 +336,52 @@ void __init tx4938_mtd_init(int ch)
        txx9_physmap_flash_init(ch, start, size, &pdata);
 }
 
+void __init tx4938_ata_init(unsigned int irq, unsigned int shift, int tune)
+{
+       struct platform_device *pdev;
+       struct resource res[] = {
+               {
+                       /* .start and .end are filled in later */
+                       .flags = IORESOURCE_MEM,
+               }, {
+                       .start = irq,
+                       .flags = IORESOURCE_IRQ,
+               },
+       };
+       struct tx4938ide_platform_info pdata = {
+               .ioport_shift = shift,
+               /*
+                * The IDE driver should not change bus timings if other ISA
+                * devices existed.
+                */
+               .gbus_clock = tune ? txx9_gbus_clock : 0,
+       };
+       u64 ebccr;
+       int i;
+
+       if ((__raw_readq(&tx4938_ccfgptr->pcfg) &
+            (TX4938_PCFG_ATA_SEL | TX4938_PCFG_NDF_SEL))
+           != TX4938_PCFG_ATA_SEL)
+               return;
+       for (i = 0; i < 8; i++) {
+               /* check EBCCRn.ISA, EBCCRn.BSZ, EBCCRn.ME */
+               ebccr = __raw_readq(&tx4938_ebuscptr->cr[i]);
+               if ((ebccr & 0x00f00008) == 0x00e00008)
+                       break;
+       }
+       if (i == 8)
+               return;
+       pdata.ebus_ch = i;
+       res[0].start = ((ebccr >> 48) << 20) + 0x10000;
+       res[0].end = res[0].start + 0x20000 - 1;
+       pdev = platform_device_alloc("tx4938ide", -1);
+       if (!pdev ||
+           platform_device_add_resources(pdev, res, ARRAY_SIZE(res)) ||
+           platform_device_add_data(pdev, &pdata, sizeof(pdata)) ||
+           platform_device_add(pdev))
+               platform_device_put(pdev);
+}
+
 static void __init tx4938_stop_unused_modules(void)
 {
        __u64 pcfg, rst = 0, ckd = 0;

diff --git a/arch/mips/txx9/rbtx4938/setup.c b/arch/mips/txx9/rbtx4938/setup.c
index e077cc4d3a59b67c3ace6eea0832fa6f786173ca..547ff2920bf084a20aab6dcdba001840a6ad6556 100644 (file)
--- a/arch/mips/txx9/rbtx4938/setup.c
+++ b/arch/mips/txx9/rbtx4938/setup.c
@@ -352,6 +352,7 @@ static void __init rbtx4938_device_init(void)
        rbtx4938_ne_init();
        tx4938_wdt_init();
        rbtx4938_mtd_init();
+       tx4938_ata_init(RBTX4938_IRQ_IOC_ATA, 0, 1);
        txx9_iocled_init(RBTX4938_LED_ADDR - IO_BASE, -1, 8, 1, "green", NULL);
 }