From patchwork Wed Jun 7 07:06:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 103208 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp1796252qgd; Wed, 7 Jun 2017 00:08:14 -0700 (PDT) X-Received: by 10.98.32.207 with SMTP id m76mr30244181pfj.111.1496819293943; Wed, 07 Jun 2017 00:08:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496819293; cv=none; d=google.com; s=arc-20160816; b=Bumml6XcNDXMDLidZqYkdn3t/zMiTUvrijPVHmQQQLdhHxgRd90Av9QXA/xLDv+2gY V7VB0eh7IGCefI8OWJ4g5skZhneKpH81TFKU0bxKCchIFTAKOTPgd0NjxRYmGCHDgUMd tY2It+MzORzyPPmeomGSRxJyk3VxG0raaRGTIiPCdtJgP3h/wp+IA7Ydciroo3mRh03n 4tkOWf+kxuzmxKi8vbc6TRep3yOSKXf3VWrCVVNBVA7aH004dNLuxQw65IoYUYLDH4t+ YZ67TcNYLF2nXKAwJECwpCjiMt9lJUCUPwUWEhav0tJ2spnDSMaTuc9vorZZ2hSAUb88 4jDg== 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=MEa8dXjIEFWZUylCvrezUz491NJZms3CCahCbVlg4Tg=; b=vkN3eI0W0LMeS8gSYFdyixnQ25B5ib5tMXnU8GvTtuJUebVaFG/p9xH95lEmXS5kO1 fC2XT7fuqxypRi8pHvv/o7X2mjl76D4C4txEeTFxvV1xKhqZZyPDyjXdd7c1e9jHfmxM Tw5rOUndH3zGjiNGaJSwaTIbesAMORIKHSGc0pN67lQA+xwQjjwoNBkhuO8Fq77g72TO UidzX3Qp1DAb5JmqQFNu3u91lXF3Ds5tUVuHshUN3a9QOX9qIxcFxkpC6EApUOpyIohs b1Be4/ssh0vYsbpwqagXJIWwRVAFUesT5vYeR/wlX/TPe2uc5Nm2733S6Zx/QEXpZmqp /beQ== 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 s6si996066pfj.114.2017.06.07.00.08.13; Wed, 07 Jun 2017 00:08:13 -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 S1751797AbdFGHHr (ORCPT + 25 others); Wed, 7 Jun 2017 03:07:47 -0400 Received: from mail-pf0-f171.google.com ([209.85.192.171]:34365 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751418AbdFGHHp (ORCPT ); Wed, 7 Jun 2017 03:07:45 -0400 Received: by mail-pf0-f171.google.com with SMTP id 9so2428886pfj.1 for ; Wed, 07 Jun 2017 00:07:39 -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=MEa8dXjIEFWZUylCvrezUz491NJZms3CCahCbVlg4Tg=; b=Vasn5xs+V0qbD4kXyq/Zhz8XWWAvxCVtQCvhf98sc59X8UwLHf62FUu55GN3AjWtyQ PYU/rwMCP/EI4wHFG3gwM26jiXAdVfVbkszSWPosJ2jjxTPJyl3Jt7HNbAqooQVRr4TQ uv9m6uXWY3T3oVXAXiNnR6Rq677YyB6GDe8fc= 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=MEa8dXjIEFWZUylCvrezUz491NJZms3CCahCbVlg4Tg=; b=ithlxe7ojEugsItp1EbuctGw+lE0ju4ckOh07SUqKuPNEwD7oRDsxREjcoBXd/E+nr fdPPhajWQ5XFgglPFwBJgrYuhxnjpvIUHUbIC+q6UB8YPkKpdGDjPErVFXJg8PVVAPaZ bO4mKuMWCywERxuoK9eWu674g18LF/nI83XulUdLwUJ44e2yXAxkdspRT7c0SPVVtR2T J6ZYEVXtFDwEblklsyFY8evUGRQ9/aMGoCUnO3L8lF6zecX8pOW0mbABrMGK2MTWeUUF oPt28U9HLT3OPLaWDW9S/SVKSWTtUvw4eI37CmUrtQCIhVoWPYNXgmTQZoibTj9DxSTP vdKQ== X-Gm-Message-State: AODbwcA/zFMCB+ZOMe7e1mv7qiijPBQE80kyUqMiYg4kPFkEVzAl7sC1 mxCu/aTZFoPToIY8 X-Received: by 10.84.209.175 with SMTP id y44mr25726539plh.54.1496819259467; Wed, 07 Jun 2017 00:07:39 -0700 (PDT) Received: from docularxu-ThinkPad-T440p.219.146.1.66 ([45.56.159.247]) by smtp.gmail.com with ESMTPSA id h84sm1849354pfh.45.2017.06.07.00.07.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Jun 2017 00:07:38 -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, Guodong Xu , Wang Xiaoyin Subject: [PATCH v5 4/8] mfd: hi6421-pmic: add support for HiSilicon Hi6421v530 Date: Wed, 7 Jun 2017 15:06:02 +0800 Message-Id: <20170607070606.8889-5-guodong.xu@linaro.org> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170607070606.8889-1-guodong.xu@linaro.org> References: <20170607070606.8889-1-guodong.xu@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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. Signed-off-by: Wang Xiaoyin Signed-off-by: Guodong Xu --- drivers/mfd/hi6421-pmic-core.c | 70 ++++++++++++++++++++++++++++++----------- include/linux/mfd/hi6421-pmic.h | 5 +++ 2 files changed, 57 insertions(+), 18 deletions(-) -- 2.10.2 diff --git a/drivers/mfd/hi6421-pmic-core.c b/drivers/mfd/hi6421-pmic-core.c index b1139d4..6fb7ba2 100644 --- a/drivers/mfd/hi6421-pmic-core.c +++ b/drivers/mfd/hi6421-pmic-core.c @@ -1,9 +1,9 @@ /* - * 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 @@ -16,16 +16,20 @@ #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, @@ -33,12 +37,33 @@ 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; + const struct of_device_id *id; + const struct mfd_cell *subdevs; + enum hi6421_type type; void __iomem *base; - int ret; + int n_subdevs, ret; + + id = of_match_device(of_hi6421_pmic_match, &pdev->dev); + if (!id) + return -EINVAL; + type = (enum hi6421_type)id->data; pmic = devm_kzalloc(&pdev->dev, sizeof(*pmic), GFP_KERNEL); if (!pmic) @@ -57,18 +82,33 @@ static int hi6421_pmic_probe(struct platform_device *pdev) 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 %d\n", + (unsigned int)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, PLATFORM_DEVID_NONE, + subdevs, n_subdevs, NULL, 0, NULL); if (ret) { dev_err(&pdev->dev, "Failed to add child devices: %d\n", ret); return ret; @@ -77,16 +117,10 @@ static int hi6421_pmic_probe(struct platform_device *pdev) 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..2580c08 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 = 0, + HI6421_V530, +}; + #endif /* __HI6421_PMIC_H */