From: Valentine Barshak <vbarshak@ru.mvista.com>
Date: Thu, 5 Jun 2008 13:36:38 +0000 (+1000)
Subject: powerpc/4xx: Fix resource issue in warp-nand.c
X-Git-Tag: v2.6.27-rc1~1058^2~133^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=156cea23acffaa270cf243a3a0f43e1e30682081;p=linux-2.6-omap-h63xx.git

powerpc/4xx: Fix resource issue in warp-nand.c

The "ndfc-chip" device doesn't need any resources. All resources
are handled by the "ndfc-nand" device. Registering the same memory
resource twice causes "cat /proc/iomem" to go into an infinite loop
displaying NDFC memory addresses.

Signed-off-by: Valentine Barshak <vbarshak@ru.mvista.com>
Acked-by: Stefan Roese <sr@denx.de>
Acked-by: Sean MacLennan <smaclennan@pikatech.com>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
---

diff --git a/arch/powerpc/platforms/44x/warp-nand.c b/arch/powerpc/platforms/44x/warp-nand.c
index d293c702e73..7bec2815771 100644
--- a/arch/powerpc/platforms/44x/warp-nand.c
+++ b/arch/powerpc/platforms/44x/warp-nand.c
@@ -94,8 +94,7 @@ static struct platform_nand_chip warp_nand_chip0 = {
 static struct platform_device warp_nand_device = {
 	.name = "ndfc-chip",
 	.id = 0,
-	.num_resources = 1,
-	.resource = &warp_ndfc,
+	.num_resources = 0,
 	.dev = {
 		.platform_data = &warp_nand_chip0,
 		.parent = &warp_ndfc_device.dev,