diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2004-02-06 14:22:25 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2004-02-06 14:22:25 +1100 |
| commit | e37fe183048631cec55e010bdc9372ab046c4dad (patch) | |
| tree | 6f276657ea56e64add12da1257aeafd1a9eb3f69 /include | |
| parent | fea796e8f4af85f7c384f80985c5656577dc5d84 (diff) | |
ppc32: Update PowerMac motherboard support
add support for newer laptops and G5 desktops
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/machdep.h | 2 | ||||
| -rw-r--r-- | include/asm-ppc/pmac_feature.h | 17 |
2 files changed, 15 insertions, 4 deletions
diff --git a/include/asm-ppc/machdep.h b/include/asm-ppc/machdep.h index c241973ff78e..054e9db2e226 100644 --- a/include/asm-ppc/machdep.h +++ b/include/asm-ppc/machdep.h @@ -95,7 +95,7 @@ struct machdep_calls { * hook used to control some machine specific features (like reset * lines, chip power control, etc...). */ - int (*feature_call)(unsigned int feature, ...); + long (*feature_call)(unsigned int feature, ...); #ifdef CONFIG_SMP /* functions for dealing with other cpus */ diff --git a/include/asm-ppc/pmac_feature.h b/include/asm-ppc/pmac_feature.h index 1c97c90068e9..83cc2ea442c4 100644 --- a/include/asm-ppc/pmac_feature.h +++ b/include/asm-ppc/pmac_feature.h @@ -112,6 +112,10 @@ */ #define PMAC_TYPE_UNKNOWN_INTREPID 0x11f /* Generic */ +/* MacRISC4 / G5 machines + */ +#define PMAC_TYPE_POWERMAC_G5 0x150 /* First tower */ + /* * Motherboard flags */ @@ -131,8 +135,8 @@ */ struct device_node; -static inline int pmac_call_feature(int selector, struct device_node* node, - int param, int value) +static inline long pmac_call_feature(int selector, struct device_node* node, + long param, long value) { if (!ppc_md.feature_call) return -ENODEV; @@ -262,9 +266,15 @@ static inline int pmac_call_feature(int selector, struct device_node* node, */ #define PMAC_FTR_WRITE_GPIO PMAC_FTR_DEF(18) +/* PMAC_FTR_ENABLE_MPIC + * + * Enable the MPIC cell + */ +#define PMAC_FTR_ENABLE_MPIC PMAC_FTR_DEF(19) + /* Don't use those directly, they are for the sake of pmac_setup.c */ -extern int pmac_do_feature_call(unsigned int selector, ...); +extern long pmac_do_feature_call(unsigned int selector, ...); extern void pmac_feature_init(void); #define PMAC_FTR_DEF(x) ((_MACH_Pmac << 16) | (x)) @@ -289,6 +299,7 @@ enum { macio_keylargo, macio_pangea, macio_intrepid, + macio_keylargo2, }; struct macio_chip |