]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
hwmon: (f75375s) Initialize pwmX_mode and pwmX_enable if there is no platform data
authorGuenter Roeck <guenter.roeck@ericsson.com>
Thu, 8 Dec 2011 18:15:51 +0000 (10:15 -0800)
committerGuenter Roeck <guenter.roeck@ericsson.com>
Thu, 5 Jan 2012 16:19:30 +0000 (08:19 -0800)
pwmX_mode and pwmX_enable are not initialized if no platform data is provided to
the driver. Read chip configuration at driver initialization time and initialize
attributes to reflect chip configuration.

Cc: Riku Voipio <riku.voipio@iki.fi>
Reviewed-by: Bjoern Gerhart <oss@extracloud.de>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
drivers/hwmon/f75375s.c

index 777a665164f992d89500ef9cd2c91fb05d19d575..9c3f078e263be10a604bc9799dca27e5940de07e 100644 (file)
@@ -652,6 +652,31 @@ static void f75375_init(struct i2c_client *client, struct f75375_data *data,
                struct f75375s_platform_data *f75375s_pdata)
 {
        int nr;
+
+       if (!f75375s_pdata) {
+               u8 conf, mode;
+               int nr;
+
+               conf = f75375_read8(client, F75375_REG_CONFIG1);
+               mode = f75375_read8(client, F75375_REG_FAN_TIMER);
+               for (nr = 0; nr < 2; nr++) {
+                       if (!(conf & (1 << FAN_CTRL_LINEAR(nr))))
+                               data->pwm_mode[nr] = 1;
+                       switch ((mode >> FAN_CTRL_MODE(nr)) & 3) {
+                       case 0:         /* speed */
+                               data->pwm_enable[nr] = 3;
+                               break;
+                       case 1:         /* automatic */
+                               data->pwm_enable[nr] = 2;
+                               break;
+                       default:        /* manual */
+                               data->pwm_enable[nr] = 1;
+                               break;
+                       }
+               }
+               return;
+       }
+
        set_pwm_enable_direct(client, 0, f75375s_pdata->pwm_enable[0]);
        set_pwm_enable_direct(client, 1, f75375s_pdata->pwm_enable[1]);
        for (nr = 0; nr < 2; nr++) {
@@ -703,8 +728,7 @@ static int f75375_probe(struct i2c_client *client,
                goto exit_remove;
        }
 
-       if (f75375s_pdata != NULL)
-               f75375_init(client, data, f75375s_pdata);
+       f75375_init(client, data, f75375s_pdata);
 
        return 0;