2 files changed, 87 insertions, 46 deletions

diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index e0ac63effa55..d09308f30960 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -39,15 +39,16 @@
 #define MANUAL_MASK  0xe0
 #define AUTO_MASK    0x20
 
-static u8 TEMP_REG[3]    = {0x26, 0x25, 0x27}; /* local, cpu, gpu */
-static u8 LIMIT_REG[3]   = {0x6b, 0x6a, 0x6c}; /* local, cpu, gpu */
+static u8 TEMP_REG[3]    = {0x26, 0x25, 0x27}; /* local, sensor1, sensor2 */
+static u8 LIMIT_REG[3]   = {0x6b, 0x6a, 0x6c}; /* local, sensor1, sensor2 */
 static u8 MANUAL_MODE[2] = {0x5c, 0x5d};       
 static u8 REM_CONTROL[2] = {0x00, 0x40};
 static u8 FAN_SPEED[2]   = {0x28, 0x2a};
 static u8 FAN_SPD_SET[2] = {0x30, 0x31};
 
-static u8 default_limits_local[3] = {70, 50, 70};    /* local, cpu, gpu */
-static u8 default_limits_chip[3] = {80, 65, 80};    /* local, cpu, gpu */
+static u8 default_limits_local[3] = {70, 50, 70};    /* local, sensor1, sensor2 */
+static u8 default_limits_chip[3] = {80, 65, 80};    /* local, sensor1, sensor2 */
+static char *sensor_location[3] = {NULL, NULL, NULL};
 
 static int limit_adjust = 0;
 static int fan_speed = -1;
@@ -58,7 +59,7 @@ MODULE_DESCRIPTION("Driver for ADT746x thermostat in iBook G4 and "
 MODULE_LICENSE("GPL");
 
 module_param(limit_adjust, int, 0644);
-MODULE_PARM_DESC(limit_adjust,"Adjust maximum temperatures (50 cpu, 70 gpu) "
+MODULE_PARM_DESC(limit_adjust,"Adjust maximum temperatures (50 sensor1, 70 sensor2) "
                  "by N degrees.");
 
 module_param(fan_speed, int, 0644);
@@ -213,10 +214,10 @@ static void write_fan_speed(struct thermostat *th, int speed, int fan)
         if (th->last_speed[fan] != speed) {
                 if (speed == -1)
                         printk(KERN_DEBUG "adt746x: Setting speed to automatic "
-                                "for %s fan.\n", fan?"GPU":"CPU");
+                                "for %s fan.\n", sensor_location[fan+1]);
                 else
                         printk(KERN_DEBUG "adt746x: Setting speed to %d "
-                                "for %s fan.\n", speed, fan?"GPU":"CPU");
+                                "for %s fan.\n", speed, sensor_location[fan+1]);
         } else
                 return;
         
@@ -300,11 +301,11 @@ static void update_fans_speed (struct thermostat *th)
                         printk(KERN_DEBUG "adt746x: setting fans speed to %d "
                                          "(limit exceeded by %d on %s) \n",
                                         new_speed, var,
-                                        fan_number?"GPU/pwr":"CPU");
+                                        sensor_location[fan_number+1]);
                         write_both_fan_speed(th, new_speed);
                         th->last_var[fan_number] = var;
                 } else if (var < -2) {
-                        /* don't stop fan if GPU/power is cold and CPU is not
+                        /* don't stop fan if sensor2 is cold and sensor1 is not
                          * so cold (lastvar >= -1) */
                         if (i == 2 && lastvar < -1) {
                                 if (th->last_speed[fan_number] != 0)
@@ -318,7 +319,7 @@ static void update_fans_speed (struct thermostat *th)
 
                 if (started)
                         return; /* we don't want to re-stop the fan
-                                * if CPU is heating and GPU/power is not */
+                                * if sensor1 is heating and sensor2 is not */
         }
 }
 
