On 19-08-16 04:43, Guenter Roeck wrote:
> On 08/16/2016 12:20 AM, Mike Looijmans wrote:
>> Parse de= vicetree parameters for voltage and prescaler setting. This allows
>= ;> using multiple max6550 devices with varying settings, and also makes = it
>> possible to instantiate and configure the device using dev= icetree.
>>
>> Signed-off-by: Mike Looijmans <mike= .looijmans@topic.nl>
>> ---
>> v4: Vendor prefix "= maxim," for devicetree properties and compatible string
>> = ;   Split documentation into separate patch
>> v3= : Resubmit because wrong mailing lists used
>>    = ; Fix style errors as reported by checkpatch.pl
>> &n= bsp;  Fix bug in DT parsing of fan-prescale
>> v2: Add= devicetree binding documentation
>>     Cod= e changes as suggested by Guenter
>>     Red= uce log info, output only a single line
>> drivers/hwmon/m= ax6650.c | 47 ++++++++++++++++++++++++++++++++++++-----------
>>= 1 file changed, 36 insertions(+), 11 deletions(-)
>>
>> diff --git a/drivers/hwmon/max6650.c b/drivers/hwmon/max6650.c>> index 162a520..6beb62c 100644
>> --- a/drivers/hwmon= /max6650.c
>> +++ b/drivers/hwmon/max6650.c
>> @@ -39= ,6 +39,7 @@
>> #include <linux/hwmon.h>
>>= ; #include <linux/hwmon-sysfs.h>
>> #include &= lt;linux/err.h>
>> +#include <linux/of_device.h>
&= gt;>
>> /*
>>   * Insmod parameter= s
>> @@ -48,7 +49,7 @@
>> static int fan_voltag= e;
>> /* prescaler: Possible values are 1, 2, 4, 8, 16 or = 0 for don't change */
>> static int prescaler;
&g= t;> -/* clock: The clock frequency of the chip the driver should assume = */
>> +/* clock: The clock frequency of the chip (max6651 can be= clocked
>> externally) */
>> static int clock = =3D 254000;
>>
>> module_param(fan_voltage, int= , S_IRUGO);
>> @@ -133,6 +134,19 @@ static const u8 tach_reg[] = =3D {
>>      MAX6650_REG_TACH3,
&= gt;> };
>>
>> +static const struct of_device= _id max6650_dt_match[] =3D {
>> +    {
>&= gt; +        .compatible =3D "maxim,max6= 650",
>> +        .data =3D (= void *)1
>> +    },
>> +   &= nbsp;{
>> +        .compatibl= e =3D "maxim,max6651",
>> +       = .data =3D (void *)4
>> +    },
>>= ; +    { },
>> +};
>> +MODULE_DEVICE_T= ABLE(of, max6650_dt_match);
>> +
>> static stru= ct max6650_data *max6650_update_device(struct device *dev)
>> &n= bsp;{
>>      struct max6650_data *data= =3D dev_get_drvdata(dev);
>> @@ -566,6 +580,17 @@ static int ma= x6650_init_client(struct max6650_data *data,
>>   &nbs= p;  struct device *dev =3D &client->dev;
>> &nb= sp;    int config;
>>    &nbs= p; int err =3D -EIO;
>> +    u32 voltage;>> +    u32 prescale;
>> +
>>= +    if (of_property_read_u32(dev->of_node, "maxim,fan-m= icrovolt",
>> +         =         &voltage))
>>= ; +        voltage =3D fan_voltage;
>> +    else
>> +     =    voltage =3D voltage > 5500000 ? 12 : 5;
>
> I think this should only accept 5V or 12V.
>
> Guente= r

A 4V, 10V or 13V fan will also work just fine, the voltage reg= ister just sets
the range of the feedback tachometer.

I do= n't have strong feelings either way, so if you feel the drive should ba= il
out on anything but 5 or 12, that's fine with me too.
Should I change this and send a v5 patch?

>>= ; +    if (of_property_read_u32(dev->of_node, "maxim,fan-= prescale",
>> +         =         &prescale))
>&g= t; +        prescale =3D prescaler;
>>
>>      config =3D i2c_smbus_= read_byte_data(client, MAX6650_REG_CONFIG);
>>
>> @@ = -574,7 +599,7 @@ static int max6650_init_client(struct max6650_data *data,<= br />>>          return = err;
>>      }
>>
>&= gt; -    switch (fan_voltage) {
>> +   = switch (voltage) {
>>      case 0= :
>>          break= ;
>>      case 5:
>> @@ -584= ,14 +609,10 @@ static int max6650_init_client(struct max6650_data *data,>>          config |= =3D MAX6650_CFG_V12;
>>       &nbs= p;  break;
>>      default:>> -        dev_err(dev, "ille= gal value for fan_voltage (%d)\n",
>> -     =        fan_voltage);
>> + &nb= sp;      dev_err(dev, "illegal value for fan_= voltage (%d)\n", voltage);
>>      }>>
>> -    dev_info(dev, "Fan voltage is= set to %dV.\n",
>> -        = (config & MAX6650_CFG_V12) ? 12 : 5);
>> -
>&g= t; -    switch (prescaler) {
>> +   &nb= sp;switch (prescale) {
>>      case 0:<= br />>>          break;<= br />>>      case 1:
>> @@ -614,1= 0 +635,11 @@ static int max6650_init_client(struct max6650_data *data,
>>            = ;   | MAX6650_CFG_PRESCALER_16;
>>   &n= bsp;      break;
>>   &n= bsp;  default:
>> -      &nbs= p; dev_err(dev, "illegal value for prescaler (%d)\n", prescaler);
>> +        dev_err(dev, "illegal= value for prescaler (%d)\n", prescale);
>>    &n= bsp; }
>>
>> -    dev_info(dev, "= Prescaler is set to %d.\n",
>> +    dev_info(dev,= "Fan voltage: %dV, prescaler: %d.\n",
>> +    &n= bsp;    (config & MAX6650_CFG_V12) ? 12 : 5,
&= gt;>           1 <&= lt; (config & MAX6650_CFG_PRESCALER_MASK));
>>
>>=      /*
>> @@ -651,6 +673,8 @@ static = int max6650_probe(struct i2c_client *client,
>>   &nbs= p;           const s= truct i2c_device_id *id)
>> {
>>   &n= bsp;  struct device *dev =3D &client->dev;
>> +=    const struct of_device_id *of_id =3D
>> + &nb= sp;      of_match_device(of_match_ptr(max6650= _dt_match), dev);
>>      struct max665= 0_data *data;
>>      struct device *hw= mon_dev;
>>      int err;
>>= @@ -661,7 +685,7 @@ static int max6650_probe(struct i2c_client *client,>>
>>      data->client =3D= client;
>>      mutex_init(&data-&= gt;update_lock);
>> -    data->nr_fans =3D id-= >driver_data;
>> +    data->nr_fans =3D of_= id ? (int)(uintptr_t)of_id->data : id->driver_data;
>>
>>      /*
>>    = ;   * Initialize the max6650 chip
>> @@ -691,6 +7= 15,7 @@ MODULE_DEVICE_TABLE(i2c, max6650_id);
>> static st= ruct i2c_driver max6650_driver =3D {
>>     = .driver =3D {
>>        = ;  .name    =3D "max6650",
>> + &= nbsp;     .of_match_table =3D of_match_ptr(max6650= _dt_match),
>>      },
>> &n= bsp;    .probe       &nbs= p;=3D max6650_probe,
>>      .id_table =    =3D max6650_id,
>>
>

TOPIC Products
Mate= riaalweg 4
5681 RJ Best	T:	+31 = (0) 499 33 69 69
Post= bus 440	E:	mike.looijmans@topicproducts.com
5680= AK Best	W:	www.topicproducts.com
The Netherlands