Commit 151e7659 authored by David Woodhouse's avatar David Woodhouse
Browse files

[MTD] Fix legacy character sets throughout drivers/mtd, include/linux/mtd 



Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 0f5ae3d2

drivers/mtd/chips/cfi_cmdset_0001.c

+1 −1
Original line number Diff line number Diff line
@@ -1475,7 +1475,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, 
	ENABLE_VPP(map);

	xip_disable(map, chip, cmd_adr);



	/* 4.8 of the 28FxxxJ3A datasheet says "Any time SR.4 and/or SR.5 is set

	/* §4.8 of the 28FxxxJ3A datasheet says "Any time SR.4 and/or SR.5 is set

	   [...], the device will not accept any more Write to Buffer commands".

	   So we must check here and reset those bits if they're set. Otherwise

	   we're just pissing in the wind */

drivers/mtd/chips/cfi_probe.c

+4 −4
Original line number Diff line number Diff line
@@ -349,12 +349,12 @@ static void print_cfi_ident(struct cfi_ident *cfip) 
	else

		printk("No Vpp line\n");



	printk("Typical byte/word write timeout: %d s\n", 1<<cfip->WordWriteTimeoutTyp);

	printk("Maximum byte/word write timeout: %d s\n", (1<<cfip->WordWriteTimeoutMax) * (1<<cfip->WordWriteTimeoutTyp));

	printk("Typical byte/word write timeout: %d µs\n", 1<<cfip->WordWriteTimeoutTyp);

	printk("Maximum byte/word write timeout: %d µs\n", (1<<cfip->WordWriteTimeoutMax) * (1<<cfip->WordWriteTimeoutTyp));



	if (cfip->BufWriteTimeoutTyp || cfip->BufWriteTimeoutMax) {

		printk("Typical full buffer write timeout: %d s\n", 1<<cfip->BufWriteTimeoutTyp);

		printk("Maximum full buffer write timeout: %d s\n", (1<<cfip->BufWriteTimeoutMax) * (1<<cfip->BufWriteTimeoutTyp));

		printk("Typical full buffer write timeout: %d µs\n", 1<<cfip->BufWriteTimeoutTyp);

		printk("Maximum full buffer write timeout: %d µs\n", (1<<cfip->BufWriteTimeoutMax) * (1<<cfip->BufWriteTimeoutTyp));

	}

	else

		printk("Full buffer write not supported\n");

drivers/mtd/devices/block2mtd.c

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * block2mtd.c - create an mtd from a block device

 *

 * Copyright (C) 2001,2002	Simon Evans <spse@secret.org.uk>

 * Copyright (C) 2004-2006	Jrn Engel <joern@wh.fh-wedel.de>

 * Copyright (C) 2004-2006	Jörn Engel <joern@wh.fh-wedel.de>

 *

 * Licence: GPL

 */

drivers/mtd/devices/phram.c

+3 −3
Original line number Diff line number Diff line 
/**

 * $Id: phram.c,v 1.16 2005/11/07 11:14:25 gleixner Exp $

 *

 * Copyright (c) ????		Jochen Schuble <psionic@psionic.de>

 * Copyright (c) 2003-2004	Jrn Engel <joern@wh.fh-wedel.de>

 * Copyright (c) ????		Jochen Schäuble <psionic@psionic.de>

 * Copyright (c) 2003-2004	Jörn Engel <joern@wh.fh-wedel.de>

 *

 * Usage:

 *
@@ -300,5 +300,5 @@ module_init(init_phram); 
module_exit(cleanup_phram);



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Jrn Engel <joern@wh.fh-wedel.de>");

MODULE_AUTHOR("Jörn Engel <joern@wh.fh-wedel.de>");

MODULE_DESCRIPTION("MTD driver for physical RAM");

drivers/mtd/maps/cfi_flagadm.c

+2 −2
Original line number Diff line number Diff line 
/*

 *  Copyright  2001 Flaga hf. Medical Devices, Kri Davsson <kd@flaga.is>

 *  Copyright © 2001 Flaga hf. Medical Devices, Kári Davíðsson <kd@flaga.is>

 *

 *  $Id: cfi_flagadm.c,v 1.15 2005/11/07 11:14:26 gleixner Exp $

 *
@@ -135,5 +135,5 @@ module_exit(cleanup_flagadm); 




MODULE_LICENSE("GPL");

MODULE_AUTHOR("Kri Davsson <kd@flaga.is>");

MODULE_AUTHOR("Kári Davíðsson <kd@flaga.is>");

MODULE_DESCRIPTION("MTD map driver for Flaga digital module");