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 */