From patchwork Fri Jun 2 10:51:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 101228 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp326288qge; Fri, 2 Jun 2017 03:52:34 -0700 (PDT) X-Received: by 10.99.1.207 with SMTP id 198mr6373503pgb.37.1496400754292; Fri, 02 Jun 2017 03:52:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496400754; cv=none; d=google.com; s=arc-20160816; b=wKuAwwC/j3jlJD7jzdxbq4S37CRUFe8xSh1NbZRdyMuHMpo9RidM5g9QAQJOj43hre 0vsZlyGBK+YL/RSxJQuev8TGNAUCSkp4l3bfHM4mrDRIujRYr62Ln7auasVEN6V+DONQ hMAVTbKULgIATi+QWNFDfOHkJblDcNGYntI34yLvU9ecTyf2t5ipb0sHGLchH4+37WkW QQLHV8r7mPMc13yEwf/CGoaGrUPF555XehyKnAyKLBsbSFogBB8I968YyR/jEkPzTsVt oMEdwq8xX8x93m/XNnmRmnBoDfBqHeWJuzJIcjscxud58dynM/OxUkFRhJxf+HoKz8at Qd/A== 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=ThSkGlpI4ec8gMMkPf2vglTWBUnc8RxRCIwt67A4Egs=; b=jISgjl6FMLIyekI0f2Peu8jhi98exnLVjBGGo8ozeN6yhurwuCMJ4gSX0BrOZnJkGS YMGLPExCOo+sup8z3eqc3dv5K5/oeuRGVKVNOwqeCBxADifSTXEL63AQXtjRmOONtzUM k/vEFiGis4hb6LpooXfpP9npKwTvD4X6asTa7KkUifzleI2C2n1ivgh2CK/m587iZnW8 x+cZS0dcVhjhiUVgCcJunuGJq/tVWPzgcNM3hfSqzcmmnxCeK/+TQaEsqdMeSeXEZr1C GxBoOmd6J/6XtL6ItTnjikHDWo7IR5mhO7aZ9BfALOC5DqUXQmFK8/1spobzKp0GRuGz NAnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (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 n20si3289561pgf.161.2017.06.02.03.52.34; Fri, 02 Jun 2017 03:52:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751148AbdFBKwT (ORCPT + 7 others); Fri, 2 Jun 2017 06:52:19 -0400 Received: from mail-it0-f52.google.com ([209.85.214.52]:34620 "EHLO mail-it0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751141AbdFBKwQ (ORCPT ); Fri, 2 Jun 2017 06:52:16 -0400 Received: by mail-it0-f52.google.com with SMTP id m47so3185624iti.1 for ; Fri, 02 Jun 2017 03:52:16 -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=jgloU86qcif4DhIiEoZ32uTfs2MJNRjbqCUeIjl7YU4=; b=OVVuOGycy7R4iUQcXs7ur3ALMzYaSKUG8cIX3ygiTtoi6vrBLoiflkbO9U0EearXvK SNQQ3wGmtmUGl9/c4y9G3sJ9aeNcLm3fvnwNLKSRXipt5uHmyXxv+T3y4k+KXoaru1Hf lBDO22vJdKKOiop+D7Olm1BSZ7jAj9+BmlgOQ= 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=jgloU86qcif4DhIiEoZ32uTfs2MJNRjbqCUeIjl7YU4=; b=nfiXQ75gKai1q3WO0Iq5q+m0FhY0m9DwWBzJPTUnpPVpQ5oOOLFpLIC3gnOAaQpfVP mV9KOPcsEv+P9ID5tFHT9nuRwIBfkX80BcNR+ylgRVHzpeFqv0tVGxiyxKrQ4EtC+iuJ ghx+69JRCJ+NBWDjUSEA2PROvyK3dXKKgRO8Kt/1knHWKOvaEaOkponjrY3/i7WTgJve cVn3o6Ai9ZisasU0eMXZzU1WarIyiGcrDJOZidW8E8fNn7E1fzssvip2YkoOFgEq5tJ2 vkaON+mYA68AU6nEnOF36UZO92YBNHNwSWoLC/1PM0jqiIF8pSaqbopQgELiVF0lrE5q DXMQ== X-Gm-Message-State: AODbwcAORMmkspDhs6KZ74owDMG0VkM6wNpZeqZscupfffpKhl9dzDTk +3WYwO90Ice07Yn2 X-Received: by 10.99.137.198 with SMTP id v189mr6431544pgd.205.1496400735886; Fri, 02 Jun 2017 03:52:15 -0700 (PDT) Received: from localhost.localdomain ([45.56.159.223]) by smtp.gmail.com with ESMTPSA id v64sm41662784pfk.86.2017.06.02.03.52.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 02 Jun 2017 03:52:15 -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 v3 1/6] dt-bindings: mfd: hi6421: Add hi6421v530 compatible string Date: Fri, 2 Jun 2017 18:51:51 +0800 Message-Id: <20170602105156.11351-2-guodong.xu@linaro.org> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170602105156.11351-1-guodong.xu@linaro.org> References: <20170602105156.11351-1-guodong.xu@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add compatible string for HiSilicon Hi6421v530 PMIC. Signed-off-by: Guodong Xu --- Documentation/devicetree/bindings/mfd/hi6421.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.10.2 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/Documentation/devicetree/bindings/mfd/hi6421.txt b/Documentation/devicetree/bindings/mfd/hi6421.txt index 0d5a446..22da96d 100644 --- a/Documentation/devicetree/bindings/mfd/hi6421.txt +++ b/Documentation/devicetree/bindings/mfd/hi6421.txt @@ -1,7 +1,9 @@ * HI6421 Multi-Functional Device (MFD), by HiSilicon Ltd. Required parent device properties: -- compatible : contains "hisilicon,hi6421-pmic"; +- compatible : One of the following chip-specific strings: + "hisilicon,hi6421-pmic"; + "hisilicon,hi6421v530-pmic"; - reg : register range space of hi6421; Supported Hi6421 sub-devices include: From patchwork Fri Jun 2 10:51:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 101229 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp326290qge; Fri, 2 Jun 2017 03:52:34 -0700 (PDT) X-Received: by 10.84.137.1 with SMTP id 1mr104151080plm.128.1496400754645; Fri, 02 Jun 2017 03:52:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496400754; cv=none; d=google.com; s=arc-20160816; b=uP0WnjI2iJNNkJCx6q245EjEShqa+RvscQ3W3Zz2zi/PxyBqgxuDuh+j1fxJK+AXT/ bvXOiZjF73Pg348fEssqQ5S7kdG7jkmHXHHuzyy+VpiMXn+qULoeRmIARYgbFNDUXa83 GIDJToUcL2QCVzSULFtL37bQaL1brRybG+iabzQAqTv2ifUs24gMi8n+D46VFrLOLLQ2 QDzdaI2CGadUbysfBwMIb3/l9g4FmWNchRAQHJJyQ0rU/JJ5Gdkq48CmNMsK0takCXWP d2jSdTl8IKespz5vtmuqL1HghnqXmTaVjufyV2keBnT+BJF7hJ5IsSTwkHRS8iV62MJb 7c5Q== 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=12PRThF5r99/bYMhcSZ/Ng7a64hK+maq3U3xts5JzrM=; b=xjYGAD6bvSMLumB1fxh4O/PoeKpbU1WGZVoM7CFPWesJO4z/aahxGqawXupzYqn13p 1oNwIYpY9Bc68Y+CMxFXWJ66+0un7puxYINNhfp8rTR0hgF2S6vY4ZZFyKPwgjjPJ5Wq qGcDuRDgIqI/3EJgAjS1fndo0KI3+Lt/s7Faf1nIo9H3Wf09L81azDnHUxOXJuPuPSlw 01q+Mgd9l2bv35I8mmJjgcOreKk17j7tdB9lFS2iA+1LDhYsyl9mVq2sf/n9349haqKp kowHNIIEoc0VDFMsR2+GuouSfTgz6bWp55Vfuyk2WOX/7Iwl2+mM8XwtY0aXd8LfjLcg bBNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (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 n20si3289561pgf.161.2017.06.02.03.52.34; Fri, 02 Jun 2017 03:52:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751298AbdFBKwZ (ORCPT + 7 others); Fri, 2 Jun 2017 06:52:25 -0400 Received: from mail-it0-f44.google.com ([209.85.214.44]:33332 "EHLO mail-it0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751297AbdFBKwY (ORCPT ); Fri, 2 Jun 2017 06:52:24 -0400 Received: by mail-it0-f44.google.com with SMTP id w68so7537006itc.0 for ; Fri, 02 Jun 2017 03:52:24 -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=r/NgWejS86XO8g+/IErdiKhIZZvlhz44mtphx1qBx5M=; b=WV3nB2xuNQPpYPsyMGtCl0sYAFEsXf79lb17eRF4ptUQAEoAY9seN3VaU37fAdidHe m88kEHcJeC3/JUrvZ9b8ARnaF2qXJtiJeKtfrO6rpOtZabVakKM6ujC2dbbPWfhGQcXT zJsZVkeCCHJ2cZZt2wlfCUg4KVr8/isyUxXL4= 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=r/NgWejS86XO8g+/IErdiKhIZZvlhz44mtphx1qBx5M=; b=EdZ7NnHFUsKK0wiZybh+ZPj2e3ll7y7dHg5WmLhR7iGz65AvdP/RIBUXOJcFNkl+5J qMfchdA2FPXyGEMlX3cV+wN43GmsypkMdt5RkSZapSMxIIFSEJSRnBJ/DATZJHfPtOrk o6PFMUNjvzRfiYT8j8H1hckBnnpCu65eIcGzJPAJRNMAznpXRy87fPZ5AJjtL6CKjD2+ n7X8tD0xsJc0itaIYCVYvk4H+iLw4X0PQdYHf9k8f0k0o9/j+mFoi/hmwNxQgeWiS5S/ kdD+cPD23NTQfgWseNyN72Euj4ovVA6AowOku+bT3gOH7ZuCkyOTmFvM8oy48yXYvyrN eVpg== X-Gm-Message-State: AODbwcDvhW8zPJyjUDO8LV6q5ISuyFHmwa/OJJyFB5l99kZprBcqvbEw DZ7v+qATJWDzNX+W X-Received: by 10.98.206.131 with SMTP id y125mr6207143pfg.108.1496400743748; Fri, 02 Jun 2017 03:52:23 -0700 (PDT) Received: from localhost.localdomain ([45.56.159.223]) by smtp.gmail.com with ESMTPSA id v64sm41662784pfk.86.2017.06.02.03.52.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 02 Jun 2017 03:52:23 -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 v3 2/6] mfd: hi6421-pmic: add support for HiSilicon Hi6421v530 Date: Fri, 2 Jun 2017 18:51:52 +0800 Message-Id: <20170602105156.11351-3-guodong.xu@linaro.org> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170602105156.11351-1-guodong.xu@linaro.org> References: <20170602105156.11351-1-guodong.xu@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add support for HiSilicon Hi6421v530 PMIC. Hi6421v530 communicates with main SoC via memory-mapped I/O. Hi6421v530 and Hi6421 are PMIC chips from the same vendor, HiSilicon, but at different revisions. They share the same memory-mapped I/O design. They differ in integrated devices, such as regulator details, LDO voltage points. Also, changed license to a shorter form, and arranged all #include in alphabetical order. Signed-off-by: Wang Xiaoyin Signed-off-by: Guodong Xu --- drivers/mfd/hi6421-pmic-core.c | 85 +++++++++++++++++++++++++---------------- include/linux/mfd/hi6421-pmic.h | 5 +++ 2 files changed, 58 insertions(+), 32 deletions(-) -- 2.10.2 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/mfd/hi6421-pmic-core.c b/drivers/mfd/hi6421-pmic-core.c index 3fd703f..b914541 100644 --- a/drivers/mfd/hi6421-pmic-core.c +++ b/drivers/mfd/hi6421-pmic-core.c @@ -1,40 +1,35 @@ /* - * Device driver for Hi6421 IC + * Device driver for Hi6421 PMIC * * Copyright (c) <2011-2014> HiSilicon Technologies Co., Ltd. * http://www.hisilicon.com - * Copyright (c) <2013-2014> Linaro Ltd. + * Copyright (c) <2013-2017> Linaro Ltd. * http://www.linaro.org * * Author: Guodong Xu * * 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 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, see . + * 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 +#include #include #include -#include static const struct mfd_cell hi6421_devs[] = { { .name = "hi6421-regulator", }, }; +static const struct mfd_cell hi6421v530_devs[] = { + { .name = "hi6421v530-regulator", }, +}; + static const struct regmap_config hi6421_regmap_config = { .reg_bits = 32, .reg_stride = 4, @@ -42,12 +37,30 @@ static const struct regmap_config hi6421_regmap_config = { .max_register = HI6421_REG_TO_BUS_ADDR(HI6421_REG_MAX), }; +static const struct of_device_id of_hi6421_pmic_match[] = { + { .compatible = "hisilicon,hi6421-pmic", + .data = (void *)HI6421 }, + { .compatible = "hisilicon,hi6421v530-pmic", + .data = (void *)HI6421_V530 }, + { }, +}; +MODULE_DEVICE_TABLE(of, of_hi6421_pmic_match); + static int hi6421_pmic_probe(struct platform_device *pdev) { struct hi6421_pmic *pmic; struct resource *res; void __iomem *base; - int ret; + const struct of_device_id *id; + unsigned long type; + const struct mfd_cell *subdevs = NULL; + int n_subdevs, ret; + + id = of_match_device(of_hi6421_pmic_match, &pdev->dev); + if (id) + type = (unsigned long)id->data; + else + return -EINVAL; pmic = devm_kzalloc(&pdev->dev, sizeof(*pmic), GFP_KERNEL); if (!pmic) @@ -61,41 +74,49 @@ 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); } - /* set over-current protection debounce 8ms */ - regmap_update_bits(pmic->regmap, HI6421_OCP_DEB_CTRL_REG, + platform_set_drvdata(pdev, pmic); + + switch (type) { + case HI6421: + /* set over-current protection debounce 8ms */ + regmap_update_bits(pmic->regmap, HI6421_OCP_DEB_CTRL_REG, (HI6421_OCP_DEB_SEL_MASK | HI6421_OCP_EN_DEBOUNCE_MASK | HI6421_OCP_AUTO_STOP_MASK), (HI6421_OCP_DEB_SEL_8MS | HI6421_OCP_EN_DEBOUNCE_ENABLE)); - platform_set_drvdata(pdev, pmic); + subdevs = hi6421_devs; + n_subdevs = ARRAY_SIZE(hi6421_devs); + break; + case HI6421_V530: + subdevs = hi6421v530_devs; + n_subdevs = ARRAY_SIZE(hi6421v530_devs); + break; + default: + dev_err(&pdev->dev, "Unknown device type %ld\n", type); + return -EINVAL; + } - ret = devm_mfd_add_devices(&pdev->dev, 0, hi6421_devs, - ARRAY_SIZE(hi6421_devs), NULL, 0, NULL); + ret = devm_mfd_add_devices(&pdev->dev, 0, subdevs, + n_subdevs, 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; } return 0; } -static const struct of_device_id of_hi6421_pmic_match_tbl[] = { - { .compatible = "hisilicon,hi6421-pmic", }, - { }, -}; -MODULE_DEVICE_TABLE(of, of_hi6421_pmic_match_tbl); - static struct platform_driver hi6421_pmic_driver = { .driver = { - .name = "hi6421_pmic", - .of_match_table = of_hi6421_pmic_match_tbl, + .name = "hi6421_pmic", + .of_match_table = of_hi6421_pmic_match, }, .probe = hi6421_pmic_probe, }; diff --git a/include/linux/mfd/hi6421-pmic.h b/include/linux/mfd/hi6421-pmic.h index 587273e..2457438 100644 --- a/include/linux/mfd/hi6421-pmic.h +++ b/include/linux/mfd/hi6421-pmic.h @@ -38,4 +38,9 @@ struct hi6421_pmic { struct regmap *regmap; }; +enum hi6421_type { + HI6421 = 1, + HI6421_V530 = 2, +}; + #endif /* __HI6421_PMIC_H */ From patchwork Fri Jun 2 10:51:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 101230 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp326428qge; Fri, 2 Jun 2017 03:52:58 -0700 (PDT) X-Received: by 10.84.248.4 with SMTP id p4mr86134070pll.155.1496400778595; Fri, 02 Jun 2017 03:52:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496400778; cv=none; d=google.com; s=arc-20160816; b=lanz3d12QsTcL1wErxMUG0ggO/UCjI8Zoo7hChzrks02vO+qo8Azx98OouDoOBJiv1 k0dx3y3DtoSFONNbPGm/CHb4zoA10HVjJnfAqPfz59TXIHMQOX288wrXbaoDtQT6nG06 kkgr/h+5IQP0UNyqyG3t2TKDKq8lqdZ3pHDKjqGQDdcLDiu8pPaXbGecOX/NkRl+GQ5x +i30RgzsDH6/GI+upU4pjwUwM/w/vZLTydoJuM5jgbboCelryHhIfaNceE6d0hNawpyN ywrsY0bfnZ6+13PxZdyCKTUWs6WoRRzGpxrStYnhFzViE5nTRiWNM0rPfb6zjRtwCdop LoyQ== 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=FsO62ZVfdV686bZ+AbzGlfL1diT1qHPYEczco0pU8FE=; b=CLFdH8tEX9ostycbUrnvHeNIsLdJZo+hoeQc234umUmfwNaGRyxbapfmGcvkcPZgkj gEB+6/0/QHaFcfDuQBk0R2ya01MXE8YmGH+WRMtflAUSzNIZaEI5ZwBrOQkp8vBWDB4y TMR69VUzXVzRmAa5VVshnsJ37Xdgxwy3s0OaiSkScd411tJjn+MhIukg710Qxr/QMh/4 hlfMj+KJ8T5lb7xaRIpq8VmTQT9VZY5yWzbyV+yDj8DyiTrsNG3IlWBcB0SJnFsV7Kek nNnjbHi76zuq29YKnN5HhBTK72WBPNWf0N+mLO56ZPA5BDaBEMzqKSLtV//ZbX5FpH1v QvzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (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 10si4843668pgc.152.2017.06.02.03.52.58; Fri, 02 Jun 2017 03:52:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751326AbdFBKwg (ORCPT + 7 others); Fri, 2 Jun 2017 06:52:36 -0400 Received: from mail-it0-f46.google.com ([209.85.214.46]:38139 "EHLO mail-it0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750910AbdFBKwd (ORCPT ); Fri, 2 Jun 2017 06:52:33 -0400 Received: by mail-it0-f46.google.com with SMTP id r63so15548132itc.1 for ; Fri, 02 Jun 2017 03:52:33 -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=PPxH0/YSvgTZKnM2bGbHt0RVaygtzfTtSHzv6i2twqk=; b=N3zoMuj4MAuCaf8SjydLwGuVcLISgzuyUYfYdo6pClGCvL+jcxdWXy/m0JuSzZFl1o sPh2nMGsBZ5AecI7xCJ+HexiSmnEBk4H81/cbw1KXvKG69lek7gVPT0nJhHI6D28qhPO NXDbnuE9CJgShKIVtOuxjBC0pUMorsXG1AHlk= 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=PPxH0/YSvgTZKnM2bGbHt0RVaygtzfTtSHzv6i2twqk=; b=o98dPA+RIsAECgHdEwt/0nDixWJDkvqhz2vKY096cUNi2ECmDyI2IcXAFnL1QSsivZ JUoPbPyrzOmyStZhYATVZHwayqrx0CuibLlfjsZfn7tjuplPITteKBp8JBEQXkegElXp XZYUbw0SvgrryK4nD7WV4j4si+cYZPXc+yQ/Q3cBjQqZY/XD+tdHo+EmT4OEkuJwFqPh 0wimRbmoSwfoC+oViShYCazspdfuHuYedPnuUTeJP7mp20ctFrOmOp/qOTwjbDTOUvoY zA8lMlD37qlwjyHcXiut0KQwv7L27EKFe4LUVx5zxTnWiVJctH/A8hkRUYVE1veF0EbO CRpw== X-Gm-Message-State: AODbwcClcHqxP6mz0zhwJvWjEgv3JAx9nbSbiv+s5SrUf/CeV9vLMWuv cJyAPy56UE9Fv2sV X-Received: by 10.98.193.65 with SMTP id i62mr6175453pfg.134.1496400752153; Fri, 02 Jun 2017 03:52:32 -0700 (PDT) Received: from localhost.localdomain ([45.56.159.223]) by smtp.gmail.com with ESMTPSA id v64sm41662784pfk.86.2017.06.02.03.52.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 02 Jun 2017 03:52:31 -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 v3 3/6] regulator: hi6421v530: add driver for hi6421v530 voltage regulator Date: Fri, 2 Jun 2017 18:51:53 +0800 Message-Id: <20170602105156.11351-4-guodong.xu@linaro.org> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170602105156.11351-1-guodong.xu@linaro.org> References: <20170602105156.11351-1-guodong.xu@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Wang Xiaoyin add the driver for hi6421v530 voltage regulator Signed-off-by: Wang Xiaoyin Signed-off-by: Guodong Xu --- drivers/regulator/Kconfig | 10 ++ drivers/regulator/Makefile | 1 + drivers/regulator/hi6421v530-regulator.c | 207 +++++++++++++++++++++++++++++++ 3 files changed, 218 insertions(+) create mode 100644 drivers/regulator/hi6421v530-regulator.c -- 2.10.2 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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..46bbba9 --- /dev/null +++ b/drivers/regulator/hi6421v530-regulator.c @@ -0,0 +1,207 @@ +/* + * 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 struct platform_driver hi6421v530_regulator_driver = { + .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");