From patchwork Fri Nov 20 10:48:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alim Akhtar X-Patchwork-Id: 7666681 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 AC6B09F2E2 for ; Fri, 20 Nov 2015 10:48:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BD42820461 for ; Fri, 20 Nov 2015 10:48:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C7B8B20459 for ; Fri, 20 Nov 2015 10:48:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759646AbbKTKsW (ORCPT ); Fri, 20 Nov 2015 05:48:22 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:51028 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759644AbbKTKsV (ORCPT ); Fri, 20 Nov 2015 05:48:21 -0500 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NY4002WD0NZ5130@mailout3.samsung.com>; Fri, 20 Nov 2015 19:47:59 +0900 (KST) Received: from epcpsbgm1new.samsung.com ( [172.20.52.125]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id C9.5E.29659.F5AFE465; Fri, 20 Nov 2015 19:47:59 +0900 (KST) X-AuditID: cbfee690-f79e96d0000073db-a3-564efa5feeda Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id 4D.C9.24993.F5AFE465; Fri, 20 Nov 2015 19:47:59 +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 <0NY400C4Q0MH6H60@mmp2.samsung.com>; Fri, 20 Nov 2015 19:47:59 +0900 (KST) From: Alim Akhtar To: lee.jones@linaro.org, broonie@kernel.org Cc: k.kozlowski@samsung.com, linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org, alim.akhtar@samsung.com Subject: [RESEND PATCH v2] mfd: sec-core: Rename MFD and regulator names differently Date: Fri, 20 Nov 2015 16:18:26 +0530 Message-id: <1448016506-8980-1-git-send-email-alim.akhtar@samsung.com> X-Mailer: git-send-email 1.7.10.4 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrGLMWRmVeSWpSXmKPExsWyRsSkVjf+l1+YwfojGhYP5m1js5j68Amb xesXhhb3vx5ltLi8aw6bxYzz+5gc2Dw2repk87hzbQ+bR9+WVYwenzfJBbBEcdmkpOZklqUW 6dslcGX0n/zCWHBbtGJ/w0fWBsargl2MHBwSAiYS89/rdzFyApliEhfurWfrYuTiEBJYwSix 7so9doiEicTkEydZIRKzGCWOLjnBDJIQEvjJKPHhTDGIzSagLXF3+hYmkKEiAjoS12+kg4SZ BcolNl0FCXNyCAuESWw6+IANxGYRUJXomn8RzOYVcJN4cf4YC8QuRYnuZxPAjpAQ+M4m0fL7 OxNEg4DEt8mHWCCOlpXYdIAZol5S4uCKGywTGAUXMDKsYhRNLUguKE5KLzLRK07MLS7NS9dL zs/dxAgMztP/nk3YwXjvgPUhRgEORiUe3huSfmFCrIllxZW5hxhNgTZMZJYSTc4HxkBeSbyh sZmRhamJqbGRuaWZkjjva6mfwUIC6YklqdmpqQWpRfFFpTmpxYcYmTg4pRoY5TuqX8w7GCHu uDH61q/Hky62rI9Y2ioRkZd++g/fJW/nzp8cIgvTqjMcrpmKR13ZmBSnzmX99uudwzHKaz7J h3pKZrfNWXOq/nB83/sd/eLXXFYusPJPiF7R5inhZ3mpQiUg905Hy/Hcd1atC3/51D86Ic07 399Uwf2Cbg63VOwNtn2l774qsRRnJBpqMRcVJwIAQouXS0kCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmphkeLIzCtJLcpLzFFi42I5/e+xoG78L78wg1OPFS0ezNvGZjH14RM2 i9cvDC3ufz3KaHF51xw2ixnn9zE5sHlsWtXJ5nHn2h42j74tqxg9Pm+SC2CJamC0yUhNTEkt UkjNS85PycxLt1XyDo53jjc1MzDUNbS0MFdSyEvMTbVVcvEJ0HXLzAFarqRQlphTChQKSCwu VtK3wzQhNMRN1wKmMULXNyQIrsfIAA0krGHM6D/5hbHgtmjF/oaPrA2MVwW7GDk5JARMJCaf OMkKYYtJXLi3nq2LkYtDSGAWo8TRJSeYQRJCAj8ZJT6cKQax2QS0Je5O38LUxcjBISKgI3H9 RjpImFmgXGLTVZAwJ4ewQJjEpoMP2EBsFgFVia75F8FsXgE3iRfnj7FA7FKU6H42gW0CI/cC RoZVjBKpBckFxUnpuYZ5qeV6xYm5xaV56XrJ+bmbGMEx8ExqB+PBXe6HGAU4GJV4eBvE/cKE WBPLiitzDzFKcDArifAeeAcU4k1JrKxKLcqPLyrNSS0+xGgKdMBEZinR5HxgfOaVxBsam5ib GptamliYmFkqifNe2A/UJJCeWJKanZpakFoE08fEwSnVwKjaYWdtLjrRbanW3APlkbM27W1h 0tS1Zn3D7vvo7OQLjg82FhcKtR1aLD83/vVfdmN1mZwtrlG3Qq/cevnJ/ZG7leLTqlrNmb8v 6dccWGL4/+qjJVyTvLo65598Oudgnmdy9d62e/nnNfN28odO3Je9RXiTh93ZrY31t7v7xNZn OxRdutZkw6PEUpyRaKjFXFScCAC1sAI3lwIAAA== 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=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Acked-by: Lee Jones --- Resending with collected Reviwed-by, Acked-by tags. 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);