From patchwork Mon Mar 20 08:16:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 95566 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp1009579qgd; Mon, 20 Mar 2017 09:04:54 -0700 (PDT) X-Received: by 10.98.16.11 with SMTP id y11mr33414060pfi.84.1490025894364; Mon, 20 Mar 2017 09:04:54 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z15si18009607pll.224.2017.03.20.09.04.54; Mon, 20 Mar 2017 09:04:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755323AbdCTQBq (ORCPT + 21 others); Mon, 20 Mar 2017 12:01:46 -0400 Received: from mail.free-electrons.com ([62.4.15.54]:38521 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753232AbdCTIRQ (ORCPT ); Mon, 20 Mar 2017 04:17:16 -0400 Received: by mail.free-electrons.com (Postfix, from userid 110) id 47EDF207F4; Mon, 20 Mar 2017 09:17:14 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT shortcircuit=ham autolearn=disabled version=3.4.0 Received: from qschulz.home (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id CB8AC20713; Mon, 20 Mar 2017 09:17:03 +0100 (CET) From: Quentin Schulz To: sre@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, wens@csie.org, linux@armlinux.org.uk, maxime.ripard@free-electrons.com, jic23@kernel.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, lee.jones@linaro.org, icenowy@aosc.xyz Cc: Quentin Schulz , liam@networkimprov.net, thomas.petazzoni@free-electrons.com, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-iio@vger.kernel.org, linux-sunxi@googlegroups.com Subject: [RESEND PATCH v4 0/9] add support for AXP20X and AXP22X power supply drivers Date: Mon, 20 Mar 2017 09:16:44 +0100 Message-Id: <20170320081653.8884-1-quentin.schulz@free-electrons.com> X-Mailer: git-send-email 2.9.3 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org These patches haven't changed since v4. The goal is to split the series in two series, one (this one) with patches ready to be merged and the other one (everything impacting the battery power supply) which depends on an ongoing series by Liam Breck to be merged once the ongoing series has a consensus. Therefore, this series of patch is ready to be merged. I don't see any dependency between subsystems. Thanks, Quentin Quote from v4 cover letter: The X-Powers AXP20X and AXP22X PMICs have multiple ADCs. They expose information and data of the various power supplies they support such as ACIN, battery and VBUS. For example, they expose the current battery voltage, charge or discharge, as well as ACIN and VBUS current voltages and currents, internal PMIC temperature and ADC on 2 different GPIOs when in the right mode (for the AXP209 only). The ACIN power supply driver is added by this patch. The AXP20X and AXP22X can both read the status and the "usability" of the power supply but only the AXP209 will be able to tell the current current and voltage of the power supply by reading ADC channels. It is simply not supported by the AXP22X PMICs. The battery power supply driver is also added by this patch. The AXP20X and AXP22X share most of their behaviour but have slight variations. The allowed target voltages for battery charging are not the same, the AXP22X PMIC are able to tell if the battery percentage computed by the PMIC is trustworthy and they have different formulas for computing max current for battery power supply. The driver is able to give the current voltage and current of the battery (be it charging or discharging), the maximal and minimal voltage and maximal current allowed for the battery, whether the battery is present and usable and its capacity. It will get the battery current current and voltage by reading the ADC channels. The PMIC allows maximal voltages (4.36V for AXP20X and 4.22V and 4.24V for AXP22X) that should not be used with Lithium-based batteries and since this PMIC is supposed to be used with Lithium-based batteries, they have been disabled. The values returned by the ADC driver are multipled by 1000 to scale from the mV returned by the ADC to the uV expected by the power supply framework. This series of patch adds DT bindings for ACIN power supply, ADC and battery power supply drivers for AXP20X and AXP22X PMICs and their documentation. It also enables the supported power supplies for the Nextthing Co. CHIP and Sinlinx SinA33 boards. The different drivers are also added to the MFD cells of the AXP20X and AXP22X cells and the writeable and volatile regs updated to work with the newly added drivers. This series of patch is based on a previous upstreaming attempt done by Bruno Prémont few months ago. It differs in three points: the ADC driver does not tell the battery temperature (TS_IN) as I do not have a board to test it with, it does not tell the instantaneous battery power as it returns crazy values for me and finally no support for OCV curves for the battery. You can test these patches from this repo and branch: https://github.com/QSchulz/linux/tree/axp2xx_adc_batt_ac_v4 v4: - added the ability to set maximum constant charge current from sysfs, - added a warning when setting a higher than current maximum constant charge current, - set default to minimum possible value for current and maximum constant charge current when no battery DT is present or invalid battery DT, - fixed a forgotten custom formula to compute maximum constant charge current for AXP22X, - automatically lower the current constant charge current when it is higher than the maximum constant charge current about to be set, v3: - Removed DT property for constant charge current in favor of the WIP battery framework as requested by Sebastian Reichel, - Using a simple if condition instead of a switch in the ADC driver, - Fixed error handling in ADC driver's probe, - Fixed missing call to iio_map_array_unregister in the ADC driver's remove, - Removed ADC driver's DT node and documentation, - Merged IIO channel mapping patches into the original ADC driver patch, - Removed `adding V-OFF to writeable reg' patch as it's already in writeable reg range, v2: - Some registers' name have been changed to better reflect their purpose, - Make VBUS power supply driver use IIO channels when AXP ADC driver is enabled, but fall back on previous behavior when disabled. This is made to avoid the ADC driver overwritting registers for VBUS power supply ADC when removed, - Removed useless adding of data registers to volatile registers, - Reordered IIO channels, now grouped by same part of the PMIC (e.g. voltage and current of the battery have the same index in different IIO types), - Added structures for specific data instead of matching on IDs, - Switched from DT IIO channels mapping to iio_map structures IIO channels mapping, Quentin Quentin Schulz (9): mfd: axp20x: correct name of temperature data ADC registers iio: adc: add support for X-Powers AXP20X and AXP22X PMICs ADCs mfd: axp20x: add ADC cells for AXP20X and AXP22X PMICs mfd: axp20x: add AC power supply cells for AXP22X PMICs ARM: dtsi: axp209: add AC power supply subnode ARM: dtsi: axp22x: add AC power supply subnode ARM: dts: sun8i: sina33: enable ACIN power supply subnode ARM: sun5i: chip: enable ACIN power supply subnode mfd: axp20x: add CHRG_CTRL1/2/3 to writeable regs for AXP20X/AXP22X arch/arm/boot/dts/axp209.dtsi | 5 + arch/arm/boot/dts/axp22x.dtsi | 5 + arch/arm/boot/dts/sun5i-r8-chip.dts | 4 + arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 4 + drivers/iio/adc/Kconfig | 10 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/axp20x_adc.c | 617 +++++++++++++++++++++++++ drivers/mfd/axp20x.c | 20 +- include/linux/mfd/axp20x.h | 4 +- 9 files changed, 667 insertions(+), 3 deletions(-) create mode 100644 drivers/iio/adc/axp20x_adc.c -- 2.9.3