linaro-dev June 2012

linaro-dev@lists.linaro.org

85 participants
81 discussions

Booting linux-linaro-2.6.37 on Beagle Board

by Avik Sil

Hi, I tried booting linux-linaro-2.6.37 kernel on my beagle board C4. I executed following: 1. Installed linaro on a 4 GB SD card using linaro-image-tools 0.4.1 with hwpack daily snapshot hwpack_linaro-omap3_20110125-0_armel_supported.tar.gz and linaro-natty-headless-tar-20101202-1.tar.gz. It was booting properly on my BB. 2. Cloned linux-linaro-2.6.37. Changed to source directory 3. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- omap2plus_defconfig 4. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- menuconfig (enabled EARLY_PRINTK) 5. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- uImage 6. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- modules 7. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- modules_install INSTALL_MOD_PATH=/media/rootfs 8. cp arch/arm/boot/uImage /media/boot; sync Everything went on smoothly. Then I put the SD card on BB and powered it on. I got a kernel panic: http://paste.ubuntu.com/560562 Please help me figuring out the problem. Is it because I didn't create uInitrd? If so, then how to create it for ARM? Regards, Avik

11 years, 9 months

ARM A9 oprofile

by Dmitry Antipov

Hello Ming, could you please give some pointers to observe an overall status of oprofile support on ARM A9 cores? IIUC, now it doesn't work without oprofile.timer=1 kernel option, at least for Linus' tree; searching gives a lot of discussion/patches fragments and similar stuff, but I was unable to find a complete patch/git tree/whatever else to try. Thanks in advance, Dmitry

12 years

[PATCH v4 0/5] thermal: exynos: Add kernel thermal support for exynos platform

by Amit Daniel Kachhap

