mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-28 04:44:03 +02:00
More bcm963xx fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5852 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
610b921322
commit
319225a9d4
@ -777,11 +777,8 @@ CONFIG_MTD_OBSOLETE_CHIPS=y
|
|||||||
# Mapping drivers for chip access
|
# Mapping drivers for chip access
|
||||||
#
|
#
|
||||||
CONFIG_MTD_COMPLEX_MAPPINGS=y
|
CONFIG_MTD_COMPLEX_MAPPINGS=y
|
||||||
CONFIG_MTD_PHYSMAP=y
|
# CONFIG_MTD_PHYSMAP is not set
|
||||||
CONFIG_MTD_PHYSMAP_START=0xBFC00000
|
CONFIG_MTD_BCM963XX=y
|
||||||
CONFIG_MTD_PHYSMAP_LEN=0x400000
|
|
||||||
CONFIG_MTD_PHYSMAP_BANKWIDTH=2
|
|
||||||
# CONFIG_MTD_BCM963XX is not set
|
|
||||||
# CONFIG_MTD_CSTM_MIPS_IXX is not set
|
# CONFIG_MTD_CSTM_MIPS_IXX is not set
|
||||||
# CONFIG_MTD_PCI is not set
|
# CONFIG_MTD_PCI is not set
|
||||||
# CONFIG_MTD_PLATRAM is not set
|
# CONFIG_MTD_PLATRAM is not set
|
||||||
|
@ -6899,7 +6899,7 @@ diff -urN linux-2.6.19/arch/mips/bcm963xx/irq.c linux-2.6.19.new/arch/mips/bcm96
|
|||||||
+ irq_desc[i].status = IRQ_DISABLED;
|
+ irq_desc[i].status = IRQ_DISABLED;
|
||||||
+ irq_desc[i].action = 0;
|
+ irq_desc[i].action = 0;
|
||||||
+ irq_desc[i].depth = 1;
|
+ irq_desc[i].depth = 1;
|
||||||
+ irq_desc[i].handler_data = &brcm_irq_type;
|
+ irq_desc[i].chip = &brcm_irq_type;
|
||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
@ -6941,7 +6941,7 @@ diff -urN linux-2.6.19/arch/mips/bcm963xx/irq.c linux-2.6.19.new/arch/mips/bcm96
|
|||||||
+ * explicitly call BcmHalInterruptEnable or enable_brcm_irq. This behavior
|
+ * explicitly call BcmHalInterruptEnable or enable_brcm_irq. This behavior
|
||||||
+ * is consistent with interrupt handling on VxWorks.
|
+ * is consistent with interrupt handling on VxWorks.
|
||||||
+ */
|
+ */
|
||||||
+ irq_desc[interruptId].handler_data = &brcm_irq_no_end_type;
|
+ irq_desc[interruptId].chip = &brcm_irq_no_end_type;
|
||||||
+
|
+
|
||||||
+ if( interruptId >= INTERNAL_ISR_TABLE_OFFSET )
|
+ if( interruptId >= INTERNAL_ISR_TABLE_OFFSET )
|
||||||
+ {
|
+ {
|
||||||
@ -7297,7 +7297,7 @@ diff -urN linux-2.6.19/arch/mips/bcm963xx/ser_init.c linux-2.6.19.new/arch/mips/
|
|||||||
diff -urN linux-2.6.19/arch/mips/bcm963xx/setup.c linux-2.6.19.new/arch/mips/bcm963xx/setup.c
|
diff -urN linux-2.6.19/arch/mips/bcm963xx/setup.c linux-2.6.19.new/arch/mips/bcm963xx/setup.c
|
||||||
--- linux-2.6.19/arch/mips/bcm963xx/setup.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.19/arch/mips/bcm963xx/setup.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.19.new/arch/mips/bcm963xx/setup.c 2006-12-16 18:46:31.000000000 +0100
|
+++ linux-2.6.19.new/arch/mips/bcm963xx/setup.c 2006-12-16 18:46:31.000000000 +0100
|
||||||
@@ -0,0 +1,524 @@
|
@@ -0,0 +1,523 @@
|
||||||
+/*
|
+/*
|
||||||
+<:copyright-gpl
|
+<:copyright-gpl
|
||||||
+ Copyright 2002 Broadcom Corp. All Rights Reserved.
|
+ Copyright 2002 Broadcom Corp. All Rights Reserved.
|
||||||
@ -7341,7 +7341,6 @@ diff -urN linux-2.6.19/arch/mips/bcm963xx/setup.c linux-2.6.19.new/arch/mips/bcm
|
|||||||
+#include <asm/gdb-stub.h>
|
+#include <asm/gdb-stub.h>
|
||||||
+
|
+
|
||||||
+extern void brcm_time_init(void);
|
+extern void brcm_time_init(void);
|
||||||
+extern void brcm_timer_setup(struct irqaction *irq);
|
|
||||||
+extern unsigned long getMemorySize(void);
|
+extern unsigned long getMemorySize(void);
|
||||||
+
|
+
|
||||||
+#if defined(CONFIG_BCM96348) && defined(CONFIG_PCI)
|
+#if defined(CONFIG_BCM96348) && defined(CONFIG_PCI)
|
||||||
@ -7831,7 +7830,7 @@ diff -urN linux-2.6.19/arch/mips/bcm963xx/softdsl/AdslCoreDefs.h linux-2.6.19.ne
|
|||||||
diff -urN linux-2.6.19/arch/mips/bcm963xx/time.c linux-2.6.19.new/arch/mips/bcm963xx/time.c
|
diff -urN linux-2.6.19/arch/mips/bcm963xx/time.c linux-2.6.19.new/arch/mips/bcm963xx/time.c
|
||||||
--- linux-2.6.19/arch/mips/bcm963xx/time.c 1970-01-01 01:00:00.000000000 +0100
|
--- linux-2.6.19/arch/mips/bcm963xx/time.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-2.6.19.new/arch/mips/bcm963xx/time.c 2006-12-16 18:46:31.000000000 +0100
|
+++ linux-2.6.19.new/arch/mips/bcm963xx/time.c 2006-12-16 18:46:31.000000000 +0100
|
||||||
@@ -0,0 +1,119 @@
|
@@ -0,0 +1,114 @@
|
||||||
+/*
|
+/*
|
||||||
+<:copyright-gpl
|
+<:copyright-gpl
|
||||||
+ Copyright 2004 Broadcom Corp. All Rights Reserved.
|
+ Copyright 2004 Broadcom Corp. All Rights Reserved.
|
||||||
@ -7940,17 +7939,12 @@ diff -urN linux-2.6.19/arch/mips/bcm963xx/time.c linux-2.6.19.new/arch/mips/bcm9
|
|||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
+void __init brcm_timer_setup(struct irqaction *irq)
|
+void __init plat_timer_setup(struct irqaction *irq)
|
||||||
+{
|
+{
|
||||||
+ r4k_cur = (read_c0_count() + r4k_offset);
|
+ r4k_cur = (read_c0_count() + r4k_offset);
|
||||||
+ write_c0_compare(r4k_cur);
|
+ write_c0_compare(r4k_cur);
|
||||||
+ set_c0_status(IE_IRQ5);
|
+ set_c0_status(IE_IRQ5);
|
||||||
+}
|
+}
|
||||||
+
|
|
||||||
+void __init plat_timer_setup(struct irqaction *irq)
|
|
||||||
+{
|
|
||||||
+ brcm_timer_setup(irq);
|
|
||||||
+}
|
|
||||||
diff -urN linux-2.6.19/arch/mips/kernel/cpu-probe.c linux-2.6.19.new/arch/mips/kernel/cpu-probe.c
|
diff -urN linux-2.6.19/arch/mips/kernel/cpu-probe.c linux-2.6.19.new/arch/mips/kernel/cpu-probe.c
|
||||||
--- linux-2.6.19/arch/mips/kernel/cpu-probe.c 2006-11-29 22:57:37.000000000 +0100
|
--- linux-2.6.19/arch/mips/kernel/cpu-probe.c 2006-11-29 22:57:37.000000000 +0100
|
||||||
+++ linux-2.6.19.new/arch/mips/kernel/cpu-probe.c 2006-12-16 18:46:31.000000000 +0100
|
+++ linux-2.6.19.new/arch/mips/kernel/cpu-probe.c 2006-12-16 18:46:31.000000000 +0100
|
||||||
|
Loading…
Reference in New Issue
Block a user