@@ -353,7 +354,7 @@ static int monitor_task(void *arg)
 
 static void set_limit(struct thermostat *th, int i)
 {
-                /* Set CPU limit higher to avoid powerdowns */ 
+                /* Set sensor1 limit higher to avoid powerdowns */
                 th->limits[i] = default_limits_chip[i] + limit_adjust;
                 write_reg(th, LIMIT_REG[i], th->limits[i]);
                 
@@ -461,6 +462,12 @@ static ssize_t show_##name(struct device *dev, char *buf)	\
         return sprintf(buf, "%d\n", data);                      \
 }
 
+#define BUILD_SHOW_FUNC_STR(name, data)                         \
+static ssize_t show_##name(struct device *dev, char *buf)       \
+{                                                               \
+        return sprintf(buf, "%s\n", data);                      \
+}
+
 #define BUILD_SHOW_FUNC_FAN(name, data)                         \
 static ssize_t show_##name(struct device *dev, char *buf)       \
 {                                                               \
@@ -476,7 +483,7 @@ static ssize_t store_##name(struct device *dev, const char *buf, size_t n) \
         int val;                                                \
         int i;                                                  \
         val = simple_strtol(buf, NULL, 10);                     \
-        printk(KERN_INFO "Adjusting limits by %d°C\n", val);    \
+        printk(KERN_INFO "Adjusting limits by %d degrees\n", val);      \
         limit_adjust = val;                                     \
         for (i=0; i < 3; i++)                                   \
                 set_limit(thermostat, i);                       \
@@ -495,35 +502,41 @@ static ssize_t store_##name(struct device *dev, const char *buf, size_t n) \
         return n;                                               \
 }
 
-BUILD_SHOW_FUNC_INT(cpu_temperature,     (read_reg(thermostat, TEMP_REG[1])))
-BUILD_SHOW_FUNC_INT(gpu_temperature,     (read_reg(thermostat, TEMP_REG[2])))
-BUILD_SHOW_FUNC_INT(cpu_limit,           thermostat->limits[1])
-BUILD_SHOW_FUNC_INT(gpu_limit,           thermostat->limits[2])
+BUILD_SHOW_FUNC_INT(sensor1_temperature,         (read_reg(thermostat, TEMP_REG[1])))
+BUILD_SHOW_FUNC_INT(sensor2_temperature,         (read_reg(thermostat, TEMP_REG[2])))
+BUILD_SHOW_FUNC_INT(sensor1_limit,               thermostat->limits[1])
+BUILD_SHOW_FUNC_INT(sensor2_limit,               thermostat->limits[2])
+BUILD_SHOW_FUNC_STR(sensor1_location,            sensor_location[1])
+BUILD_SHOW_FUNC_STR(sensor2_location,            sensor_location[2])
 
 BUILD_SHOW_FUNC_INT(specified_fan_speed, fan_speed)
-BUILD_SHOW_FUNC_FAN(cpu_fan_speed,       0)
-BUILD_SHOW_FUNC_FAN(gpu_fan_speed,       1)
+BUILD_SHOW_FUNC_FAN(sensor1_fan_speed,   0)
+BUILD_SHOW_FUNC_FAN(sensor2_fan_speed,   1)
 
 BUILD_STORE_FUNC_INT(specified_fan_speed,fan_speed)
 BUILD_SHOW_FUNC_INT(limit_adjust,        limit_adjust)
 BUILD_STORE_FUNC_DEG(limit_adjust,       thermostat)
                 
