From: Manish Lachwani <mlachwani@prometheus.mvista.com>
To: linux-mips@linux-mips.org
Cc: ralf@linux-mips.org
Subject: [PATCH] Minor fixups for Ocelot-3 board
Date: Wed, 24 Nov 2004 10:22:02 -0800 [thread overview]
Message-ID: <20041124182202.GA15917@prometheus.mvista.com> (raw)
[-- 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;
next reply other threads:[~2004-11-24 18:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-11-24 18:22 Manish Lachwani [this message]
2004-11-24 19:51 ` [PATCH] Minor fixups for Ocelot-3 board Ralf Baechle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20041124182202.GA15917@prometheus.mvista.com \
--to=mlachwani@prometheus.mvista.com \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox