From patchwork Mon Nov 2 04:06:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alim Akhtar X-Patchwork-Id: 7533181 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 34C409F327 for ; Mon, 2 Nov 2015 04:05:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4DBE0205BD for ; Mon, 2 Nov 2015 04:05:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 47514205C1 for ; Mon, 2 Nov 2015 04:04:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751316AbbKBEE6 (ORCPT ); Sun, 1 Nov 2015 23:04:58 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:60431 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751083AbbKBEE5 (ORCPT ); Sun, 1 Nov 2015 23:04:57 -0500 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NX602SXP607FIB0@mailout3.samsung.com>; Mon, 02 Nov 2015 13:04:55 +0900 (KST) Received: from epcpsbgm1new.samsung.com ( [172.20.52.122]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 47.BB.05385.7E0E6365; Mon, 2 Nov 2015 13:04:55 +0900 (KST) X-AuditID: cbfee691-f79d66d000001509-68-5636e0e7b7f4 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id 78.32.23663.7E0E6365; Mon, 2 Nov 2015 13:04:55 +0900 (KST) Received: from exypnos.sisodomain.com ([107.108.73.28]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NX600C5A5ZSBE20@mmp2.samsung.com>; Mon, 02 Nov 2015 13:04:55 +0900 (KST) From: Alim Akhtar To: lee.jones@linaro.org, broonie@kernel.org Cc: k.kozlowski@samsung.com, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] mfd: sec-core: Rename MFD and regulator names differently Date: Mon, 02 Nov 2015 09:36:09 +0530 Message-id: <1446437169-29550-1-git-send-email-alim.akhtar@samsung.com> X-Mailer: git-send-email 1.7.10.4 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrPLMWRmVeSWpSXmKPExsWyRsSkSvf5A7Mwg4N3RC2mPnzCZvH6haHF /a9HGS0u75rDZjHj/D4mB1aPTas62TzuXNvD5tG3ZRWjx+dNcgEsUVw2Kak5mWWpRfp2CVwZ F4+8Yyw4I1px4toG9gbGg4JdjJwcEgImEt3fN7NA2GISF+6tZwOxhQRWMErs+CQPU9Oxs5cR Ij6LUWLlDvsuRi4g+yejRM+jGWAJNgFtibvTtzB1MXJwiAjoSFy/kQ5iMgvESTS+FwapEBbw lTizeDU7iM0ioCqxZcJ2ZhCbV8BdYt/mdWwQqxQlup9NgLJfs0nsn2MFUS8g8W3yIRaQkRIC shKbDjBDlEhKHFxxg2UCo+ACRoZVjKKpBckFxUnpRaZ6xYm5xaV56XrJ+bmbGIHhePrfs4k7 GO8fsD7EKMDBqMTDm+FuFibEmlhWXJl7iNEUaMNEZinR5Hxg0OeVxBsamxlZmJqYGhuZW5op ifPqSP8MFhJITyxJzU5NLUgtii8qzUktPsTIxMEp1cCYnbSwQWJWGZfqxpPL9ujffRywjsuh vU3v3YFFiyKF1+aFTHkTv0r+aT7foR1lgnbeVcffL9LeJFih4NN08qnThQ2SdyXurFH6F5i3 ipnvD8uZjXuz46IKn11caSskxcazLUW2OnxhWz3zxA8Jk1dOXrtty+bETaolXvqz/Feca7k+ /adjxmlVJZbijERDLeai4kQAvSrLhEICAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrHLMWRmVeSWpSXmKPExsVy+t9jQd3nD8zCDNqW8VhMffiEzeL1C0OL +1+PMlpc3jWHzWLG+X1MDqwem1Z1snncubaHzaNvyypGj8+b5AJYohoYbTJSE1NSixRS85Lz UzLz0m2VvIPjneNNzQwMdQ0tLcyVFPISc1NtlVx8AnTdMnOA9ioplCXmlAKFAhKLi5X07TBN CA1x07WAaYzQ9Q0JgusxMkADCWsYMy4eecdYcEa04sS1DewNjAcFuxg5OSQETCQ6dvYyQthi EhfurWcDsYUEZjFKrNxh38XIBWT/ZJToeTQDrIhNQFvi7vQtTF2MHBwiAjoS12+kg5jMAnES je+FQSqEBXwlzixezQ5iswioSmyZsJ0ZxOYVcJfYt3kdG8QqRYnuZxPYJjByL2BkWMUokVqQ XFCclJ5rmJdarlecmFtcmpeul5yfu4kRHPbPpHYwHtzlfohRgINRiYf3gKdZmBBrYllxZe4h RgkOZiURXq8bQCHelMTKqtSi/Pii0pzU4kOMpkAHTGSWEk3OB8ZkXkm8obGJuamxqaWJhYmZ pZI4r76nUZiQQHpiSWp2ampBahFMHxMHp1QDI5dc4urn/VYWG7VnRc49MocnLSHom4DKPc3D 179eZ1eyaDWwML9SMKlInZc3s3OTxu/d7aEt8q0rzepy57gal932O17P76nmcDy0XTJmVmrg 14zlqpMSirwV/z64tuWws3LU9pNPjPetNpnO+PS20/JjE8XC3kSk/jl7KOpwrkaWwo2XwryX lViKMxINtZiLihMBLZp2cJECAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently S2MPSXX multifunction device is named as *-pmic, and these MFDs also supports regulator as a one of its MFD cell which has the same name, because current name is confusing and we want to sort it out. We did discussed different approaches about how the MFD and it cells need to be named here [1]. Based in the discussion this patch rename MFD regulator name as *-regulator instead of current *-pmic. This patch also changes the corresponding entries in the regulator driver to keep git-bisect happy. [1]-> https://lkml.org/lkml/2015/10/28/417 Suggested-by: Lee Jones Signed-off-by: Alim Akhtar Reviewed-by: Krzysztof Kozlowski Acked-by: Mark Brown --- Changes since V1: * Squashed the two patches in one as sugeested by Lee * Based on the top of [1] [1]-> https://www.mail-archive.com/linux-samsung-soc@vger.kernel.org/msg47736.html drivers/mfd/sec-core.c | 8 ++++---- drivers/regulator/s2mps11.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c index 7c4e7be17f1e..c9802ba9be72 100644 --- a/drivers/mfd/sec-core.c +++ b/drivers/mfd/sec-core.c @@ -68,7 +68,7 @@ static const struct mfd_cell s5m8767_devs[] = { static const struct mfd_cell s2mps11_devs[] = { { - .name = "s2mps11-pmic", + .name = "s2mps11-regulator", }, { .name = "s2mps14-rtc", }, { @@ -78,7 +78,7 @@ static const struct mfd_cell s2mps11_devs[] = { }; static const struct mfd_cell s2mps13_devs[] = { - { .name = "s2mps13-pmic", }, + { .name = "s2mps13-regulator", }, { .name = "s2mps13-rtc", }, { .name = "s2mps13-clk", @@ -88,7 +88,7 @@ static const struct mfd_cell s2mps13_devs[] = { static const struct mfd_cell s2mps14_devs[] = { { - .name = "s2mps14-pmic", + .name = "s2mps14-regulator", }, { .name = "s2mps14-rtc", }, { @@ -116,7 +116,7 @@ static const struct mfd_cell s2mpa01_devs[] = { static const struct mfd_cell s2mpu02_devs[] = { { - .name = "s2mpu02-pmic", + .name = "s2mpu02-regulator", }, }; diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c index b2f3a28e720c..3242ffc0cb25 100644 --- a/drivers/regulator/s2mps11.c +++ b/drivers/regulator/s2mps11.c @@ -1199,11 +1199,11 @@ out: } static const struct platform_device_id s2mps11_pmic_id[] = { - { "s2mps11-pmic", S2MPS11X}, - { "s2mps13-pmic", S2MPS13X}, - { "s2mps14-pmic", S2MPS14X}, + { "s2mps11-regulator", S2MPS11X}, + { "s2mps13-regulator", S2MPS13X}, + { "s2mps14-regulator", S2MPS14X}, { "s2mps15-regulator", S2MPS15X}, - { "s2mpu02-pmic", S2MPU02}, + { "s2mpu02-regulator", S2MPU02}, { }, }; MODULE_DEVICE_TABLE(platform, s2mps11_pmic_id);