From patchwork Thu Jun 8 22:08:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 103425 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp2649664qgd; Thu, 8 Jun 2017 15:10:07 -0700 (PDT) X-Received: by 10.84.232.199 with SMTP id x7mr37859250plm.193.1496959806916; Thu, 08 Jun 2017 15:10:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496959806; cv=none; d=google.com; s=arc-20160816; b=h5c1+fEw5xR41mMsrFgMEsHSixVHM5yxnuuRrwoJyL82mImK+vCKEQ74AyjMcm72Q2 g3LiCw6IyHCNBDGMuaWeKuCPWEul3NmGpqXRBDfsbhCD2YDYwghtvTQMCZBlfgJctJLj G67yaU1jhCtPs818n2FgWa4kydKKCI/Pzjt0FiNkL9Ak1bS0MPBM+DhE2QTeJdBbEfv0 5M+CBfFGP9gQn+2N4TEwfdEotf2cPyVHzP1laAxpEeIhJ4m0lVSWbhDuAMpAF8AKeEYU 6dQ2IGwx3DwY0EroGx4Ejk6C3i8kIJdvjmtAO61hOuLOQWQ9q/bzOOThP391+3MLfD4t jjZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=faldoP6hm+N+vWlll454PPrTWRmK//VYkJScO73WLNE=; b=dZ0Du/DQff3LeeQywzmW5g74kWSCbPPjLtsps+Wdw7jWUuqnlfy5RlyPAWRKoWWYP6 gVz2HYJS430S3qRR6v/K+XlEj6e5B1Sn4IMlg8vNH4B8LjsjCCQZgr2QOti7eehDzQEk S0pfVFkXyeWorDx6bIdsiFUttgQnDDnpWt+/YDukxIjmqcIFbtHgSgLoIAYiQ4+noVtv tUoR/F8r2X3i1rp93IWwmmKmj4D2lZPl97YjaXwVD1gAyx/3vgGYgglMScNuq1Gfp/wZ /WZUYIPd7EvBDnYPfeaEdb1+d4URMMYUTpiKv6Q4rFdww3PQ01oYo9hZP2Mngb8WTzEY curQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t10si5288833plh.401.2017.06.08.15.10.06; Thu, 08 Jun 2017 15:10:06 -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; dkim=pass header.i=@linaro.org; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751961AbdFHWJr (ORCPT + 25 others); Thu, 8 Jun 2017 18:09:47 -0400 Received: from mail-pf0-f172.google.com ([209.85.192.172]:33680 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751932AbdFHWJo (ORCPT ); Thu, 8 Jun 2017 18:09:44 -0400 Received: by mail-pf0-f172.google.com with SMTP id 83so21571772pfr.0 for ; Thu, 08 Jun 2017 15:09:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=faldoP6hm+N+vWlll454PPrTWRmK//VYkJScO73WLNE=; b=HmkCGEAuF45T+I7w2QG+a1CgbaP5pHVp5cMrwOMQim0t2XpUmEtE049FaXnWs5ySEW FgkUGi2U7OhVpPJ2YFTAyw9TlgadFmS0NvLLv+sIj4m/Etovr9nUI5mn9Z2hY9W5o7SI AwiO6F89KNIbkvTh+evjuzXXaoOBzYnio0uNk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=faldoP6hm+N+vWlll454PPrTWRmK//VYkJScO73WLNE=; b=p2Zl3nvZ9Z9Q8ckBZZTvKFC5a8sKl2eQlxh0T/+fABlBIdz9iq8DXLD1G1YCEGOykP ERtTLLg6i3MHL1PeYo4VxVipWKshsNliEMTOvCFPI/Mjj9gno0z1mbE+Tif5rf6XycB6 emRWIF4Dr0DlXESgMNc29BWFBpX9Z7ZdzaQhLTqxyc7EOxHuW57M0bieWbgxTuClaN8V Yi2Veyu/iMtXUu+EtnHBHSl0VL8KcyWQf7Zi95GjB2+6dNucvLMP4ehwG2IsaDnAwkOw NXR49qSRpLH2Uwefaa4wyQdOS2dLUPDXAljbgEfXGJ31ant19DXKjMYl8Q2OitoBCLDH IqYg== X-Gm-Message-State: AODbwcA1mEIEUv0IRc3UzkzucxKZKECvy7R9LcS2urvoz7m6L19pi2DP 41aIH57XOI+iaEMC X-Received: by 10.84.228.194 with SMTP id y2mr36827466pli.13.1496959784087; Thu, 08 Jun 2017 15:09:44 -0700 (PDT) Received: from docularxu-ThinkPad-T440p.219.146.1.66 ([45.56.159.87]) by smtp.gmail.com with ESMTPSA id r85sm11963639pfb.61.2017.06.08.15.09.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Jun 2017 15:09:43 -0700 (PDT) From: Guodong Xu To: lee.jones@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com, xuwei5@hisilicon.com, catalin.marinas@arm.com, will.deacon@arm.com, lgirdwood@gmail.com, broonie@kernel.org, khilman@baylibre.com, arnd@arndb.de, gregory.clement@free-electrons.com, horms+renesas@verge.net.au, olof@lixom.net, thomas.petazzoni@free-electrons.com, yamada.masahiro@socionext.com, riku.voipio@linaro.org, treding@nvidia.com, krzk@kernel.org, eric@anholt.net, damm+renesas@opensource.se, ard.biesheuvel@linaro.org, linus.walleij@linaro.org, geert+renesas@glider.be Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, hw.wangxiaoyin@hisilicon.com, Guodong Xu Subject: [PATCH v6 2/8] mfd: hi6421-pmic: cleanup: update dev_err messages Date: Fri, 9 Jun 2017 06:08:35 +0800 Message-Id: <20170608220841.26531-3-guodong.xu@linaro.org> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170608220841.26531-1-guodong.xu@linaro.org> References: <20170608220841.26531-1-guodong.xu@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Update dev_err messages to make them more readable. Signed-off-by: Guodong Xu Acked-by: Arnd Bergmann --- drivers/mfd/hi6421-pmic-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.10.2 diff --git a/drivers/mfd/hi6421-pmic-core.c b/drivers/mfd/hi6421-pmic-core.c index ad9e3d8..b1139d4 100644 --- a/drivers/mfd/hi6421-pmic-core.c +++ b/drivers/mfd/hi6421-pmic-core.c @@ -52,8 +52,8 @@ static int hi6421_pmic_probe(struct platform_device *pdev) pmic->regmap = devm_regmap_init_mmio_clk(&pdev->dev, NULL, base, &hi6421_regmap_config); if (IS_ERR(pmic->regmap)) { - dev_err(&pdev->dev, - "regmap init failed: %ld\n", PTR_ERR(pmic->regmap)); + dev_err(&pdev->dev, "Failed to initialise Regmap: %ld\n", + PTR_ERR(pmic->regmap)); return PTR_ERR(pmic->regmap); } @@ -70,7 +70,7 @@ static int hi6421_pmic_probe(struct platform_device *pdev) ret = devm_mfd_add_devices(&pdev->dev, 0, hi6421_devs, ARRAY_SIZE(hi6421_devs), NULL, 0, NULL); if (ret) { - dev_err(&pdev->dev, "add mfd devices failed: %d\n", ret); + dev_err(&pdev->dev, "Failed to add child devices: %d\n", ret); return ret; } From patchwork Thu Jun 8 22:08:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 103429 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp2649794qgd; Thu, 8 Jun 2017 15:10:30 -0700 (PDT) X-Received: by 10.98.200.66 with SMTP id z63mr2392226pff.136.1496959830693; Thu, 08 Jun 2017 15:10:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496959830; cv=none; d=google.com; s=arc-20160816; b=SkkU+NgYNE5h99InWR2q7i1AZqkGrTGNn4cBQS0lLcGh0wJjYTSdsjh1NbcNwXFv0C tv/DeruVJPqzn1y7r/HFgbGGpRn+S1ClibaXcyLIUyO+KEmfmFxoGSeOrhrtHKlKOyGm w+mL+D/ZF6bnkp3II1NtlHLREdtVc1qzinn0fUiM1AV7DyOBDRPagWrC4Lc75bRuPHdn CA0tus5X1b23KKpeq5coa+Z+NmCeRHimOT/rRdPbqsNkeUzEm7V/Q7iosgxblG8Sh46R qEQlC7vjnC1wQljpQ52paEKTd51k4fvdCF1EtOzlItRK0/jVyF/e90zIaizTdwi9Va1q Iv5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=ivSZcddu463zR3Tc21Exch2STqjOUN+MgaPMuW9MwdE=; b=kGMFHb2HYardehsuVl8+GV00LT6seq6BsGVUinlKhL+4uPQScoLC+Upz7eJV8HWDG2 YNjzqMB78niGKlRg6B0j6QrZrOoOkPpRms75Ge8gXHZ+gK4I+KiMgEyM3B7+ih0/s/xB HW2iN/iRQENBEwqMyKhHs4n5D9ehSjA9zQYwHe8JHzZMWw8rCCt8yKrRDSsDC3bCpbA9 CS7N9tI62KfBhkUrtIp0GjXoRv+ZxPhBka6Zq85EIIUhNuMwW6Vs8PQ313Cz1tWit2Ss SHl9olaeJxTMZ7VMO0jIEi+OPI4UHqeQRUOdRiaAXFPWU7edLbZ1HPUWDl3y9cs+0RUn fmVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f84si5251825pfk.318.2017.06.08.15.10.30; Thu, 08 Jun 2017 15:10:30 -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; dkim=pass header.i=@linaro.org; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752027AbdFHWKX (ORCPT + 25 others); Thu, 8 Jun 2017 18:10:23 -0400 Received: from mail-pf0-f181.google.com ([209.85.192.181]:35295 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751826AbdFHWKT (ORCPT ); Thu, 8 Jun 2017 18:10:19 -0400 Received: by mail-pf0-f181.google.com with SMTP id l89so21576145pfi.2 for ; Thu, 08 Jun 2017 15:10:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ivSZcddu463zR3Tc21Exch2STqjOUN+MgaPMuW9MwdE=; b=fbPSz/f4Wf3GHyfAPo48gLX+hqSek6+8GIJQncsPVVkGHHYqtcou6rBjLhdGEkkfyq dFF5RSnUKpYSj1Nqtn/3DHhTZ8z25oaUptcsXYmiCIQC2ECkM6BEsJRgdVE5GwEut1W7 sd3dUphffqaEe27v8lzRFXKCYaOPXGEgEV3G8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ivSZcddu463zR3Tc21Exch2STqjOUN+MgaPMuW9MwdE=; b=G4mBqO53NVCW282XNhAvkY5BP9OtIboARuUgxDkrGeSkYdjAC2jPJNzQHqfMEMNQz6 l6RR8XRLWaPnbOq2mfHWXDaxhM3YS1OFWWVDZHCveJQrSQapC97uxhyG6w2bULeDbyLf 0yFqmxxs/LHFzQWvVVvutQ4h1S7pPTijwxn+u4Oq/eKkxtTLlYX/nJxE1N/o5YcScXwU aKNZJbC9wCOFyAXCK0Lq/9+LfkFlu2iW18PvFmiGFuLOt/O/yO3ACFbaKnN0yelgK/E4 tdAKhpoVTOsc2o68ydCU9pmWJxKvXjvvbek2QBoMIJRenI/QoQfzeOYrTsQzdPVCroiw zbfg== X-Gm-Message-State: AODbwcDvSKo/m5siUWoSBHh7/O+3JvtKqgbLDQKnQ3b498+j++qHBoDp MSlTrR3j4Sg1Oo09 X-Received: by 10.84.216.84 with SMTP id f20mr37351046plj.177.1496959808696; Thu, 08 Jun 2017 15:10:08 -0700 (PDT) Received: from docularxu-ThinkPad-T440p.219.146.1.66 ([45.56.159.87]) by smtp.gmail.com with ESMTPSA id r85sm11963639pfb.61.2017.06.08.15.10.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Jun 2017 15:10:08 -0700 (PDT) From: Guodong Xu To: lee.jones@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com, xuwei5@hisilicon.com, catalin.marinas@arm.com, will.deacon@arm.com, lgirdwood@gmail.com, broonie@kernel.org, khilman@baylibre.com, arnd@arndb.de, gregory.clement@free-electrons.com, horms+renesas@verge.net.au, olof@lixom.net, thomas.petazzoni@free-electrons.com, yamada.masahiro@socionext.com, riku.voipio@linaro.org, treding@nvidia.com, krzk@kernel.org, eric@anholt.net, damm+renesas@opensource.se, ard.biesheuvel@linaro.org, linus.walleij@linaro.org, geert+renesas@glider.be Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, hw.wangxiaoyin@hisilicon.com, Guodong Xu Subject: [PATCH v6 5/8] regulator: hi6421v530: add driver for hi6421v530 voltage regulator Date: Fri, 9 Jun 2017 06:08:38 +0800 Message-Id: <20170608220841.26531-6-guodong.xu@linaro.org> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170608220841.26531-1-guodong.xu@linaro.org> References: <20170608220841.26531-1-guodong.xu@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wang Xiaoyin add the driver for hi6421v530 voltage regulator Signed-off-by: Wang Xiaoyin Signed-off-by: Guodong Xu Acked-by: Arnd Bergmann --- drivers/regulator/Kconfig | 10 ++ drivers/regulator/Makefile | 1 + drivers/regulator/hi6421v530-regulator.c | 214 +++++++++++++++++++++++++++++++ 3 files changed, 225 insertions(+) create mode 100644 drivers/regulator/hi6421v530-regulator.c -- 2.10.2 diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 48db87d..78cd8d8 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -296,6 +296,16 @@ config REGULATOR_HI6421 21 general purpose LDOs, 3 dedicated LDOs, and 5 BUCKs. All of them come with support to either ECO (idle) or sleep mode. +config REGULATOR_HI6421V530 + tristate "HiSilicon Hi6421v530 PMIC voltage regulator support" + depends on MFD_HI6421_PMIC && OF + help + This driver provides support for the voltage regulators on + HiSilicon Hi6421v530 PMU / Codec IC. + Hi6421v530 is a multi-function device which, on regulator part, + provides 5 general purpose LDOs, and all of them come with support + to either ECO (idle) or sleep mode. + config REGULATOR_HI655X tristate "Hisilicon HI655X PMIC regulators support" depends on ARCH_HISI || COMPILE_TEST diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index dc3503f..36e2b75 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -38,6 +38,7 @@ obj-$(CONFIG_REGULATOR_DB8500_PRCMU) += db8500-prcmu.o obj-$(CONFIG_REGULATOR_FAN53555) += fan53555.o obj-$(CONFIG_REGULATOR_GPIO) += gpio-regulator.o obj-$(CONFIG_REGULATOR_HI6421) += hi6421-regulator.o +obj-$(CONFIG_REGULATOR_HI6421V530) += hi6421v530-regulator.o obj-$(CONFIG_REGULATOR_HI655X) += hi655x-regulator.o obj-$(CONFIG_REGULATOR_ISL6271A) += isl6271a-regulator.o obj-$(CONFIG_REGULATOR_ISL9305) += isl9305.o diff --git a/drivers/regulator/hi6421v530-regulator.c b/drivers/regulator/hi6421v530-regulator.c new file mode 100644 index 0000000..c09bc71 --- /dev/null +++ b/drivers/regulator/hi6421v530-regulator.c @@ -0,0 +1,214 @@ +/* + * Device driver for regulators in Hi6421V530 IC + * + * Copyright (c) <2017> HiSilicon Technologies Co., Ltd. + * http://www.hisilicon.com + * Copyright (c) <2017> Linaro Ltd. + * http://www.linaro.org + * + * Author: Wang Xiaoyin + * Guodong Xu + * + * 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. + */ + +#include +#include +#include +#include +#include +#include + +/* + * struct hi6421v530_regulator_info - hi6421v530 regulator information + * @desc: regulator description + * @mode_mask: ECO mode bitmask of LDOs; for BUCKs, this masks sleep + * @eco_microamp: eco mode load upper limit (in uA), valid for LDOs only + */ +struct hi6421v530_regulator_info { + struct regulator_desc rdesc; + u8 mode_mask; + u32 eco_microamp; +}; + +/* HI6421v530 regulators */ +enum hi6421v530_regulator_id { + HI6421V530_LDO3, + HI6421V530_LDO9, + HI6421V530_LDO11, + HI6421V530_LDO15, + HI6421V530_LDO16, +}; + +static const unsigned int ldo_3_voltages[] = { + 1800000, 1825000, 1850000, 1875000, + 1900000, 1925000, 1950000, 1975000, + 2000000, 2025000, 2050000, 2075000, + 2100000, 2125000, 2150000, 2200000, +}; + +static const unsigned int ldo_9_11_voltages[] = { + 1750000, 1800000, 1825000, 2800000, + 2850000, 2950000, 3000000, 3300000, +}; + +static const unsigned int ldo_15_16_voltages[] = { + 1750000, 1800000, 2400000, 2600000, + 2700000, 2850000, 2950000, 3000000, +}; + +static const struct regulator_ops hi6421v530_ldo_ops; + +#define HI6421V530_LDO_ENABLE_TIME (350) + +/* + * _id - LDO id name string + * v_table - voltage table + * vreg - voltage select register + * vmask - voltage select mask + * ereg - enable register + * emask - enable mask + * odelay - off/on delay time in uS + * ecomask - eco mode mask + * ecoamp - eco mode load uppler limit in uA + */ +#define HI6421V530_LDO(_ID, v_table, vreg, vmask, ereg, emask, \ + odelay, ecomask, ecoamp) { \ + .rdesc = { \ + .name = #_ID, \ + .of_match = of_match_ptr(#_ID), \ + .regulators_node = of_match_ptr("regulators"), \ + .ops = &hi6421v530_ldo_ops, \ + .type = REGULATOR_VOLTAGE, \ + .id = HI6421V530_##_ID, \ + .owner = THIS_MODULE, \ + .n_voltages = ARRAY_SIZE(v_table), \ + .volt_table = v_table, \ + .vsel_reg = HI6421_REG_TO_BUS_ADDR(vreg), \ + .vsel_mask = vmask, \ + .enable_reg = HI6421_REG_TO_BUS_ADDR(ereg), \ + .enable_mask = emask, \ + .enable_time = HI6421V530_LDO_ENABLE_TIME, \ + .off_on_delay = odelay, \ + }, \ + .mode_mask = ecomask, \ + .eco_microamp = ecoamp, \ +} + +/* HI6421V530 regulator information */ + +static struct hi6421v530_regulator_info hi6421v530_regulator_info[] = { + HI6421V530_LDO(LDO3, ldo_3_voltages, 0x061, 0xf, 0x060, 0x2, + 20000, 0x6, 8000), + HI6421V530_LDO(LDO9, ldo_9_11_voltages, 0x06b, 0x7, 0x06a, 0x2, + 40000, 0x6, 8000), + HI6421V530_LDO(LDO11, ldo_9_11_voltages, 0x06f, 0x7, 0x06e, 0x2, + 40000, 0x6, 8000), + HI6421V530_LDO(LDO15, ldo_15_16_voltages, 0x077, 0x7, 0x076, 0x2, + 40000, 0x6, 8000), + HI6421V530_LDO(LDO16, ldo_15_16_voltages, 0x079, 0x7, 0x078, 0x2, + 40000, 0x6, 8000), +}; + +static unsigned int hi6421v530_regulator_ldo_get_mode( + struct regulator_dev *rdev) +{ + struct hi6421v530_regulator_info *info; + unsigned int reg_val; + + info = rdev_get_drvdata(rdev); + regmap_read(rdev->regmap, rdev->desc->enable_reg, ®_val); + + if (reg_val & (info->mode_mask)) + return REGULATOR_MODE_IDLE; + + return REGULATOR_MODE_NORMAL; +} + +static int hi6421v530_regulator_ldo_set_mode(struct regulator_dev *rdev, + unsigned int mode) +{ + struct hi6421v530_regulator_info *info; + unsigned int new_mode; + + info = rdev_get_drvdata(rdev); + switch (mode) { + case REGULATOR_MODE_NORMAL: + new_mode = 0; + break; + case REGULATOR_MODE_IDLE: + new_mode = info->mode_mask; + break; + default: + return -EINVAL; + } + + regmap_update_bits(rdev->regmap, rdev->desc->enable_reg, + info->mode_mask, new_mode); + + return 0; +} + + +static const struct regulator_ops hi6421v530_ldo_ops = { + .is_enabled = regulator_is_enabled_regmap, + .enable = regulator_enable_regmap, + .disable = regulator_disable_regmap, + .list_voltage = regulator_list_voltage_table, + .map_voltage = regulator_map_voltage_ascend, + .get_voltage_sel = regulator_get_voltage_sel_regmap, + .set_voltage_sel = regulator_set_voltage_sel_regmap, + .get_mode = hi6421v530_regulator_ldo_get_mode, + .set_mode = hi6421v530_regulator_ldo_set_mode, +}; + +static int hi6421v530_regulator_probe(struct platform_device *pdev) +{ + struct hi6421_pmic *pmic; + struct regulator_dev *rdev; + struct regulator_config config = { }; + unsigned int i; + + pmic = dev_get_drvdata(pdev->dev.parent); + if (!pmic) { + dev_err(&pdev->dev, "no pmic in the regulator parent node\n"); + return -ENODEV; + } + + for (i = 0; i < ARRAY_SIZE(hi6421v530_regulator_info); i++) { + config.dev = pdev->dev.parent; + config.regmap = pmic->regmap; + config.driver_data = &hi6421v530_regulator_info[i]; + + rdev = devm_regulator_register(&pdev->dev, + &hi6421v530_regulator_info[i].rdesc, + &config); + if (IS_ERR(rdev)) { + dev_err(&pdev->dev, "failed to register regulator %s\n", + hi6421v530_regulator_info[i].rdesc.name); + return PTR_ERR(rdev); + } + } + return 0; +} + +static const struct platform_device_id hi6421v530_regulator_table[] = { + { .name = "hi6421v530-regulator" }, + {}, +}; +MODULE_DEVICE_TABLE(platform, hi6421v530_regulator_table); + +static struct platform_driver hi6421v530_regulator_driver = { + .id_table = hi6421v530_regulator_table, + .driver = { + .name = "hi6421v530-regulator", + }, + .probe = hi6421v530_regulator_probe, +}; +module_platform_driver(hi6421v530_regulator_driver); + +MODULE_AUTHOR("Wang Xiaoyin "); +MODULE_DESCRIPTION("Hi6421v530 regulator driver"); +MODULE_LICENSE("GPL v2"); From patchwork Thu Jun 8 22:08:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 103430 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp2649796qgd; Thu, 8 Jun 2017 15:10:31 -0700 (PDT) X-Received: by 10.98.75.215 with SMTP id d84mr5482331pfj.135.1496959831099; Thu, 08 Jun 2017 15:10:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496959831; cv=none; d=google.com; s=arc-20160816; b=SKNs5vaS+mzaRxsF2vkYk25744GPyUcIS7GCP/0R5xhsB6HY+nW0NUIjI9T65nNo8z 1B/jVMe86io4DakedD1L2lhROfzJ+9HYifjlasiOxNAk9jGVwcv/mgd/m0RLhEYRhBK0 hbJ3cxhQksnIysocHFYuiuVCFmSoazPbyd0+tebkdZqvY7F1zRdXhlDN8vfhhHSmmxnC c9+R1WzC0Ktw5prBAb2sXKsLkOH7Ca6gsr6lPqwWMUYluuVgmCtoHTa6WF6+JVHAkW50 LlWBLW1TMeGxuqRn1iEJc0TRibBAQp3YlUOIHBYBaDer3ueaBcYNEDKXk2Lk2IqBzPbV ibxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=J5eIgFGuC6fQWgIdRwut7PePBMybpIpFZ/nkmH1sAA4=; b=fTJtITIY9Kek4AA6PRvKgdPGsBA+RQ4LrFAFj709q5BpeiQ7E8Ty8vsifitcYuXIUq 5OpJ0SJYH58oreZKilDlYtdDjjp2SU6p/4Kd21KaDfc9NL5A7/UfMCdFDaddvTBRr+xK wXaVnu3OluUX4JFU3/4E4x5q/jnyFHX7nJBT0ZWuy7FSjNKwABM4MeXZ7P6Izxvk0qQA i5KHuHdayTvfz58k6yiOh3Oh8g2IUm6bpNIMn+oHYyXU3rIDItICL3vxc48u0fWd0sN8 gSrKffpcSDUOt0s+UW6f31FqWrEKz2EyEmrA4RntOvgh9GZLY++8YurdhqgqU2wQGqM5 MuOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f84si5251825pfk.318.2017.06.08.15.10.30; Thu, 08 Jun 2017 15:10:31 -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; dkim=pass header.i=@linaro.org; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752048AbdFHWK2 (ORCPT + 25 others); Thu, 8 Jun 2017 18:10:28 -0400 Received: from mail-pf0-f182.google.com ([209.85.192.182]:34411 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751826AbdFHWKZ (ORCPT ); Thu, 8 Jun 2017 18:10:25 -0400 Received: by mail-pf0-f182.google.com with SMTP id 9so21579516pfj.1 for ; Thu, 08 Jun 2017 15:10:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=J5eIgFGuC6fQWgIdRwut7PePBMybpIpFZ/nkmH1sAA4=; b=Ffziy07LgOiwFSLumcYVd+YvQrfHRNIq9TXotdxBbPLFQiWEcNgA44fp6uBZ/d11WW jlVWi/lXDVF1DQYlakv4mjaYlWvvRuahnomweyljLcu2FIrkoQc+tkJWGPLwoefZpcK/ JnOE8OXnIIiZy44Y5kDZmBMNIAaBIMFNWFUHE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=J5eIgFGuC6fQWgIdRwut7PePBMybpIpFZ/nkmH1sAA4=; b=D0QWbpkSWnvSPlDONyoUn3SPe75vh41UcV6uF5OXbEzPNl4Aya4nWG9RXJG8q+wUw2 jDWohJsSQZcbefhUOmK1HsRTPNASvwDhQN5AruUgbWR6Vzve46nMVtW6sxOgoWxWqYFR pV2AXe9+Zc/5sz33eWVtsfv2JMXXwCdLeMNO2S5fi6VfXp0x1SRsERz9gl7+ZyhqKznw 6ewSct3EAtL8qsxN7qDsMVtOaaZRT9gQWdZWunXyJxnK/gZrZB1d3MAKjl3urZI9wJzZ ZVjTQUDAuBQ8qmqTb75pyoWOjTkvWqOOaPzGvFIxc3hdr1LE2UH/GLtN6NjEktc9PUhz Mf2g== X-Gm-Message-State: AODbwcB5moJ9paeLUnsmRbX9HysH2Odbuc38Wga3MWhr+MtshpwsqMag BAvfF3VoyrL82P/y X-Received: by 10.98.58.83 with SMTP id h80mr38876190pfa.50.1496959825215; Thu, 08 Jun 2017 15:10:25 -0700 (PDT) Received: from docularxu-ThinkPad-T440p.219.146.1.66 ([45.56.159.87]) by smtp.gmail.com with ESMTPSA id r85sm11963639pfb.61.2017.06.08.15.10.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Jun 2017 15:10:24 -0700 (PDT) From: Guodong Xu To: lee.jones@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com, xuwei5@hisilicon.com, catalin.marinas@arm.com, will.deacon@arm.com, lgirdwood@gmail.com, broonie@kernel.org, khilman@baylibre.com, arnd@arndb.de, gregory.clement@free-electrons.com, horms+renesas@verge.net.au, olof@lixom.net, thomas.petazzoni@free-electrons.com, yamada.masahiro@socionext.com, riku.voipio@linaro.org, treding@nvidia.com, krzk@kernel.org, eric@anholt.net, damm+renesas@opensource.se, ard.biesheuvel@linaro.org, linus.walleij@linaro.org, geert+renesas@glider.be Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, hw.wangxiaoyin@hisilicon.com, Guodong Xu Subject: [PATCH v6 7/8] arm64: dts: hikey960: add device node for pmic and regulators Date: Fri, 9 Jun 2017 06:08:40 +0800 Message-Id: <20170608220841.26531-8-guodong.xu@linaro.org> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170608220841.26531-1-guodong.xu@linaro.org> References: <20170608220841.26531-1-guodong.xu@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wang Xiaoyin add device node for hi6421 pmic core and hi6421v530 voltage regulator,include LDO(1,3,9,11,15,16) Signed-off-by: Wang Xiaoyin Signed-off-by: Guodong Xu Acked-by: Arnd Bergmann --- arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 46 +++++++++++++++++++++++ 1 file changed, 46 insertions(+) -- 2.10.2 diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts index ca448f0..e579333 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts +++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts @@ -97,6 +97,52 @@ default-state = "off"; }; }; + + pmic: pmic@fff34000 { + compatible = "hisilicon,hi6421v530-pmic"; + reg = <0x0 0xfff34000 0x0 0x1000>; + interrupt-controller; + #interrupt-cells = <2>; + + regulators { + ldo3: LDO3 { /* HDMI */ + regulator-name = "VOUT3_1V85"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2200000>; + regulator-enable-ramp-delay = <120>; + }; + + ldo9: LDO9 { /* SDCARD I/O */ + regulator-name = "VOUT9_1V8_2V95"; + regulator-min-microvolt = <1750000>; + regulator-max-microvolt = <3300000>; + regulator-enable-ramp-delay = <240>; + }; + + ldo11: LDO11 { /* Low Speed Connector */ + regulator-name = "VOUT11_1V8_2V95"; + regulator-min-microvolt = <1750000>; + regulator-max-microvolt = <3300000>; + regulator-enable-ramp-delay = <240>; + }; + + ldo15: LDO15 { /* UFS VCC */ + regulator-name = "VOUT15_3V0"; + regulator-min-microvolt = <1750000>; + regulator-max-microvolt = <3000000>; + regulator-boot-on; + regulator-always-on; + regulator-enable-ramp-delay = <120>; + }; + + ldo16: LDO16 { /* SD VDD */ + regulator-name = "VOUT16_2V95"; + regulator-min-microvolt = <1750000>; + regulator-max-microvolt = <3000000>; + regulator-enable-ramp-delay = <360>; + }; + }; + }; }; &i2c0 {