[PATCH 120] Amiga Zorro bus doc updates

[PATCH 120] Amiga Zorro bus doc updates

[Geert Uytterhoeven]

Amiga Zorro bus: Update the docs to match the current situation.

--- linux-2.4.23-pre5/Documentation/zorro.txt	21 Oct 2001 23:54:30 -0000	1.1.1.1
+++ linux-m68k-2.4.23-pre5/Documentation/zorro.txt	23 Sep 2003 13:03:44 -0000
@@ -2,7 +2,7 @@
 		----------------------------------------
 
 Written by Geert Uytterhoeven <geert@linux-m68k.org>
-Last revised: February 27, 2000
+Last revised: September 5, 2003
 
 
 1. Introduction
@@ -77,7 +77,7 @@
 The treatment of these regions depends on the type of Zorro space:
 
   - Zorro II address space is always mapped and does not have to be mapped
-    explicitly using ioremap().
+    explicitly using z_ioremap().
     
     Conversion from bus/physical Zorro II addresses to kernel virtual addresses
     and vice versa is done using:
@@ -85,22 +85,20 @@
 	virt_addr = ZTWO_VADDR(bus_addr);
 	bus_addr = ZTWO_PADDR(virt_addr);
 
-  - Zorro III address space must be mapped explicitly using ioremap() first
+  - Zorro III address space must be mapped explicitly using z_ioremap() first
     before it can be accessed:
  
-	virt_addr = ioremap(bus_addr, size);
+	virt_addr = z_ioremap(bus_addr, size);
 	...
-	iounmap(virt_addr);
+	z_iounmap(virt_addr);
 
 
 5. References
 -------------
 
 linux/include/linux/zorro.h
-linux/include/linux/ioport.h
-linux/include/asm-m68k/io.h
-linux/include/asm-m68k/amigahw.h
-linux/include/asm-ppc/io.h
+linux/include/asm-{m68k,ppc}/zorro.h
+linux/include/linux/zorro_ids.h
 linux/drivers/zorro
 /proc/bus/zorro
 

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Email address

[Marcelo Tosatti]

On Fri, 26 Sep 2003, Geert Uytterhoeven wrote:

> Amiga Zorro bus: Update the docs to match the current situation.

+> --- linux-2.4.23-pre5/Documentation/zorro.txt	21 Oct 2001 
23:54:30 -0000	1.1.1.1
> +++ linux-m68k-2.4.23-pre5/Documentation/zorro.txt	23 Sep 2003 13:03:44 -0000
> @@ -2,7 +2,7 @@
>  		----------------------------------------
>  
>  Written by Geert Uytterhoeven <geert@linux-m68k.org>
> -Last revised: February 27, 2000
> +Last revised: September 5, 2003
>  
>  
>  1. Introduction
> @@ -77,7 +77,7 @@
>  The treatment of these regions depends on the type of Zorro space:
>  
>    - Zorro II address space is always mapped and does not have to be mapped
> -    explicitly using ioremap().
> +    explicitly using z_ioremap().
>      
>      Conversion from bus/physical Zorro II addresses to kernel virtual addresses
>      and vice versa is done using:
> @@ -85,22 +85,20 @@
>  	virt_addr = ZTWO_VADDR(bus_addr);
>  	bus_addr = ZTWO_PADDR(virt_addr);
>  
> -  - Zorro III address space must be mapped explicitly using ioremap() first
> +  - Zorro III address space must be mapped explicitly using z_ioremap() first
>      before it can be accessed:
>   
> -	virt_addr = ioremap(bus_addr, size);
> +	virt_addr = z_ioremap(bus_addr, size);
>  	...
> -	iounmap(virt_addr);
> +	z_iounmap(virt_addr);
>  
>  
>  5. References
>  -------------
>  
>  linux/include/linux/zorro.h
> -linux/include/linux/ioport.h
> -linux/include/asm-m68k/io.h
> -linux/include/asm-m68k/amigahw.h
> -linux/include/asm-ppc/io.h
> +linux/include/asm-{m68k,ppc}/zorro.h
> +linux/include/linux/zorro_ids.h
>  linux/drivers/zorro
>  /proc/bus/zorro
>  
> 
> Gr{oetje,eeting}s,
> 
> 						Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> 							    -- Linus Torvalds
> 

Email address

[Marcelo Tosatti]

On Fri, 26 Sep 2003, Geert Uytterhoeven wrote:

> Amiga Zorro bus: Update the docs to match the current situation.

Sorry for the first bogus message.

Please use marcelo.tosatti@cyclades.com in future messages. 

Thanks