ChangeSet 1.2065.3.5, 2005/03/12 08:21:57-08:00, [EMAIL PROTECTED]
[PATCH] ppc64: new machine definitions
This patch adds new machine definitions for the iMac G5 and the new
single
processor PowerMac G5. It also slightly updates the existing
definitions.
Signed-off-by: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
arch/ppc64/kernel/pmac_feature.c | 10 +++++++++-
include/asm-ppc/pmac_feature.h | 8 ++++++--
2 files changed, 15 insertions(+), 3 deletions(-)
diff -Nru a/arch/ppc64/kernel/pmac_feature.c b/arch/ppc64/kernel/pmac_feature.c
--- a/arch/ppc64/kernel/pmac_feature.c 2005-03-12 21:25:20 -08:00
+++ b/arch/ppc64/kernel/pmac_feature.c 2005-03-12 21:25:20 -08:00
@@ -321,8 +321,16 @@
PMAC_TYPE_POWERMAC_G5, g5_features,
0,
},
+ { "PowerMac8,1", "iMac G5",
+ PMAC_TYPE_IMAC_G5, g5_features,
+ 0,
+ },
+ { "PowerMac9,1", "PowerMac G5",
+ PMAC_TYPE_POWERMAC_G5_U3L, g5_features,
+ 0,
+ },
{ "RackMac3,1", "XServe G5",
- PMAC_TYPE_POWERMAC_G5, g5_features,
+ PMAC_TYPE_XSERVE_G5, g5_features,
0,
},
};
diff -Nru a/include/asm-ppc/pmac_feature.h b/include/asm-ppc/pmac_feature.h
--- a/include/asm-ppc/pmac_feature.h 2005-03-12 21:25:20 -08:00
+++ b/include/asm-ppc/pmac_feature.h 2005-03-12 21:25:20 -08:00
@@ -112,9 +112,13 @@
*/
#define PMAC_TYPE_UNKNOWN_INTREPID 0x11f /* Generic */
-/* MacRISC4 / G5 machines
+/* MacRISC4 / G5 machines. We don't have per-machine selection here anymore,
+ * but rather machine families
*/
-#define PMAC_TYPE_POWERMAC_G5 0x150 /* First tower */
+#define PMAC_TYPE_POWERMAC_G5 0x150 /* U3 & U3H based */
+#define PMAC_TYPE_POWERMAC_G5_U3L 0x151 /* U3L based desktop */
+#define PMAC_TYPE_IMAC_G5 0x152 /* iMac G5 */
+#define PMAC_TYPE_XSERVE_G5 0x153 /* Xserve G5 */
#define PMAC_TYPE_UNKNOWN_K2 0x19f /* Any other K2 based */
/*
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