-static DEVICE_ATTR(cpu_temperature,     S_IRUGO,
-                   show_cpu_temperature,NULL);
-static DEVICE_ATTR(gpu_temperature,     S_IRUGO,
-                   show_gpu_temperature,NULL);
-static DEVICE_ATTR(cpu_limit,           S_IRUGO,
-                   show_cpu_limit,      NULL);
-static DEVICE_ATTR(gpu_limit,           S_IRUGO,
-                   show_gpu_limit,      NULL);
+static DEVICE_ATTR(sensor1_temperature, S_IRUGO,
+                   show_sensor1_temperature,NULL);
+static DEVICE_ATTR(sensor2_temperature, S_IRUGO,
+                   show_sensor2_temperature,NULL);
+static DEVICE_ATTR(sensor1_limit, S_IRUGO,
+                   show_sensor1_limit,  NULL);
+static DEVICE_ATTR(sensor2_limit, S_IRUGO,
+                   show_sensor2_limit,  NULL);
+static DEVICE_ATTR(sensor1_location, S_IRUGO,
+                   show_sensor1_location, NULL);
+static DEVICE_ATTR(sensor2_location, S_IRUGO,
+                   show_sensor2_location, NULL);
 
 static DEVICE_ATTR(specified_fan_speed, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH,
                    show_specified_fan_speed,store_specified_fan_speed);
 
-static DEVICE_ATTR(cpu_fan_speed,       S_IRUGO,
-                   show_cpu_fan_speed,  NULL);
-static DEVICE_ATTR(gpu_fan_speed,       S_IRUGO,
-                   show_gpu_fan_speed,  NULL);
+static DEVICE_ATTR(sensor1_fan_speed,   S_IRUGO,
+                   show_sensor1_fan_speed,      NULL);
+static DEVICE_ATTR(sensor2_fan_speed,   S_IRUGO,
+                   show_sensor2_fan_speed,      NULL);
 
 static DEVICE_ATTR(limit_adjust,        S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH,
                    show_limit_adjust,   store_limit_adjust);
@@ -534,6 +547,7 @@ thermostat_init(void)
 {
         struct device_node* np;
         u32 *prop;
+        int i = 0, offset = 0;
         
         np = of_find_node_by_name(NULL, "fan");
         if (!np)
@@ -545,6 +559,12 @@ thermostat_init(void)
         else
                 return -ENODEV;
 
+        prop = (u32 *)get_property(np, "hwsensor-params-version", NULL);
+        printk(KERN_INFO "adt746x: version %d (%ssupported)\n", *prop,
+                         (*prop == 1)?"":"un");
+        if (*prop != 1)
+                return -ENODEV;
+
         prop = (u32 *)get_property(np, "reg", NULL);
         if (!prop)
                 return -ENODEV;
@@ -563,6 +583,23 @@ thermostat_init(void)
                          "limit_adjust: %d, fan_speed: %d\n",
                          therm_bus, therm_address, limit_adjust, fan_speed);
 
+        if (get_property(np, "hwsensor-location", NULL)) {
+                for (i = 0; i < 3; i++) {
+                        sensor_location[i] = get_property(np,
+                                        "hwsensor-location", NULL) + offset;
+
+                        if (sensor_location[i] == NULL)
+                                sensor_location[i] = "";
+
+                        printk(KERN_INFO "sensor %d: %s\n", i, sensor_location[i]);
+                        offset += strlen(sensor_location[i]) + 1;
+                }
+        } else {
+                sensor_location[0] = "?";
+                sensor_location[1] = "?";
+                sensor_location[2] = "?";
+        }
+
         of_dev = of_platform_device_create(np, "temperatures");
         
         if (of_dev == NULL) {
@@ -570,15 +607,17 @@ thermostat_init(void)
                 return -ENODEV;
         }
         
-        device_create_file(&of_dev->dev, &dev_attr_cpu_temperature);
-        device_create_file(&of_dev->dev, &dev_attr_gpu_temperature);
-        device_create_file(&of_dev->dev, &dev_attr_cpu_limit);
-        device_create_file(&of_dev->dev, &dev_attr_gpu_limit);
+        device_create_file(&of_dev->dev, &dev_attr_sensor1_temperature);
+        device_create_file(&of_dev->dev, &dev_attr_sensor2_temperature);
+        device_create_file(&of_dev->dev, &dev_attr_sensor1_limit);
+        device_create_file(&of_dev->dev, &dev_attr_sensor2_limit);
+        device_create_file(&of_dev->dev, &dev_attr_sensor1_location);
+        device_create_file(&of_dev->dev, &dev_attr_sensor2_location);
         device_create_file(&of_dev->dev, &dev_attr_limit_adjust);
         device_create_file(&of_dev->dev, &dev_attr_specified_fan_speed);
