Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7f786e0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e5717c48 f00a3ec4

arch/mips/cobalt/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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)

arch/mips/cobalt/mtd.c

0 → 100644
+61 −0
Original line number Diff line number Diff line 
/*

 *  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);

arch/mips/configs/cobalt_defconfig

+84 −2
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.20

# Sun Feb 18 21:27:37 2007

# Mon Feb 19 14:51:58 2007

#

CONFIG_MIPS=y
@@ -373,7 +373,88 @@ CONFIG_PROC_EVENTS=y 
#

# Memory Technology Devices (MTD)

#

# CONFIG_MTD is not set

CONFIG_MTD=y

# CONFIG_MTD_DEBUG is not set

# CONFIG_MTD_CONCAT is not set

CONFIG_MTD_PARTITIONS=y

# CONFIG_MTD_REDBOOT_PARTS is not set

# CONFIG_MTD_CMDLINE_PARTS is not set



#

# User Modules And Translation Layers

#

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLKDEVS=y

# CONFIG_MTD_BLOCK is not set

# CONFIG_MTD_BLOCK_RO is not set

# CONFIG_FTL is not set

# CONFIG_NFTL is not set

# CONFIG_INFTL is not set

# CONFIG_RFD_FTL is not set

# CONFIG_SSFDC is not set



#

# RAM/ROM/Flash chip drivers

#

# CONFIG_MTD_CFI is not set

CONFIG_MTD_JEDECPROBE=y

CONFIG_MTD_GEN_PROBE=y

# CONFIG_MTD_CFI_ADV_OPTIONS is not set

CONFIG_MTD_MAP_BANK_WIDTH_1=y

CONFIG_MTD_MAP_BANK_WIDTH_2=y

CONFIG_MTD_MAP_BANK_WIDTH_4=y

# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set

# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set

# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set

CONFIG_MTD_CFI_I1=y

CONFIG_MTD_CFI_I2=y

# CONFIG_MTD_CFI_I4 is not set

# CONFIG_MTD_CFI_I8 is not set

# CONFIG_MTD_CFI_INTELEXT is not set

CONFIG_MTD_CFI_AMDSTD=y

# CONFIG_MTD_CFI_STAA is not set

CONFIG_MTD_CFI_UTIL=y

# CONFIG_MTD_RAM is not set

# CONFIG_MTD_ROM is not set

# CONFIG_MTD_ABSENT is not set

# CONFIG_MTD_OBSOLETE_CHIPS is not set



#

# Mapping drivers for chip access

#

# CONFIG_MTD_COMPLEX_MAPPINGS is not set

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_PHYSMAP_START=0x0

CONFIG_MTD_PHYSMAP_LEN=0

CONFIG_MTD_PHYSMAP_BANKWIDTH=0

# CONFIG_MTD_PLATRAM is not set



#

# Self-contained MTD device drivers

#

# CONFIG_MTD_PMC551 is not set

# CONFIG_MTD_SLRAM is not set

# CONFIG_MTD_PHRAM is not set

# CONFIG_MTD_MTDRAM is not set

# CONFIG_MTD_BLOCK2MTD is not set



#

# Disk-On-Chip Device Drivers

#

# CONFIG_MTD_DOC2000 is not set

# CONFIG_MTD_DOC2001 is not set

# CONFIG_MTD_DOC2001PLUS is not set



#

# NAND Flash Device Drivers

#

# CONFIG_MTD_NAND is not set

# CONFIG_MTD_NAND_CAFE is not set



#

# OneNAND Flash Device Drivers

#

# CONFIG_MTD_ONENAND is not set



#

# Parallel port support
@@ -901,6 +982,7 @@ CONFIG_CONFIGFS_FS=y 
# CONFIG_BEFS_FS is not set

# CONFIG_BFS_FS is not set

# CONFIG_EFS_FS is not set

# CONFIG_JFFS2_FS is not set

# CONFIG_CRAMFS is not set

# CONFIG_VXFS_FS is not set

# CONFIG_HPFS_FS is not set

arch/mips/emma2rh/common/irq.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/irq.h>

#include <linux/types.h>



#include <asm/i8259.h>

#include <asm/system.h>

#include <asm/mipsregs.h>

#include <asm/debug.h>

arch/mips/emma2rh/markeins/irq.c

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <linux/ptrace.h>

#include <linux/delay.h>



#include <asm/i8259.h>

#include <asm/irq_cpu.h>

#include <asm/system.h>

#include <asm/mipsregs.h>