r1697 - in trunk/linux-2.6.x

[dslinux_amadeus at dslinux.in-berlin.de]

Author: amadeus
Date: 2007-03-30 12:59:10 +0200 (Fri, 30 Mar 2007)
New Revision: 1697

Log:
dldi return code improved and EZ-V Expansion pack added

Modified: trunk/linux-2.6.x/arch/arm/mach-nds/head.S
===================================================================
--- trunk/linux-2.6.x/arch/arm/mach-nds/head.S	2007-03-25 18:29:48 UTC (rev 1696)
+++ trunk/linux-2.6.x/arch/arm/mach-nds/head.S	2007-03-30 10:59:10 UTC (rev 1697)
@@ -213,6 +213,7 @@
 #endif
 #ifdef CONFIG_NDS_DLDI
 	op_set_ram	@ switch to RAM mode
+	ez_set_ram	@ the EZ-V Expansion pack
 #endif
 	@ more activation for other cards here
 

Modified: trunk/linux-2.6.x/drivers/block/dldi_s.S
===================================================================
--- trunk/linux-2.6.x/drivers/block/dldi_s.S	2007-03-25 18:29:48 UTC (rev 1696)
+++ trunk/linux-2.6.x/drivers/block/dldi_s.S	2007-03-30 10:59:10 UTC (rev 1697)
@@ -105,8 +105,8 @@
 	ldr	lr,[ip,#4]		@ restore link register
 	@ Restore Write Buffer
 	@	      gGViWDMI
-	ldr	r0,=0b11111010
-	mcr	p15, 0, r0, c3, c0, 0
+	ldr	ip,=0b11111010
+	mcr	p15, 0, ip, c3, c0, 0
 	@ enable interrupts
 	ldr	r3, =NDS_IME		@ interrupt mask register
 	mov	ip, #1			@ 1 = enable
@@ -115,7 +115,7 @@
 
 	.pool
 	.align
-	.space	4096	
+	.space	1024			@ allows for one physical sector and more	
 _stack_dldi:
 	.space	4			@ for safety
 _buf_dldi:

Modified: trunk/linux-2.6.x/include/asm-arm/arch-nds/gbarom-macro.S
===================================================================
--- trunk/linux-2.6.x/include/asm-arm/arch-nds/gbarom-macro.S	2007-03-25 18:29:48 UTC (rev 1696)
+++ trunk/linux-2.6.x/include/asm-arm/arch-nds/gbarom-macro.S	2007-03-30 10:59:10 UTC (rev 1697)
@@ -211,3 +211,25 @@
 	.endm
 
 /*****************************************************************************/
+/*
+ * EZ-V Expansion pack RAM switching.
+ */
+	.macro	ez_set_ram
+	ldr	r2, =0xd200
+	ldr	r3, =0x1500
+	ldr	ip, =0x9fe0000
+	strh	r2, [ip]
+	ldr	ip, =0x8000000
+	strh	r3, [ip]
+	ldr	ip, =0x8020000
+	strh	r2, [ip]
+	ldr	ip, =0x8040000
+	strh	r3, [ip]
+	ldr	r2, =0xA500
+	ldr	ip, =0x9C40000
+	strh	r2, [ip]
+	ldr	ip, =0x9fc0000
+	strh	r3, [ip]
+	.endm
+
+/*****************************************************************************/