-        device_create_file(&of_dev->dev, &dev_attr_cpu_fan_speed);
+        device_create_file(&of_dev->dev, &dev_attr_sensor1_fan_speed);
         if(therm_type == ADT7460)
-                device_create_file(&of_dev->dev, &dev_attr_gpu_fan_speed);
+                device_create_file(&of_dev->dev, &dev_attr_sensor2_fan_speed);
 
 #ifndef CONFIG_I2C_KEYWEST
         request_module("i2c-keywest");
@@ -591,17 +630,19 @@ static void __exit
 thermostat_exit(void)
 {
         if (of_dev) {
-                device_remove_file(&of_dev->dev, &dev_attr_cpu_temperature);
-                device_remove_file(&of_dev->dev, &dev_attr_gpu_temperature);
-                device_remove_file(&of_dev->dev, &dev_attr_cpu_limit);
-                device_remove_file(&of_dev->dev, &dev_attr_gpu_limit);
+                device_remove_file(&of_dev->dev, &dev_attr_sensor1_temperature);
+                device_remove_file(&of_dev->dev, &dev_attr_sensor2_temperature);
+                device_remove_file(&of_dev->dev, &dev_attr_sensor1_limit);
+                device_remove_file(&of_dev->dev, &dev_attr_sensor2_limit);
+                device_remove_file(&of_dev->dev, &dev_attr_sensor1_location);
+                device_remove_file(&of_dev->dev, &dev_attr_sensor2_location);
                 device_remove_file(&of_dev->dev, &dev_attr_limit_adjust);
                 device_remove_file(&of_dev->dev, &dev_attr_specified_fan_speed);
-                device_remove_file(&of_dev->dev, &dev_attr_cpu_fan_speed);
+                device_remove_file(&of_dev->dev, &dev_attr_sensor1_fan_speed);
 
                 if(therm_type == ADT7460)
                         device_remove_file(&of_dev->dev,
-                                           &dev_attr_gpu_fan_speed);
+                                           &dev_attr_sensor2_fan_speed);
 
                 of_device_unregister(of_dev);
         }
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index e654aa5eecd4..bb9f4044c74d 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -2421,7 +2421,7 @@ pmac_wakeup_devices(void)
 
         /* Re-enable local CPU interrupts */
         local_irq_enable();
-        mdelay(100);
+        mdelay(10);
         preempt_enable();
 
         /* Re-enable clock spreading on some machines */
@@ -2549,7 +2549,9 @@ powerbook_sleep_Core99(void)
                 return ret;
         }
 
-        printk(KERN_DEBUG "HID1, before: %x\n", mfspr(SPRN_HID1));
+        /* Stop environment and ADB interrupts */
+        pmu_request(&req, NULL, 2, PMU_SET_INTR_MASK, 0);
+        pmu_wait_complete(&req);
 
         /* Tell PMU what events will wake us up */
         pmu_request(&req, NULL, 4, PMU_POWER_EVENTS, PMU_PWR_CLR_WAKEUP_EVENTS,
@@ -2611,8 +2613,6 @@ powerbook_sleep_Core99(void)
         pmu_request(&req, NULL, 2, PMU_SET_INTR_MASK, pmu_intr_mask);
         pmu_wait_complete(&req);
 
-        printk(KERN_DEBUG "HID1, after: %x\n", mfspr(SPRN_HID1));
-
         pmac_wakeup_devices();
 
         return 0;