PERFORCE change 175450 for review

Rafal Jaworowski raj at FreeBSD.org
Sun Mar 7 15:33:22 UTC 2010


http://p4web.freebsd.org/chv.cgi?CH=175450

Change 175450 by raj at raj_nand on 2010/03/07 15:32:38

	Prepare Marvell DB-78XXX to use its NAND controller.
	
	This is going to be our guinea pig target for the NAND-related work.
	
	Obtained from:	Juniper Networks, Semihalf

Affected files ...

.. //depot/projects/nand2/sys/arm/mv/discovery/db78xxx.c#2 edit
.. //depot/projects/nand2/sys/arm/mv/discovery/discovery.c#2 edit
.. //depot/projects/nand2/sys/arm/mv/mvwin.h#2 edit

Differences ...

==== //depot/projects/nand2/sys/arm/mv/discovery/db78xxx.c#2 (text+ko) ====

@@ -95,6 +95,13 @@
 		VM_PROT_READ | VM_PROT_WRITE,
 		PTE_NOCACHE,
 	},
+	{ /* NAND */
+		MV_DEV_CS2_PHYS_BASE,
+		MV_DEV_CS2_PHYS_BASE,
+		MV_DEV_CS2_SIZE,
+		VM_PROT_READ | VM_PROT_WRITE,
+		PTE_NOCACHE,
+	},
 	{ 0, 0, 0, 0, 0, }
 };
 

==== //depot/projects/nand2/sys/arm/mv/discovery/discovery.c#2 (text+ko) ====

@@ -99,6 +99,12 @@
 		{ -1 },
 		CPU_PM_CTRL_XOR
 	},
+	{ "nand", MV_NAND_BASE, MV_NAND_SIZE,
+		{ -1 },
+		{ -1 },
+		CPU_PM_CTRL_NONE
+	},
+
 	{ "ehci", MV_USB0_BASE, MV_USB_SIZE,
 		{ MV_INT_USB_ERR, MV_INT_USB0, -1 },
 		{ -1 },

==== //depot/projects/nand2/sys/arm/mv/mvwin.h#2 (text+ko) ====

@@ -71,6 +71,7 @@
 /* CS2: 32MB NAND FLASH */
 #define MV_DEV_CS2_PHYS_BASE	(MV_DEV_CS1_PHYS_BASE + MV_DEV_CS1_SIZE)
 #define MV_DEV_CS2_SIZE	1024	/* XXX u-boot has 1MB */
+#define MV_NAND_FLASH		MV_DEV_CS2_PHYS_BASE
 
 #define MV_CESA_SRAM_PHYS_BASE	0xFD000000
 #define MV_CESA_SRAM_BASE	MV_CESA_SRAM_PHYS_BASE /* VA == PA mapping */
@@ -91,6 +92,8 @@
 #define MV_GPIO_SIZE		0x20
 #define MV_RTC_BASE		(MV_BASE + 0x10300)
 #define MV_RTC_SIZE		0x08
+#define MV_NAND_BASE		(MV_BASE + 0x10400)
+#define MV_NAND_SIZE		0x80
 #define MV_TWSI0_BASE		(MV_BASE + 0x11000)
 #define MV_TWSI1_BASE		(MV_BASE + 0x11100)
 #define MV_TWSI_SIZE		0x20


More information about the p4-projects mailing list