On 15/07/13 14:30, Kozaruk, Oleksandr wrote: > Hello Jonathan, > Thanks for the review. > >> Couple of things: >> >> 1) It looks from the driver that a lot of the channels are not measuring >> voltages but rather temperature or currents etc. If so then their >> types in the channel mask should be appropriately set. Also if some >> of the channels are entirely internal test networks, what is the benefit >> of exposing them to userspace as readable channels? >> If channels are merely 'suggested' as being used for temperatures etc >> then it is fine to keep them as voltages. > There are two kinds of channel for measuring temperature: die temperature > and those that measure temperature indirectly measuring voltage on resistive > load(NTC sensor). > die temperature is calculated by some formulas which convert ADC code to > temperature. This is not implemented in the driver. > Channels intended to measure temperature with NTC sensor have inbuilt current > sources. Voltage measured by this channels and specific NTC could be converted > to temperature. > This is the reason they chosen to be voltage channels. > As for test network I'll remove them from exposing to userspace. > [...] > >>> +static int twl6030_gpadc_get_raw(struct twl6030_gpadc_data *gpadc, >>> + int channel, int *res) >>> +{ >>> + u8 reg = gpadc->pdata->channel_to_reg(channel); >>> + u8 val[2]; >> le16 val; >>> + int ret; >>> + >> ret = twl6030_gpadc_read(val, reg); >> (note that (reg, val) ordering of parameters would be a more common choice) >> >>> + ret = twl6030_gpadc_read(val, reg); >>> + if (ret) { >>> + dev_dbg(gpadc->dev, "unable to read register 0x%X\n", reg); >>> + return ret; >>> + } >>> + >> res = le16_to_cpup(val); >> >>> + *res = (val[1] << 8) | val[0]; >>> + >>> + return ret; >>> +} >>> + > You mean something like this: > static int twl6030_gpadc_get_raw(struct twl6030_gpadc_data *gpadc, > int channel, int *res) > { > u8 reg = gpadc->pdata->channel_to_reg(channel); > __le16 val; > int ret; > > ret = twl6030_gpadc_read(reg, (u8 *)&val); > if (ret) { > dev_dbg(gpadc->dev, "unable to read register 0x%X\n", reg); > return ret; > } > > *res = le16_to_cpup(&val); > > return ret; > } > Note, that twl6030_gpadc_read() is just wrapper for twl_i2c_read() which takes > "an array of num_bytes containing data to be read" > I like the original implementation better then this(if I did it correctly) > Do you insist on this change? > [...] > >>> +static int twl6030_gpadc_get_processed(struct twl6030_gpadc_data *gpadc, >>> + int channel, int *val) >>> +{ >>> + int raw_code; >>> + int corrected_code; >>> + int channel_value; >>> + int ret; >>> + >>> + ret = twl6030_gpadc_get_raw(gpadc, channel, &raw_code); >>> + if (ret) >>> + return ret; >>> + >> Might first thought on seeing this is that it would be better to return >> raw for all channels and provide the scale and offset info_mask elements >> where possible rather than doing the conversion in the kernel. Note we > In our custom kernel branch battery driver needs battery voltage and > temperature. Thus the conversion anyway is done in the kernel, either > in ADC driver or battery driver. > >> allow really quite a bit of precision on those values so I doubt it >> will be a problem. >> >> If nothing else it would make everything rather more consistent. >> > [...] > >>> +static int twl6032_calibration(struct twl6030_gpadc_data *gpadc) >>> +{ >>> + int chn, d1 = 0, d2 = 0, temp; >>> + u8 trim_regs[17]; >>> + int ret; >>> + >>> + ret = twl_i2c_read(TWL6030_MODULE_ID2, trim_regs + 1, >>> + TWL6030_GPADC_TRIM1, 16); >>> + if (ret < 0) { >>> + dev_err(gpadc->dev, "calibration failed\n"); >>> + return ret; >>> + } >>> + >> /* >> * Loop >> please for kernel code. >>> + /* Loop to calculate the value needed for returning voltages from >>> + * GPADC not values. >>> + * >>> + * gain is calculated to 3 decimal places fixed point. >>> + */ >>> + for (chn = 0; chn < TWL6032_GPADC_MAX_CHANNELS; chn++) { >>> + >>> + switch (chn) { >>> + case 0: >>> + case 1: >>> + case 2: >>> + case 3: >>> + case 4: >>> + case 5: >>> + case 6: >>> + case 11: >>> + case 12: >>> + case 13: >>> + case 14: >>> + /* D1 */ >>> + d1 = (trim_regs[3] & 0x1F) << 2; >>> + d1 |= (trim_regs[1] & 0x06) >> 1; >>> + if (trim_regs[1] & 0x01) >>> + d1 = -d1; >>> + >>> + /* D2 */ >>> + d2 = (trim_regs[4] & 0x3F) << 2; >>> + d2 |= (trim_regs[2] & 0x06) >> 1; >>> + if (trim_regs[2] & 0x01) >>> + d2 = -d2; >>> + break; >>> + case 8: >> No coment on your code, but this is an 'interesting' bit >> of bit packing... >> I did vaguely wonder if this could be mapped to a big lookup table, >> but having tried it I think I end up with something almost as tricky >> to read.. Oh well that was a fun 10 minute diversion ;) > This is inherited code from Graeme - original author of implementation > for twl6032. > [...] > That bit is the bane of my life :-( I think the data sheet used to changed weekly as the hardware guys did not understand the difference between ones and twos complement! The reason for the crazy packing is there was not enough space allocated in hardware for the change from 10 to 12 bits for the error values between 6030 and 6032. Graeme -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html