From patchwork Wed Jun 7 07:05:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 103205 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp1796032qgd; Wed, 7 Jun 2017 00:07:34 -0700 (PDT) X-Received: by 10.84.238.129 with SMTP id v1mr25962915plk.102.1496819254074; Wed, 07 Jun 2017 00:07:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496819254; cv=none; d=google.com; s=arc-20160816; b=FnLZQPm8flqU+CcYYqBjSQPgvWMbKiCSxEWGgX5fjXYqR/9Xtv7kOzpCyJGr6BdzDd FvdTKZdE7RNEo06EW/y7WqWu0Ro0sAOXYSYQFh1s+XgSDvK/aLIRCiEKris2qS6LMWia XOm9Kzbkc35Oi8zDFxKZT1W9bBFm3QzzNk5BjanCca23Nd5RJ9dksfhskWvFvJ2ecTw1 5M+ynZaSBRjzYxmVbbYo3te9XrkmJfiGFfSKveD11/nBxWFZi5TPTG8ZVGTNfMBMtHWK VKtFoaMRrFoJyHW7CrkAojBtSp683qKixs8B7xLzACBasPrnvOxisMxKlYZ/7Y9gJm2N uV5A== 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=2jlnukg7/ySaCyfsWYdYewX6rMGD/2xwdhpH2n47EOo=; b=Z4g92qzD8dyxoYEefuQbZjvuC/i4nxJm0bEqoH30un3mtTKonUgVWsU+J7F2Tq5qMl 6pZQvUBvBxB9LMshPfWGqi2Vkft55dcz8wYzPgoK14iPRC1V7xCQN4Xzx3Y/dsC/hz8b tbk1gVihrbG4K2uqFfm+zl6xETkdAoHR6ZNM4b9rhLtDL0scxxC8QREc7aCyniFHQFL6 yYc5XZlEBx7bGPEPXhw8stOgdYZxNs+5FcK9arXuIs33i64kcsM8fmLrP5R4WxvS6/ek OGj7k3/Sgq2w7ZdhhuOuR65jJGFtjkJX0hMkYFMlnJwWdeYtExaSMaoPm9uz3k01LaDz 5IZg== 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 a1si1021997plt.55.2017.06.07.00.07.33; Wed, 07 Jun 2017 00:07:34 -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 S1751667AbdFGHHS (ORCPT + 25 others); Wed, 7 Jun 2017 03:07:18 -0400 Received: from mail-pf0-f172.google.com ([209.85.192.172]:36193 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751615AbdFGHHP (ORCPT ); Wed, 7 Jun 2017 03:07:15 -0400 Received: by mail-pf0-f172.google.com with SMTP id x63so2401928pff.3 for ; Wed, 07 Jun 2017 00:07:15 -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=2jlnukg7/ySaCyfsWYdYewX6rMGD/2xwdhpH2n47EOo=; b=gdwHfcSddjGaeYL4AZCAnFCNMx07w4qQy0cCIeUVVC0HKbQTwF0uPPJ7ZQFnm3pFj4 Z5bIWvoLQpekQC3XMLwzR47nNzw3vWW2iSn2QJVZriJ1K+80nHTqn1LxwuxHVTUmPVkz /xOrBliQ/pnPK6j0I7/VjDoHl05Q9SbIKhfzY= 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=2jlnukg7/ySaCyfsWYdYewX6rMGD/2xwdhpH2n47EOo=; b=t3AhS57alZ25RTjBptFIpJBVEpadpPQHK8PYiGdD/bNcjwoaPUH71fBGK2muzWUJb4 vVBl4EUkpnlEhgAU7+B3OCDJPGw9HqQmuda3BBlPoeDL2TzmFEwP4f1IwXlc5e9OX/DQ Yw0oc1LySjGW2P4ZqAUrX5EtQbKe/zqTxghxeTJmZ8znhzlvKzHB2GJriyOzIfE15j19 TvqOMI7jftzWJWzcM9vSrEDi/fyugFwqO8MumRAOM1JNttaT2qmYLH2R1ypgI/ySB42S iBm0l2ZFGFsPsJNzqBYr20egp1veWN3zUo7wUcVg5fk0bYTyqasENH+2hN31iAp0FcnM BOlg== X-Gm-Message-State: AODbwcCnlZclRnJDz3lCoe7P6hw1b6OELy7MeYlk/uFbfT7vfapv6krI Vb8t8WgBX88C/G63 X-Received: by 10.99.109.9 with SMTP id i9mr15508913pgc.32.1496819235257; Wed, 07 Jun 2017 00:07:15 -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.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Jun 2017 00:07:14 -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 Subject: [PATCH v5 1/8] mfd: hi6421-pmic: cleanup: change license text to shorter form Date: Wed, 7 Jun 2017 15:05:59 +0800 Message-Id: <20170607070606.8889-2-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 Change license text to a shorter form of GPLv2. Signed-off-by: Guodong Xu --- drivers/mfd/hi6421-pmic-core.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) -- 2.10.2 diff --git a/drivers/mfd/hi6421-pmic-core.c b/drivers/mfd/hi6421-pmic-core.c index 3fd703f..ad9e3d8 100644 --- a/drivers/mfd/hi6421-pmic-core.c +++ b/drivers/mfd/hi6421-pmic-core.c @@ -9,17 +9,8 @@ * 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 From patchwork Wed Jun 7 07:06:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 103206 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp1796243qgd; Wed, 7 Jun 2017 00:08:12 -0700 (PDT) X-Received: by 10.84.142.131 with SMTP id 3mr25908694plx.183.1496819292659; Wed, 07 Jun 2017 00:08:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496819292; cv=none; d=google.com; s=arc-20160816; b=PZo4fZ4nbnOv2p6qvF7zR4h4Sf//VRVOPJbk/J0mmInM2GYXyXHU+Pn6X76K+bZP9g 4R8EL5uuL5mww7J7I3ehWC15vGhL2Env2cyrEmMezc4EzIZPNaCgIlwGS9m6j/Lk/pt6 Bz2x/a6lhulF1LAq5weMQlXWYiBFm4sN1nVVgBYbqm2LCx5mHucfLdLUegaRdukvUetQ HGcHIMabSf9nROiwPFQlP2/i9y8pRj8dHc8FwHN/ba48j+R8j71DvbKqftEv0nA0GEGX I+irRRc/g3nUobaVi/ciFSA4Kmnu7EvJAQHOrnD1XxhoszROhQ0DAQk2KIbvXPEVxUNC ywlw== 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=eadAuPLWz+ubm+xMXhvzuW40A+fVjIXHTbVw2jNpq1A=; b=QWex9qzE6X4lgBwhgLjFkvzdobxR4CZ5l0opr/DdneD5jNU3z3rGu38vnGv5uLYZHE LoWfqR/CS4suRoZGFQlDpSz3Y1VDhZXR7pzmQFIK4sHx6URqCtXJDderu+FCdDE94buJ Idm/SSvYIi0Tj7LaOjtCQnPIvU4xukheytePRlF4t5og7szP05Tf1IX2jXkuVX8WNzS+ l/S3d4ToL/ZhKCT+NcGyfjvKTi2ROerkjjK2xAKZ1qalLRkrYs/rC1tDpprpIEznuEAe s8iubhtk9CdYySCI7OjsoCB9Ef1WaCzg1QCyNwyFiRgnZ4NbRwAY/egIzAxC5XDExSbI G9Qw== 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.12; Wed, 07 Jun 2017 00:08:12 -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 S1751746AbdFGHHf (ORCPT + 25 others); Wed, 7 Jun 2017 03:07:35 -0400 Received: from mail-pf0-f177.google.com ([209.85.192.177]:34284 "EHLO mail-pf0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751721AbdFGHHd (ORCPT ); Wed, 7 Jun 2017 03:07:33 -0400 Received: by mail-pf0-f177.google.com with SMTP id 9so2426159pfj.1 for ; Wed, 07 Jun 2017 00:07: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=eadAuPLWz+ubm+xMXhvzuW40A+fVjIXHTbVw2jNpq1A=; b=fSxpeIXirOFa2sgcBDBH2c675hGMgR1kG1RPrGMDYfDfTce/oXMsEramLInd1GWpJt eqbKJv7NcBCEeIQ2ruPHoucJ7U+/cgfkYDoUht8Gn9BdJNRBQi+us57v4DFzlB7Cfwi3 Thikov9YNnadKhxkWO3H9hdem891VoGoDxO5I= 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=eadAuPLWz+ubm+xMXhvzuW40A+fVjIXHTbVw2jNpq1A=; b=tZvp2obkOB2B6xtddZE2+27s/uzWvvr646omJV9MoGB50Y3g28qYCWvbbCZg8dZvcO b17doYZWnfburn3u4/IKOEd9JwUzx1wytLhUwARn+TNSf3wIpU8g2oC05leQK/7IvIks K+lBdajH3n9LLJ4B3eYDdFnT6F0KBi8XQEfppsPM9JCM6rypu/2YLqw1Xj+RphUrnDDt UNL8PrGSjEJS9g88zJg+b+5g6eHRSiBrrxSW1OYZtZkY6rJ6C8SvNaVkEb3RpslSpM5z T/ez4g+ftNsffSNynT/btwUVAZrtenOKrZ7jr/KzKrVgSZe/3qNoRnW4EsrKN4cjsO4y i0nw== X-Gm-Message-State: AODbwcCOr37Td8MakMVpHOMKWEYmbTYBFCiY5CGK+GSGp6e1K5F07bzK 4zufDFM/hh6MjnvU X-Received: by 10.84.128.1 with SMTP id 1mr26477287pla.244.1496819243201; Wed, 07 Jun 2017 00:07:23 -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.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Jun 2017 00:07:22 -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 Subject: [PATCH v5 2/8] mfd: hi6421-pmic: cleanup: update dev_err messages Date: Wed, 7 Jun 2017 15:06:00 +0800 Message-Id: <20170607070606.8889-3-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 Update dev_err messages to make them more readable. Signed-off-by: Guodong Xu --- 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 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 */ From patchwork Wed Jun 7 07:06:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 103209 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp1796253qgd; Wed, 7 Jun 2017 00:08:14 -0700 (PDT) X-Received: by 10.101.70.70 with SMTP id k6mr30487177pgr.39.1496819294309; Wed, 07 Jun 2017 00:08:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496819294; cv=none; d=google.com; s=arc-20160816; b=qz3bowYAhdkDmt9F4KQf8D6tjOMGPtwjovYR5n3AEJlAO0csWIp1EtiTpM+O97MnNK 2OBVJrcs+328uPxSytcKPN5uXr/q+91xQUYEPaDpufL5MlvWdTM1VRuwLo7eU8Ku+EZl oNLDAQL/oMZQTsbpbgPR5rIsiTv+vb0ohRlP2zk7BC29wTEoQZCVCIirSM8uRkWghQcb PHeSdWC7Dvb/nncjqdq+55YxtBtNNrUbEFZx7EELePwa5iJHrzuMgvY530k45y26GM58 F3WKZ7oBlYuQKkbMBPwlRdaZdOPlm7C6S5LSMscyqGlFSUrtJGavAG1LVtAWskbfsnXO oP+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=PPxH0/YSvgTZKnM2bGbHt0RVaygtzfTtSHzv6i2twqk=; b=YYoZgrx3f0roWy9d5ZQNfCU/mjkG9OHdoabMsiAXgZWr7FRa1swulhveVBihysK2W7 fw2AcK9zvv01dRh2DQSQuVvdbdXN+L42sEBTgkTiNckwq/z5fBaFEQAGu2U+A2z5871t OSQIO9gAvjYmo0M0l7QmRlYW7k8AEn6fBjZuVC35a06fGlexNV/5UPPtYwGX06FsvCqL kPp04q0OIMAfpxN6ODauhoeEndrqOK3UOC9+y9cAtdq6hUXMo+D+QhLpRF8lWV/96B7I yQLiAukMvosweYrn5AfUyaYu3pZyhwQMnddsw4nh0xysPWDB/NSR194AMWisl0Z5qCrs jqpw== 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.14; Wed, 07 Jun 2017 00:08:14 -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 S1751816AbdFGHHy (ORCPT + 25 others); Wed, 7 Jun 2017 03:07:54 -0400 Received: from mail-pg0-f45.google.com ([74.125.83.45]:34668 "EHLO mail-pg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751418AbdFGHHt (ORCPT ); Wed, 7 Jun 2017 03:07:49 -0400 Received: by mail-pg0-f45.google.com with SMTP id v18so2298384pgb.1 for ; Wed, 07 Jun 2017 00:07:49 -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=FTUf4+C7xJaRCYyhixijCrSy5SGxH8sg+g3XKz3tTGDLmpt275zanUDFqwugHjPw6s WoqHt3ZbLnad1UgsoikH0mcElQ5tHC8ZPQiwDXXvDUB4JawjLhNzU28YdNbC/AjQ9MDq aT3GBswV9bNWU7Hh2dZ/5a2tKfObo9d+CBEUc= 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=Ai0p4aXFcgEdn+Y1JUE8k3OBS/xYa4KTTypWeIzhFrwx0uai/63PFpmbi4Tty/qUAz wyiCcmyisKfEKj7PBg1hEpUaltHXUB+5t/62lVUsSDRTJES0Gnbks473wqqkKI0ed99S Ve7L4mIhw8Zqn+z7/SISlZXBupzHzN+QfS1tj8zpyk1qc171H8xOy5Mg0KXNQWkXVATF 93zYn9Jl5n8E2Hsz35wEuqaXLw/0H84vPpN2M2VKSNinx9f4rO5q3GHKnD83IxBm5n1Z ilkYrX+mPmbRBu6U2MZ2NzrXm0cQ/OiTcFQKhcv5kbj/r+gHcY3PVMhxSGl+yBvrvvVy /p+g== X-Gm-Message-State: AODbwcAO3zwnC8NlYmE6bA0QoQHGI7x4pPlVAHsjO/N2PRkPkEf87pY9 GRQutJ7IX6TzuOe3 X-Received: by 10.84.132.42 with SMTP id 39mr16096607ple.226.1496819268835; Wed, 07 Jun 2017 00:07:48 -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.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Jun 2017 00:07:47 -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, Wang Xiaoyin , Guodong Xu Subject: [PATCH v5 5/8] regulator: hi6421v530: add driver for hi6421v530 voltage regulator Date: Wed, 7 Jun 2017 15:06:03 +0800 Message-Id: <20170607070606.8889-6-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 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 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"); From patchwork Wed Jun 7 07:06:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 103211 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp1796260qgd; Wed, 7 Jun 2017 00:08:15 -0700 (PDT) X-Received: by 10.99.143.90 with SMTP id r26mr30815271pgn.102.1496819295062; Wed, 07 Jun 2017 00:08:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496819295; cv=none; d=google.com; s=arc-20160816; b=QMpUeEwKdKrUl8RpQ5TRx4UVrA+Anw3FfJDhjzf2bj/jT+K6TPhuFs8o0QC55tae5d 1bAc6If3rdZIh0ylhCfqUX8jO2n5nH5ht8aPydDLArji42EOs5QKW29+9tIeNuE/NeCP vFw+nlzTzbgNf4C6aO07cCU12hAAvZSaib+bl1P2bG5+feLYT1NJ7whIJzbJfkGVL4dq o8KGOPqLnON0YWJqGQNfoXKpgRw9iVKbAiUWQbD3WustxAxouAm/rwBV20VKxo1KqhSr rQ9F5I0jaGK7lSrtHRdAX+ItMueO7BeOkIpmtNlGYXdQmIXGawZg5igDwBeu9ikKfFZY K/eQ== 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=8PV3QUvE4/KsHx+LrJUzAofvvlExf85kZV20f2X9des=; b=yFjXQsTOr08DeV3KEUVGnzOMBhP4UkIVrvZ0UNl4G6RZbBMu2vRVgAJWApoTTsHdht d9GKm2kubXabGFbsNb9wjL7mQctgixBJnbGnjkOZ0IhNWpo6+xSNqbQrAp9cwTmZGcGI Jk/RzrhjYh3qI5V8u4Mp8m7kda/ld5+bh+lQXyGhRXNLDCYvDhnCH+FBtv8NNWjrWxnc 46F8YL3VfPo73iOQ+KOa+VDH1XrBLbNL425kzQ1ROpF0CkwYPwWLtW8kBGsdZOhgGRC6 1nOPmneARS/IpA1eiQZpUMUu/jUrAyXu6JvciCn7wt4TaOtj8a4JeOZF22vfIuKMsQ8p rAMg== 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.14; Wed, 07 Jun 2017 00:08:15 -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 S1751825AbdFGHII (ORCPT + 25 others); Wed, 7 Jun 2017 03:08:08 -0400 Received: from mail-pf0-f170.google.com ([209.85.192.170]:35794 "EHLO mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751457AbdFGHIF (ORCPT ); Wed, 7 Jun 2017 03:08:05 -0400 Received: by mail-pf0-f170.google.com with SMTP id l89so2420318pfi.2 for ; Wed, 07 Jun 2017 00:08:05 -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=8PV3QUvE4/KsHx+LrJUzAofvvlExf85kZV20f2X9des=; b=XQ9o9/5MvjXnG3Gomr6Dgylgd6qQABs5a4sliy7FJeWsIuohWzXXJVHBmsM//o2/cN DGprW45BWEol7jVxWM/lwVHd4Owz5AEf4O3oXDZ/ZT/jGW1SJMr7eGGoW2P5nZu1FTSQ BonHIWj/dD56osXo5bKR5odapEPrJI19cKU0A= 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=8PV3QUvE4/KsHx+LrJUzAofvvlExf85kZV20f2X9des=; b=KcnBCLyuac7NKRf7vYRgREYz2rG3BQbt6ZKuVu0Z3oZy8r/9pJVn8X+iK9SuWdI1H4 FDFU68xn6knN4ptvqPta64KThlXEgeNxcjRb2g/mfhbTp5cxSfj7OCjq4HH4jtKV3OhQ 1y/k6yPxnfZsDu++vOuGl5yqgeBggdXyiB87qIQb+8nGofNJiFAKI+C3mAjp+wxk1lcK TKHoCr1gSLNYIZve0R+akxrdBBdrdlDLQaXImVscYzSycag3Jaz9oUu9qGf1Efj5ig43 g45r3HGP1Tfy1g7j7D8ONwJj+MWQmOYVm9lcMWqyIDDjhvYG1KREwQDYoxWcEFlByb6+ CIig== X-Gm-Message-State: AODbwcCgP7hd9jI05Yw1QdXv9ZylnjeMtCWmFfuUH7J1bUWLNrTGtgLK mBq34ut93n15uXhY X-Received: by 10.84.231.136 with SMTP id g8mr26949889plk.257.1496819285191; Wed, 07 Jun 2017 00:08:05 -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.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Jun 2017 00:08:04 -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, Wang Xiaoyin , Guodong Xu Subject: [PATCH v5 7/8] arm64: dts: hikey960: add device node for pmic and regulators Date: Wed, 7 Jun 2017 15:06:05 +0800 Message-Id: <20170607070606.8889-8-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 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 --- 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 { From patchwork Wed Jun 7 07:06:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 103212 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp1796345qgd; Wed, 7 Jun 2017 00:08:30 -0700 (PDT) X-Received: by 10.84.218.199 with SMTP id g7mr25348678plm.69.1496819310840; Wed, 07 Jun 2017 00:08:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496819310; cv=none; d=google.com; s=arc-20160816; b=XI1eEzq/MOndkgadXY3lm3wMqC+muq+IOQXHJQGUK+jsMprEHxhDI9680InhqUPDLO W3QYe5xG6eppXi+sMHWJazUjnv9Ln8J/GXLXiHHxk40xqFZUenVgTISHozzF64mKscMy 5V2y5Y5aet68SN8t+xW+JwTzS5awtHdVkIZF/q6+7c4rxHtSaWMhlaPD4oBaI9zOiiIt XdEJ0WxLNQMTJGI5Nc5dSK0Db5M9el9kBVauWEHn5Kn4+xJiGnudbmxY0MNzxkFfGDeh 9/r3X6zqV4PUHVEI8R6EEQWXywnrATEOIpLQvh31vJs1cfsd/Tr9obzTtjUftn/GbrVU gzGw== 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=tFo0Wuv7WcLCcKkG/W0NR4++ErJQh3L6voXZiX5zVq4=; b=rEMUhiI8ZDMnkZ14g+Qc2+8aEbC2T719BbNMwyAg2ELycdm4HUOv6x6rGbubPjXM9h 3u5tD/MlxqKPJ04gNtcMh3dZaVMimS7IzB8yX8SqcksGpuK6+WIun+GaXcxlggbIQYYl 6Okb8pNlswyPcRIbXFizhybeQO+XxA+pgQrBnPr3RJJMN6LXr8TS30vMuv5XqYRKDw7K qFsj4nJfZnbnAiOEaE6k8okrP5YRzr7Ko6n0EQVuCl49yGbbl7SPwC4TbuVpPw8sYv5t OP6XhKWsKwRx1gvf92tpo+RPvoCTtjHm44wL+UiFcuM4nGaHTLm5bQm2KufP63Kt/kZC /f1g== 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 r39si962577pld.136.2017.06.07.00.08.30; Wed, 07 Jun 2017 00:08: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 S1751845AbdFGHIR (ORCPT + 25 others); Wed, 7 Jun 2017 03:08:17 -0400 Received: from mail-pg0-f47.google.com ([74.125.83.47]:36772 "EHLO mail-pg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751633AbdFGHIN (ORCPT ); Wed, 7 Jun 2017 03:08:13 -0400 Received: by mail-pg0-f47.google.com with SMTP id a70so2273905pge.3 for ; Wed, 07 Jun 2017 00:08:13 -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=tFo0Wuv7WcLCcKkG/W0NR4++ErJQh3L6voXZiX5zVq4=; b=dOsKpT3NULb3KnOCg1sdbPYbshQ9P0L9Kul2zVqnW44FX8nzdhhYbK8e8kk+cUWPXT vxfz+Cy4ife+Y+7PD6zN7Fx1VV/0dP1dm0hHkaDa66pPo2azG0mC4uZs1JxSp//eMnCH m/oVnbPTIjSOZETNgJo+7hIlHc9gOsOiyt/fE= 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=tFo0Wuv7WcLCcKkG/W0NR4++ErJQh3L6voXZiX5zVq4=; b=F+1jqEu1RdJP9eEKV2wYbpJ8qxadzSNPls5fZnul492dYdD148O88+y0eonR4nuja1 e6hB6ktVmKT/YP44Cp6Rur2buH/AAP1jfp2E96VkvOUEYWpojRnRYAuD6RAZonS5VuFC vzza5VhjACEwxV+X8WEE0MSCGeWOKW8Ptf/JWTc6BSX1xeI+RxXjA1Py4fvClJX4BoGR xVcCeHg5x2hufLDR80tWaki/kTVGqKkAoyLAY9tiICEaY4bdf6CqO78QaUsk9I5eZ8vA sH7Yuoawh89DQ7awIYrjCsDgkgH/m2pBmsJxmKYRsU2dmdtIjv6EBUPWqwCxhxAeJwE4 I+yQ== X-Gm-Message-State: AODbwcAzsASvbqajhqZrjpdomFD9MqSEUOrABIbjdWSt8R+eYkl1LEw5 kHXiVQ+VNpZ4FI7F X-Received: by 10.84.233.196 with SMTP id m4mr19268042pln.228.1496819293199; Wed, 07 Jun 2017 00:08:13 -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.08.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Jun 2017 00:08:12 -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 Subject: [PATCH v5 8/8] arm64: defconfig: enable support hi6421v530 PMIC Date: Wed, 7 Jun 2017 15:06:06 +0800 Message-Id: <20170607070606.8889-9-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 Enable configs for hi6421v530 mfd and regulator driver + CONFIG_MFD_HI6421_PMIC=y + CONFIG_REGULATOR_HI6421V530=y Signed-off-by: Guodong Xu --- arch/arm64/configs/defconfig | 2 ++ 1 file changed, 2 insertions(+) -- 2.10.2 diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index ce07285..867d68c 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -305,6 +305,7 @@ CONFIG_S3C2410_WATCHDOG=y CONFIG_MESON_GXBB_WATCHDOG=m CONFIG_MESON_WATCHDOG=m CONFIG_MFD_EXYNOS_LPASS=m +CONFIG_MFD_HI6421_PMIC=y CONFIG_MFD_MAX77620=y CONFIG_MFD_RK808=y CONFIG_MFD_SPMI_PMIC=y @@ -315,6 +316,7 @@ CONFIG_MFD_CROS_EC=y CONFIG_MFD_CROS_EC_I2C=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_GPIO=y +CONFIG_REGULATOR_HI6421V530=y CONFIG_REGULATOR_HI655X=y CONFIG_REGULATOR_MAX77620=y CONFIG_REGULATOR_PWM=y