Hi Andrew/Rui, As discussed with Rui Zhang, I dropped the patch for new trip type THERMAL_TRIP_STATE_INSTANCE and made the necessary state magnagement changes in cpufreq cooling functions. Also I fixed all the review comments suggested by Andrew. If any other changes please let me know. This patchset introduces a new generic cooling device based on cpufreq that can be used on non-ACPI platforms. As a proof of concept, we have drivers for the following platforms using this mechanism now: * Samsung Exynos (Exynos4 and Exynos5) in the current patchset. * TI OMAP (git://git.linaro.org/people/amitdanielk/linux.git omap4460_thermal) * Freescale i.MX (git://git.linaro.org/people/amitdanielk/linux.git imx6q_thermal) The is a small change in cpufreq cooling registration APIs, so a minor change is needed for OMAP and Freescale platforms. Thanks, Amit Daniel Changes since V3: * Dropped the concept of using new trip type THERMAL_TRIP_STATE_INSTANCE as discussed with Rui Zhang. This requires adding some state management logic in cpufreq cooling implementation. * Many review comments suggested by Andrew Morton * More documentation added in cpufreq cooling codes. Changes since V2: *Added Exynos5 TMU sensor support by enhancing the exynos4 tmu driver. Exynos5 TMU driver was internally developed by SangWook Ju <sw.ju(a)samsung.com>. *Removed cpuhotplug cooling code in this patchset. *Rebased the patches against 3.4-rc6 kernel. Changes since V1: *Moved the sensor driver to driver/thermal folder from driver/hwmon folder as suggested by Mark Brown and Guenter Roeck *Added notifier support to notify the registered drivers of any cpu cooling action. The driver can modify the default cooling behaviour(eg set different max clip frequency). *The percentage based frequency replaced with absolute clipped frequency. *Some more conditional checks when setting max frequency. *Renamed the new trip type THERMAL_TRIP_STATE_ACTIVE to THERMAL_TRIP_STATE_INSTANCE *Many review comments from R, Durgadoss <durgadoss.r(a)intel.com> and eduardo.valentin(a)ti.com implemented. *Removed cooling stats through debugfs patch *The V1 based can be found here, https://lkml.org/lkml/2012/2/22/123 http://lkml.org/lkml/2012/3/3/32 Changes since RFC: *Changed the cpu cooling registration/unregistration API's to instance based *Changed the STATE_ACTIVE trip type to pass correct instance id *Adding support to restore back the policy->max_freq after doing frequency clipping. *Moved the trip cooling stats from sysfs node to debugfs node as suggested by Greg KH greg(a)kroah.com *Incorporated several review comments from eduardo.valentin(a)ti.com *Moved the Temperature sensor driver from driver/hwmon/ to driver/mfd as discussed with Guenter Roeck <guenter.roeck(a)ericsson.com> and Donggeun Kim <dg77.kim(a)samsung.com> (https://lkml.org/lkml/2012/1/5/7) *Some changes according to the changes in common cpu cooling APIs *The RFC based patches can be found here, https://lkml.org/lkml/2011/12/13/186 https://lkml.org/lkml/2011/12/21/169 Brief Description: 1) The generic cooling devices code is placed inside driver/thermal/* as placing inside acpi folder will need un-necessary enabling of acpi code. This codes is architecture independent. 2) This patchset adds generic cpu cooling low level implementation through frequency clipping. In future, other cpu related cooling devices may be added here. An ACPI version of this already exists (drivers/acpi/processor_thermal.c) . But this will be useful for platforms like ARM using the generic thermal interface along with the generic cpu cooling devices. The cooling device registration API's return cooling device pointers which can be easily binded with the thermal zone trip points. The important APIs exposed are, a)struct thermal_cooling_device *cpufreq_cooling_register( struct freq_clip_table *tab_ptr, unsigned int tab_size) b)void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev) 3) Samsung exynos platform thermal implementation is done using the generic cpu cooling APIs and the new trip type. The temperature sensor driver present in the hwmon folder(registered as hwmon driver) is moved to thermal folder and registered as a thermal driver. All this patchset is based on Kernel version 3.4-rc6 A simple data/control flow diagrams is shown below, Core Linux thermal <-----> Exynos thermal interface <----- Temperature Sensor | | \|/ | Cpufreq cooling device <--------------- TODO: *Will send the DT enablement patches later after the driver is merged. Amit Daniel Kachhap (5): thermal: Add generic cpufreq cooling implementation hwmon: exynos4: Move thermal sensor driver to driver/thermal directory thermal: exynos5: Add exynos5 thermal sensor driver support thermal: exynos: Register the tmu sensor with the kernel thermal layer ARM: exynos: Add thermal sensor driver platform data support Documentation/hwmon/exynos4_tmu | 81 --- Documentation/thermal/cpu-cooling-api.txt | 60 ++ Documentation/thermal/exynos_thermal | 52 ++ drivers/hwmon/Kconfig | 10 - drivers/hwmon/Makefile | 1 - drivers/hwmon/exynos4_tmu.c | 514 -------------- drivers/thermal/Kconfig | 20 + drivers/thermal/Makefile | 4 +- drivers/thermal/cpu_cooling.c | 483 +++++++++++++ drivers/thermal/exynos_thermal.c | 956 ++++++++++++++++++++++++++ include/linux/cpu_cooling.h | 99 +++ include/linux/platform_data/exynos4_tmu.h | 83 --- include/linux/platform_data/exynos_thermal.h | 100 +++ 13 files changed, 1773 insertions(+), 690 deletions(-) delete mode 100644 Documentation/hwmon/exynos4_tmu create mode 100644 Documentation/thermal/cpu-cooling-api.txt create mode 100644 Documentation/thermal/exynos_thermal delete mode 100644 drivers/hwmon/exynos4_tmu.c create mode 100644 drivers/thermal/cpu_cooling.c create mode 100644 drivers/thermal/exynos_thermal.c create mode 100644 include/linux/cpu_cooling.h delete mode 100644 include/linux/platform_data/exynos4_tmu.h create mode 100644 include/linux/platform_data/exynos_thermal.h

12 years, 2 months

[Powertop][PATCH] fix cpuidle state name parsing

by Rajagopal Venkat

parse cpuidle C state based on sysfs file entry(stateX) instead of state name/description Signed-off-by: Rajagopal Venkat <rajagopal.venkat(a)linaro.org> --- src/cpu/abstract_cpu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpu/abstract_cpu.cpp b/src/cpu/abstract_cpu.cpp index cd4eba0..72969fc 100644 --- a/src/cpu/abstract_cpu.cpp +++ b/src/cpu/abstract_cpu.cpp @@ -147,7 +147,7 @@ void abstract_cpu::insert_cstate(const char *linux_name, const char *human_name, strcpy(state->linux_name, linux_name); strcpy(state->human_name, human_name); - c = human_name; + c = linux_name; while (*c) { if (strcmp(linux_name, "active")==0) { state->line_level = LEVEL_C0; -- 1.7.9.5

12 years, 2 months

[Powertop][PATCH v3] conditionally disable pci if not supported

by Rajagopal Venkat

disable pci if not supported by host platform. When libpci is not found, define a macro which will be used for conditional compilation. Signed-off-by: Rajagopal Venkat <rajagopal.venkat(a)linaro.org> --- configure.ac | 5 +++-- src/lib.cpp | 20 ++++++++++++++++++-- src/lib.h | 5 +++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 4da4eea..3cbc7b0 100644 --- a/configure.ac +++ b/configure.ac @@ -48,8 +48,9 @@ AC_CHECK_FUNCS([fdatasync getpagesize gettimeofday memmove memset mkdir munmap p AC_SEARCH_LIBS([delwin], [ncursesw ncurses], [], AC_MSG_ERROR([ncurses is required but was not found]), []) PKG_CHECK_MODULES([PCIUTILS], [libpci],[],[ - AC_SEARCH_LIBS([pci_get_dev], [pci], [], AC_MSG_ERROR([libpci is required but was not found]), []) -]) + AC_SEARCH_LIBS([pci_get_dev], [pci], [], AC_DEFINE([HAVE_NO_PCI],[1],[Define if pci is not supported]), []) +]) + PKG_CHECK_MODULES([LIBZ], [zlib],[],[ AC_SEARCH_LIBS([deflate], [z], [], AC_MSG_ERROR([zlib is required but was not found]), []) ]) diff --git a/src/lib.cpp b/src/lib.cpp index 0f87e48..77e49a2 100644 --- a/src/lib.cpp +++ b/src/lib.cpp @@ -35,11 +35,13 @@ #include <math.h> #include <stdlib.h> +#include "lib.h" + +#ifndef HAVE_NO_PCI extern "C" { #include <pci/pci.h> } - -#include "lib.h" +#endif #include <stdio.h> #include <stdint.h> @@ -266,6 +268,7 @@ void format_watts(double W, char *buffer, unsigned int len) } +#ifndef HAVE_NO_PCI static struct pci_access *pci_access; char *pci_id_to_name(uint16_t vendor, uint16_t device, char *buffer, int len) @@ -290,6 +293,19 @@ void end_pci_access(void) pci_free_name_list(pci_access); } +#else + +char *pci_id_to_name(uint16_t vendor, uint16_t device, char *buffer, int len) +{ + return NULL; +} + +void end_pci_access(void) +{ +} + +#endif /* HAVE_NO_PCI */ + int utf_ok = -1; diff --git a/src/lib.h b/src/lib.h index 588c023..7093b7f 100644 --- a/src/lib.h +++ b/src/lib.h @@ -30,6 +30,11 @@ #endif #include <stdint.h> +/* Include only for Automake builds */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifndef DISABLE_I18N #define _(STRING) gettext(STRING) #else -- 1.7.9.5

12 years, 3 months

cpuidle future and improvements

by Daniel Lezcano

Dear all, A few weeks ago, Peter De Schrijver proposed a patch [1] to allow per cpu latencies. We had a discussion about this patchset because it reverse the modifications Deepthi did some months ago [2] and we may want to provide a different implementation. The Linaro Connect [3] event bring us the opportunity to meet people involved in the power management and the cpuidle area for different SoC. With the Tegra3 and big.LITTLE architecture, making per cpu latencies for cpuidle is vital. Also, the SoC vendors would like to have the ability to tune their cpu latencies through the device tree. We agreed in the following steps: 1. factor out / cleanup the cpuidle code as much as possible 2. better sharing of code amongst SoC idle drivers by moving common bits to core code 3. make the cpuidle_state structure contain only data 4. add a API to register latencies per cpu These four steps impacts all the architecture. I began the factor out code / cleanup [4] and that has been accepted upstream and I proposed some modifications [5] but I had a very few answers. The patch review are very slow and done at the last minute at the merge window and that makes code upstreaming very difficult. It is not a reproach, it is just how it is and I would like to propose a solution for that. I propose to host a cpuidle-next tree where all these modifications will be and where people can send patches against, preventing last minutes conflicts and perhaps Lenb will agree to pull from this tree. In the meantime, the tree will be part of the linux-next, the patches will be more widely tested and could be fixed earlier. Thanks -- Daniel [1] http://lwn.net/Articles/491257/ [2] http://lwn.net/Articles/464808/ [3] http://summit.linaro.org/ [4] http://www.mail-archive.com/linux-omap@vger.kernel.org/msg67033.html, http://www.spinics.net/lists/linux-pm/msg27330.html, http://comments.gmane.org/gmane.linux.ports.arm.omap/76311, http://www.digipedia.pl/usenet/thread/18885/11795/ [5] https://lkml.org/lkml/2012/6/8/375 -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog

12 years, 3 months

Black screen when booting Ubuntu

by David Cullen

Hello, linaro-dev, When I boot the Ubuntu desktop image available from http://releases.linaro.org/12.06/ubuntu/leb-panda/lt-panda-x11-base_2012062… all I see is a black screen and the mouse pointer. I see some messages on the console like [ 13.996887] (stk) : timed out waiting for ldisc to be un-installed [ 15.145019] (stk) :ldisc installation timeout and [ 22.983459] omap-hdmi-audio-dai omap-hdmi-audio-dai: audio not supported [ 22.990631] omap-hdmi-audio-dai omap-hdmi-audio-dai: can't open interface omap-hdmi-audio-dai: -19 My PandaBoard is connected to a Dell monitor with a native resolution of 1680 x 1050. Is this a problem? -- Thank you, David

12 years, 3 months

[PATCH 1/2] make v3.4-rc3 run on snowball

by hongbo.zhang

From: "hongbo.zhang" <hongbo.zhang(a)stericsson.com> --- arch/arm/configs/u8500_defconfig | 2 ++ drivers/power/Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index 889d73a..4dc11da 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -99,6 +99,8 @@ CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT2_FS_SECURITY=y CONFIG_EXT3_FS=y +CONFIG_EXT4_FS=y +CONFIG_LBDAF=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y diff --git a/drivers/power/Makefile b/drivers/power/Makefile index b6b2434..e642e1c 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -34,7 +34,7 @@ obj-$(CONFIG_BATTERY_S3C_ADC) += s3c_adc_battery.o obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o obj-$(CONFIG_BATTERY_JZ4740) += jz4740-battery.o obj-$(CONFIG_BATTERY_INTEL_MID) += intel_mid_battery.o -obj-$(CONFIG_AB8500_BM) += ab8500_charger.o ab8500_btemp.o ab8500_fg.o abx500_chargalg.o +#obj-$(CONFIG_AB8500_BM) += ab8500_charger.o ab8500_btemp.o ab8500_fg.o abx500_chargalg.o obj-$(CONFIG_CHARGER_ISP1704) += isp1704_charger.o obj-$(CONFIG_CHARGER_MAX8903) += max8903_charger.o obj-$(CONFIG_CHARGER_TWL4030) += twl4030_charger.o -- 1.7.10

12 years, 3 months

[PATCH 1/2] mfd: Add Freescale's PMIC MC34708 support

by Ying-Chun Liu (PaulLiu)

From: "Ying-Chun Liu (PaulLiu)" <paul.liu(a)linaro.org> Freescale MC34708 is a PMIC which supports the following features: * 6 multi-mode buck regulators * Boost regulator for USB OTG. * 8 regulators for thermal budget optimization * 10-bit ADC * Real time clock Signed-off-by: Robin Gong <B38343(a)freescale.com> Signed-off-by: Ying-Chun Liu (PaulLiu) <paul.liu(a)linaro.org> Cc: Samuel Ortiz <sameo(a)linux.intel.com> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Cc: Shawn Guo <shawn.guo(a)linaro.org> --- Documentation/devicetree/bindings/mfd/mc34708.txt | 61 ++ drivers/mfd/Kconfig | 11 + drivers/mfd/Makefile | 1 + drivers/mfd/mc34708-core.c | 634 +++++++++++++++++++++ include/linux/mfd/mc34708.h | 134 +++++ 5 files changed, 841 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/mc34708.txt create mode 100644 drivers/mfd/mc34708-core.c create mode 100644 include/linux/mfd/mc34708.h diff --git a/Documentation/devicetree/bindings/mfd/mc34708.txt b/Documentation/devicetree/bindings/mfd/mc34708.txt new file mode 100644 index 0000000..2bb5c9e --- /dev/null +++ b/Documentation/devicetree/bindings/mfd/mc34708.txt @@ -0,0 +1,61 @@ +* Freescale MC34708 Power Management Integrated Circuit (PMIC) + +Required properties: +- compatible : Must be "fsl,mc34708" + +Optional properties: +- fsl,mc34708-uses-adc : Indicate the ADC is being used +- fsl,mc34708-uses-rtc : Indicate the RTC is being used +- fsl,mc34708-uses-ts : Indicate the touchscreen controller is being used + +Sub-nodes: +- regulators : Contain the regulator nodes. The MC34708 regulators are + bound using their names as listed below for enabling. + + mc34708__sw1a : regulator SW1A + mc34708__sw1b : regulator SW1B + mc34708__sw2 : regulator SW2 + mc34708__sw3 : regulator SW3 + mc34708__sw4A : regulator SW4A + mc34708__sw4b : regulator SW4B + mc34708__swbst : regulator SWBST + mc34708__vpll : regulator VPLL + mc34708__vrefddr : regulator VREFDDR + mc34708__vusb : regulator VUSB + mc34708__vusb2 : regulator VUSB2 + mc34708__vdac : regulator VDAC + mc34708__vgen1 : regulator VGEN1 + mc34708__vgen2 : regulator VGEN2 + + The bindings details of individual regulator device can be found in: + Documentation/devicetree/bindings/regulator/regulator.txt + +Examples: + +i2c@63fc8000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,imx53-i2c", "fsl,imx1-i2c"; + reg = <0x63fc8000 0x4000>; + interrupts = <62>; + status = "okay"; + + pmic: mc34708@8 { + compatible = "fsl,mc34708"; + reg = <0x08>; + + regulators { + mc34708__sw1a { + regulator-min-microvolt = <650000>; + regulator-max-microvolt = <1437500>; + regulator-boot-on; + regulator-always-on; + }; + + mc34708__vusb { + regulator-boot-on; + regulator-always-on; + }; + }; + }; +}; diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 29f463c..17b6cc5 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -600,6 +600,17 @@ config MFD_MC13XXX additional drivers must be enabled in order to use the functionality of the device. +config MFD_MC34708 + tristate "Support for Freescale's PMIC MC34708" + depends on I2C + depends on OF + select MFD_CORE + help + Support for the Freescale's PMIC MC34708 + This driver provides common support for accessing the device, + additional drivers must be enabled in order to use the + functionality of the device. + config ABX500_CORE bool "ST-Ericsson ABX500 Mixed Signal Circuit register functions" default y if ARCH_U300 || ARCH_U8500 diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 05fa538..b98d943 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -54,6 +54,7 @@ obj-$(CONFIG_TWL6030_PWM) += twl6030-pwm.o obj-$(CONFIG_TWL6040_CORE) += twl6040-core.o twl6040-irq.o obj-$(CONFIG_MFD_MC13XXX) += mc13xxx-core.o +obj-$(CONFIG_MFD_MC34708) += mc34708-core.o obj-$(CONFIG_MFD_CORE) += mfd-core.o diff --git a/drivers/mfd/mc34708-core.c b/drivers/mfd/mc34708-core.c new file mode 100644 index 0000000..54f469b --- /dev/null +++ b/drivers/mfd/mc34708-core.c @@ -0,0 +1,634 @@ +/* + * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved. + * + * 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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <linux/slab.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/mutex.h> +#include <linux/interrupt.h> +#include <linux/i2c.h> +#include <linux/mfd/core.h> +#include <linux/mfd/mc34708.h> +#include <linux/delay.h> +#include <linux/of.h> +#include <linux/of_device.h> + +struct mc34708 { + struct i2c_client *i2c_client; + struct mutex lock; + int irq; + + irq_handler_t irqhandler[MC34708_NUM_IRQ]; + void *irqdata[MC34708_NUM_IRQ]; +}; + +/*! + * This is the enumeration of versions of PMIC + */ +enum mc34708_id { + MC_PMIC_ID_MC34708, + MC_PMIC_ID_INVALID, +}; + +struct mc34708_version_t { + /*! + * PMIC version identifier. + */ + enum mc34708_id id; + /*! + * Revision of the PMIC. + */ + int revision; +}; + +#define PMIC_I2C_RETRY_TIMES 10 + +static const struct i2c_device_id mc34708_device_id[] = { + {"mc34708", MC_PMIC_ID_MC34708}, + {}, +}; + +static const char * const mc34708_chipname[] = { + [MC_PMIC_ID_MC34708] = "mc34708", +}; + +void mc34708_lock(struct mc34708 *mc_pmic) +{ + if (!mutex_trylock(&mc_pmic->lock)) { + dev_dbg(&mc_pmic->i2c_client->dev, "wait for %s from %pf\n", + __func__, __builtin_return_address(0)); + + mutex_lock(&mc_pmic->lock); + } + dev_dbg(&mc_pmic->i2c_client->dev, "%s from %pf\n", + __func__, __builtin_return_address(0)); +} +EXPORT_SYMBOL(mc34708_lock); + +void mc34708_unlock(struct mc34708 *mc_pmic) +{ + dev_dbg(&mc_pmic->i2c_client->dev, "%s from %pf\n", + __func__, __builtin_return_address(0)); + mutex_unlock(&mc_pmic->lock); +} +EXPORT_SYMBOL(mc34708_unlock); + +static int mc34708_i2c_24bit_read(struct i2c_client *client, + unsigned int offset, + unsigned int *value) +{ + unsigned char buf[3]; + int ret; + int i; + + memset(buf, 0, 3); + for (i = 0; i < PMIC_I2C_RETRY_TIMES; i++) { + ret = i2c_smbus_read_i2c_block_data(client, offset, 3, buf); + if (ret == 3) + break; + usleep_range(1000, 1500); + } + + if (ret == 3) { + *value = buf[0] << 16 | buf[1] << 8 | buf[2]; + return ret; + } else { + dev_err(&client->dev, "24bit read error, ret = %d\n", ret); + return -1; /* return -1 on failure */ + } +} + +int mc34708_reg_read(struct mc34708 *mc_pmic, unsigned int offset, + u32 *val) +{ + BUG_ON(!mutex_is_locked(&mc_pmic->lock)); + + if (offset > MC34708_NUMREGS) + return -EINVAL; + + if (mc34708_i2c_24bit_read(mc_pmic->i2c_client, offset, val) == -1) + return -1; + *val &= 0xffffff; + + dev_vdbg(&mc_pmic->i2c_client->dev, "mc_pmic read [%02d] -> 0x%06x\n", + offset, *val); + + return 0; +} +EXPORT_SYMBOL(mc34708_reg_read); + +static int mc34708_i2c_24bit_write(struct i2c_client *client, + unsigned int offset, unsigned int reg_val) +{ + char buf[3]; + int ret; + int i; + + buf[0] = (reg_val >> 16) & 0xff; + buf[1] = (reg_val >> 8) & 0xff; + buf[2] = (reg_val) & 0xff; + + for (i = 0; i < PMIC_I2C_RETRY_TIMES; i++) { + ret = i2c_smbus_write_i2c_block_data(client, offset, 3, buf); + if (ret == 0) + break; + usleep_range(1000, 1500); + } + if (i == PMIC_I2C_RETRY_TIMES) + dev_err(&client->dev, "24bit write error, ret = %d\n", ret); + + return ret; +} + +int mc34708_reg_write(struct mc34708 *mc_pmic, unsigned int offset, u32 val) +{ + BUG_ON(!mutex_is_locked(&mc_pmic->lock)); + + if (offset > MC34708_NUMREGS) + return -EINVAL; + + if (mc34708_i2c_24bit_write(mc_pmic->i2c_client, offset, val)) + return -1; + val &= 0xffffff; + + dev_vdbg(&mc_pmic->i2c_client->dev, "mc_pmic write[%02d] -> 0x%06x\n", + offset, val); + + return 0; +} +EXPORT_SYMBOL(mc34708_reg_write); + +int mc34708_reg_rmw(struct mc34708 *mc_pmic, unsigned int offset, u32 mask, + u32 val) +{ + int ret; + u32 valread; + + BUG_ON(val & ~mask); + + ret = mc34708_reg_read(mc_pmic, offset, &valread); + if (ret) + return ret; + + valread = (valread & ~mask) | val; + + return mc34708_reg_write(mc_pmic, offset, valread); +} +EXPORT_SYMBOL(mc34708_reg_rmw); + +int mc34708_irq_mask(struct mc34708 *mc_pmic, int irq) +{ + int ret; + unsigned int offmask = + irq < 24 ? MC34708_REG_INT_MASK0 : MC34708_REG_INT_MASK1; + u32 irqbit = 1 << (irq < 24 ? irq : irq - 24); + u32 mask; + + if (irq < 0 || irq >= MC34708_NUM_IRQ) + return -EINVAL; + + ret = mc34708_reg_read(mc_pmic, offmask, &mask); + if (ret) + return ret; + + if (mask & irqbit) + /* already masked */ + return 0; + + return mc34708_reg_write(mc_pmic, offmask, mask | irqbit); +} +EXPORT_SYMBOL(mc34708_irq_mask); + +int mc34708_irq_unmask(struct mc34708 *mc_pmic, int irq) +{ + int ret; + unsigned int offmask = + irq < 24 ? MC34708_REG_INT_MASK0 : MC34708_REG_INT_MASK1; + u32 irqbit = 1 << (irq < 24 ? irq : irq - 24); + u32 mask; + + if (irq < 0 || irq >= MC34708_NUM_IRQ) + return -EINVAL; + + ret = mc34708_reg_read(mc_pmic, offmask, &mask); + if (ret) + return ret; + + if (!(mask & irqbit)) + /* already unmasked */ + return 0; + + return mc34708_reg_write(mc_pmic, offmask, mask & ~irqbit); +} +EXPORT_SYMBOL(mc34708_irq_unmask); + +int mc34708_irq_status(struct mc34708 *mc_pmic, int irq, int *enabled, + int *pending) +{ + int ret; + unsigned int offmask = + irq < 24 ? MC34708_REG_INT_MASK0 : MC34708_REG_INT_MASK1; + unsigned int offstat = + irq < 24 ? MC34708_REG_INT_STATUS0 : MC34708_REG_INT_STATUS1; + u32 irqbit = 1 << (irq < 24 ? irq : irq - 24); + + if (irq < 0 || irq >= MC34708_NUM_IRQ) + return -EINVAL; + + if (enabled) { + u32 mask; + + ret = mc34708_reg_read(mc_pmic, offmask, &mask); + if (ret) + return ret; + + *enabled = mask & irqbit; + } + + if (pending) { + u32 stat; + + ret = mc34708_reg_read(mc_pmic, offstat, &stat); + if (ret) + return ret; + + *pending = stat & irqbit; + } + + return 0; +} +EXPORT_SYMBOL(mc34708_irq_status); + +int mc34708_irq_ack(struct mc34708 *mc_pmic, int irq) +{ + unsigned int offstat = + irq < 24 ? MC34708_REG_INT_STATUS0 : MC34708_REG_INT_STATUS1; + unsigned int val = 1 << (irq < 24 ? irq : irq - 24); + + BUG_ON(irq < 0 || irq >= MC34708_NUM_IRQ); + + return mc34708_reg_write(mc_pmic, offstat, val); +} +EXPORT_SYMBOL(mc34708_irq_ack); + +int mc34708_irq_request_nounmask(struct mc34708 *mc_pmic, int irq, + irq_handler_t handler, const char *name, + void *dev) +{ + BUG_ON(!mutex_is_locked(&mc_pmic->lock)); + BUG_ON(!handler); + + if (irq < 0 || irq >= MC34708_NUM_IRQ) + return -EINVAL; + + if (mc_pmic->irqhandler[irq]) + return -EBUSY; + + mc_pmic->irqhandler[irq] = handler; + mc_pmic->irqdata[irq] = dev; + + return 0; +} +EXPORT_SYMBOL(mc34708_irq_request_nounmask); + +int mc34708_irq_request(struct mc34708 *mc_pmic, int irq, + irq_handler_t handler, const char *name, void *dev) +{ + int ret; + + ret = mc34708_irq_request_nounmask(mc_pmic, irq, handler, name, dev); + if (ret) + return ret; + + ret = mc34708_irq_unmask(mc_pmic, irq); + if (ret) { + mc_pmic->irqhandler[irq] = NULL; + mc_pmic->irqdata[irq] = NULL; + return ret; + } + + return 0; +} +EXPORT_SYMBOL(mc34708_irq_request); + +int mc34708_irq_free(struct mc34708 *mc_pmic, int irq, void *dev) +{ + int ret; + BUG_ON(!mutex_is_locked(&mc_pmic->lock)); + + if (irq < 0 || irq >= MC34708_NUM_IRQ || !mc_pmic->irqhandler[irq] || + mc_pmic->irqdata[irq] != dev) + return -EINVAL; + + ret = mc34708_irq_mask(mc_pmic, irq); + if (ret) + return ret; + + mc_pmic->irqhandler[irq] = NULL; + mc_pmic->irqdata[irq] = NULL; + + return 0; +} +EXPORT_SYMBOL(mc34708_irq_free); + +static inline irqreturn_t mc34708_irqhandler(struct mc34708 *mc_pmic, int irq) +{ + return mc_pmic->irqhandler[irq] (irq, mc_pmic->irqdata[irq]); +} + +/* + * returns: number of handled irqs or negative error + * locking: holds mc_pmic->lock + */ +static int mc34708_irq_handle(struct mc34708 *mc_pmic, + unsigned int offstat, unsigned int offmask, + int baseirq) +{ + u32 stat, mask; + int ret = mc34708_reg_read(mc_pmic, offstat, &stat); + int num_handled = 0; + + if (ret) + return ret; + + ret = mc34708_reg_read(mc_pmic, offmask, &mask); + if (ret) + return ret; + + while (stat & ~mask) { + int irq = __ffs(stat & ~mask); + + stat &= ~(1 << irq); + + if (likely(mc_pmic->irqhandler[baseirq + irq])) { + irqreturn_t handled; + + handled = mc34708_irqhandler(mc_pmic, baseirq + irq); + if (handled == IRQ_HANDLED) + num_handled++; + } else { + dev_err(&mc_pmic->i2c_client->dev, + "BUG: irq %u but no handler\n", baseirq + irq); + + mask |= 1 << irq; + + ret = mc34708_reg_write(mc_pmic, offmask, mask); + } + } + + return num_handled; +} + +static irqreturn_t mc34708_irq_thread(int irq, void *data) +{ + struct mc34708 *mc_pmic = data; + irqreturn_t ret; + int handled = 0; + + mc34708_lock(mc_pmic); + + ret = mc34708_irq_handle(mc_pmic, MC34708_REG_INT_STATUS0, + MC34708_REG_INT_MASK0, 0); + if (ret > 0) + handled = 1; + + ret = mc34708_irq_handle(mc_pmic, MC34708_REG_INT_STATUS1, + MC34708_REG_INT_MASK1, 24); + if (ret > 0) + handled = 1; + + mc34708_unlock(mc_pmic); + + return IRQ_RETVAL(handled); +} + +#define maskval(reg, mask) (((reg) & (mask)) >> __ffs(mask)) +static int mc34708_identify(struct mc34708 *mc_pmic, + struct mc34708_version_t *ver) +{ + int rev_id = 0; + int rev1 = 0; + int rev2 = 0; + int finid = 0; + int icid = 0; + int ret; + ret = mc34708_reg_read(mc_pmic, MC34708_REG_IDENTIFICATION, &rev_id); + if (ret) { + dev_dbg(&mc_pmic->i2c_client->dev, "read ID error!%x\n", ret); + return ret; + } + rev1 = (rev_id & 0x018) >> 3; + rev2 = (rev_id & 0x007); + icid = (rev_id & 0x01C0) >> 6; + finid = (rev_id & 0x01E00) >> 9; + ver->id = MC_PMIC_ID_MC34708; + + ver->revision = ((rev1 * 10) + rev2); + dev_dbg(&mc_pmic->i2c_client->dev, + "mc_pmic Rev %d.%d FinVer %x detected\n", rev1, rev2, finid); + + return 0; +} + +static const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id, + const struct i2c_client *client) +{ + while (id->name[0]) { + if (strcmp(client->name, id->name) == 0) + return id; + id++; + } + + return NULL; +} + +static const struct i2c_device_id *i2c_get_device_id(const struct i2c_client + *idev) +{ + const struct i2c_driver *idrv = to_i2c_driver(idev->dev.driver); + + return i2c_match_id(idrv->id_table, idev); +} + +static const char *mc34708_get_chipname(struct mc34708 *mc_pmic) +{ + const struct i2c_device_id *devid = + i2c_get_device_id(mc_pmic->i2c_client); + + if (!devid) + return NULL; + + return mc34708_chipname[devid->driver_data]; +} + +int mc34708_get_flags(struct mc34708 *mc_pmic) +{ + struct mc34708_platform_data *pdata = + dev_get_platdata(&mc_pmic->i2c_client->dev); + + return pdata->flags; +} +EXPORT_SYMBOL(mc34708_get_flags); + +static int mc34708_add_subdevice_pdata(struct mc34708 *mc_pmic, + const char *format, void *pdata, + size_t pdata_size) +{ + char buf[30]; + const char *name = mc34708_get_chipname(mc_pmic); + + struct mfd_cell cell = { + .platform_data = pdata, + .pdata_size = pdata_size, + }; + + /* there is no asnprintf in the kernel :-( */ + if (snprintf(buf, sizeof(buf), format, name) > sizeof(buf)) + return -E2BIG; + + cell.name = kmemdup(buf, strlen(buf) + 1, GFP_KERNEL); + if (!cell.name) + return -ENOMEM; + + return mfd_add_devices(&mc_pmic->i2c_client->dev, -1, &cell, 1, NULL, + 0); +} + +static int mc34708_add_subdevice(struct mc34708 *mc_pmic, const char *format) +{ + return mc34708_add_subdevice_pdata(mc_pmic, format, NULL, 0); +} + +static int mc34708_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + struct mc34708 *mc_pmic; + struct mc34708_version_t version; + struct mc34708_platform_data *pdata = client->dev.platform_data; + struct device_node *np = client->dev.of_node; + int ret; + + mc_pmic = kzalloc(sizeof(*mc_pmic), GFP_KERNEL); + if (!mc_pmic) + return -ENOMEM; + i2c_set_clientdata(client, mc_pmic); + mc_pmic->i2c_client = client; + + mutex_init(&mc_pmic->lock); + mc34708_lock(mc_pmic); + mc34708_identify(mc_pmic, &version); + /* mask all irqs */ + ret = mc34708_reg_write(mc_pmic, MC34708_REG_INT_MASK0, 0x00ffffff); + if (ret) + goto err_mask; + + ret = mc34708_reg_write(mc_pmic, MC34708_REG_INT_MASK1, 0x00ffffff); + if (ret) + goto err_mask; + + ret = request_threaded_irq(client->irq, NULL, mc34708_irq_thread, + IRQF_ONESHOT | IRQF_TRIGGER_HIGH, "mc_pmic", + mc_pmic); + + if (ret) { + err_mask: + mc34708_unlock(mc_pmic); + dev_set_drvdata(&client->dev, NULL); + kfree(mc_pmic); + return ret; + } + + mc34708_unlock(mc_pmic); + + if (pdata && pdata->flags & MC34708_USE_ADC) + mc34708_add_subdevice(mc_pmic, "%s-adc"); + else if (of_get_property(np, "fsl,mc34708-uses-adc", NULL)) + mc34708_add_subdevice(mc_pmic, "%s-adc"); + + + if (pdata && pdata->flags & MC34708_USE_REGULATOR) { + struct mc34708_regulator_platform_data regulator_pdata = { + .num_regulators = pdata->num_regulators, + .regulators = pdata->regulators, + }; + + mc34708_add_subdevice_pdata(mc_pmic, "%s-regulator", + &regulator_pdata, + sizeof(regulator_pdata)); + } else if (of_find_node_by_name(np, "regulators")) { + mc34708_add_subdevice(mc_pmic, "%s-regulator"); + } + + if (pdata && pdata->flags & MC34708_USE_RTC) + mc34708_add_subdevice(mc_pmic, "%s-rtc"); + else if (of_get_property(np, "fsl,mc34708-uses-rtc", NULL)) + mc34708_add_subdevice(mc_pmic, "%s-rtc"); + + if (pdata && pdata->flags & MC34708_USE_TOUCHSCREEN) + mc34708_add_subdevice(mc_pmic, "%s-ts"); + else if (of_get_property(np, "fsl,mc34708-uses-ts", NULL)) + mc34708_add_subdevice(mc_pmic, "%s-ts"); + + return 0; +} + +static int __devexit mc34708_remove(struct i2c_client *client) +{ + struct mc34708 *mc_pmic = dev_get_drvdata(&client->dev); + + free_irq(mc_pmic->i2c_client->irq, mc_pmic); + + mfd_remove_devices(&client->dev); + + kfree(mc_pmic); + + return 0; +} + +static const struct of_device_id mc34708_dt_ids[] = { + { .compatible = "fsl,mc34708" }, + { /* sentinel */ } +}; + +static struct i2c_driver mc34708_driver = { + .id_table = mc34708_device_id, + .driver = { + .name = "mc34708", + .owner = THIS_MODULE, + .of_match_table = mc34708_dt_ids, + }, + .probe = mc34708_probe, + .remove = __devexit_p(mc34708_remove), +}; + +static int __init mc34708_init(void) +{ + return i2c_add_driver(&mc34708_driver); +} +subsys_initcall(mc34708_init); + +static void __exit mc34708_exit(void) +{ + i2c_del_driver(&mc34708_driver); +} +module_exit(mc34708_exit); + +MODULE_DESCRIPTION("Core driver for Freescale MC34708 PMIC"); +MODULE_AUTHOR("Robin Gong <B38343(a)freescale.com>, " + "Ying-Chun Liu (PaulLiu) <paul.liu(a)linaro.org>"); +MODULE_LICENSE("GPL v2"); diff --git a/include/linux/mfd/mc34708.h b/include/linux/mfd/mc34708.h new file mode 100644 index 0000000..505813d --- /dev/null +++ b/include/linux/mfd/mc34708.h @@ -0,0 +1,134 @@ +/* For mc34708's pmic driver + * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. + * + * based on: + * Copyright 2009-2010 Pengutronix, Uwe Kleine-Koenig + * <u.kleine-koenig(a)pengutronix.de> + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License version 2 as published by the + * Free Software Foundation. + */ +#ifndef __LINUX_MFD_MC_34708_H +#define __LINUX_MFD_MC_34708_H + +#include <linux/interrupt.h> +#include <linux/regulator/driver.h> + +struct mc34708; + +void mc34708_lock(struct mc34708 *mc_pmic); +void mc34708_unlock(struct mc34708 *mc_pmic); + +int mc34708_reg_read(struct mc34708 *mc_pmic, unsigned int offset, u32 *val); +int mc34708_reg_write(struct mc34708 *mc_pmic, unsigned int offset, u32 val); +int mc34708_reg_rmw(struct mc34708 *mc_pmic, unsigned int offset, + u32 mask, u32 val); + +int mc34708_get_flags(struct mc34708 *mc_pmic); + +int mc34708_irq_request(struct mc34708 *mc_pmic, int irq, + irq_handler_t handler, const char *name, void *dev); +int mc34708_irq_request_nounmask(struct mc34708 *mc_pmic, int irq, + irq_handler_t handler, const char *name, + void *dev); +int mc34708_irq_free(struct mc34708 *mc_pmic, int irq, void *dev); +int mc34708_irq_mask(struct mc34708 *mc_pmic, int irq); +int mc34708_irq_unmask(struct mc34708 *mc_pmic, int irq); +int mc34708_irq_status(struct mc34708 *mc_pmic, int irq, + int *enabled, int *pending); +int mc34708_irq_ack(struct mc34708 *mc_pmic, int irq); + +int mc34708_get_flags(struct mc34708 *mc_pmic); + +#define MC34708_SW1A 0 +#define MC34708_SW1B 1 +#define MC34708_SW2 2 +#define MC34708_SW3 3 +#define MC34708_SW4A 4 +#define MC34708_SW4B 5 +#define MC34708_SW5 6 +#define MC34708_SWBST 7 +#define MC34708_VPLL 8 +#define MC34708_VREFDDR 9 +#define MC34708_VUSB 10 +#define MC34708_VUSB2 11 +#define MC34708_VDAC 12 +#define MC34708_VGEN1 13 +#define MC34708_VGEN2 14 +#define MC34708_REGU_NUM 15 + +#define MC34708_REG_INT_STATUS0 0 +#define MC34708_REG_INT_MASK0 1 +#define MC34708_REG_INT_STATUS1 3 +#define MC34708_REG_INT_MASK1 4 +#define MC34708_REG_IDENTIFICATION 7 + +#define MC34708_IRQ_ADCDONE 0 +#define MC34708_IRQ_TSDONE 1 +#define MC34708_IRQ_TSPENDET 2 +#define MC34708_IRQ_USBDET 3 +#define MC34708_IRQ_AUXDET 4 +#define MC34708_IRQ_USBOVP 5 +#define MC34708_IRQ_AUXOVP 6 +#define MC34708_IRQ_CHRTIMEEXP 7 +#define MC34708_IRQ_BATTOTP 8 +#define MC34708_IRQ_BATTOVP 9 +#define MC34708_IRQ_CHRCMPL 10 +#define MC34708_IRQ_WKVBUSDET 11 +#define MC34708_IRQ_WKAUXDET 12 +#define MC34708_IRQ_LOWBATT 13 +#define MC34708_IRQ_VBUSREGMI 14 +#define MC34708_IRQ_ATTACH 15 +#define MC34708_IRQ_DETACH 16 +#define MC34708_IRQ_KP 17 +#define MC34708_IRQ_LKP 18 +#define MC34708_IRQ_LKR 19 +#define MC34708_IRQ_UKNOW_ATTA 20 +#define MC34708_IRQ_ADC_CHANGE 21 +#define MC34708_IRQ_STUCK_KEY 22 +#define MC34708_IRQ_STUCK_KEY_RCV 23 +#define MC34708_IRQ_1HZ 24 +#define MC34708_IRQ_TODA 25 +#define MC34708_IRQ_UNUSED1 26 +#define MC34708_IRQ_PWRON1 27 +#define MC34708_IRQ_PWRON2 28 +#define MC34708_IRQ_WDIRESET 29 +#define MC34708_IRQ_SYSRST 30 +#define MC34708_IRQ_RTCRST 31 +#define MC34708_IRQ_PCI 32 +#define MC34708_IRQ_WARM 33 +#define MC34708_IRQ_MEMHLD 34 +#define MC34708_IRQ_UNUSED2 35 +#define MC34708_IRQ_THWARNL 36 +#define MC34708_IRQ_THWARNH 37 +#define MC34708_IRQ_CLK 38 +#define MC34708_IRQ_UNUSED3 39 +#define MC34708_IRQ_SCP 40 +#define MC34708_NUMREGS 0x3f +#define MC34708_NUM_IRQ 46 + +struct mc34708_regulator_init_data { + int id; + struct regulator_init_data *init_data; +}; + +struct mc34708_regulator_platform_data { + int num_regulators; + struct mc34708_regulator_init_data *regulators; +}; + +struct mc34708_platform_data { +#define MC34708_USE_TOUCHSCREEN (1 << 0) +#define MC34708_USE_CODEC (1 << 1) +#define MC34708_USE_ADC (1 << 2) +#define MC34708_USE_RTC (1 << 3) +#define MC34708_USE_REGULATOR (1 << 4) +#define MC34708_USE_LED (1 << 5) + unsigned int flags; + + int num_regulators; + struct mc34708_regulator_init_data *regulators; +}; + +#endif /* ifndef __LINUX_MFD_MC_PMIC_H */ -- 1.7.9.5

12 years, 3 months

[PATCH] [RFC]: mfd: Implement DT Support for AB8500 Btemp and fg

by Rajanikanth H.V

From: "Rajanikanth H.V" <rajanikanth.hv(a)linaro.org> This patch addes device tree support for battery temperature and fuel guage driver Signed-off-by: Rajanikanth H.V <rajanikanth.hv(a)linaro.org> --- .../bindings/power_supply/ab8500/ab8500-btemp.txt | 209 +++++++++++++ .../bindings/power_supply/ab8500/ab8500-fg.txt | 51 +++ arch/arm/boot/dts/db8500.dtsi | 327 ++++++++++++++++++++ drivers/mfd/ab8500-core.c | 16 +- drivers/power/ab8500_btemp.c | 299 +++++++++++++++++- drivers/power/ab8500_fg.c | 58 +++- include/linux/mfd/abx500.h | 17 +- include/linux/of.h | 33 ++ 8 files changed, 966 insertions(+), 44 deletions(-) create mode 100644 Documentation/devicetree/bindings/power_supply/ab8500/ab8500-btemp.txt create mode 100644 Documentation/devicetree/bindings/power_supply/ab8500/ab8500-fg.txt diff --git a/Documentation/devicetree/bindings/power_supply/ab8500/ab8500-btemp.txt b/Documentation/devicetree/bindings/power_supply/ab8500/ab8500-btemp.txt new file mode 100644 index 0000000..9908934 --- /dev/null +++ b/Documentation/devicetree/bindings/power_supply/ab8500/ab8500-btemp.txt @@ -0,0 +1,209 @@ +* St-Ericsson AB8500 Power Management Integrated Circuit (PMIC) + + battery temperature monitor: + +* Required properties: +- compatible: "stericsson,ab8500-btemp" + +* Sub-node: +- ab8500_bm_data: + +example: + ab8500-btemp { + compatible = "stericsson,ab8500-btemp"; + ... + ... + bat = <&ab8500_bm_data>; + }; + +ab8500_bm_data: + Contain the battery management/monitor node with the following + information to support different battery types. + +{ + temp_under under this temp, charging is stopped + temp_low between this temp and temp_under charging is reduced + temp_high between this temp and temp_over charging is reduced + temp_over over this temp, charging is stopped + temp_now present battery temperature + temp_interval_chg temperature measurement interval in s when charging + temp_interval_nochg temperature measurement interval in s when not charging + main_safety_tmr_h safety timer for main charger + usb_safety_tmr_h safety timer for usb charger + bkup_bat_v voltage which we charge the backup battery with + bkup_bat_i current which we charge the backup battery with + no_maintenance indicates that maintenance charging is disabled + abx500_adc_therm placement of thermistor, batctrl or battemp adc + chg_unknown_bat flag to enable charging of unknown batteries + enable_overshoot flag to enable VBAT overshoot control + auto_trig flag to enable auto adc trigger + fg_res resistance of FG resistor in 0.1mOhm + n_btypes number of elements in array bat_type + batt_id index of the identified battery in array bat_type + interval_charging charge alg cycle period time when charging (sec) + interval_not_charging charge alg cycle period time when not charging (sec) + temp_hysteresis temperature hysteresis + gnd_lift_resistance Battery ground to phone ground resistance (mOhm) +} +e.g: + ab8500_bm_data: bm_data { + temp_under = <3>; + temp_low = <8>; + temp_high = <43>; + temp_over = <48>; + temp_now = <0>; + temp_interval_chg = <20>; + temp_interval_nochg = <120>; + main_safety_tmr_h = <4>; + usb_safety_tmr_h = <4>; + bkup_bat_v = <1>; /* BUP_VCH_SEL_2P6V */ + bkup_bat_i = <4>; /* BUP_ICH_SEL_150UA */ + no_maintenance = <0>; + chg_unknown_bat = <0>; + enable_overshoot = <0>; + auto_trig = <0>; + adc_therm = <0>; + fg_res = <100>; + batt_id = <0>; + interval_charging = <5>; + interval_not_charging = <120>; + temp_hysteresis = <3>; + gnd_lift_resistance = <34>; + }; + +* subnodes for the node 'ab8500_bm_data': + - maxi : maximization parameters + - cap_levels: capacity in percent for the different capacity levels + - bat_type : table of supported battery types + - chg_params: charger parameters + - fg_params : fuel gauge parameters + +example: +ab8500_bm_data: bm_data { + ... + ... + n_btypes = <3>; /* number of battery types */ + ... + maxi = <&ab8500_bm_data_maxim_parameters>; + cap_levels = <&ab8500_bm_data_cap_levels>; + bat_type = <&ab8500_battery_type_0 &ab8500_battery_type_1 &ab8500_battery_type_2>; + chg_params = <&ab8500_bm_data_charger_parameters>; + fg_params = <&ab8500_bm_data_fuel_guage_parameters>; + +}; + +bx500_battery_type: + prepare battery type information from individual battery specification as: + { + name : battery technology + resis_high : battery upper resistance limit + resis_low : battery lower resistance limit + charge_full_design : Maximum battery capacity in mAh + nominal_voltage : Nominal voltage of the battery in mV + termination_vol : max voltage upto which battery can be charged + termination_curr : battery charging termination current in mA + recharge_vol : battery voltage limit that will trigger a new + full charging cycle in the case where maintenance + charging has been disabled + normal_cur_lvl : charger current in normal state in mA + normal_vol_lvl : charger voltage in normal state in mV + maint_a_cur_lvl : charger current in maintenance A state in mA + maint_a_vol_lvl : charger voltage in maintenance A state in mV + maint_a_chg_timer_h : charge time in maintenance A state + maint_b_cur_lvl : charger current in maintenance B state in mA + maint_b_vol_lvl : charger voltage in maintenance B state in mV + maint_b_chg_timer_h : charge time in maintenance B state + low_high_cur_lvl : charger current in temp low/high state in mA + low_high_vol_lvl : charger voltage in temp low/high state in mV' + battery_resistance : battery inner resistance in mOhm. + n_r_t_tbl_elements : number of elements in r_to_t_tbl + r_to_t_tbl : table containing resistance to temp points + n_v_cap_tbl_elements: number of elements in v_to_cap_tbl + v_to_cap_tbl : Voltage to capacity (in %) table + n_batres_tbl_elements: number of elements in the batres_tbl + batres_tbl : battery internal resistance vs temperature table + } + + Note: + Selected battery shall adhere to the specification provided in: + http://www.giga-concept.fr/media/uploads/products/documents/2008/09/9100.pdf + +-example: + + ab8500_battery_type_1: ab8500_battery_therm_on_batctrl { + bat_name = <3>; + resis_high = <53407>; + resis_low = <12500>; + charge_full_design = <900>; + nominal_voltage = <3600>; + termination_vol = <4150>; + termination_curr = <80>; + recharge_vol = <4130>; + normal_cur_lvl = <700>; + normal_vol_lvl = <4200>; + maint_a_cur_lvl = <600>; + maint_a_vol_lvl = <4150>; + maint_a_chg_timer_h = <60>; + maint_b_cur_lvl = <600>; + maint_b_vol_lvl = <4100>; + maint_b_chg_timer_h = <200>; + low_high_cur_lvl = <300>; + low_high_vol_lvl = <4000>; + battery_resistance = <300>; + + n_temp_tbl_elements = <15>; + + r_to_t_tbl - defines one point in a temp to res curve. To be used + in battery packs that combines the identification resistor + with a NTC resistor. + + r_to_t_tbl = < + 0xfffffffb 53407 /* -5 */ + 0 48594 'battery pack temperature in Celcius' 'NTC resistor net total resistance' + 5 43804 + 10 39188 + 15 34870 + 20 30933 + 25 27422 + 30 24347 + 35 21694 + 40 19431 + 45 17517 + 50 15908 + 55 14561 + 60 13437 + 65 12500>; + + n_v_cap_tbl_elements = <20>; + v_to_cap_tbl = < /* Table for translating voltage to capacity */ + 4171 100 'Voltage in mV' 'Capacity in percent' + 4114 95 + 4009 83 + 3947 74 + 3907 67 + 3863 59 + 3830 56 + 3813 53 + 3791 46 + 3771 33 + 3754 25 + 3735 20 + 3717 17 + 3681 13 + 3664 8 + 3651 6 + 3635 5 + 3560 3 + 3408 1 + 3247 0>; + + n_batres_tbl_elements = <7>; /* ARRAY_SIZE(batres_tbl), */ + batres_tbl = < /* defines one point in a temp vs battery internal resistance curve. */ + 40 120 'battery pack temperature in Celcius' 'battery internal reistance in mOhm' + 30 135 + 20 165 + 10 230 + 00 325 + 0xfffffff6 445 /* -10 */ + 0xffffffec 595>; /* -20 */ + }; diff --git a/Documentation/devicetree/bindings/power_supply/ab8500/ab8500-fg.txt b/Documentation/devicetree/bindings/power_supply/ab8500/ab8500-fg.txt new file mode 100644 index 0000000..5e84852 --- /dev/null +++ b/Documentation/devicetree/bindings/power_supply/ab8500/ab8500-fg.txt @@ -0,0 +1,51 @@ +* St-Ericsson AB8500 Power Management Integrated Circuit (PMIC) + fuel guage: + +* Required properties: +- compatible: "stericsson,ab8500-fg" + +* Sub-node: +- ab8500_bm_data: + +example: + ab8500-btemp { + compatible = "stericsson,ab8500-fg"; + ... + ... + bat = <&ab8500_bm_data>; + }; + +Refer: + Documentation/devicetree/bindings/power_supply/ab8500/ab8500-btemp.txt for + information on 'ab8500_bm_data' + +* subnode for the node 'ab8500_bm_data': + - fg_params : fuel gauge parameters + +example: + +ab8500_bm_data: bm_data { + ... + ... + ... + fg_params = <&ab8500_bm_data_fuel_guage_parameters>; +} + + /* Fuel gauge algorithm parameters, in seconds */ + ab8500_bm_data_fuel_guage_parameters: bm_data_fuel_guage_parameters { + recovery_sleep_timer = <10>; /* Time between measurements while recovering */ + recovery_total_time = <100>; /* Total recovery time */ + init_timer = <1>; /* Measurement interval during startup */ + init_discard_time = <5>; /* Time we discard voltage measurement at startup */ + init_total_time = <40>; /* Total init time during startup */ + high_curr_time = <60>; /* Time current has to be high to go to recovery */ + accu_charging = <30>; /* FG accumulation time while charging */ + accu_high_curr = <30>; /* FG accumulation time in high current mode */ + high_curr_threshold = <50>; /* High current threshold, in mA */ + lowbat_threshold = <3100>;/* Low battery threshold, in mV */ + battok_falling_th_sel0 = <2860>;/* Over battery threshold, in mV */ + battok_raising_th_sel1 = <2860>;/* Threshold in mV for battOk signal sel0 Resolution in 50 mV step. */ + user_cap_limit = <15>; /* Threshold in mV for battOk signal sel1 Resolution in 50 mV step. */ + maint_thres = <97>; /* Capacity reported from user must be within this limit to be considered as sane, in percentage points. + }; * This is the threshold where we stop reporting battery full while in maintenance, in per cent + */ diff --git a/arch/arm/boot/dts/db8500.dtsi b/arch/arm/boot/dts/db8500.dtsi index 26f895f..6f3b5df 100644 --- a/arch/arm/boot/dts/db8500.dtsi +++ b/arch/arm/boot/dts/db8500.dtsi @@ -330,6 +330,333 @@ vddadc-supply = <&ab8500_ldo_tvout_reg>; }; + ab8500-fg { + compatible = "stericsson,ab8500-fg"; + interrupts = <24 0x4 + 8 0x4 + 28 0x4 + 27 0x4 + 26 0x4>; + interrupt-names = "NCONV_ACCU", + "BATT_OVV", + "LOW_BAT_F", + "CC_INT_CALIB", + "CCEOC"; + supplied_to = "ab8500_chargalg", "ab8500_usb"; + num_supplicants = <2>; + bat = <&ab8500_bm_data>; + }; + + ab8500-btemp { + compatible = "stericsson,ab8500-btemp"; + interrupts = <20 0x04 + 80 0x04 + 81 0x04 + 82 0x04 + 83 0x04>; + interrupt-names = "BAT_CTRL_INDB", + "BTEMP_LOW", + "BTEMP_HIGH", + "BTEMP_LOW_MEDIUM", + "BTEMP_MEDIUM_HIGH"; + supplied_to = "ab8500_chargalg", "ab8500_fg"; + num_supplicants = <2>; + bat = <&ab8500_bm_data>; + }; + + ab8500_battery_type_0: ab8500_battery_unknown { + bat_name = <0>; + resis_high = <0>; + resis_low = <0>; + charge_full_design = <612>; + nominal_voltage = <3700>; + termination_vol = <4050>; + termination_curr = <200>; + recharge_vol = <3990>; + normal_cur_lvl = <400>; + normal_vol_lvl = <4100>; + maint_a_cur_lvl = <400>; + maint_a_vol_lvl = <4050>; + maint_a_chg_timer_h = <60>; + maint_b_cur_lvl = <400>; + maint_b_vol_lvl = <4000>; + maint_b_chg_timer_h = <200>; + low_high_cur_lvl = <300>; + low_high_vol_lvl = <4000>; + battery_resistance = <300>; + + n_temp_tbl_elements = <15>; + r_to_t_tbl = < + 0xfffffffb 214834 /* -5 */ + 0 162943 + 5 124820 + 10 96520 + 15 75306 + 20 59254 + 25 47000 + 30 37566 + 35 30245 + 40 24520 + 45 20010 + 50 16432 + 55 13576 + 60 11280 + 65 9425>; + + n_v_cap_tbl_elements = <24>; + v_to_cap_tbl = < + 4186 100 + 4163 99 + 4114 95 + 4068 90 + 3990 80 + 3926 70 + 3898 65 + 3866 60 + 3833 55 + 3812 50 + 3787 40 + 3768 30 + 3747 25 + 3730 20 + 3705 15 + 3699 14 + 3684 12 + 3672 9 + 3657 7 + 3638 6 + 3556 4 + 3424 2 + 3317 1 + 3094 0>; + + n_batres_tbl_elements = <7>; + batres_tbl = < + 40 120 + 30 135 + 20 165 + 10 230 + 00 325 + 0xfffffff6 445 /* -10 */ + 0xffffffec 595>; /* -20 */ + }; + + ab8500_battery_type_1: ab8500_battery_therm_on_batctrl { + bat_name = <3>; + resis_high = <53407>; + resis_low = <12500>; + charge_full_design = <900>; + nominal_voltage = <3600>; + termination_vol = <4150>; + termination_curr = <80>; + recharge_vol = <4130>; + normal_cur_lvl = <700>; + normal_vol_lvl = <4200>; + maint_a_cur_lvl = <600>; + maint_a_vol_lvl = <4150>; + maint_a_chg_timer_h = <60>; + maint_b_cur_lvl = <600>; + maint_b_vol_lvl = <4100>; + maint_b_chg_timer_h = <200>; + low_high_cur_lvl = <300>; + low_high_vol_lvl = <4000>; + battery_resistance = <300>; + + n_temp_tbl_elements = <15>; + r_to_t_tbl = < + 0xfffffffb 53407 /* -5 */ + 0 48594 + 5 43804 + 10 39188 + 15 34870 + 20 30933 + 25 27422 + 30 24347 + 35 21694 + 40 19431 + 45 17517 + 50 15908 + 55 14561 + 60 13437 + 65 12500>; + + n_v_cap_tbl_elements = <20>; + v_to_cap_tbl = < + 4171 100 + 4114 95 + 4009 83 + 3947 74 + 3907 67 + 3863 59 + 3830 56 + 3813 53 + 3791 46 + 3771 33 + 3754 25 + 3735 20 + 3717 17 + 3681 13 + 3664 8 + 3651 6 + 3635 5 + 3560 3 + 3408 1 + 3247 0>; + + n_batres_tbl_elements = <7>; /* ARRAY_SIZE(batres_tbl), */ + batres_tbl = < + 40 120 + 30 135 + 20 165 + 10 230 + 00 325 + 0xfffffff6 445 /* -10 */ + 0xffffffec 595>; /* -20 */ + }; + + ab8500_battery_type_2: ab8500_battery_therm_on_batctrl_1 { + bat_name = <3>; + resis_high = <165418>; + resis_low = <82869>; + charge_full_design = <900>; + nominal_voltage = <3600>; + termination_vol = <4150>; + termination_curr = <80>; + recharge_vol = <4130>; + normal_cur_lvl = <700>; + normal_vol_lvl = <4200>; + maint_a_cur_lvl = <600>; + maint_a_vol_lvl = <4150>; + maint_a_chg_timer_h = <60>; + maint_b_cur_lvl = <600>; + maint_b_vol_lvl = <4100>; + maint_b_chg_timer_h = <200>; + low_high_cur_lvl = <300>; + low_high_vol_lvl = <4000>; + battery_resistance = <300>; + + n_temp_tbl_elements = <15>; + r_to_t_tbl = < + 0xfffffffb 165418 + 0 159024 + 5 151921 + 10 144300 + 15 136424 + 20 128565 + 25 120978 + 30 113875 + 35 107397 + 40 101629 + 45 96592 + 50 92253 + 55 88569 + 60 85461 + 65 82869>; + + n_v_cap_tbl_elements = <20>; + v_to_cap_tbl = < + 4161 100 + 4124 98 + 4044 90 + 4003 85 + 3966 80 + 3933 75 + 3888 67 + 3849 60 + 3813 55 + 3787 47 + 3772 30 + 3751 25 + 3718 20 + 3681 16 + 3660 14 + 3589 10 + 3546 7 + 3495 4 + 3404 2 + 3250 0>; + + n_batres_tbl_elements = <7>; /* ARRAY_SIZE(batres_tbl), */ + batres_tbl = < + 40 120 + 30 135 + 20 165 + 10 230 + 00 325 + 0xfffffff6 445 /* -10 */ + 0xffffffec 595>; /* -20 */ + }; + + ab8500_bm_data_cap_levels: bm_data_cap_levels { + critical = <2>; + low = <10>; + normal = <70>; + high = <95>; + full = <100>; + }; + + ab8500_bm_data_maxim_parameters: bm_data_maxim_parameters { + ena_maxi = <1>; + chg_curr = <910>; + wait_cycles = <10>; + charger_curr_step = <100>; + }; + + ab8500_bm_data_charger_parameters: bm_data_charger_parameters { + usb_volt_max = <5500>; + usb_curr_max = <1500>; + ac_volt_max = <7500>; + ac_curr_max = <1500>; + }; + + ab8500_bm_data_fuel_guage_parameters: bm_data_fuel_guage_parameters { + recovery_sleep_timer = <10>; + recovery_total_time = <100>; + init_timer = <1>; + init_discard_time = <5>; + init_total_time = <40>; + high_curr_time = <60>; + accu_charging = <30>; + accu_high_curr = <30>; + high_curr_threshold = <50>; + lowbat_threshold = <3100>; + battok_falling_th_sel0 = <2860>; + battok_raising_th_sel1 = <2860>; + user_cap_limit = <15>; + maint_thres = <97>; + }; + + ab8500_bm_data: bm_data { + temp_under = <3>; + temp_low = <8>; + temp_high = <43>; + temp_over = <48>; + temp_now = <0>; + temp_interval_chg = <20>; + temp_interval_nochg = <120>; + main_safety_tmr_h = <4>; + usb_safety_tmr_h = <4>; + bkup_bat_v = <1>; /* BUP_VCH_SEL_2P6V */ + bkup_bat_i = <4>; /* BUP_ICH_SEL_150UA */ + no_maintenance = <0>; /* CONFIG_AB8500_9100_LI_ION_BATTERY not considered */ + chg_unknown_bat = <0>; /* CONFIG_AB8500_9100_LI_ION_BATTERY not considered */ + enable_overshoot = <0>; + auto_trig = <0>; + adc_therm = <0>; + fg_res = <100>; + n_btypes = <3>; + batt_id = <0>; + interval_charging = <5>; + interval_not_charging = <120>; + temp_hysteresis = <3>; + gnd_lift_resistance = <34>; + maxi = <&ab8500_bm_data_maxim_parameters>; + cap_levels = <&ab8500_bm_data_cap_levels>; + bat_type = <&ab8500_battery_type_0 &ab8500_battery_type_1 &ab8500_battery_type_2>; + chg_params = <&ab8500_bm_data_charger_parameters>; + fg_params = <&ab8500_bm_data_fuel_guage_parameters>; + }; + ab8500-usb { compatible = "stericsson,ab8500-usb"; interrupts = < 90 0x4 diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c index 6d613e8..837488b 100644 --- a/drivers/mfd/ab8500-core.c +++ b/drivers/mfd/ab8500-core.c @@ -1419,15 +1419,15 @@ static int __devinit ab8500_probe(struct platform_device *pdev) ab8500->irq_base); if (ret) goto out_freeirq; - } - if (!no_bm) { - /* Add battery management devices */ - ret = mfd_add_devices(ab8500->dev, 0, ab8500_bm_devs, - ARRAY_SIZE(ab8500_bm_devs), NULL, - ab8500->irq_base); - if (ret) - dev_err(ab8500->dev, "error adding bm devices\n"); + if (!no_bm) { + /* Add battery management devices */ + ret = mfd_add_devices(ab8500->dev, 0, ab8500_bm_devs, + ARRAY_SIZE(ab8500_bm_devs), NULL, + ab8500->irq_base); + if (ret) + dev_err(ab8500->dev, "error adding bm devices\n"); + } } if (is_ab9540(ab8500)) diff --git a/drivers/power/ab8500_btemp.c b/drivers/power/ab8500_btemp.c index bba3cca..04da929 100644 --- a/drivers/power/ab8500_btemp.c +++ b/drivers/power/ab8500_btemp.c @@ -20,6 +20,7 @@ #include <linux/power_supply.h> #include <linux/completion.h> #include <linux/workqueue.h> +#include <linux/of.h> #include <linux/mfd/abx500/ab8500.h> #include <linux/mfd/abx500.h> #include <linux/mfd/abx500/ab8500-bm.h> @@ -480,7 +481,7 @@ static int ab8500_btemp_measure_temp(struct ab8500_btemp *di) vntc = ab8500_gpadc_convert(di->gpadc, BTEMP_BALL); if (vntc < 0) { dev_err(di->dev, - "%s gpadc conversion failed," + "%s gpadc conversion failed, " " using previous value\n", __func__); return prev; } @@ -960,15 +961,249 @@ static int __devexit ab8500_btemp_remove(struct platform_device *pdev) return 0; } +int populate_abx8500_bm_data(struct device *dev, + struct abx500_bm_data *bm_data, + struct device_node *np) +{ + int i, plen, itbl, ret = 0; + phandle *temp_phandle; + struct abx500_battery_type *temp_bat_type; + struct property *pbat_type; + struct device_node *np_bat; + const __be32 *p; + u32 u; + +#define get_bm_data_property(node_p, prop_name)\ + be32_to_cpup(of_get_property(node_p, prop_name, NULL)); + + temp_phandle = (phandle *)of_get_property(np, "bat", NULL); + BUG_ON(!temp_phandle); + np_bat = of_find_node_by_phandle(be32_to_cpup(temp_phandle)); + BUG_ON(!np_bat); + + bm_data->temp_under = get_bm_data_property(np_bat, "temp_under"); + bm_data->temp_low = get_bm_data_property(np_bat, "temp_low"); + bm_data->temp_high = get_bm_data_property(np_bat, "temp_high"); + bm_data->temp_over = get_bm_data_property(np_bat, "temp_over"); + bm_data->temp_now = get_bm_data_property(np_bat, "temp_now"); + bm_data->temp_interval_chg = + get_bm_data_property(np_bat, "temp_interval_chg"); + bm_data->temp_interval_nochg = + get_bm_data_property(np_bat, "temp_interval_nochg"); + bm_data->main_safety_tmr_h = + get_bm_data_property(np_bat, "main_safety_tmr_h"); + bm_data->usb_safety_tmr_h = + get_bm_data_property(np_bat, "usb_safety_tmr_h"); + bm_data->bkup_bat_v = + get_bm_data_property(np_bat, "bkup_bat_v"); + bm_data->bkup_bat_i = + get_bm_data_property(np_bat, "bkup_bat_i"); + bm_data->no_maintenance = + get_bm_data_property(np_bat, "no_maintenance"); + bm_data->chg_unknown_bat = + get_bm_data_property(np_bat, "chg_unknown_bat"); + bm_data->enable_overshoot = + get_bm_data_property(np_bat, "enable_overshoot"); + bm_data->auto_trig = + get_bm_data_property(np_bat, "auto_trig"); + bm_data->adc_therm = + get_bm_data_property(np_bat, "adc_therm"); + bm_data->fg_res = + get_bm_data_property(np_bat, "fg_res"); + bm_data->n_btypes = + get_bm_data_property(np_bat, "n_btypes"); + bm_data->batt_id = + get_bm_data_property(np_bat, "batt_id"); + bm_data->interval_charging = + get_bm_data_property(np_bat, "interval_charging"); + bm_data->interval_not_charging = + get_bm_data_property(np_bat, "interval_not_charging"); + bm_data->temp_hysteresis = + get_bm_data_property(np_bat, "temp_hysteresis"); + bm_data->gnd_lift_resistance = + get_bm_data_property(np_bat, "gnd_lift_resistance"); + + temp_phandle = (phandle *)of_get_property(np_bat, "bat_type", &plen); + if (temp_phandle == NULL) { + dev_warn(dev, "battery type not found\n"); + return -EINVAL; + } + + plen = plen/sizeof(u32); + + if (bm_data->n_btypes != plen) { + dev_crit(dev, "Invalid number of battery types\n"); + return -EINVAL; + } + + bm_data->bat_type = + kzalloc(plen * sizeof(struct abx500_battery_type), GFP_KERNEL); + if (bm_data->bat_type == NULL) { + dev_crit(dev, "no mem for bm_data->bat_type\n"); + return -ENOMEM; + } + + of_node_put(np_bat); + + /* + * traverse 'plen' times in 'allnext' for battery types and + * fillup bm_data->bat_type + */ + i = 0; + for_each_node_by_phandle(np_bat, plen, temp_phandle) + { + temp_bat_type = (struct abx500_battery_type *) + (bm_data->bat_type + i++); + temp_bat_type->name = + get_bm_data_property(np_bat, "bat_name"); + temp_bat_type->resis_high = + get_bm_data_property(np_bat, "resis_high"); + temp_bat_type->resis_low = + get_bm_data_property(np_bat, "resis_low"); + temp_bat_type->charge_full_design = + get_bm_data_property(np_bat, "charge_full_design"); + temp_bat_type->nominal_voltage = + get_bm_data_property(np_bat, "nominal_voltage"); + temp_bat_type->termination_vol = + get_bm_data_property(np_bat, "termination_vol"); + temp_bat_type->termination_curr = + get_bm_data_property(np_bat, "termination_curr"); + temp_bat_type->recharge_vol = + get_bm_data_property(np_bat, "recharge_vol"); + temp_bat_type->normal_cur_lvl = + get_bm_data_property(np_bat, "normal_cur_lvl"); + temp_bat_type->normal_vol_lvl = + get_bm_data_property(np_bat, "normal_vol_lvl"); + temp_bat_type->maint_a_cur_lvl = + get_bm_data_property(np_bat, "maint_a_cur_lvl"); + temp_bat_type->maint_a_vol_lvl = + get_bm_data_property(np_bat, "maint_a_vol_lvl"); + temp_bat_type->maint_a_chg_timer_h = + get_bm_data_property(np_bat, "maint_a_chg_timer_h"); + temp_bat_type->maint_b_cur_lvl = + get_bm_data_property(np_bat, "maint_b_cur_lvl"); + temp_bat_type->maint_b_vol_lvl = + get_bm_data_property(np_bat, "maint_b_vol_lvl"); + temp_bat_type->maint_b_chg_timer_h = + get_bm_data_property(np_bat, "maint_b_chg_timer_h"); + temp_bat_type->low_high_cur_lvl = + get_bm_data_property(np_bat, "low_high_cur_lvl"); + temp_bat_type->low_high_vol_lvl = + get_bm_data_property(np_bat, "low_high_vol_lvl"); + temp_bat_type->battery_resistance = + get_bm_data_property(np_bat, "battery_resistance"); + + temp_bat_type->n_temp_tbl_elements = + get_bm_data_property(np_bat, "n_temp_tbl_elements"); + temp_bat_type->r_to_t_tbl = (struct abx500_res_to_temp *) + kzalloc(sizeof(struct abx500_res_to_temp) * + temp_bat_type->n_temp_tbl_elements, GFP_KERNEL); + if (temp_bat_type->r_to_t_tbl == NULL) { + dev_crit(dev, "no mem for r_to_t_tbl\n"); + kfree(bm_data->bat_type); + return -ENOMEM; + } + itbl = 0; + of_property_for_each_u32(np_bat, "r_to_t_tbl", pbat_type, p, u) + *((int *)(temp_bat_type->r_to_t_tbl) + itbl++) = (int)u; + + temp_bat_type->n_v_cap_tbl_elements = + get_bm_data_property(np_bat, "n_v_cap_tbl_elements"); + temp_bat_type->v_to_cap_tbl = (struct abx500_v_to_cap *) + kzalloc(sizeof(struct abx500_v_to_cap) * + temp_bat_type->n_v_cap_tbl_elements, GFP_KERNEL); + if (temp_bat_type->v_to_cap_tbl == NULL) { + ret = -ENOMEM; + dev_crit(dev, "no mem for v_to_cap_tbl\n"); + goto out_free_mem1; + } + itbl = 0; + of_property_for_each_u32(np_bat, + "v_to_cap_tbl", pbat_type, p, u) + *((int *)(temp_bat_type->v_to_cap_tbl) + itbl++) = + (int)u; + + temp_bat_type->n_batres_tbl_elements = + get_bm_data_property(np_bat, "n_batres_tbl_elements"); + temp_bat_type->batres_tbl = (struct batres_vs_temp *) + kzalloc(sizeof(struct batres_vs_temp) * + temp_bat_type->n_temp_tbl_elements, GFP_KERNEL); + if (temp_bat_type->batres_tbl == NULL) { + ret = -ENOMEM; + dev_crit(dev, "no mem for batres_tbl\n"); + goto out_free_mem2; + } + itbl = 0; + of_property_for_each_u32(np_bat, "batres_tbl", pbat_type, p, u) + *((int *)(temp_bat_type->batres_tbl) + itbl++) = (int)u; + } + + of_node_put(np_bat); + + bm_data->chg_params = (struct abx500_bm_charger_parameters *) + kzalloc(sizeof(struct abx500_bm_charger_parameters), + GFP_KERNEL); + if (bm_data->chg_params == NULL) { + dev_crit(dev, "Failed to alloc memory for chg_params\n"); + ret = -ENOMEM; + goto out_free_mem3; + } + itbl = 0; + of_property_for_each_u32(np_bat, "chg_params", pbat_type, p, u) + *((int *)(bm_data->chg_params) + itbl++) = (int)u; + + bm_data->fg_params = (struct abx500_fg_parameters *) + kzalloc(sizeof(struct abx500_fg_parameters), GFP_KERNEL); + if (bm_data->fg_params == NULL) { + dev_crit(dev, "Failed to alloc memory for fg_params\n"); + ret = -ENOMEM; + goto out_free_mem4; + } + itbl = 0; + of_property_for_each_u32(np_bat, "fg_params", pbat_type, p, u) + *((int *)(bm_data->fg_params) + itbl++) = (int)u; + + return ret; + +out_free_mem1: + kfree(bm_data->bat_type); + kfree(temp_bat_type->r_to_t_tbl); + return ret; + +out_free_mem2: + kfree(bm_data->bat_type); + kfree(temp_bat_type->r_to_t_tbl); + kfree(temp_bat_type->v_to_cap_tbl); + return ret; + +out_free_mem3: + kfree(bm_data->bat_type); + kfree(temp_bat_type->r_to_t_tbl); + kfree(temp_bat_type->v_to_cap_tbl); + kfree(temp_bat_type->batres_tbl); + return ret; + +out_free_mem4: + kfree(bm_data->bat_type); + kfree(temp_bat_type->r_to_t_tbl); + kfree(temp_bat_type->v_to_cap_tbl); + kfree(temp_bat_type->batres_tbl); + kfree(bm_data->chg_params); + return ret; +} +EXPORT_SYMBOL_GPL(populate_abx8500_bm_data); + static int __devinit ab8500_btemp_probe(struct platform_device *pdev) { int irq, i, ret = 0; u8 val; - struct abx500_bm_plat_data *plat_data = pdev->dev.platform_data; + struct device_node *np = pdev->dev.of_node; struct ab8500_btemp *di; + const unsigned int *btemp_p_val; + const char *pvalue = NULL; - if (!plat_data) { - dev_err(&pdev->dev, "No platform data\n"); + if (!np) { + dev_err(&pdev->dev, "No platform data or DT found\n"); return -EINVAL; } @@ -982,20 +1217,46 @@ static int __devinit ab8500_btemp_probe(struct platform_device *pdev) di->gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); /* get btemp specific platform data */ - di->pdata = plat_data->btemp; - if (!di->pdata) { - dev_err(di->dev, "no btemp platform data supplied\n"); - ret = -EINVAL; - goto free_device_info; + btemp_p_val = of_get_property(np, "num_supplicants", NULL); + BUG_ON(!btemp_p_val); + + di->pdata = + kzalloc(sizeof(struct abx500_btemp_platform_data), GFP_KERNEL); + if (di->pdata == NULL) { + kfree(di); + return -ENOMEM; } - /* get battery specific platform data */ - di->bat = plat_data->battery; + di->pdata->num_supplicants = be32_to_cpup(btemp_p_val); + di->pdata->supplied_to = + kzalloc(di->pdata->num_supplicants * + sizeof(const char *), GFP_KERNEL); + if (di->pdata->supplied_to == NULL) { + kfree(di); + kfree(di->pdata); + return -ENOMEM; + } + + for (val = 0; val < di->pdata->num_supplicants; ++val) + if (of_property_read_string_index + (np, "supplied_to", val, &pvalue) == 0) + *(di->pdata->supplied_to + val) = (char *)pvalue; + else { + dev_warn(di->dev, "insufficient number of supplied_to data found\n"); + goto free_device_info; + } + dev_dbg(di->dev, "getting DT battery information\n"); + di->bat = kzalloc(sizeof(struct abx500_bm_data), GFP_KERNEL); if (!di->bat) { - dev_err(di->dev, "no battery platform data supplied\n"); - ret = -EINVAL; + kfree(di); + kfree(di->pdata); + return -ENOMEM; + } + if (populate_abx8500_bm_data(di->dev, di->bat, np) < 0) { + dev_warn(di->dev, "Failed to bind DT\n"); goto free_device_info; } + dev_dbg(di->dev, "getting DT battery information...done\n"); /* BTEMP supply */ di->btemp_psy.name = "ab8500_btemp"; @@ -1008,7 +1269,6 @@ static int __devinit ab8500_btemp_probe(struct platform_device *pdev) di->btemp_psy.external_power_changed = ab8500_btemp_external_power_changed; - /* Create a work queue for the btemp */ di->btemp_wq = create_singlethread_workqueue("ab8500_btemp_wq"); @@ -1016,7 +1276,6 @@ static int __devinit ab8500_btemp_probe(struct platform_device *pdev) dev_err(di->dev, "failed to create work queue\n"); goto free_device_info; } - /* Init work for measuring temperature periodically */ INIT_DELAYED_WORK_DEFERRABLE(&di->btemp_periodic_work, ab8500_btemp_periodic_work); @@ -1090,14 +1349,23 @@ free_irq: irq = platform_get_irq_byname(pdev, ab8500_btemp_irq[i].name); free_irq(irq, di); } + free_btemp_wq: destroy_workqueue(di->btemp_wq); + free_device_info: kfree(di); + kfree(di->pdata); + kfree(di->bat); return ret; } +static const struct of_device_id ab8500_btemp_match[] = { + {.compatible = "stericsson,ab8500-btemp",}, + {}, +}; + static struct platform_driver ab8500_btemp_driver = { .probe = ab8500_btemp_probe, .remove = __devexit_p(ab8500_btemp_remove), @@ -1106,6 +1374,7 @@ static struct platform_driver ab8500_btemp_driver = { .driver = { .name = "ab8500-btemp", .owner = THIS_MODULE, + .of_match_table = ab8500_btemp_match, }, }; diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c index bf02225..1d0e32a 100644 --- a/drivers/power/ab8500_fg.c +++ b/drivers/power/ab8500_fg.c @@ -31,6 +31,7 @@ #include <linux/mfd/abx500.h> #include <linux/time.h> #include <linux/completion.h> +#include <linux/of.h> #define MILLI_TO_MICRO 1000 #define FG_LSB_IN_MA 1627 @@ -2446,11 +2447,12 @@ static int __devinit ab8500_fg_probe(struct platform_device *pdev) { int i, irq; int ret = 0; - struct abx500_bm_plat_data *plat_data = pdev->dev.platform_data; + const char *fg_p_val; + struct device_node *np = pdev->dev.of_node; struct ab8500_fg *di; - if (!plat_data) { - dev_err(&pdev->dev, "No platform data\n"); + if (!np) { + dev_err(&pdev->dev, "No DT node for platform data available\n"); return -EINVAL; } @@ -2464,20 +2466,42 @@ static int __devinit ab8500_fg_probe(struct platform_device *pdev) di->dev = &pdev->dev; di->parent = dev_get_drvdata(pdev->dev.parent); di->gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); - - /* get fg specific platform data */ - di->pdata = plat_data->fg; - if (!di->pdata) { - dev_err(di->dev, "no fg platform data supplied\n"); - ret = -EINVAL; - goto free_device_info; + di->pdata = + kzalloc(sizeof(struct abx500_btemp_platform_data), GFP_KERNEL); + if (di->pdata == NULL) { + kfree(di); + return -ENOMEM; + } + di->pdata->num_supplicants = + be32_to_cpup(of_get_property(np, "num_supplicants", NULL)); + di->pdata->supplied_to = + kzalloc(di->pdata->num_supplicants * + sizeof(const char *), GFP_KERNEL); + if (di->pdata->supplied_to == NULL) { + kfree(di); + kfree(di->pdata); + return -ENOMEM; } + for (i = 0; i < di->pdata->num_supplicants; ++i) + if (of_property_read_string_index + (np, "supplied_to", i, &fg_p_val) == 0) + *(di->pdata->supplied_to + i) = (char *)fg_p_val; + else { + dev_warn(di->dev, "insufficient number of supplied_to data found\n"); + goto free_device_info; + } + /* get battery specific platform data */ - di->bat = plat_data->battery; + di->bat = kzalloc(sizeof(struct abx500_bm_data), GFP_KERNEL); if (!di->bat) { - dev_err(di->dev, "no battery platform data supplied\n"); - ret = -EINVAL; + kfree(di); + kfree(di->pdata); + return -ENOMEM; + } + ret = populate_abx8500_bm_data(di->dev, di->bat, np); + if (ret < 0) { + dev_warn(di->dev, "Failed to bind DT\n"); goto free_device_info; } @@ -2607,10 +2631,15 @@ free_inst_curr_wq: destroy_workqueue(di->fg_wq); free_device_info: kfree(di); + kfree(di->pdata); return ret; } +static const struct of_device_id ab8500_fg_match[] = { + {.compatible = "stericsson,ab8500-fg",}, + {}, +}; static struct platform_driver ab8500_fg_driver = { .probe = ab8500_fg_probe, .remove = __devexit_p(ab8500_fg_remove), @@ -2619,6 +2648,7 @@ static struct platform_driver ab8500_fg_driver = { .driver = { .name = "ab8500-fg", .owner = THIS_MODULE, + .of_match_table = ab8500_fg_match, }, }; @@ -2632,7 +2662,7 @@ static void __exit ab8500_fg_exit(void) platform_driver_unregister(&ab8500_fg_driver); } -subsys_initcall_sync(ab8500_fg_init); +subsys_initcall(ab8500_fg_init); module_exit(ab8500_fg_exit); MODULE_LICENSE("GPL v2"); diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h index 1318ca6..9dbc4d1 100644 --- a/include/linux/mfd/abx500.h +++ b/include/linux/mfd/abx500.h @@ -113,13 +113,13 @@ struct ab3100 { * struct ab3100_platform_data * Data supplied to initialize board connections to the AB3100 * @reg_constraints: regulator constraints for target board - * the order of these constraints are: LDO A, C, D, E, - * F, G, H, K, EXT and BUCK. + * the order of these constraints are: LDO A, C, D, E, + * F, G, H, K, EXT and BUCK. * @reg_initvals: initial values for the regulator registers - * plus two sleep settings for LDO E and the BUCK converter. - * exactly AB3100_NUM_REGULATORS+2 values must be sent in. - * Order: LDO A, C, E, E sleep, F, G, H, K, EXT, BUCK, - * BUCK sleep, LDO D. (LDO D need to be initialized last.) + * plus two sleep settings for LDO E and the BUCK converter. + * exactly AB3100_NUM_REGULATORS+2 values must be sent in. + * Order: LDO A, C, E, E sleep, F, G, H, K, EXT, BUCK, + * BUCK sleep, LDO D. (LDO D need to be initialized last.) * @external_voltage: voltage level of the external regulator. */ struct ab3100_platform_data { @@ -131,7 +131,7 @@ struct ab3100_platform_data { int ab3100_event_register(struct ab3100 *ab3100, struct notifier_block *nb); int ab3100_event_unregister(struct ab3100 *ab3100, - struct notifier_block *nb); + struct notifier_block *nb); /** * struct abx500_init_setting @@ -387,6 +387,9 @@ struct abx500_bm_data { const struct abx500_fg_parameters *fg_params; }; +int populate_abx8500_bm_data(struct device *, struct abx500_bm_data *, + struct device_node *); + struct abx500_chargalg_platform_data { char **supplied_to; size_t num_supplicants; diff --git a/include/linux/of.h b/include/linux/of.h index 2ec1083..61b4ac8 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -183,6 +183,39 @@ extern struct device_node *of_find_matching_node(struct device_node *from, #define for_each_matching_node(dn, matches) \ for (dn = of_find_matching_node(NULL, matches); dn; \ dn = of_find_matching_node(dn, matches)) + +/* + * syntax: for_each_node_by_phandle(np, len, phandle); + * @np : pointer to node to start in the list + * @len: number of nodes expected + * @phandle: current phandle which is obtained through of_get_property(...) + * + * e.g: + * node_a: <> { + * ... + * }; + * node_b: <> { + * ... + * }; + * node_c: <> { + * ... + * }; + * + * node_x: <> { + * p1 = <v1>; + * p2 = <v2>; + * n_nodes = <3> + * p3 = <&node_a &node_b &node_c ....>; + * }; + * + * Note: + * - invoke of_node_put(...) as it uses of_find_node_by_phandle(...) + */ +#define for_each_node_by_phandle(np, len, phandle) \ + for (np = of_find_node_by_phandle(be32_to_cpup(phandle));\ + (len--);\ + np = np->allnext) + extern struct device_node *of_find_node_by_path(const char *path); extern struct device_node *of_find_node_by_phandle(phandle handle); extern struct device_node *of_get_parent(const struct device_node *node); -- 1.7.9.5

12 years, 3 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

linaro-dev June 2012