5 files changed, 66 insertions, 39 deletions

diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig
index ee711431e504..4e711a0c3dae 100644
--- a/arch/sh/drivers/dma/Kconfig
+++ b/arch/sh/drivers/dma/Kconfig
@@ -12,6 +12,7 @@ config SH_DMA
 config NR_ONCHIP_DMA_CHANNELS
         int
         depends on SH_DMA
+        default "6" if CPU_SUBTYPE_SH7720
         default "8" if CPU_SUBTYPE_SH7750R || CPU_SUBTYPE_SH7751R
         default "12" if CPU_SUBTYPE_SH7780
         default "4"
diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c
index 06ed0609a95d..958bac1c585a 100644
--- a/arch/sh/drivers/dma/dma-sh.c
+++ b/arch/sh/drivers/dma/dma-sh.c
@@ -24,13 +24,19 @@ static int dmte_irq_map[] = {
         DMTE1_IRQ,
         DMTE2_IRQ,
         DMTE3_IRQ,
-#if defined(CONFIG_CPU_SUBTYPE_SH7751R) ||      \
+#if defined(CONFIG_CPU_SUBTYPE_SH7720)  ||      \
+    defined(CONFIG_CPU_SUBTYPE_SH7751R) ||      \
     defined(CONFIG_CPU_SUBTYPE_SH7760)  ||      \
+    defined(CONFIG_CPU_SUBTYPE_SH7709)  ||      \
     defined(CONFIG_CPU_SUBTYPE_SH7780)
         DMTE4_IRQ,
         DMTE5_IRQ,
+#endif
+#if defined(CONFIG_CPU_SUBTYPE_SH7751R) ||      \
+    defined(CONFIG_CPU_SUBTYPE_SH7760)  ||      \
+    defined(CONFIG_CPU_SUBTYPE_SH7780)
         DMTE6_IRQ,
-        DMTE7_IRQ,    
+        DMTE7_IRQ,
 #endif
 };
 
@@ -196,7 +202,8 @@ static int sh_dmac_get_dma_residue(struct dma_channel *chan)
         return ctrl_inl(DMATCR[chan->chan]) << calc_xmit_shift(chan);
 }
 
-#ifdef CONFIG_CPU_SUBTYPE_SH7780
+#if defined(CONFIG_CPU_SUBTYPE_SH7720) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7780)
 #define dmaor_read_reg()        ctrl_inw(DMAOR)
 #define dmaor_write_reg(data)   ctrl_outw(data, DMAOR)
 #else
diff --git a/arch/sh/drivers/heartbeat.c b/arch/sh/drivers/heartbeat.c
index 10c1828c9ff5..b76a14f12ce2 100644
--- a/arch/sh/drivers/heartbeat.c
+++ b/arch/sh/drivers/heartbeat.c
@@ -24,24 +24,44 @@
 #include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/io.h>
+#include <asm/heartbeat.h>
 
 #define DRV_NAME "heartbeat"
-#define DRV_VERSION "0.1.0"
+#define DRV_VERSION "0.1.1"
 
