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

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

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 0f5ae3d2
...@@ -1475,7 +1475,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, ...@@ -1475,7 +1475,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
ENABLE_VPP(map); ENABLE_VPP(map);
xip_disable(map, chip, cmd_adr); 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". [...], 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 So we must check here and reset those bits if they're set. Otherwise
we're just pissing in the wind */ we're just pissing in the wind */
......
...@@ -349,12 +349,12 @@ static void print_cfi_ident(struct cfi_ident *cfip) ...@@ -349,12 +349,12 @@ static void print_cfi_ident(struct cfi_ident *cfip)
else else
printk("No Vpp line\n"); printk("No Vpp line\n");
printk("Typical byte/word write timeout: %d s\n", 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)); printk("Maximum byte/word write timeout: %d µs\n", (1<<cfip->WordWriteTimeoutMax) * (1<<cfip->WordWriteTimeoutTyp));
if (cfip->BufWriteTimeoutTyp || cfip->BufWriteTimeoutMax) { if (cfip->BufWriteTimeoutTyp || cfip->BufWriteTimeoutMax) {
printk("Typical full buffer write timeout: %d s\n", 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)); printk("Maximum full buffer write timeout: %d µs\n", (1<<cfip->BufWriteTimeoutMax) * (1<<cfip->BufWriteTimeoutTyp));
} }
else else
printk("Full buffer write not supported\n"); printk("Full buffer write not supported\n");
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* block2mtd.c - create an mtd from a block device * block2mtd.c - create an mtd from a block device
* *
* Copyright (C) 2001,2002 Simon Evans <spse@secret.org.uk> * 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 * Licence: GPL
*/ */
......
/** /**
* $Id: phram.c,v 1.16 2005/11/07 11:14:25 gleixner Exp $ * $Id: phram.c,v 1.16 2005/11/07 11:14:25 gleixner Exp $
* *
* Copyright (c) ???? Jochen Schuble <psionic@psionic.de> * Copyright (c) ???? Jochen Schäuble <psionic@psionic.de>
* Copyright (c) 2003-2004 Jrn Engel <joern@wh.fh-wedel.de> * Copyright (c) 2003-2004 Jörn Engel <joern@wh.fh-wedel.de>
* *
* Usage: * Usage:
* *
...@@ -300,5 +300,5 @@ module_init(init_phram); ...@@ -300,5 +300,5 @@ module_init(init_phram);
module_exit(cleanup_phram); module_exit(cleanup_phram);
MODULE_LICENSE("GPL"); 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"); MODULE_DESCRIPTION("MTD driver for physical RAM");
/* /*
* 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 $ * $Id: cfi_flagadm.c,v 1.15 2005/11/07 11:14:26 gleixner Exp $
* *
...@@ -135,5 +135,5 @@ module_exit(cleanup_flagadm); ...@@ -135,5 +135,5 @@ module_exit(cleanup_flagadm);
MODULE_LICENSE("GPL"); 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"); MODULE_DESCRIPTION("MTD map driver for Flaga digital module");
...@@ -122,5 +122,5 @@ module_exit(cleanup_dbox2_flash); ...@@ -122,5 +122,5 @@ module_exit(cleanup_dbox2_flash);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Kri Davsson <kd@flaga.is>, Bastian Blank <waldi@tuxbox.org>, Alexander Wild <wild@te-elektronik.com>"); MODULE_AUTHOR("Kári Davíðsson <kd@flaga.is>, Bastian Blank <waldi@tuxbox.org>, Alexander Wild <wild@te-elektronik.com>");
MODULE_DESCRIPTION("MTD map driver for D-Box 2 board"); MODULE_DESCRIPTION("MTD map driver for D-Box 2 board");
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* $Id: mtx-1_flash.c,v 1.2 2005/11/07 11:14:27 gleixner Exp $ * $Id: mtx-1_flash.c,v 1.2 2005/11/07 11:14:27 gleixner Exp $
* *
* (C) 2005 Bruno Randolf <bruno.randolf@4g-systems.biz> * (C) 2005 Bruno Randolf <bruno.randolf@4g-systems.biz>
* (C) 2005 Jrn Engel <joern@wohnheim.fh-wedel.de> * (C) 2005 Jörn Engel <joern@wohnheim.fh-wedel.de>
* *
*/ */
......
/* /*
* drivers/mtd/nand/edb7312.c * drivers/mtd/nand/edb7312.c
* *
* Copyright (C) 2002 Marius Grger (mag@sysgo.de) * Copyright (C) 2002 Marius Gröger (mag@sysgo.de)
* *
* Derived from drivers/mtd/nand/autcpu12.c * Derived from drivers/mtd/nand/autcpu12.c
* Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de) * Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Copyright (C) 2003 Joshua Wise (joshua@joshuawise.com) * Copyright (C) 2003 Joshua Wise (joshua@joshuawise.com)
* *
* Derived from drivers/mtd/nand/edb7312.c * Derived from drivers/mtd/nand/edb7312.c
* Copyright (C) 2002 Marius Grger (mag@sysgo.de) * Copyright (C) 2002 Marius Gröger (mag@sysgo.de)
* Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de) * Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de)
* *
* $Id: h1910.c,v 1.6 2005/11/07 11:14:30 gleixner Exp $ * $Id: h1910.c,v 1.6 2005/11/07 11:14:30 gleixner Exp $
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Copyright (C) 2004 Technologic Systems (support@embeddedARM.com) * Copyright (C) 2004 Technologic Systems (support@embeddedARM.com)
* *
* Derived from drivers/mtd/nand/edb7312.c * Derived from drivers/mtd/nand/edb7312.c
* Copyright (C) 2004 Marius Grger (mag@sysgo.de) * Copyright (C) 2004 Marius Gröger (mag@sysgo.de)
* *
* Derived from drivers/mtd/nand/autcpu12.c * Derived from drivers/mtd/nand/autcpu12.c
* Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de) * Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de)
......
...@@ -61,7 +61,7 @@ struct mtd_info { ...@@ -61,7 +61,7 @@ struct mtd_info {
u_int32_t flags; u_int32_t flags;
u_int32_t size; // Total size of the MTD u_int32_t size; // Total size of the MTD
/* "Major" erase size for the device. Nave users may take this /* "Major" erase size for the device. Naïve users may take this
* to be the only erase size available, or may use the more detailed * to be the only erase size available, or may use the more detailed
* information below if they desire * information below if they desire
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment