Skip to contentSkip to conversation

powerpc: Warp patches for the new ndfc driver

PATCH In review Sean MacLennan 2 participants 3 messages Jan 10, 2009 – Jan 20, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc: Warp patches for the new ndfc driver

Woo hoo! The ndfc driver finally got in the kernel! These patches update the warp to use the new driver.

Cheers,
Sean

These patches allow the warp to use the new of platform ndfc driver.
- warp.dts changed to work with ndfc
- warp-nand.c no longer needed
- removed obsolete rev A support from cuboot-warp.c

---

arch/powerpc/boot/cuboot-warp.c +0 -43
index 2178021..806df69 100644
@@ -18,57 +18,14 @@
 
 static bd_t bd;
 
-static void warp_fixup_one_nor(u32 from, u32 to)
-{
-	void *devp;
-	char name[50];
-	u32 v[2];
-
-	sprintf(name, "/plb/opb/ebc/nor_flash@0,0/partition@%x", from);
-
-	devp = finddevice(name);
-	if (!devp)
-		return;
-
-	if (getprop(devp, "reg", v, sizeof(v)) == sizeof(v)) {
-		v[0] = to;
-		setprop(devp, "reg", v, sizeof(v));
-
-		printf("NOR 64M fixup %x -> %x\r\n", from, to);
-	}
-}
-
-
 static void warp_fixups(void)
 {
 	ibm440ep_fixup_clocks(66000000, 11059200, 50000000);
 	ibm4xx_sdram_fixup_memsize();
 	ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
 	dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
-
-	/* Fixup for 64M flash on Rev A boards. */
-	if (bd.bi_flashsize == 0x4000000) {
-		void *devp;
-		u32 v[3];
-
-		devp = finddevice("/plb/opb/ebc/nor_flash@0,0");
-		if (!devp)
-			return;
-
-		/* Fixup the size */
-		if (getprop(devp, "reg", v, sizeof(v)) == sizeof(v)) {
-			v[2] = bd.bi_flashsize;
-			setprop(devp, "reg", v, sizeof(v));
-		}
-
-		/* Fixup parition offsets */
-		warp_fixup_one_nor(0x300000, 0x3f00000);
-		warp_fixup_one_nor(0x340000, 0x3f40000);
-		warp_fixup_one_nor(0x380000, 0x3f80000);
-	}
 }
 
-
 void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 		   unsigned long r6, unsigned long r7)
 {
arch/powerpc/boot/dts/warp.dts +41 -1

59 lines not on this page · raw message

arch/powerpc/platforms/44x/Makefile +0 -1
index 6981331..01f51da 100644
@@ -3,5 +3,4 @@ obj-$(CONFIG_PPC44x_SIMPLE) += ppc44x_simple.o
 obj-$(CONFIG_EBONY)	+= ebony.o
 obj-$(CONFIG_SAM440EP) 	+= sam440ep.o
 obj-$(CONFIG_WARP)	+= warp.o
-obj-$(CONFIG_WARP)	+= warp-nand.o
 obj-$(CONFIG_XILINX_VIRTEX_5_FXT) += virtex.o
arch/powerpc/platforms/44x/warp-nand.c deleted +0 -135

135 lines not on this page · raw message

#1 lore raw
Quoted 2 lines · On Fri, 9 Jan 2009 23:20:11 -0500 "Sean MacLennan"…

Woo hoo! The ndfc driver finally got in the kernel! These patches update the warp to use the new driver.

Just a bump and a comment to see who is reading this ;)

2.6.29 is a very important release for the Warp because with the ndfc driver, and assuming this patch or something like it is accepted, you will be able to get a working kernel for the warp from kernel.org. It will be missing SD support and LED support, but everything else will work :)

But it seems to me that otherwise, 2.6.29 seems to be a very quiet release. Has anybody else noticed this?

Cheers,
Sean

#2 lore raw
Quoted 6 lines · Sean MacLennan
Quoted 2 lines · On Fri, 9 Jan 2009 23:20:11 -0500 "Sean MacLennan"…

Woo hoo! The ndfc driver finally got in the kernel! These patches update the warp to use the new driver.

Quoted 7 lines

Just a bump and a comment to see who is reading this ;)

2.6.29 is a very important release for the Warp because with the ndfc driver, and assuming this patch or something like it is accepted, you will be able to get a working kernel for the warp from kernel.org. It will be missing SD support and LED support, but everything else will work :)

I have it queued up for today. I was waiting for Ben to bump his tree to include -rc2 so that I can send him the defconfig updates at the same time.

Quoted 2 lines

But it seems to me that otherwise, 2.6.29 seems to be a very quiet release. Has anybody else noticed this?

Yes.

josh