Gabor Juhos
12 years ago
parent
87ae19eaa3
commit
1a0ef04231
@ -1,129 +0,0 @@
|
||||
--- a/arch/mips/adm8668/irq.c
|
||||
+++ b/arch/mips/adm8668/irq.c
|
||||
@@ -20,28 +20,7 @@
|
||||
#include <asm/irq.h>
|
||||
#include <adm8668.h>
|
||||
|
||||
-
|
||||
-void enable_adm8668_irq(unsigned int irq);
|
||||
-void disable_adm8668_irq(unsigned int irq);
|
||||
-void adm8668_irq_cascade(void);
|
||||
-
|
||||
-void plat_irq_dispatch(void)
|
||||
-{
|
||||
- unsigned int pending;
|
||||
-
|
||||
- pending = read_c0_cause() & read_c0_status() & ST0_IM;
|
||||
-
|
||||
- /* timer interrupt, that we renumbered */
|
||||
- if (pending & STATUSF_IP7)
|
||||
- do_IRQ(MIPS_CPU_IRQ_BASE + 7);
|
||||
- if (pending & STATUSF_IP2)
|
||||
- adm8668_irq_cascade();
|
||||
-}
|
||||
-
|
||||
-/*
|
||||
- * System irq dispatch
|
||||
- */
|
||||
-void adm8668_irq_cascade()
|
||||
+static void adm8668_irq_cascade(void)
|
||||
{
|
||||
int i;
|
||||
unsigned long intsrc;
|
||||
@@ -53,49 +32,53 @@ void adm8668_irq_cascade()
|
||||
}
|
||||
|
||||
/*
|
||||
- * irq enable
|
||||
+ * System irq dispatch
|
||||
*/
|
||||
-static __inline void _irq_enable(int irql)
|
||||
+void plat_irq_dispatch(void)
|
||||
{
|
||||
- ADM8668_INTC_REG(IRQ_ENABLE_REG) = (1 << irql);
|
||||
-}
|
||||
+ unsigned int pending;
|
||||
|
||||
+ pending = read_c0_cause() & read_c0_status() & ST0_IM;
|
||||
|
||||
-/*
|
||||
- * irq disable
|
||||
- */
|
||||
-static __inline void _irq_disable(int irql)
|
||||
-{
|
||||
- ADM8668_INTC_REG(IRQ_DISABLE_REG) = (1 << irql);
|
||||
+ /* timer interrupt, that we renumbered */
|
||||
+ if (pending & STATUSF_IP7)
|
||||
+ do_IRQ(MIPS_CPU_IRQ_BASE + 7);
|
||||
+ if (pending & STATUSF_IP2)
|
||||
+ adm8668_irq_cascade();
|
||||
}
|
||||
|
||||
-
|
||||
/*
|
||||
* enable 8668 irq
|
||||
*/
|
||||
-void enable_adm8668_irq(unsigned int irq)
|
||||
+static void enable_adm8668_irq(struct irq_data *d)
|
||||
{
|
||||
+ int irq = d->irq;
|
||||
+
|
||||
if ((irq < 0) || (irq > NR_IRQS))
|
||||
return;
|
||||
|
||||
- _irq_enable(irq);
|
||||
+ ADM8668_INTC_REG(IRQ_ENABLE_REG) = (1 << irq);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* disable 8668 irq
|
||||
*/
|
||||
-void disable_adm8668_irq(unsigned int irq)
|
||||
+static void disable_adm8668_irq(struct irq_data *d)
|
||||
{
|
||||
+ int irq = d->irq;
|
||||
+
|
||||
if ((irq < 0) || (irq > NR_IRQS))
|
||||
return;
|
||||
|
||||
- _irq_disable(irq);
|
||||
+ ADM8668_INTC_REG(IRQ_DISABLE_REG) = (1 << irq);
|
||||
}
|
||||
|
||||
-static inline void ack_adm8668_irq(unsigned int irq_nr)
|
||||
+static void ack_adm8668_irq(struct irq_data *d)
|
||||
{
|
||||
- ADM8668_INTC_REG(IRQ_DISABLE_REG) = (1 << irq_nr);
|
||||
+ int irq = d->irq;
|
||||
+
|
||||
+ ADM8668_INTC_REG(IRQ_DISABLE_REG) = (1 << irq);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -104,20 +87,20 @@ static inline void ack_adm8668_irq(unsig
|
||||
|
||||
static struct irq_chip adm8668_irq_type = {
|
||||
.name = "adm8668",
|
||||
- .ack = ack_adm8668_irq,
|
||||
- .mask = disable_adm8668_irq,
|
||||
- .unmask = enable_adm8668_irq
|
||||
+ .irq_ack = ack_adm8668_irq,
|
||||
+ .irq_mask = disable_adm8668_irq,
|
||||
+ .irq_unmask = enable_adm8668_irq
|
||||
};
|
||||
|
||||
/*
|
||||
* irq init
|
||||
*/
|
||||
-void __init init_adm8668_irqs(void)
|
||||
+static void __init init_adm8668_irqs(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i <= INT_LVL_MAX; i++)
|
||||
- set_irq_chip_and_handler(i, &adm8668_irq_type,
|
||||
+ irq_set_chip_and_handler(i, &adm8668_irq_type,
|
||||
handle_level_irq);
|
||||
|
||||
/* hw0 is where our interrupts are uh.. interrupted at. */
|
||||
@ -1,51 +0,0 @@
|
||||
--- a/arch/mips/adm8668/net_core.c
|
||||
+++ b/arch/mips/adm8668/net_core.c
|
||||
@@ -133,7 +133,7 @@ tulip_open(struct net_device *dev)
|
||||
|
||||
tulip_init_ring (dev);
|
||||
|
||||
- retval = request_irq(dev->irq, tulip_interrupt, IRQF_SHARED, dev->name, dev);
|
||||
+ retval = request_irq(dev->irq, tulip_interrupt, 0, dev->name, dev);
|
||||
if (retval)
|
||||
goto free_ring;
|
||||
|
||||
@@ -469,7 +469,7 @@ static const struct net_device_ops tulip
|
||||
.ndo_tx_timeout = tulip_tx_timeout,
|
||||
.ndo_stop = tulip_close,
|
||||
.ndo_get_stats = tulip_get_stats,
|
||||
- .ndo_set_multicast_list = set_rx_mode,
|
||||
+ .ndo_set_rx_mode = set_rx_mode,
|
||||
.ndo_change_mtu = eth_change_mtu,
|
||||
.ndo_set_mac_address = eth_mac_addr,
|
||||
.ndo_validate_addr = eth_validate_addr,
|
||||
@@ -509,6 +509,7 @@ static int __devinit adm8668net_probe(st
|
||||
tp->dev = dev;
|
||||
tp->base_addr = ioaddr;
|
||||
tp->csr0 = csr0;
|
||||
+ tp->pdev = pdev;
|
||||
tp->rx_ring = dma_alloc_coherent(&pdev->dev,
|
||||
sizeof(struct tulip_rx_desc) * RX_RING_SIZE +
|
||||
sizeof(struct tulip_tx_desc) * TX_RING_SIZE,
|
||||
--- a/arch/mips/adm8668/net.h
|
||||
+++ b/arch/mips/adm8668/net.h
|
||||
@@ -12,6 +12,7 @@
|
||||
#define __NET_TULIP_H__
|
||||
|
||||
#include <linux/module.h>
|
||||
+#include <linux/export.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/mii.h>
|
||||
@@ -25,10 +26,10 @@
|
||||
#include <linux/delay.h>
|
||||
#include <linux/etherdevice.h>
|
||||
#include <linux/platform_device.h>
|
||||
+#include <linux/io.h>
|
||||
+#include <linux/interrupt.h>
|
||||
#include <asm/unaligned.h>
|
||||
#include <asm/uaccess.h>
|
||||
-#include <asm/io.h>
|
||||
-#include <asm/irq.h>
|
||||
|
||||
/* undefine, or define to various debugging levels (>4 == obscene levels) */
|
||||
#define TULIP_DEBUG 1
|
||||
@ -1,81 +0,0 @@
|
||||
--- a/drivers/mtd/maps/adm8668.c
|
||||
+++ b/drivers/mtd/maps/adm8668.c
|
||||
@@ -47,9 +47,7 @@
|
||||
#include <linux/mtd/mtd.h>
|
||||
#include <linux/mtd/map.h>
|
||||
#include <linux/slab.h>
|
||||
-#ifdef CONFIG_MTD_PARTITIONS
|
||||
#include <linux/mtd/partitions.h>
|
||||
-#endif
|
||||
#include <linux/crc32.h>
|
||||
#include <linux/magic.h>
|
||||
#include <asm/io.h>
|
||||
@@ -94,8 +92,6 @@ struct map_info adm8668_map = {
|
||||
bankwidth: BANKWIDTH,
|
||||
};
|
||||
|
||||
-#ifdef CONFIG_MTD_PARTITIONS
|
||||
-
|
||||
/*
|
||||
* Copied from mtdblock.c
|
||||
*
|
||||
@@ -238,7 +234,12 @@ init_mtd_partitions(struct mtd_info *mtd
|
||||
return NR_PARTS;
|
||||
|
||||
if (be32_to_cpu(uhdr.ih_size) != (linux_len - sizeof(uhdr))) {
|
||||
- unsigned char *block, *data = (unsigned char *)(WINDOW_ADDR | (adm8668_parts[PART_LINUX].offset + sizeof(struct uboot_header)) | 0xA0000000);
|
||||
+ unsigned char *block, *data;
|
||||
+ unsigned int offset;
|
||||
+
|
||||
+ offset = adm8668_parts[PART_LINUX].offset +
|
||||
+ sizeof(struct uboot_header);
|
||||
+ data = (unsigned char *)(WINDOW_ADDR | 0xA0000000 | offset);
|
||||
|
||||
printk(KERN_NOTICE "Updating U-boot image:\n");
|
||||
printk(KERN_NOTICE " old: [size: %8d crc32: 0x%08x]\n",
|
||||
@@ -279,16 +280,11 @@ init_mtd_partitions(struct mtd_info *mtd
|
||||
return NR_PARTS;
|
||||
}
|
||||
|
||||
-#endif
|
||||
-
|
||||
-
|
||||
int __init init_adm8668_map(void)
|
||||
{
|
||||
-#ifdef CONFIG_MTD_PARTITIONS
|
||||
int nr_parts, ret;
|
||||
-#endif
|
||||
|
||||
- adm8668_map.virt = (unsigned long)ioremap(WINDOW_ADDR, WINDOW_SIZE);
|
||||
+ adm8668_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE);
|
||||
|
||||
if (!adm8668_map.virt) {
|
||||
printk(KERN_ERR "Failed to ioremap\n");
|
||||
@@ -304,14 +300,12 @@ int __init init_adm8668_map(void)
|
||||
|
||||
adm8668_mtd->owner = THIS_MODULE;
|
||||
|
||||
-#ifdef CONFIG_MTD_PARTITIONS
|
||||
nr_parts = init_mtd_partitions(adm8668_mtd, adm8668_mtd->size);
|
||||
- ret = add_mtd_partitions(adm8668_mtd, adm8668_parts, nr_parts);
|
||||
+ ret = mtd_device_register(adm8668_mtd, adm8668_parts, nr_parts);
|
||||
if (ret) {
|
||||
- printk(KERN_ERR "Flash: add_mtd_partitions failed\n");
|
||||
+ printk(KERN_ERR "Flash: mtd_device_register failed\n");
|
||||
goto fail;
|
||||
}
|
||||
-#endif
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -326,9 +320,7 @@ int __init init_adm8668_map(void)
|
||||
|
||||
void __exit cleanup_adm8668_map(void)
|
||||
{
|
||||
-#ifdef CONFIG_MTD_PARTITIONS
|
||||
- del_mtd_partitions(adm8668_mtd);
|
||||
-#endif
|
||||
+ mtd_device_unregister(adm8668_mtd);
|
||||
map_destroy(adm8668_mtd);
|
||||
iounmap((void *) adm8668_map.virt);
|
||||
adm8668_map.virt = 0;
|
||||
Loading…
Reference in New Issue