[PATCH] Minor fixups for Ocelot-3 board

[PATCH] Minor fixups for Ocelot-3 board

[Manish Lachwani]

[-- Attachment #1: Type: text/plain, Size: 120 bytes --]

Hi Ralf,

Attached patch fixes minor issues with the Momentum Ocelot-3
code. Please review ...

Thanks
Manish Lachwani


[-- Attachment #2: common_mips_ocelot3_minor.patch --]
[-- Type: text/plain, Size: 1869 bytes --]

Index: linux/arch/mips/momentum/ocelot_3/prom.c
===================================================================
--- linux.orig/arch/mips/momentum/ocelot_3/prom.c
+++ linux/arch/mips/momentum/ocelot_3/prom.c
@@ -28,7 +28,6 @@
 
 #include <asm/addrspace.h>
 #include <asm/bootinfo.h>
-#include <asm/mv64340.h>
 #include <asm/pmon.h>
 #include "ocelot_3_fpga.h"
 
@@ -36,7 +35,7 @@
 extern unsigned long marvell_base;
 extern unsigned long cpu_clock;
 
-#ifdef CONFIG_MV64340_ETH
+#ifdef CONFIG_MV643XX_ETH
 extern unsigned char prom_mac_addr_base[6];
 #endif
 
@@ -45,7 +44,7 @@
 	return "Momentum Ocelot-3";
 }
 
-#ifdef CONFIG_MV64340_ETH
+#ifdef CONFIG_MV643XX_ETH
 void burn_clocks(void)
 {
 	int i;
@@ -230,7 +229,7 @@
 	mips_machgroup = MACH_GROUP_MOMENCO;
 	mips_machtype = MACH_MOMENCO_OCELOT_3;
 
-#ifdef CONFIG_MV64340_ETH
+#ifdef CONFIG_MV643XX_ETH
 	/* get the base MAC address for on-board ethernet ports */
 	get_mac(prom_mac_addr_base);
 #endif
Index: linux/arch/mips/kernel/irq-mv6434x.c
===================================================================
--- linux.orig/arch/mips/kernel/irq-mv6434x.c
+++ linux/arch/mips/kernel/irq-mv6434x.c
@@ -16,7 +16,7 @@
 #include <linux/kernel_stat.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/mv64340.h>
+#include <linux/mv643xx.h>
 
 static unsigned int irq_base;
 
Index: linux/arch/mips/pci/fixup-ocelot3.c
===================================================================
--- linux.orig/arch/mips/pci/fixup-ocelot3.c
+++ linux/arch/mips/pci/fixup-ocelot3.c
@@ -14,6 +14,15 @@
 #include <linux/pci.h>
 #include <asm/mipsregs.h>
 
+/* 
+ * Do platform specific device initialization at 
+ * pci_enable_device() time 
+ */
+int pcibios_plat_dev_init(struct pci_dev *dev)
+{
+	return 0;
+}
+
 int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
 	int bus = dev->bus->number;

Re: [PATCH] Minor fixups for Ocelot-3 board

[Ralf Baechle]

On Wed, Nov 24, 2004 at 10:22:02AM -0800, Manish Lachwani wrote:

> Attached patch fixes minor issues with the Momentum Ocelot-3
> code. Please review ...

I'm sure you meant apply ;-)

Done,

  Ralf