[POWERPC] Constify & voidify get_property()

[powerpc.git] / include / asm-powerpc / smu.h

diff --git a/include/asm-powerpc/smu.h b/include/asm-powerpc/smu.h
index 76c29a9..51e65fc 100644 (file)
--- a/include/asm-powerpc/smu.h
+++ b/include/asm-powerpc/smu.h
@@ -4,9 +4,10 @@
 /*
  * Definitions for talking to the SMU chip in newer G5 PowerMacs
  */
-
-#include <linux/config.h>
+#ifdef __KERNEL__
 #include <linux/list.h>
+#endif
+#include <linux/types.h>
 
 /*
  * Known SMU commands
@@ -20,7 +21,7 @@
 /*
  * Partition info commands
  *
- * These commands are used to retreive the sdb-partition-XX datas from
+ * These commands are used to retrieve the sdb-partition-XX datas from
  * the SMU. The lenght is always 2. First byte is the subcommand code
  * and second byte is the partition ID.
  *
@@ -223,7 +224,7 @@
  *
  * SMU_CMD_MISC_ee_GET_DATABLOCK_REC is used, among others, to
  * transfer blocks of data from the SMU. So far, I've decrypted it's
- * usage to retreive partition data. In order to do that, you have to
+ * usage to retrieve partition data. In order to do that, you have to
  * break your transfer in "chunks" since that command cannot transfer
  * more than a chunk at a time. The chunk size used by OF is 0xe bytes,
  * but it seems that the darwin driver will let you do 0x1e bytes if
@@ -356,6 +357,9 @@ extern unsigned long smu_cmdbuf_abs;
  * Kenrel asynchronous i2c interface
  */
 
+#define SMU_I2C_READ_MAX       0x1d
+#define SMU_I2C_WRITE_MAX      0x15
+
 /* SMU i2c header, exactly matches i2c header on wire */
 struct smu_i2c_param
 {
@@ -366,12 +370,9 @@ struct smu_i2c_param
        u8      subaddr[3];     /* subaddress */
        u8      caddr;          /* combined address, filled by SMU driver */
        u8      datalen;        /* length of transfer */
-       u8      data[7];        /* data */
+       u8      data[SMU_I2C_READ_MAX]; /* data */
 };
 
-#define SMU_I2C_READ_MAX       0x0d
-#define SMU_I2C_WRITE_MAX      0x05
-
 struct smu_i2c_cmd
 {
        /* public */
@@ -385,7 +386,7 @@ struct smu_i2c_cmd
        int                     read;
        int                     stage;
        int                     retries;
-       u8                      pdata[0x10];
+       u8                      pdata[32];
        struct list_head        link;
 };
 
@@ -487,8 +488,8 @@ struct smu_sdbp_slotspow {
 #define SMU_SDB_SENSORTREE_ID          0x25
 
 struct smu_sdbp_sensortree {
-       u8      model_id;
-       u8      unknown[3];
+       __u8    model_id;
+       __u8    unknown[3];
 };
 
 /* This partition contains CPU thermal control PID informations. So far
@@ -498,13 +499,13 @@ struct smu_sdbp_sensortree {
 #define SMU_SDB_CPUPIDDATA_ID          0x17
 
 struct smu_sdbp_cpupiddata {
-       u8      unknown1;
-       u8      target_temp_delta;
-       u8      unknown2;
-       u8      history_len;
-       s16     power_adj;
-       u16     max_power;
-       s32     gp,gr,gd;
+       __u8    unknown1;
+       __u8    target_temp_delta;
+       __u8    unknown2;
+       __u8    history_len;
+       __s16   power_adj;
+       __u16   max_power;
+       __s32   gp,gr,gd;
 };
 
 
@@ -517,7 +518,12 @@ struct smu_sdbp_cpupiddata {
  * if not found. The data format is described below
  */
 extern struct smu_sdbp_header *smu_get_sdb_partition(int id,
-                                                    unsigned int *size);
+                                       unsigned int *size);
+
+/* Get "sdb" partition data from an SMU satellite */
+extern struct smu_sdbp_header *smu_sat_get_sdb_partition(unsigned int sat_id,
+                                       int id, unsigned int *size);
+
 
 #endif /* __KERNEL__ */
 
@@ -554,7 +560,7 @@ struct smu_user_cmd_hdr
        __u32           cmdtype;
 #define SMU_CMDTYPE_SMU                        0       /* SMU command */
 #define SMU_CMDTYPE_WANTS_EVENTS       1       /* switch fd to events mode */
-#define SMU_CMDTYPE_GET_PARTITION      2       /* retreive an sdb partition */
+#define SMU_CMDTYPE_GET_PARTITION      2       /* retrieve an sdb partition */
 
        __u8            cmd;                    /* SMU command byte */
        __u8            pad[3];                 /* padding */