[ RFC PATCH 3/3] powerpc:pasemi: Fix device_type of Nemo SB600 node.

[ RFC PATCH 3/3] powerpc:pasemi: Fix device_type of Nemo SB600 node.

[Darren Stevens]

[-- Attachment #1: Type: text/plain, Size: 178 bytes --]

  AmigaOS...........: http://yam.ch/
  Unix/MacOS/Windows: http://www.mozilla.com/thunderbird/

General information about MIME can be found at:
http://en.wikipedia.org/wiki/MIME

[-- Attachment #2: Type: text/plain, Size: 262 bytes --]

    The of_node for the SB600 (io-bridge) has its device_type set to
    'io-bridge' Set it to 'isa' so that it can be found by
    isa_bridge_find_early() instead of using patches in the kernel.

    Signed-off-by: Darren Stevens <darren@stevens-zone.net>

---

[-- Attachment #3: nemo_2.patch --]
[-- Type: text/plain, Size: 833 bytes --]

diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 8269093..d75937a 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -2697,6 +2697,24 @@ static void __init fixup_device_tree_pasemi(void)
 			}
 		}
 	}
+
+	/*
+	 * The io-bridge has device_type set to 'io-bridge'
+	 * change it to 'isa' so that generic isa-bridge code can add the SB600 and
+	 * its on-board peripherals.
+	 */
+
+	name = "/pxp@0,e0000000/io-bridge@0";
+        iob = call_prom("finddevice", 1, 1, ADDR(name));
+        if (!PHANDLE_VALID(iob))
+                return;
+
+	/* device_type is already set, just change it. */
+
+	prom_printf("Changing device_type of SB600 node...\n");
+
+	prom_setprop(iob, name, "device_type", "isa", sizeof("isa"));
+
 #endif //CONFIG_PPC_PASEMI_NEMO
 }
 #else