From patchwork Mon Apr 14 08:09:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 3977781 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 03C369F2CC for ; Mon, 14 Apr 2014 08:10:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 332BD201DC for ; Mon, 14 Apr 2014 08:10:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 52AFD20170 for ; Mon, 14 Apr 2014 08:10:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754448AbaDNIJi (ORCPT ); Mon, 14 Apr 2014 04:09:38 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:49818 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751658AbaDNIJf (ORCPT ); Mon, 14 Apr 2014 04:09:35 -0400 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N40000GXHBOXU80@mailout4.w1.samsung.com>; Mon, 14 Apr 2014 09:09:24 +0100 (BST) X-AuditID: cbfec7f5-b7fc96d000004885-b9-534b97b61b26 Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 43.27.18565.6B79B435; Mon, 14 Apr 2014 09:09:26 +0100 (BST) Received: from AMDC1943.digital.local ([106.116.151.171]) by eusync2.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0N40001VMHBJ5Q70@eusync2.samsung.com>; Mon, 14 Apr 2014 09:09:26 +0100 (BST) From: Krzysztof Kozlowski To: Sangbeom Kim , Liam Girdwood , Mark Brown , Samuel Ortiz , Lee Jones , linux-kernel@vger.kernel.org, Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: Kyungmin Park , Marek Szyprowski , Bartlomiej Zolnierkiewicz , Tomasz Figa , Krzysztof Kozlowski Subject: [PATCH 4/4] regulator: s5m8767: Use same binding for external control as in s2mps11 Date: Mon, 14 Apr 2014 10:09:09 +0200 Message-id: <1397462949-22379-5-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.8.3.2 In-reply-to: <1397462949-22379-1-git-send-email-k.kozlowski@samsung.com> References: <1397462949-22379-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrHLMWRmVeSWpSXmKPExsVy+t/xK7rbpnsHG7x8pWOxccZ6VoupD5+w Wcw/co7Vov/NQlaLc69WMlq8fmFocbbpDbvF/a9HGS2+Xelgsri8aw6bxYzz+5gs1h65y26x 9PpFJosJ09eyWLTuPcJucbqb1eLiii9MFutnvGZxEPJYM28No8flvl4mj52z7rJ7rFz+hc1j 06pONo871/awecw7GejRt2UVo8fnTXIBnFFcNimpOZllqUX6dglcGZOXzmEs+CJQsbp/MVsD Yy9fFyMnh4SAicTB75PZIWwxiQv31rN1MXJxCAksZZS4uHABI4TTxyTxeuU+NpAqNgFjic3L l4BViQjcYJaYuGwXE0iCWeA5o8TT7+EgtrBAnMSrWSfAGlgEVCU6J90Aq+EVcJd4s3kLC8Q6 BYllX9YydzFycHAKeEi8uQlWLgRU8vX3LKYJjLwLGBlWMYqmliYXFCel5xrpFSfmFpfmpesl 5+duYoSE+dcdjEuPWR1iFOBgVOLh5djqGSzEmlhWXJl7iFGCg1lJhHdbhlewEG9KYmVValF+ fFFpTmrxIUYmDk6pBsazzg68z+VbnF/H3Y4NXSx5x3tnWWfn3A9GXfUak5QcDO/Pe7ygaD/D 1PVlDadsfGY3z1g9cfXuOWEsJVPiLxgqqZ+4fatmx6O3L1nsuOZz79mtO+M5o3GZqfbX6hfP nWWevzhYyvjmW+acqDs8i5NsQgO613097r1vY5VO2Bk/m4msub73Xp9WYinOSDTUYi4qTgQA YnYEflECAAA= 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.9 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 Change the binding for regulators external control to the same used in s2mps11 driver to be consistent. Signed-off-by: Krzysztof Kozlowski Cc: Tomasz Figa Cc: devicetree@vger.kernel.org Cc: Rob Herring Cc: Pawel Moll Cc: Mark Rutland Cc: Ian Campbell Cc: Kumar Gala --- Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt | 4 ++-- drivers/regulator/s5m8767.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt b/Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt index d290988ed975..558c80345ef0 100644 --- a/Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt +++ b/Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt @@ -76,7 +76,7 @@ except these properties: 1 - on in normal mode 2 - low power mode 3 - suspend mode - - s5m8767,pmic-ext-control-gpios: (optional) GPIO specifier for one + - samsung,ext-control-gpios: (optional) GPIO specifier for one GPIO controlling this regulator (enable/disable); This is valid only for buck9. @@ -157,7 +157,7 @@ Example: regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; op_mode = <3>; /* Standby Mode */ - s5m8767,pmic-ext-control-gpios = <&gpk0 2 0>; + samsung,ext-control-gpios = <&gpk0 2 0>; }; }; }; diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c index 92f19a005dc3..dbfd98b04a77 100644 --- a/drivers/regulator/s5m8767.c +++ b/drivers/regulator/s5m8767.c @@ -534,7 +534,7 @@ static void s5m8767_pmic_dt_parse_ext_control_gpio(struct sec_pmic_dev *iodev, struct device_node *reg_np) { rdata->ext_control_gpio = of_get_named_gpio(reg_np, - "s5m8767,pmic-ext-control-gpios", 0); + "samsung,ext-control-gpios", 0); if (!gpio_is_valid(rdata->ext_control_gpio)) rdata->ext_control_gpio = 0; }