diff for duplicates of <566C5613.3040101@kernel.org> diff --git a/a/1.txt b/N1/1.txt index d970965..bdfd1c0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -147,7 +147,7 @@ Jonathan > + > +static bool ina2xx_is_writeable_reg(struct device *dev, unsigned int reg) > +{ -> + return (reg == INA2XX_CONFIG) || (reg > INA2XX_CURRENT); +> + return (reg = INA2XX_CONFIG) || (reg > INA2XX_CURRENT); > +} > + > +static bool ina2xx_is_volatile_reg(struct device *dev, unsigned int reg) @@ -264,7 +264,7 @@ Jonathan > + > + case IIO_CHAN_INFO_INT_TIME: > + *val = 0; -> + if (chan->address == INA2XX_SHUNT_VOLTAGE) +> + if (chan->address = INA2XX_SHUNT_VOLTAGE) > + *val2 = chip->int_time_vshunt; > + else > + *val2 = chip->int_time_vbus; @@ -381,7 +381,7 @@ Jonathan > + break; > + > + case IIO_CHAN_INFO_INT_TIME: -> + if (chan->address == INA2XX_SHUNT_VOLTAGE) +> + if (chan->address = INA2XX_SHUNT_VOLTAGE) > + ret = ina226_set_int_time_vshunt(chip, val2, &tmp); > + else > + ret = ina226_set_int_time_vbus(chip, val2, &tmp); @@ -646,8 +646,7 @@ fix this up when applying (should be predisable) > + > + if (of_property_read_u32(client->dev.of_node, > + "shunt-resistor", &val) < 0) { -> + struct ina2xx_platform_data *pdata = -> + dev_get_platdata(&client->dev); +> + struct ina2xx_platform_data *pdata > + dev_get_platdata(&client->dev); > + > + if (pdata) > + val = pdata->shunt_uohms; @@ -682,7 +681,7 @@ fix this up when applying (should be predisable) > + /* Patch the current config register with default. */ > + val = chip->config->config_default; > + -> + if (id->driver_data == ina226) { +> + if (id->driver_data = ina226) { > + ina226_set_average(chip, INA226_DEFAULT_AVG, &val); > + ina226_set_int_time_vbus(chip, INA226_DEFAULT_IT, &val); > + ina226_set_int_time_vshunt(chip, INA226_DEFAULT_IT, &val); @@ -745,4 +744,10 @@ fix this up when applying (should be predisable) > +MODULE_AUTHOR("Marc Titinger <marc.titinger@baylibre.com>"); > +MODULE_DESCRIPTION("Texas Instruments INA2XX ADC driver"); > +MODULE_LICENSE("GPL v2"); -> +> + + +_______________________________________________ +lm-sensors mailing list +lm-sensors@lm-sensors.org +http://lists.lm-sensors.org/mailman/listinfo/lm-sensors diff --git a/a/content_digest b/N1/content_digest index a243477..6bb2158 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01449479375-4061-1-git-send-email-mtitinger@baylibre.com\0" "ref\01449479375-4061-2-git-send-email-mtitinger@baylibre.com\0" "From\0Jonathan Cameron <jic23@kernel.org>\0" - "Subject\0Re: [PATCH v3 1/2] iio: ina2xx: add support for TI INA2xx Power Monitors\0" + "Subject\0Re: [lm-sensors] [PATCH v3 1/2] iio: ina2xx: add support for TI INA2xx Power Monitors\0" "Date\0Sat, 12 Dec 2015 17:14:59 +0000\0" "To\0Marc Titinger <mtitinger@baylibre.com>" knaack.h@gmx.de @@ -163,7 +163,7 @@ "> +\n" "> +static bool ina2xx_is_writeable_reg(struct device *dev, unsigned int reg)\n" "> +{\n" - "> +\treturn (reg == INA2XX_CONFIG) || (reg > INA2XX_CURRENT);\n" + "> +\treturn (reg = INA2XX_CONFIG) || (reg > INA2XX_CURRENT);\n" "> +}\n" "> +\n" "> +static bool ina2xx_is_volatile_reg(struct device *dev, unsigned int reg)\n" @@ -280,7 +280,7 @@ "> +\n" "> +\tcase IIO_CHAN_INFO_INT_TIME:\n" "> +\t\t*val = 0;\n" - "> +\t\tif (chan->address == INA2XX_SHUNT_VOLTAGE)\n" + "> +\t\tif (chan->address = INA2XX_SHUNT_VOLTAGE)\n" "> +\t\t\t*val2 = chip->int_time_vshunt;\n" "> +\t\telse\n" "> +\t\t\t*val2 = chip->int_time_vbus;\n" @@ -397,7 +397,7 @@ "> +\t\tbreak;\n" "> +\n" "> +\tcase IIO_CHAN_INFO_INT_TIME:\n" - "> +\t\tif (chan->address == INA2XX_SHUNT_VOLTAGE)\n" + "> +\t\tif (chan->address = INA2XX_SHUNT_VOLTAGE)\n" "> +\t\t\tret = ina226_set_int_time_vshunt(chip, val2, &tmp);\n" "> +\t\telse\n" "> +\t\t\tret = ina226_set_int_time_vbus(chip, val2, &tmp);\n" @@ -662,8 +662,7 @@ "> +\n" "> +\tif (of_property_read_u32(client->dev.of_node,\n" "> +\t\t\t\t \"shunt-resistor\", &val) < 0) {\n" - "> +\t\tstruct ina2xx_platform_data *pdata =\n" - "> +\t\t dev_get_platdata(&client->dev);\n" + "> +\t\tstruct ina2xx_platform_data *pdata > +\t\t dev_get_platdata(&client->dev);\n" "> +\n" "> +\t\tif (pdata)\n" "> +\t\t\tval = pdata->shunt_uohms;\n" @@ -698,7 +697,7 @@ "> +\t/* Patch the current config register with default. */\n" "> +\tval = chip->config->config_default;\n" "> +\n" - "> +\tif (id->driver_data == ina226) {\n" + "> +\tif (id->driver_data = ina226) {\n" "> +\t\tina226_set_average(chip, INA226_DEFAULT_AVG, &val);\n" "> +\t\tina226_set_int_time_vbus(chip, INA226_DEFAULT_IT, &val);\n" "> +\t\tina226_set_int_time_vshunt(chip, INA226_DEFAULT_IT, &val);\n" @@ -761,6 +760,12 @@ "> +MODULE_AUTHOR(\"Marc Titinger <marc.titinger@baylibre.com>\");\n" "> +MODULE_DESCRIPTION(\"Texas Instruments INA2XX ADC driver\");\n" "> +MODULE_LICENSE(\"GPL v2\");\n" - > + "> \n" + "\n" + "\n" + "_______________________________________________\n" + "lm-sensors mailing list\n" + "lm-sensors@lm-sensors.org\n" + http://lists.lm-sensors.org/mailman/listinfo/lm-sensors -b87de441d17aa3d2140f4370a2c689b5f5bd618303371a3a31fedac8a2d2ba81 +5db52715deeda782ba0508dd8780d0243353ff3e487b115b7b59e7450473967a
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.