Hi Uwe, On Sun, 12 Feb 2012 11:09:44 +0100, Uwe Kleine-König wrote: > Based on a patch by David Jander that mostly did s/mc13783/mc13xxx/ . > > Additionally use dev_get_drvdata instead of to_platform_device + > platform_get_drvdata in mc13783_adc_read (spotted by Jean Delvare). > > Cc: David Jander <david.jander@xxxxxxxxxxx> > Acked-by: Jean Delvare <khali@xxxxxxxxxxxx> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> > --- > changes since v4: > - provide touchscreen inputs on mc13892, too > changes since v3: > - drop _adc in Documentation/hwmon/mc13783-adc, too > - use dev_get_drvdata instead of to_platform_device + > platform_get_drvdata > changes since v2: > - make code generating name attribute more robust and strip [-_]adc > - consistenly use MC13783_ADC_16CHANS / mc13783_attr_16chans > --- > Documentation/hwmon/mc13783-adc | 50 +++++++++++++----- > drivers/hwmon/Kconfig | 6 +- > drivers/hwmon/mc13783-adc.c | 107 +++++++++++++++++++++++++++++--------- > 3 files changed, 121 insertions(+), 42 deletions(-) > > diff --git a/Documentation/hwmon/mc13783-adc b/Documentation/hwmon/mc13783-adc > index 044531a..356b10a 100644 > --- a/Documentation/hwmon/mc13783-adc > +++ b/Documentation/hwmon/mc13783-adc > (...) > @@ -48,3 +52,23 @@ Channel Signal Input Range Scaling > 13 General Purpose TSX2 / Touchscreen X-plate 2 0 - 2.30V No > 14 General Purpose TSY1 / Touchscreen Y-plate 1 0 - 2.30V No > 15 General Purpose TSY2 / Touchscreen Y-plate 2 0 - 2.30V No > + > +MC13892: > +Channel Signal Input Range Scaling > +------------------------------------------------------------------------------- > +0 Battery Voltage (BATT) 0 - 4.8V /2 > +1 Battery Current (BATT - BATTISNSCC) -60 - 60 mV x20 > +2 Application Supply (BPSNS) 0 - 4.8V /2 > +3 Charger Voltage (CHRGRAW) 0 - 12V / /5 > + 0 - 20V /10 > +4 Charger Current (CHRGISNS-BPSNS) / -0.3 - 0.3V / x4 / > + Touchscreen X-plate 1 0 - 2.4V No > +5 General Purpose ADIN5 / Battery Pack Thermistor 0 - 2.4V No > +6 General Purpose ADIN6 / Backup Voltage (LICELL) 0 - 2.4V / No > + Backup Voltage (LICELL) 0 - 3.6V x2/3 > +7 General Purpose ADIN7 / UID / Die Temperature 0 - 2.4V / No / > + 0 - 4.8V /2 > +12 Touchscreen X-plate 1 0 - 2.4V No > +13 Touchscreen X-plate 2 0 - 2.4V No > +14 Touchscreen Y-plate 1 0 - 2.4V No > +15 Touchscreen Y-plate 2 0 - 2.4V No I think we can add General Purpose TS* for inputs 12-15 now. I'll do that, no need to resend. All the rest looks good, applied, thanks. -- Jean Delvare _______________________________________________ lm-sensors mailing list lm-sensors@xxxxxxxxxxxxxx http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
