diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-11-06 22:36:21 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:17:53 -0500 |
| commit | 7d49697ef92bd2cf84ab53bd4cea82fefb197fb9 (patch) | |
| tree | 502141dc2692c37c8b8349e92832c36ce29d8ee0 | |
| parent | c618cf19995ef00c7ab85a9734abe028de9c08d4 (diff) | |
[PATCH] ppc64: More U3 device-tree fixes
Some more U3 revisions have the missing "interrupts" property in U3,
this adds them to the fixup code in prom_init.c
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/kernel/prom_init.c | 2 | ||||
| -rw-r--r-- | arch/ppc64/kernel/prom_init.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index c758b6624d7b..0d91961f9433 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c | |||
| @@ -1872,7 +1872,7 @@ static void __init fixup_device_tree(void) | |||
| 1872 | if (prom_getprop(u3, "device-rev", &u3_rev, sizeof(u3_rev)) | 1872 | if (prom_getprop(u3, "device-rev", &u3_rev, sizeof(u3_rev)) |
| 1873 | == PROM_ERROR) | 1873 | == PROM_ERROR) |
| 1874 | return; | 1874 | return; |
| 1875 | if (u3_rev != 0x35 && u3_rev != 0x37) | 1875 | if (u3_rev < 0x35 || u3_rev > 0x39) |
| 1876 | return; | 1876 | return; |
| 1877 | /* does it need fixup ? */ | 1877 | /* does it need fixup ? */ |
| 1878 | if (prom_getproplen(i2c, "interrupts") > 0) | 1878 | if (prom_getproplen(i2c, "interrupts") > 0) |
diff --git a/arch/ppc64/kernel/prom_init.c b/arch/ppc64/kernel/prom_init.c index e72b3f9061f0..e4c880dab997 100644 --- a/arch/ppc64/kernel/prom_init.c +++ b/arch/ppc64/kernel/prom_init.c | |||
| @@ -1824,7 +1824,7 @@ static void __init fixup_device_tree(void) | |||
| 1824 | if (prom_getprop(u3, "device-rev", &u3_rev, sizeof(u3_rev)) | 1824 | if (prom_getprop(u3, "device-rev", &u3_rev, sizeof(u3_rev)) |
| 1825 | == PROM_ERROR) | 1825 | == PROM_ERROR) |
| 1826 | return; | 1826 | return; |
| 1827 | if (u3_rev != 0x35 && u3_rev != 0x37) | 1827 | if (u3_rev < 0x35 || u3_rev > 0x39) |
| 1828 | return; | 1828 | return; |
| 1829 | /* does it need fixup ? */ | 1829 | /* does it need fixup ? */ |
| 1830 | if (prom_getproplen(i2c, "interrupts") > 0) | 1830 | if (prom_getproplen(i2c, "interrupts") > 0) |
