Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756370Ab1DNMXR (ORCPT ); Thu, 14 Apr 2011 08:23:17 -0400 Received: from tx2ehsobe001.messaging.microsoft.com ([65.55.88.11]:21209 "EHLO TX2EHSOBE001.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751681Ab1DNMXQ (ORCPT ); Thu, 14 Apr 2011 08:23:16 -0400 X-SpamScore: 1 X-BigFish: VPS1(zz936eKc8kzz1202hzz8275bhz32i2a8h668h839h61h) X-Spam-TCS-SCL: 0:0 X-Forefront-Antispam-Report: KIP:(null);UIP:(null);IPVD:NLI;H:Kcinpunhjhc01.kpit.com;RD:Kcinpunhjhc01.Kpit.com;EFVD:NLI From: Ashish Jangam To: Randy Dunlap CC: "lm-sensors@lm-sensors.org" , "linux-kernel@vger.kernel.org" , Dajun Chen Date: Thu, 14 Apr 2011 17:52:52 +0530 Subject: [PATCHv1 6/11] HWMON: HWMON module of DA9052 PMIC driver Thread-Topic: [PATCHv1 6/11] HWMON: HWMON module of DA9052 PMIC driver Thread-Index: Acv6nq0dcbDpVX9qRya4I/7stf3b8w== Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 X-OriginatorOrg: kpitcummins.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id p3ECNTQC019359 Content-Length: 13520 Lines: 446 Hi Randy, HWMON Driver for Dialog Semiconductor DA9052 PMICs. Changes made since last submission: . Changed the return format for charging current, bat temperature . and junction temperature . Code formatting done . Added DA9052 HWMON description file . Ported on 2.6.38.2 kernel Linux Kernel Version: 2.6.38.2 Signed-off-by: D. Chen --- diff -Naur linux-2.6.38.2/Documentation/hwmon/da9052 wrk_linux-2.6.38.2/Documentation/hwmon/da9052 --- linux-2.6.38.2/Documentation/hwmon/da9052 1970-01-01 05:00:00.000000000 +0500 +++ wrk_linux-2.6.38.2/Documentation/hwmon/da9052 2011-04-14 15:27:49.000000000 +0500 @@ -0,0 +1,60 @@ +Kernel driver da9052-hwmon +========================== + +Supported chips: + * Dialog Semiconductors DA9052 PMICs + Prefix: 'da9052' + Datasheet:Available on the Internet + +Authors: David Dajun Chen + +Description +----------- + +The DA9052 is a highly integrated PMIC subsystem with supply domain flexibility +to support a wide range of application processors, associated peripherals and +user interface functions. + +Combined with a switched-mode DC input/USB compatible charger, full power path +management and multiple sleep modes the device offers an energy-optimised +solution suitable for portable handheld, wireless and infotainment applications. + +Interfacing directly to a Li-lon/Polymer battery pack the high efficiency +switching charger supports precise current/voltage charging as well as +pre charge and USB modes without processor interaction. During charging the die +temperature is thermally regulated enabling higher capacity batteries to be +rapidly charged at currents up to 1.25A with minimum thermal impact to +space-constrained PCB.s. + +USB suspend mode operation is supported and for robustness the USB power inputs +are internally protected against over-voltage conditions. + +The autonomous power path controller seamlessly detects and manages energy flow +between an AC adaptor, USB cable and battery whilst maintaining USB power +specification compliance. + +The internally-generated system power rail supports power scenarios such as +instant-on with a full discharged battery. A reverse-protected backup battery +charger is also integrated into the power path function. + +The power efficiency and flexibility of the switching input stage is maintained +to the generated supplies. Controlled by a programmable digital power manager +the 14 user- programmable switched/linear regulators may be configured +for a variety of start up sequences, levels and timings. + +Voltage Monitoring +------------------ + +Voltages are sampled by a 10 bit ADC. Voltages in milivolts are 1.465 +times the ADC value. + +Temperature Monitoring +---------------------- + +Temperatures are sampled by a 10 bit ADC. Chip and battery temperatures +are available. The chip temperature is calculated as: + + Degrees celsius = (512.18 - data) / 1.0983 + +while the battery temperature calculation will depend on the NTC +thermistor component. diff -Naur linux-2.6.38.2/drivers/hwmon/da9052-hwmon.c wrk_linux-2.6.38.2/drivers/hwmon/da9052-hwmon.c --- linux-2.6.38.2/drivers/hwmon/da9052-hwmon.c 1970-01-01 05:00:00.000000000 +0500 +++ wrk_linux-2.6.38.2/drivers/hwmon/da9052-hwmon.c 2011-04-14 15:36:40.000000000 +0500 @@ -0,0 +1,328 @@ +/* + * HWMON Driver for Dialog DA9052 + * + * Copyright(c) 2009 Dialog Semiconductor Ltd. + * + * Author: Dajun Chen + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +struct da9052_hwmon { + struct da9052 *da9052; + struct device *class_device; + struct mutex hwmon_lock; +}; + +static const char *input_names[] = { + [DA9052_ADC_VDDOUT]= "VDDOUT", + [DA9052_ADC_ICH] = "CHARGING CURRENT", + [DA9052_ADC_TBAT] = "BATTERY TEMP", + [DA9052_ADC_VBAT] = "BATTERY VOLTAGE", + [DA9052_ADC_IN4] = "ADC IN4", + [DA9052_ADC_IN5] = "ADC IN5", + [DA9052_ADC_IN6] = "ADC IN6", + [DA9052_ADC_TJUNC]= "BATTERY JUNCTION TEMP", + [DA9052_ADC_VBBAT]= "BACK-UP BATTERY VOLTAGE", +}; + +static int da9052_enable_vddout_channel(struct da9052 *da9052) +{ + int ret; + + ret = da9052_reg_read(da9052, DA9052_ADC_CONT_REG); + if (ret < 0) + return ret; + + ret |= DA9052_ADCCONT_AUTOVDDEN; + return da9052_reg_write(da9052, DA9052_ADC_CONT_REG, ret); +} + +static int da9052_disable_vddout_channel(struct da9052 *da9052) +{ + int ret; + + ret = da9052_reg_read(da9052, DA9052_ADC_CONT_REG); + if (ret < 0) + return ret; + + ret |= ~DA9052_ADCCONT_AUTOVDDEN; + return da9052_reg_write(da9052, DA9052_ADC_CONT_REG, ret); + +} + +static ssize_t da9052_read_vddout(struct device *dev, + struct device_attribute *devattr, char *buf) +{ + struct da9052_hwmon *hwmon = dev_get_drvdata(dev); + int ret = -EIO; + + mutex_lock(&hwmon->hwmon_lock); + + ret = da9052_enable_vddout_channel(hwmon->da9052); + if (ret < 0) { + mutex_unlock(&hwmon->hwmon_lock); + return ret; + } + + ret = da9052_reg_read(hwmon->da9052, DA9052_VDD_RES_REG); + if (ret < 0) { + mutex_unlock(&hwmon->hwmon_lock); + return ret; + } + + ret = da9052_disable_vddout_channel(hwmon->da9052); + if (ret < 0) { + mutex_unlock(&hwmon->hwmon_lock); + return ret; + } + + mutex_unlock(&hwmon->hwmon_lock); + return sprintf(buf, "%u\n", ret); + +} + +static ssize_t da9052_read_ich(struct device *dev, + struct device_attribute *devattr, char *buf) +{ + struct da9052_hwmon *hwmon = dev_get_drvdata(dev); + int ret; + + ret = da9052_reg_read(hwmon->da9052, DA9052_ICHG_AV_REG); + if (ret < 0) + return ret; + + /* Equivalent to 3.9mA/bit in register ICHG_AV */ + ret = DIV_ROUND_CLOSEST(ret * 39, 10); + return sprintf(buf, "%d\n", ret); +} + +static ssize_t da9052_read_tbat(struct device *dev, + struct device_attribute *devattr, char *buf) +{ + struct da9052_hwmon *hwmon = dev_get_drvdata(dev); + int ret; + + ret = da9052_reg_read(hwmon->da9052, DA9052_TBAT_RES_REG); + if (ret < 0) + return ret; + + /* Degrees celsius = (512.18-ret) / 1.0983 */ + ret = 512180 - (ret * 1000); + ret = DIV_ROUND_CLOSEST(ret * 10000, 10983); + return sprintf(buf, "%d\n", ret); +} + +static ssize_t da9052_read_vbat(struct device *dev, + struct device_attribute *devattr, char *buf) +{ + struct da9052_hwmon *hwmon = dev_get_drvdata(dev); + int ret; + + ret = da9052_adc_manual_read(hwmon->da9052, DA9052_ADC_VBAT); + if (ret < 0) + return ret; + + return sprintf(buf, "%u\n", ret); +} + +static ssize_t da9052_read_misc_channel(struct device *dev, + struct device_attribute *devattr, char *buf) +{ + struct da9052_hwmon *hwmon = dev_get_drvdata(dev); + int channel = to_sensor_dev_attr(devattr)->index; + int ret; + + ret = da9052_adc_manual_read(hwmon->da9052, channel); + if (ret < 0) + return -EIO; + + return sprintf(buf, "%u\n", ret); +} + +static ssize_t da9052_read_tjunc(struct device *dev, + struct device_attribute *devattr, char *buf) +{ + struct da9052_hwmon *hwmon = dev_get_drvdata(dev); + int temp; + int ret; + + ret = da9052_reg_read(hwmon->da9052, DA9052_TJUNC_RES_REG); + if (ret < 0) + return ret; + + temp = ret; + + ret = da9052_reg_read(hwmon->da9052, DA9052_T_OFFSET_REG); + if (ret < 0) + return ret; + + /* Degrees celsius = 1.708 * (TJUNC_RES– T_OFFSET) – 108.8 */ + ret = DIV_ROUND_CLOSEST((temp - ret) * 1708, 1000); + ret = round_down(ret, 108.8); + return sprintf(buf, "%d\n", (char)ret); +} + +static ssize_t da9052_read_vbbat(struct device *dev, + struct device_attribute *devattr, char *buf) +{ + struct da9052_hwmon *hwmon = dev_get_drvdata(dev); + int ret; + + ret = da9052_adc_manual_read(hwmon->da9052, DA9052_ADC_VBBAT); + if (ret < 0) + return ret; + + return sprintf(buf, "%u\n", ret); + +} + +static ssize_t da9052_hwmon_show_name(struct device *dev, + struct device_attribute *devattr, char *buf) +{ + return sprintf(buf, "da9052-hwmon\n"); +} + +static ssize_t show_label(struct device *dev, + struct device_attribute *devattr, char *buf) +{ + int channel = to_sensor_dev_attr(devattr)->index; + + return sprintf(buf, "%s\n", input_names[channel]); +} + +#define DA9052_ADC_CHANNELS(id, func_name, name)\ + static SENSOR_DEVICE_ATTR(in##id##_label, S_IRUGO, show_label,\ + NULL, name);\ + static SENSOR_DEVICE_ATTR(in##id##_input, S_IRUGO, func_name,\ + NULL, name) + +DA9052_ADC_CHANNELS(0, da9052_read_vddout, DA9052_ADC_VDDOUT); +DA9052_ADC_CHANNELS(1, da9052_read_ich, DA9052_ADC_ICH); +DA9052_ADC_CHANNELS(2, da9052_read_tbat, DA9052_ADC_TBAT); +DA9052_ADC_CHANNELS(3, da9052_read_vbat, DA9052_ADC_VBAT); +DA9052_ADC_CHANNELS(4, da9052_read_misc_channel, DA9052_ADC_IN4); +DA9052_ADC_CHANNELS(5, da9052_read_misc_channel, DA9052_ADC_IN5); +DA9052_ADC_CHANNELS(6, da9052_read_misc_channel, DA9052_ADC_IN6); +DA9052_ADC_CHANNELS(8, da9052_read_tjunc, DA9052_ADC_TJUNC); +DA9052_ADC_CHANNELS(9, da9052_read_vbbat, DA9052_ADC_VBBAT); + +static DEVICE_ATTR(name, S_IRUGO, da9052_hwmon_show_name, NULL); + +static struct attribute *da9052_attr[] = { + &dev_attr_name.attr, + + &sensor_dev_attr_in0_input.dev_attr.attr, + &sensor_dev_attr_in0_label.dev_attr.attr, + &sensor_dev_attr_in1_input.dev_attr.attr, + &sensor_dev_attr_in1_label.dev_attr.attr, + &sensor_dev_attr_in2_input.dev_attr.attr, + &sensor_dev_attr_in2_label.dev_attr.attr, + &sensor_dev_attr_in3_input.dev_attr.attr, + &sensor_dev_attr_in3_label.dev_attr.attr, + &sensor_dev_attr_in4_input.dev_attr.attr, + &sensor_dev_attr_in4_label.dev_attr.attr, + &sensor_dev_attr_in5_input.dev_attr.attr, + &sensor_dev_attr_in5_label.dev_attr.attr, + &sensor_dev_attr_in6_input.dev_attr.attr, + &sensor_dev_attr_in6_label.dev_attr.attr, + &sensor_dev_attr_in8_input.dev_attr.attr, + &sensor_dev_attr_in8_label.dev_attr.attr, + &sensor_dev_attr_in9_input.dev_attr.attr, + &sensor_dev_attr_in9_label.dev_attr.attr, + + NULL +}; + +static const struct attribute_group da9052_attr_group = {.attrs = da9052_attr}; + +static int __init da9052_hwmon_probe(struct platform_device *pdev) +{ + struct da9052_hwmon *hwmon; + int ret; + + hwmon = kzalloc(sizeof(struct da9052_hwmon), GFP_KERNEL); + if (!hwmon) + return -ENOMEM; + + mutex_init(&hwmon->hwmon_lock); + hwmon->da9052 = dev_get_drvdata(pdev->dev.parent); + + hwmon->class_device = hwmon_device_register(&pdev->dev); + if (IS_ERR(hwmon->class_device)) { + ret = PTR_ERR(hwmon->class_device); + goto err_sysfs; + } + + ret = sysfs_create_group(&pdev->dev.kobj, &da9052_attr_group); + if (ret) + goto err_mem; + + platform_set_drvdata(pdev, hwmon); + + return 0; + +err_sysfs: + sysfs_remove_group(&pdev->dev.kobj, &da9052_attr_group); +err_mem: + mutex_destroy(&hwmon->hwmon_lock); + kfree(hwmon); + return ret; +} + +static int __devexit da9052_hwmon_remove(struct platform_device *pdev) +{ + struct da9052_hwmon *hwmon = platform_get_drvdata(pdev); + + mutex_destroy(&hwmon->hwmon_lock); + hwmon_device_unregister(hwmon->class_device); + sysfs_remove_group(&pdev->dev.kobj, &da9052_attr_group); + kfree(hwmon); + + return 0; +} + +static struct platform_driver da9052_hwmon_driver = { + .driver = { + .name = "da9052-hwmon", + .owner = THIS_MODULE, + }, + .probe = da9052_hwmon_probe, + .remove = __devexit_p(da9052_hwmon_remove), + +}; + +static int __init da9052_hwmon_init(void) +{ + + return platform_driver_register(&da9052_hwmon_driver); +} +module_init(da9052_hwmon_init); + +static void __exit da9052_hwmon_exit(void) +{ + platform_driver_unregister(&da9052_hwmon_driver); +} +module_exit(da9052_hwmon_exit); + +MODULE_AUTHOR("David Dajun Chen "); +MODULE_DESCRIPTION("DA9052 ADC driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:da9052-hwmon"); diff -Naur linux-2.6.38.2/drivers/hwmon/Kconfig wrk_linux-2.6.38.2/drivers/hwmon/Kconfig --- linux-2.6.38.2/drivers/hwmon/Kconfig 2011-03-27 23:37:20.000000000 +0500 +++ wrk_linux-2.6.38.2/drivers/hwmon/Kconfig 2011-04-14 15:37:09.000000000 +0500 @@ -294,6 +294,13 @@ This driver can also be built as a module. If so, the module will be called ds1621. +config SENSORS_DA9052_ADC + tristate "Dialog DA9052 HWMON" + depends on PMIC_DA9052 + help + Say y here to support the ADC found on + Dialog Semiconductor DA9052 PMIC. + config SENSORS_I5K_AMB tristate "FB-DIMM AMB temperature sensor on Intel 5000 series chipsets" depends on PCI && EXPERIMENTAL diff -Naur linux-2.6.38.2/drivers/hwmon/Makefile wrk_linux-2.6.38.2/drivers/hwmon/Makefile --- linux-2.6.38.2/drivers/hwmon/Makefile 2011-03-27 23:37:20.000000000 +0500 +++ wrk_linux-2.6.38.2/drivers/hwmon/Makefile 2011-04-14 15:37:01.000000000 +0500 @@ -40,6 +40,7 @@ obj-$(CONFIG_SENSORS_ATXP1) += atxp1.o obj-$(CONFIG_SENSORS_CORETEMP) += coretemp.o obj-$(CONFIG_SENSORS_PKGTEMP) += pkgtemp.o +obj-$(CONFIG_SENSORS_DA9052_ADC)+= da9052-hwmon.o obj-$(CONFIG_SENSORS_DME1737) += dme1737.o obj-$(CONFIG_SENSORS_DS620) += ds620.o obj-$(CONFIG_SENSORS_DS1621) += ds1621.o Regards, Ashish J ????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay?ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m???? ????????I?