-struct heartbeat_data {
-        void __iomem *base;
-        unsigned char bit_pos[8];
-        struct timer_list timer;
-};
+static unsigned char default_bit_pos[] = { 0, 1, 2, 3, 4, 5, 6, 7 };
+
+static inline void heartbeat_toggle_bit(struct heartbeat_data *hd,
+                                        unsigned bit, unsigned int inverted)
+{
+        unsigned int new;
+
+        new = (1 << hd->bit_pos[bit]);
+        if (inverted)
+                new = ~new;
+
+        switch (hd->regsize) {
+        case 32:
+                iowrite32(new, hd->base);
+                break;
+        case 16:
+                iowrite16(new, hd->base);
+                break;
+        default:
+                iowrite8(new, hd->base);
+                break;
+        }
+}
 
 static void heartbeat_timer(unsigned long data)
 {
         struct heartbeat_data *hd = (struct heartbeat_data *)data;
         static unsigned bit = 0, up = 1;
 
-        ctrl_outw(1 << hd->bit_pos[bit], (unsigned long)hd->base);
+        heartbeat_toggle_bit(hd, bit, hd->flags & HEARTBEAT_INVERTED);
+
         bit += up;
-        if ((bit == 0) || (bit == ARRAY_SIZE(hd->bit_pos)-1))
+        if ((bit == 0) || (bit == (hd->nr_bits)-1))
                 up = -up;
 
         mod_timer(&hd->timer, jiffies + (110 - ((300 << FSHIFT) /
@@ -64,21 +84,31 @@ static int heartbeat_drv_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        hd = kmalloc(sizeof(struct heartbeat_data), GFP_KERNEL);
-        if (unlikely(!hd))
-                return -ENOMEM;
-
         if (pdev->dev.platform_data) {
-                memcpy(hd->bit_pos, pdev->dev.platform_data,
-                       ARRAY_SIZE(hd->bit_pos));
+                hd = pdev->dev.platform_data;
         } else {
-                int i;
+                hd = kzalloc(sizeof(struct heartbeat_data), GFP_KERNEL);
+                if (unlikely(!hd))
+                        return -ENOMEM;
+        }
+
+        hd->base = ioremap_nocache(res->start, res->end - res->start + 1);
+        if (!unlikely(hd->base)) {
+                dev_err(&pdev->dev, "ioremap failed\n");
+
+                if (!pdev->dev.platform_data)
+                        kfree(hd);
+
+                return -ENXIO;
+        }
 
-                for (i = 0; i < ARRAY_SIZE(hd->bit_pos); i++)
-                        hd->bit_pos[i] = i;
+        if (!hd->nr_bits) {
+                hd->bit_pos = default_bit_pos;
+                hd->nr_bits = ARRAY_SIZE(default_bit_pos);
         }
 
-        hd->base = (void __iomem *)(unsigned long)res->start;
+        if (!hd->regsize)
+                hd->regsize = 8;        /* default access size */
 
         setup_timer(&hd->timer, heartbeat_timer, (unsigned long)hd);
         platform_set_drvdata(pdev, hd);
@@ -91,10 +121,12 @@ static int heartbeat_drv_remove(struct platform_device *pdev)
         struct heartbeat_data *hd = platform_get_drvdata(pdev);
 
         del_timer_sync(&hd->timer);
+        iounmap(hd->base);
 
         platform_set_drvdata(pdev, NULL);
 
-        kfree(hd);
+        if (!pdev->dev.platform_data)
+                kfree(hd);
 
         return 0;
 }
diff --git a/arch/sh/drivers/pci/ops-rts7751r2d.c b/arch/sh/drivers/pci/ops-rts7751r2d.c
index 4a518d948049..ec8430c8d2d1 100644
--- a/arch/sh/drivers/pci/ops-rts7751r2d.c
+++ b/arch/sh/drivers/pci/ops-rts7751r2d.c
@@ -19,10 +19,10 @@
 #include "pci-sh4.h"
 
 static u8 rts7751r2d_irq_tab[] __initdata = {
-        IRQ_PCISLOT1,
-        IRQ_PCISLOT2,
-        IRQ_PCMCIA,
-        IRQ_PCIETH,
+        IRQ_PCI_INTA,
+        IRQ_PCI_INTB,
+        IRQ_PCI_INTC,
+        IRQ_PCI_INTD,
 };
 
 int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
diff --git a/arch/sh/drivers/pci/pci-sh7780.c b/arch/sh/drivers/pci/pci-sh7780.c
index 5508e45d4838..e516087fb435 100644
--- a/arch/sh/drivers/pci/pci-sh7780.c
+++ b/arch/sh/drivers/pci/pci-sh7780.c
@@ -79,19 +79,6 @@ static int __init sh7780_pci_init(void)
                 ctrl_outl(0xAAAA0000, INTC_ICR1);
                 /* INTPRI: priority=3(all) */
                 ctrl_outl(0x33333333, INTC_INTPRI);
-        } else {
-                /* INTC SH-4 Mode */
-                ctrl_outl(0x00200000, INTC_ICR0);
-                /* enable PCIINTA - PCIINTD */
-                ctrl_outl(0x00078000, INTC_INT2MSKCR);
-                /* disable IRL4-7 Interrupt */
-                ctrl_outl(0x40000000, INTC_INTMSK1);
-                /* disable IRL4-7 Interrupt */
-                ctrl_outl(0x0000fffe, INTC_INTMSK2);
-                /* enable IRL0-3 Interrupt */
-                ctrl_outl(0x80000000, INTC_INTMSKCLR1);
-                /* enable IRL0-3 Interrupt */
-                ctrl_outl(0xfffe0000, INTC_INTMSKCLR2);
         }
 
         if ((ret = sh4_pci_check_direct()) != 0)