From patchwork Fri Jan 4 08:55:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liu, Xiaoting" X-Patchwork-Id: 10748193 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0E8501575 for ; Fri, 4 Jan 2019 08:56:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F187927F94 for ; Fri, 4 Jan 2019 08:56:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E54CF27FA1; Fri, 4 Jan 2019 08:56:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 952B227FA8 for ; Fri, 4 Jan 2019 08:56:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727219AbfADI4E convert rfc822-to-8bit (ORCPT ); Fri, 4 Jan 2019 03:56:04 -0500 Received: from mx01.hxt-semitech.com ([223.203.96.7]:46671 "EHLO barracuda.hxt-semitech.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727006AbfADI4E (ORCPT ); Fri, 4 Jan 2019 03:56:04 -0500 X-ASG-Debug-ID: 1546592159-093b7e2d8806ba0001-LXWHwZ Received: from HXTBJIDCEMVIW02.hxtcorp.net ([10.128.0.15]) by barracuda.hxt-semitech.com with ESMTP id 898rFEhDEaL4TxcG (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NO); Fri, 04 Jan 2019 16:55:59 +0800 (CST) X-Barracuda-Envelope-From: xiaoting.liu@hxt-semitech.com Received: from openbmc001.localdomain (10.5.21.169) by HXTBJIDCEMVIW02.hxtcorp.net (10.128.0.15) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 4 Jan 2019 16:55:55 +0800 From: Xiaoting Liu To: , CC: , , , Xiaoting Liu , Shunyong Yang Subject: [PATCH 1/4] pmbus: associate PMBUS_SKIP_STATUS_CHECK with driver_data Date: Fri, 4 Jan 2019 16:55:51 +0800 X-ASG-Orig-Subj: [PATCH 1/4] pmbus: associate PMBUS_SKIP_STATUS_CHECK with driver_data Message-ID: <680b4d5659971cc4f6e1a6878837c2ce49962a7c.1546591275.git.xiaoting.liu@hxt-semitech.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.5.21.169] X-ClientProxiedBy: HXTBJIDCEMVIW02.hxtcorp.net (10.128.0.15) To HXTBJIDCEMVIW02.hxtcorp.net (10.128.0.15) X-Barracuda-Connect: UNKNOWN[10.128.0.15] X-Barracuda-Start-Time: 1546592159 X-Barracuda-Encrypted: ECDHE-RSA-AES256-SHA384 X-Barracuda-URL: https://192.168.50.101:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at hxt-semitech.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Bayes: INNOCENT GLOBAL 0.4997 1.0000 0.0000 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=9.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.65068 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Current code compares device name with name in i2c_device_id to decide whether PMBUS_SKIP_STATUS_CHECK should be set in pmbus_platform_data, which makes adding new devices with PMBUS_SKIP_STATUS_CHECK should also modify code in pmbus_probe(). This patch adds pmbus_device_info to save pages and flags. Its pointer is put in driver_data of i2c_device_id, which makes adding new device more straightforward. Signed-off-by: Shunyong Yang Signed-off-by: Xiaoting Liu --- drivers/hwmon/pmbus/pmbus.c | 54 +++++++++++++++++++++++++++------------------ include/linux/pmbus.h | 5 +++++ 2 files changed, 37 insertions(+), 22 deletions(-) -- 1.8.3.1 This email is intended only for the named addressee. It may contain information that is confidential/private, legally privileged, or copyright-protected, and you should handle it accordingly. If you are not the intended recipient, you do not have legal rights to retain, copy, or distribute this email or its contents, and should promptly delete the email and all electronic copies in your system; do not retain copies in any media. If you have received this email in error, please notify the sender promptly. Thank you. diff --git a/drivers/hwmon/pmbus/pmbus.c b/drivers/hwmon/pmbus/pmbus.c index 7688dab32f6e..aa4cf9636e99 100644 --- a/drivers/hwmon/pmbus/pmbus.c +++ b/drivers/hwmon/pmbus/pmbus.c @@ -172,13 +172,15 @@ static int pmbus_probe(struct i2c_client *client, struct pmbus_driver_info *info; struct pmbus_platform_data *pdata = NULL; struct device *dev = &client->dev; + struct pmbus_device_info *device_info; info = devm_kzalloc(dev, sizeof(struct pmbus_driver_info), GFP_KERNEL); if (!info) return -ENOMEM; - if (!strcmp(id->name, "dps460") || !strcmp(id->name, "dps800") || - !strcmp(id->name, "sgd009")) { + device_info = (struct pmbus_device_info *)id->driver_data; + + if (device_info->flags & PMBUS_SKIP_STATUS_CHECK) { pdata = devm_kzalloc(dev, sizeof(struct pmbus_platform_data), GFP_KERNEL); if (!pdata) @@ -187,36 +189,44 @@ static int pmbus_probe(struct i2c_client *client, pdata->flags = PMBUS_SKIP_STATUS_CHECK; } - info->pages = id->driver_data; + info->pages = device_info->pages; info->identify = pmbus_identify; dev->platform_data = pdata; return pmbus_do_probe(client, id, info); } +static const struct pmbus_device_info default_pmbus_info = {1, 0}; +static const struct pmbus_device_info dps460_pmbus_info = { + 1, PMBUS_SKIP_STATUS_CHECK}; +static const struct pmbus_device_info dps800_pmbus_info = { + 1, PMBUS_SKIP_STATUS_CHECK}; +static const struct pmbus_device_info sgd009_pmbus_info = { + 1, PMBUS_SKIP_STATUS_CHECK}; +static const struct pmbus_device_info pmbus_info = {0, 0}; /* * Use driver_data to set the number of pages supported by the chip. */ static const struct i2c_device_id pmbus_id[] = { - {"adp4000", 1}, - {"bmr453", 1}, - {"bmr454", 1}, - {"dps460", 1}, - {"dps800", 1}, - {"mdt040", 1}, - {"ncp4200", 1}, - {"ncp4208", 1}, - {"pdt003", 1}, - {"pdt006", 1}, - {"pdt012", 1}, - {"pmbus", 0}, - {"sgd009", 1}, - {"tps40400", 1}, - {"tps544b20", 1}, - {"tps544b25", 1}, - {"tps544c20", 1}, - {"tps544c25", 1}, - {"udt020", 1}, + {"adp4000", (kernel_ulong_t)&default_pmbus_info}, + {"bmr453", (kernel_ulong_t)&default_pmbus_info}, + {"bmr454", (kernel_ulong_t)&default_pmbus_info}, + {"dps460", (kernel_ulong_t)&dps460_pmbus_info}, + {"dps800", (kernel_ulong_t)&dps800_pmbus_info}, + {"mdt040", (kernel_ulong_t)&default_pmbus_info}, + {"ncp4200", (kernel_ulong_t)&default_pmbus_info}, + {"ncp4208", (kernel_ulong_t)&default_pmbus_info}, + {"pdt003", (kernel_ulong_t)&default_pmbus_info}, + {"pdt006", (kernel_ulong_t)&default_pmbus_info}, + {"pdt012", (kernel_ulong_t)&default_pmbus_info}, + {"pmbus", (kernel_ulong_t)&pmbus_info}, + {"sgd009", (kernel_ulong_t)&sgd009_pmbus_info}, + {"tps40400", (kernel_ulong_t)&default_pmbus_info}, + {"tps544b20", (kernel_ulong_t)&default_pmbus_info}, + {"tps544b25", (kernel_ulong_t)&default_pmbus_info}, + {"tps544c20", (kernel_ulong_t)&default_pmbus_info}, + {"tps544c25", (kernel_ulong_t)&default_pmbus_info}, + {"udt020", (kernel_ulong_t)&default_pmbus_info}, {} }; diff --git a/include/linux/pmbus.h b/include/linux/pmbus.h index ee3c2aba2a8e..3c05edad7666 100644 --- a/include/linux/pmbus.h +++ b/include/linux/pmbus.h @@ -46,4 +46,9 @@ struct pmbus_platform_data { struct regulator_init_data *reg_init_data; }; +struct pmbus_device_info { + int pages; + u32 flags; +}; + #endif /* _PMBUS_H_ */