ppc32: Update PowerMac motherboard support

add support for newer laptops and G5 desktops
parent fea796e8
This diff is collapsed.
...@@ -95,7 +95,7 @@ struct machdep_calls { ...@@ -95,7 +95,7 @@ struct machdep_calls {
* hook used to control some machine specific features (like reset * hook used to control some machine specific features (like reset
* lines, chip power control, etc...). * lines, chip power control, etc...).
*/ */
int (*feature_call)(unsigned int feature, ...); long (*feature_call)(unsigned int feature, ...);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
/* functions for dealing with other cpus */ /* functions for dealing with other cpus */
......
...@@ -112,6 +112,10 @@ ...@@ -112,6 +112,10 @@
*/ */
#define PMAC_TYPE_UNKNOWN_INTREPID 0x11f /* Generic */ #define PMAC_TYPE_UNKNOWN_INTREPID 0x11f /* Generic */
/* MacRISC4 / G5 machines
*/
#define PMAC_TYPE_POWERMAC_G5 0x150 /* First tower */
/* /*
* Motherboard flags * Motherboard flags
*/ */
...@@ -131,8 +135,8 @@ ...@@ -131,8 +135,8 @@
*/ */
struct device_node; struct device_node;
static inline int pmac_call_feature(int selector, struct device_node* node, static inline long pmac_call_feature(int selector, struct device_node* node,
int param, int value) long param, long value)
{ {
if (!ppc_md.feature_call) if (!ppc_md.feature_call)
return -ENODEV; return -ENODEV;
...@@ -262,9 +266,15 @@ static inline int pmac_call_feature(int selector, struct device_node* node, ...@@ -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) #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 */ /* 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); extern void pmac_feature_init(void);
#define PMAC_FTR_DEF(x) ((_MACH_Pmac << 16) | (x)) #define PMAC_FTR_DEF(x) ((_MACH_Pmac << 16) | (x))
...@@ -289,6 +299,7 @@ enum { ...@@ -289,6 +299,7 @@ enum {
macio_keylargo, macio_keylargo,
macio_pangea, macio_pangea,
macio_intrepid, macio_intrepid,
macio_keylargo2,
}; };
struct macio_chip struct macio_chip
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment