Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [NET] Eliminate user-selectable CONFIG_MV643XX_ETH_[012]
  [MIPS] Drop __init from init_8259A()
  [MIPS] Fix Kconfig typo bug
  [MIPS] Fix double signal on trap and break instruction
  [MIPS] sigset_32 has been made redundand by compat_sigset_t.
  [MIPS] emma2rh: Remove needless <asm/i8259.h> inclusion.
  [MIPS] Add MTD device support for Cobalt

2 files changed, 62 insertions, 0 deletions

diff --git a/arch/mips/cobalt/Makefile b/arch/mips/cobalt/Makefile
index 225ac8f34ccd..12589a1ff048 100644
--- a/arch/mips/cobalt/Makefile
+++ b/arch/mips/cobalt/Makefile
@@ -5,5 +5,6 @@
 obj-y    := irq.o reset.o setup.o
 
 obj-$(CONFIG_EARLY_PRINTK)      += console.o
+obj-$(CONFIG_MTD_PHYSMAP)       += mtd.o
 
 EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/cobalt/mtd.c b/arch/mips/cobalt/mtd.c
new file mode 100644
index 000000000000..01d8ec77fe9c
--- /dev/null
+++ b/arch/mips/cobalt/mtd.c
@@ -0,0 +1,61 @@
+/*
+ *  Registration of Cobalt MTD device.
+ *
+ *  Copyright (C) 2006  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
+
+static struct mtd_partition cobalt_mtd_partitions[] = {
+        {
+                .name   = "Colo",
+                .offset = 0x0,
+                .size   = 0x80000,
+        },
+};
+
+static struct physmap_flash_data cobalt_flash_data = {
+        .width          = 1,
+        .nr_parts       = 1,
+        .parts          = cobalt_mtd_partitions,
+};
+
+static struct resource cobalt_mtd_resource = {
+        .start  = 0x1fc00000,
+        .end    = 0x1fc7ffff,
+        .flags  = IORESOURCE_MEM,
+};
+
+static struct platform_device cobalt_mtd = {
+        .name           = "physmap-flash",
+        .dev            = {
+                .platform_data  = &cobalt_flash_data,
+        },
+        .num_resources  = 1,
+        .resource       = &cobalt_mtd_resource,
+};
+
+static int __init cobalt_mtd_init(void)
+{
+        platform_device_register(&cobalt_mtd);
+
+        return 0;
+}
+
+module_init(cobalt_mtd_init);