From patchwork Thu Jul 20 07:32:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 108319 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1795731qge; Thu, 20 Jul 2017 00:34:20 -0700 (PDT) X-Received: by 10.98.59.152 with SMTP id w24mr2955970pfj.63.1500536060071; Thu, 20 Jul 2017 00:34:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500536060; cv=none; d=google.com; s=arc-20160816; b=JO2Tls7ZGAasiTJQ6ayr7jjFxA9YNuTZ9OiJKaw5mjI73FXQagwr5zYr6sS7pdMPVA VSsAC3jmSHlJG+/FKNgvEakK8uRpMbIXYlnLRMaJgNz+m2SprMVkG4PVmFEyF1Zn5A0O qwykQ8iDhqV4lR24WuDF/SmAKsarmP57G7BCVIsS4RLHjsTB9VU4WI5gv59oWBSeyVUf wHxKMERva+kXyAv2hkZMQQ+WzMIAunznO7vLbOHXbEpx+iM/AfdwmU81Z4VO8XswbGDd Avw0Apmfy0CZFGHUSA+J1mVoZ/6jKkxC0npMYSAjwcb0Ft93VD348TyjgKJkXXlUG/Lo 4V+g== 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=udzzKflFq14vHG9EY3TwfCx9TpsQQUo0b2UxmlTGAjc=; b=lGczeexIByeyosG2jaa56S5bpzEHxuGEQy7Kdz9JRwsusW5x2eQBtVRRgpikNCapXP DCLygRwah+r7+gS8Z7R7grt9TBilUIEtRU3LAkM4QBvIto/MGpqupIwUjjTH+pmUI8f7 z0Y6winxq4NBwzP0iJlvwMbkWUGtQkmrQqR5aQx9reGGvaL9Rjv3+R1EmgJAuwt1OcaU /kN2kx0LYGwKmJE3cKvku9pVMc+L67H4rtAI5I9lBuRjNGbAQTzW4TnQiaxJhAp6bLsl csdkQNQzcsVEF5tBdctrssKCP2brq26SY3FmzXinvIV873Qka4oXBCyW9yVD9kZY1dN0 c7Ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=fggL9Z3C; 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 h2si1257204pgc.359.2017.07.20.00.34.19; Thu, 20 Jul 2017 00:34:20 -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 header.b=fggL9Z3C; 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 S934588AbdGTHeS (ORCPT + 25 others); Thu, 20 Jul 2017 03:34:18 -0400 Received: from mail-pg0-f50.google.com ([74.125.83.50]:34908 "EHLO mail-pg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934508AbdGTHdL (ORCPT ); Thu, 20 Jul 2017 03:33:11 -0400 Received: by mail-pg0-f50.google.com with SMTP id v190so11095144pgv.2 for ; Thu, 20 Jul 2017 00:33:11 -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=udzzKflFq14vHG9EY3TwfCx9TpsQQUo0b2UxmlTGAjc=; b=fggL9Z3CpWhEkyCalkJApKxN7vr+LgZnubC9dmY1siWzXUwGh7eCmw14v5F5xHSGc5 el0C7wYk5gc7+i8F38CQZJO4z9xOWiGCmzd79LUv8BJRJzY5OUqZzQ+wj25seqxnv0om 0P677sZmrtfWnRppT4IsyMswT0R7Yy5hpyqRE= 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=udzzKflFq14vHG9EY3TwfCx9TpsQQUo0b2UxmlTGAjc=; b=SqAz3hTKmxgX94gjZvUEbJALbV9xf1hzO9Cb1EEg3WI3OvcQnMwLeV5n9yAarSwIc8 GbpT9cqsBqg72YYNRNRdiexWwHmYK0zJWN3Q8I4bk1ajfPQNqPeLSP5XJcSW9jYLYT06 8vU29cVYZjtjR55Rmu0OGNzpuNWDMTLO46CGCY7vjBbVoM3UXrgAAM5SwcI5v6xQn/XS jl8GUrDgVBMH5GeyGlZh6hqm87rAov2003EdlfvACJWkgqfmojUEnXRJqI1b1h7KAq5w 6NBQto3dvbhbscyKR04IiPQcQ7AfEG+d3RlSFastrMkWAhxnog1LTDlj+pE9uZ6+APtM SCZA== X-Gm-Message-State: AIVw112aIATypYHySJCem2irtev+h5zikOXt9S68gDBs8kJfS4BPq8W1 hZ28fm05E4IqsGWmr8pJxw== X-Received: by 10.84.193.101 with SMTP id e92mr3134332pld.209.1500535990910; Thu, 20 Jul 2017 00:33:10 -0700 (PDT) Received: from docularxu-ThinkPad-T440p.219.146.1.66 ([45.56.159.45]) by smtp.gmail.com with ESMTPSA id s62sm3230494pfi.36.2017.07.20.00.33.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Jul 2017 00:33:10 -0700 (PDT) From: Guodong Xu To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Guodong Xu Subject: [PATCH v7 1/3] mfd: hi6421-pmic: cleanup: change license text to shorter form Date: Thu, 20 Jul 2017 15:32:40 +0800 Message-Id: <20170720073242.1758-2-guodong.xu@linaro.org> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170720073242.1758-1-guodong.xu@linaro.org> References: <20170720073242.1758-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 Acked-by: Arnd Bergmann --- 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 Thu Jul 20 07:32:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 108317 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1795174qge; Thu, 20 Jul 2017 00:33:37 -0700 (PDT) X-Received: by 10.99.44.201 with SMTP id s192mr2904192pgs.312.1500536016903; Thu, 20 Jul 2017 00:33:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500536016; cv=none; d=google.com; s=arc-20160816; b=n+x9MW0OfQAmBEnON/p/DDRZG4lZkEEiKgkc6D4nk35chYD7ei3vBb8x6oX0teEt19 kchIaDw2CazL/qh+vEFNVBDY9OpyYFaQtAJ/LOMpFdRh3fWiYjP6IPeFkGdy8vY+sYIo j271N6WYY/82vJX+SN5yQoqQsohBHjWhQtHG5IbQkVWQrdDq8Xuo7urbEUKZKIH1R5pI OEfVBjK6qed5vO4dYeiOwqdbhSSfd2KRNXT488TRzwUEXilDHD+Z1lHqzC3+Qdtxm5Ql GnmXIODTCsBP7y4nhons0spvZgK70SUdiPcPTYpRL0c04uFXI51M9kcj53Bz1/Gur8rt JaZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=faldoP6hm+N+vWlll454PPrTWRmK//VYkJScO73WLNE=; b=LuRbCAxHYqMBtAerQ9pkpEpmZQB2gseIqUgs9gvmPpVr0n+bo1ilHyjtPnMckes9pW ajPxP/7anjdx9+Eymxf8owwndkj+/s2kFCllmfI+bGNJW/dHNzbq0SBrNIDb65jPaYX5 yKZzmP5aNYSU7WHJIe+UVxIFjd7odIXlb8p9rdw8xjTFfqgj0u6h3Q5Eq1YotAyfigef 6K3xm1FNvQfP2QHRibRRuS0jtujB1W0BAnbUFmUc5vWyw84gnONYgpyPQk+ConKrF+9O HcYXUOsR0iSUG3gIE2MimgYTI0g9hIRykRJKU8YI2LWt24ZM4+7nGyZEIsPCYy/WAyaw sjow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=EZ7FfDCf; 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 t1si1290822pgs.53.2017.07.20.00.33.36; Thu, 20 Jul 2017 00:33:36 -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 header.b=EZ7FfDCf; 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 S934537AbdGTHdT (ORCPT + 25 others); Thu, 20 Jul 2017 03:33:19 -0400 Received: from mail-pg0-f52.google.com ([74.125.83.52]:35960 "EHLO mail-pg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934521AbdGTHdP (ORCPT ); Thu, 20 Jul 2017 03:33:15 -0400 Received: by mail-pg0-f52.google.com with SMTP id 125so11079584pgi.3 for ; Thu, 20 Jul 2017 00:33: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=faldoP6hm+N+vWlll454PPrTWRmK//VYkJScO73WLNE=; b=EZ7FfDCfuU+Yp7L2tId0KVjsofOVNXyxj65pddFd3M1N2OozHtByYlxth+biuYTDD7 euh69G54+pZimOuLeyCGfKRKxt/ZVtUuxs9l42XChlCicViWciQtvnf0kqFtm5io5HhX Mp8QLWGTYlB7PsdIb7nsQRocNDNWBJI6N7+C0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=faldoP6hm+N+vWlll454PPrTWRmK//VYkJScO73WLNE=; b=iqStyyLQqmDCD4S9NSVBmThZUlt/Lcc02XN6C5dZJ1577wZnznSXsOQy23pj8WkblF hcGRtyrp2c06hwQzAOGgW2ixOscS6yH8IIk7L80nhiJEPdVb/52wH3zaP8/HAA384kgR QYqOIxAjsK88WXM/KT2scApQ0zqje5TIFTSuZAhj1UJWFkTDJXPIHeFlwQMBE7CJ9+cG BJQzdG1pO6f4NxNwTPbWMKA+TETEq/ljicJpq3avE+FGDf4d4aCpZpXK1158IEIlm99r MN3Dcs4f4iYCYHxAGIUBAdvOcPsZ3lyA438/Mgnqf2A6lmKXmTdh9qycBOkGFSXPZQ0W aPeA== X-Gm-Message-State: AIVw111QpFtOqFTkQ9kKbcj0TMexrN2LbOy/wAPPbnij+amKvKDReUqY FPdhkDznxfpwkxue X-Received: by 10.99.42.143 with SMTP id q137mr2876750pgq.297.1500535994801; Thu, 20 Jul 2017 00:33:14 -0700 (PDT) Received: from docularxu-ThinkPad-T440p.219.146.1.66 ([45.56.159.45]) by smtp.gmail.com with ESMTPSA id s62sm3230494pfi.36.2017.07.20.00.33.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Jul 2017 00:33:14 -0700 (PDT) From: Guodong Xu To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Guodong Xu Subject: [PATCH v7 2/3] mfd: hi6421-pmic: cleanup: update dev_err messages Date: Thu, 20 Jul 2017 15:32:41 +0800 Message-Id: <20170720073242.1758-3-guodong.xu@linaro.org> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170720073242.1758-1-guodong.xu@linaro.org> References: <20170720073242.1758-1-guodong.xu@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Update dev_err messages to make them more readable. Signed-off-by: Guodong Xu Acked-by: Arnd Bergmann --- drivers/mfd/hi6421-pmic-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.10.2 diff --git a/drivers/mfd/hi6421-pmic-core.c b/drivers/mfd/hi6421-pmic-core.c index ad9e3d8..b1139d4 100644 --- a/drivers/mfd/hi6421-pmic-core.c +++ b/drivers/mfd/hi6421-pmic-core.c @@ -52,8 +52,8 @@ static int hi6421_pmic_probe(struct platform_device *pdev) pmic->regmap = devm_regmap_init_mmio_clk(&pdev->dev, NULL, base, &hi6421_regmap_config); if (IS_ERR(pmic->regmap)) { - dev_err(&pdev->dev, - "regmap init failed: %ld\n", PTR_ERR(pmic->regmap)); + dev_err(&pdev->dev, "Failed to initialise Regmap: %ld\n", + PTR_ERR(pmic->regmap)); return PTR_ERR(pmic->regmap); } @@ -70,7 +70,7 @@ static int hi6421_pmic_probe(struct platform_device *pdev) ret = devm_mfd_add_devices(&pdev->dev, 0, hi6421_devs, ARRAY_SIZE(hi6421_devs), NULL, 0, NULL); if (ret) { - dev_err(&pdev->dev, "add mfd devices failed: %d\n", ret); + dev_err(&pdev->dev, "Failed to add child devices: %d\n", ret); return ret; } From patchwork Thu Jul 20 07:32:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 108318 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1795376qge; Thu, 20 Jul 2017 00:33:53 -0700 (PDT) X-Received: by 10.99.98.193 with SMTP id w184mr2848142pgb.358.1500536033808; Thu, 20 Jul 2017 00:33:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500536033; cv=none; d=google.com; s=arc-20160816; b=tvKwXL5+yraHQribFlzjFpciBZZZ1R4as/p3zRuii73UTmO2VqtcgtNvBRqjnI+ojs qFClDTHcJg07/VDizeNk/+A9a3Kpih7+fZqdRbA8SIJNYPK9rhAeV51RABrUPp7uq3tI YpwSQ5h1SDcM754zgRh6g2RjfUhkrRZYRKXH3UHfPCWtmAIWIOk/Y9YJq0E8zr/kdkBw PFZ+RrNRz761V2O35L+D6sEqmjG6JGZyIwOd8XeiMLdqgvMkeyOJUAQ4hSTMZcn0yKfm CqB/AsRYAdoD5lQg8sPASNeSviblYqDhE9Qjbf1JXlcVj7tQA+BczoDo1D/mz70xa+Na 9gpQ== 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=8y6Mm56GpXJdaHP+5SlUe5BYJRH8SIF4HNwWWLbOnV4=; b=CNZY+TbSJpFMMLmvPAwrwIuBgp+5evpY84IME9TaBGZLNnb4cC81dxbtcz1gZDijQ5 sze4DmxygTDotRq85Zq/AE4f5uQ4TedrppKWnGBVBTyJS8z3CLIGhN4EG0ZA7QZjhde+ eirOtFxGsp78Y+AK/YcrkP20fByzxe/3FmFOdq1LzWbX7ZmPvfRlHAYbQeqAhNwCkkS/ bjF0c5KD6RfDT/5CNhvNkDV84kQOMGdwEQ31KXCSaaGSm8nObdcUCL2Fr3SywVYu2e/Q 53xmJmcLBpEs0PY2CFi8xvRMedOFVZ5FZMwwrnjD+SQ12gqb2Yf/bau8Jtk4SZrNLAnc TBbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=GYsh9nvn; 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 w4si1222145pfa.314.2017.07.20.00.33.53; Thu, 20 Jul 2017 00:33:53 -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 header.b=GYsh9nvn; 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 S934565AbdGTHdg (ORCPT + 25 others); Thu, 20 Jul 2017 03:33:36 -0400 Received: from mail-pg0-f53.google.com ([74.125.83.53]:38493 "EHLO mail-pg0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934521AbdGTHdT (ORCPT ); Thu, 20 Jul 2017 03:33:19 -0400 Received: by mail-pg0-f53.google.com with SMTP id s4so11027514pgr.5 for ; Thu, 20 Jul 2017 00:33:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8y6Mm56GpXJdaHP+5SlUe5BYJRH8SIF4HNwWWLbOnV4=; b=GYsh9nvnL+JuNx+i1u8Y/WIpu1XuBa18JB7xSw4gZm0/Nye7rlEgXRIvciUATSyXP1 pSHGo16gjCQ4BoYTN7b/eXobhOkDnsAXD9lWOcr5c7mV8A5MeeeuaZq7m4okIquLLTcM pSDE2qOksR18j1w/P9b+mMG6MG7s898/4XMYE= 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=8y6Mm56GpXJdaHP+5SlUe5BYJRH8SIF4HNwWWLbOnV4=; b=pxGrxgLkI0QvGkMyX5SbK5JhKw8ceqiHqAIJ+wIFNmRsBgB81ZJYg503Wk0JBDEcB2 Ab7UFvAI9+Pnbz75pU5tBcZMgOkkZeu4DG+ohHmQoAClUaJ4SnsM2Q5VD/wBtGuK+wFc lqvmiJcjF0CaDRTWkS7EUP1Mzml6HIaoIDCwPxFvAQAqb3J8eKVjJ/+cctzRcQ1BGN1N EhUWC24c+PMMtOU5ClxJX/yj74QQugosTXzUvcbr8fhBl/1vunhGF/1fWYhpJt6yGc1K /2gMJacgM7MHIkNCuLX0ZaGbiaRfoppV5u1gf6pgHZcrAkqtTdE7UaX0KaTAnYZ6CQvQ p3uQ== X-Gm-Message-State: AIVw113ZtsI6QJE9nid0ebPocHH8OM/tYoSegPWI8dOgiMYxOVaI/FKx 6r9xfAWB/UO5GEmk X-Received: by 10.99.149.79 with SMTP id t15mr2856694pgn.247.1500535999071; Thu, 20 Jul 2017 00:33:19 -0700 (PDT) Received: from docularxu-ThinkPad-T440p.219.146.1.66 ([45.56.159.45]) by smtp.gmail.com with ESMTPSA id s62sm3230494pfi.36.2017.07.20.00.33.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Jul 2017 00:33:18 -0700 (PDT) From: Guodong Xu To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Guodong Xu , Wang Xiaoyin Subject: [PATCH v7 3/3] mfd: hi6421-pmic: add support for HiSilicon Hi6421v530 Date: Thu, 20 Jul 2017 15:32:42 +0800 Message-Id: <20170720073242.1758-4-guodong.xu@linaro.org> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170720073242.1758-1-guodong.xu@linaro.org> References: <20170720073242.1758-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 Acked-by: Arnd Bergmann --- 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 */