[PATCH] update MTD OF implementation

[Sergei Shtylyov]

Hello.

Vitaly Wool wrote:

> the patch below updates the powerpc part of the MTD OF implementation with the new field probe-type and also fixes the typos/build warning for rom.c.
> So therefore it in a way supersedes the patch from Geoff which can be seen at http://ozlabs.org/pipermail/linuxppc-dev/2006-December/028831.html.
> 
>  Documentation/powerpc/booting-without-of.txt |   19 +++++++++++--------
>  arch/powerpc/sysdev/rom.c                    |    1 +
>  2 files changed, 12 insertions(+), 8 deletions(-)
> 
> Signed-off-by: Vitaly Wool <vwool at ru.mvista.com>

Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>

> diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt
> index b3bd366..3399427 100644
> --- a/Documentation/powerpc/booting-without-of.txt
> +++ b/Documentation/powerpc/booting-without-of.txt
> @@ -1703,29 +1703,32 @@ platforms are moved over to use the flat
>      Required properties:
>  
>       - device_type : has to be "rom"
> -     - compatible : Should specify what this ROM device is compatible with
> -       (i.e. "onenand"). Currently, this is most likely to be "direct-mapped"
> -       (which corresponds to the MTD physmap mapping driver).
> -     - regs : Offset and length of the register set (or memory mapping) for
> +     - compatible : Should specify what this flash device is compatible with.
> +       Currently, this is most likely to be "direct-mapped" (which
> +       corresponds to the MTD physmap mapping driver).
> +     - reg : Offset and length of the register set (or memory mapping) for
>         the device.
> +     - bank-width : Width of the flash data bus in bytes. Required
> +       for the NOR flashes (compatible == "direct-mapped" and others) ONLY.
>  
>      Recommended properties :
>  
> -     - bank-width : Width of the flash data bus in bytes. Required
> -       for the NOR flashes (compatible == "direct-mapped" and others) ONLY.
>       - partitions : Several pairs of 32-bit values where the first value is
>         partition's offset from the start of the device and the second one is
>         partition size in bytes with LSB used to signify a read only
> -       partititon (so, the parition size should always be an even number).
> +       partition (so, the parition size should always be an even number).
>       - partition-names : The list of concatenated zero terminated strings
>         representing the partition names.
> +     - probe-type : The type of probe which should be done for the chip
> +       (JEDEC vs CFI actually). Valid ONLY for NOR flashes.
>  
>     Example:
>  
>   	flash at ff000000 {
>   		device_type = "rom";
>   		compatible = "direct-mapped";
> - 		regs = <ff000000 01000000>;
> + 		probe-type = "CFI";
> + 		reg = <ff000000 01000000>;
>   		bank-width = <4>;
>   		partitions = <00000000 00f80000
>   			      00f80000 00080001>;
> diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
> diff --git a/arch/powerpc/sysdev/rom.c b/arch/powerpc/sysdev/rom.c
> index bf5b3f1..c855a3b 100644
> --- a/arch/powerpc/sysdev/rom.c
> +++ b/arch/powerpc/sysdev/rom.c
> @@ -9,6 +9,7 @@
>  
>  #include <linux/kernel.h>
>  #include <asm/of_device.h>
> +#include <asm/of_platform.h>
>  
>  static int __init powerpc_flash_init(void)
>  {

WBR, Sergei