diff options
| author | Paul Mackerras <paulus@samba.org> | 2003-03-22 05:33:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-03-22 05:33:50 -0800 |
| commit | 8f7d7732b9a97f57d1a8c837e8b03423e31c049f (patch) | |
| tree | 55735dbafabb09ddff8dfc091346f359d3078ced /include/linux | |
| parent | 8035f35cf51d3f19fa70e5ae9522e82d91bd4fb9 (diff) | |
[PATCH] update macintosh-specific headers
This patch updates include/linux/adb.h and include/linux/pmu.h with
some additional definitions that we need on powermacs and powerbooks.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/adb.h | 9 | ||||
| -rw-r--r-- | include/linux/pmu.h | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/adb.h b/include/linux/adb.h index e2af8f33c122..e9fdc63483c7 100644 --- a/include/linux/adb.h +++ b/include/linux/adb.h @@ -30,6 +30,15 @@ #define POWER_PACKET 4 #define MACIIC_PACKET 5 #define PMU_PACKET 6 +#define ADB_QUERY 7 + +/* ADB queries */ + +/* ADB_QUERY_GETDEVINFO + * Query ADB slot for device presence + * data[2] = id, rep[0] = orig addr, rep[1] = handler_id + */ +#define ADB_QUERY_GETDEVINFO 1 #ifdef __KERNEL__ diff --git a/include/linux/pmu.h b/include/linux/pmu.h index bf0ed74e9826..9c9d40cf3309 100644 --- a/include/linux/pmu.h +++ b/include/linux/pmu.h @@ -30,6 +30,7 @@ #define PMU_SET_INTR_MASK 0x70 /* set PMU interrupt mask */ #define PMU_INT_ACK 0x78 /* read interrupt bits */ #define PMU_SHUTDOWN 0x7e /* turn power off */ +#define PMU_CPU_SPEED 0x7d /* control CPU speed on some models */ #define PMU_SLEEP 0x7f /* put CPU to sleep */ #define PMU_POWER_EVENTS 0x8f /* Send power-event commands to PMU */ #define PMU_RESET 0xd0 /* reset CPU */ @@ -191,6 +192,10 @@ int pmu_unregister_sleep_notifier(struct pmu_sleep_notifier* notifier); /* values for pmu_battery_info.flags */ #define PMU_BATT_PRESENT 0x00000001 #define PMU_BATT_CHARGING 0x00000002 +#define PMU_BATT_TYPE_MASK 0x000000f0 +#define PMU_BATT_TYPE_SMART 0x00000010 /* Smart battery */ +#define PMU_BATT_TYPE_HOOPER 0x00000020 /* 3400/3500 */ +#define PMU_BATT_TYPE_COMET 0x00000030 /* 2400 */ struct pmu_battery_info { |