From patchwork Fri Dec 4 01:10:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 7764411 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 4D2A89F350 for ; Fri, 4 Dec 2015 01:12:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 38041205BB for ; Fri, 4 Dec 2015 01:12:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D5957204E3 for ; Fri, 4 Dec 2015 01:12:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754351AbbLDBLr (ORCPT ); Thu, 3 Dec 2015 20:11:47 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:43718 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754320AbbLDBLn (ORCPT ); Thu, 3 Dec 2015 20:11:43 -0500 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NYT00DRJ7BGQ910@mailout1.w1.samsung.com>; Fri, 04 Dec 2015 01:11:40 +0000 (GMT) X-AuditID: cbfec7f4-f79026d00000418a-5c-5660e84c1941 Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id C1.B4.16778.C48E0665; Fri, 4 Dec 2015 01:11:40 +0000 (GMT) Received: from localhost.localdomain ([10.113.15.26]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NYT0091679DE590@eusync1.samsung.com>; Fri, 04 Dec 2015 01:11:40 +0000 (GMT) From: Krzysztof Kozlowski To: Sangbeom Kim , Krzysztof Kozlowski , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Lee Jones , Kukjin Kim , linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org, devicetree@vger.kernel.org, Michael Turquette , Stephen Boyd , Liam Girdwood , Mark Brown Cc: linux-clk@vger.kernel.org Subject: [PATCH 3/3] dt-bindings: regulator/mfd: Reorganize S2MPA01 bindings Date: Fri, 04 Dec 2015 10:10:05 +0900 Message-id: <1449191405-3344-4-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1449191405-3344-1-git-send-email-k.kozlowski@samsung.com> References: <1449191405-3344-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrOLMWRmVeSWpSXmKPExsVy+t/xy7o+LxLCDLYcFrKY+vAJm8X8I+dY LfrfLGS1OPdqJaPF6xeGFv2PXzNb3P96lNHi25UOJouPPfdYLS7vmsNmMeP8PiaLpdcvMllc POVqMWH6WhaL1r1H2C0urvjCZPHjTDeLg6DHmnlrGD3e32hl97jc18vksXPWXXaPlcu/sHls WtXJ5nHn2h42j74tqxg9Pm+SC+CM4rJJSc3JLEst0rdL4MqYsGcPW8Eth4rvczcwNjDuNOli 5OSQEDCRmNHwjxHCFpO4cG89WxcjF4eQwFJGic13z7BCOP8ZJf7MOMwMUsUmYCyxefkSNhBb ROAGi8Teq1ogNrOArMSO10/YQWxhAR+Jk2sXsYDYLAKqErtaTzCB2LwCbhKdS6awQ2yTkzh5 bDIriM0p4C5x6FMPUA0H0DI3iX/zhSYw8i5gZFjFKJpamlxQnJSea6hXnJhbXJqXrpecn7uJ ERLcX3YwLj5mdYhRgINRiYeXYVNCmBBrYllxZe4hRgkOZiUR3j+7gUK8KYmVValF+fFFpTmp xYcYpTlYlMR55+56HyIkkJ5YkpqdmlqQWgSTZeLglGpgVD0+qcb48EG2M1a82hkrI0Vuea4V u82n83X7vBWC6TcVw6+fPPFN9xFffBt/oLLekx9hK7mWvGr62xHaNd+1i0F24ZOvx112lVyL /t59MeXKaqvoK89c6z6xZ+guYLn66t2D0qgtyl92sdT3OsqFx3D1rF8TeffbZ2uVrqQs9s5f N6qtDnP5K7EUZyQaajEXFScCAP8YlipqAgAA 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 The mfd/s2mpa01.txt duplicates some of the information about bindings with old mfd/s2mps11.txt. Now common part exists entirely in mfd/samsung,sec-core.txt so: - add company prefix to file name (regulator/samsung,s2mpa01.txt), - remove duplicated information, - reorganize the contents to match style of regulator/samsung,s2mps11.txt. Signed-off-by: Krzysztof Kozlowski Acked-by: Mark Brown Acked-by: Rob Herring Acked-by: Lee Jones --- Documentation/devicetree/bindings/mfd/s2mpa01.txt | 90 ---------------------- .../devicetree/bindings/mfd/samsung,sec-core.txt | 4 +- .../bindings/regulator/samsung,s2mpa01.txt | 79 +++++++++++++++++++ 3 files changed, 82 insertions(+), 91 deletions(-) delete mode 100644 Documentation/devicetree/bindings/mfd/s2mpa01.txt create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mpa01.txt diff --git a/Documentation/devicetree/bindings/mfd/s2mpa01.txt b/Documentation/devicetree/bindings/mfd/s2mpa01.txt deleted file mode 100644 index c13d3d8c3947..000000000000 --- a/Documentation/devicetree/bindings/mfd/s2mpa01.txt +++ /dev/null @@ -1,90 +0,0 @@ - -* Samsung S2MPA01 Voltage and Current Regulator - -The Samsung S2MPA01 is a multi-function device which includes high -efficiency buck converters including Dual-Phase buck converter, various LDOs, -and an RTC. It is interfaced to the host controller using an I2C interface. -Each sub-block is addressed by the host system using different I2C slave -addresses. - -Required properties: -- compatible: Should be "samsung,s2mpa01-pmic". -- reg: Specifies the I2C slave address of the PMIC block. It should be 0x66. - -Optional properties: -- interrupt-parent: Specifies the phandle of the interrupt controller to which - the interrupts from s2mpa01 are delivered to. -- interrupts: An interrupt specifier for the sole interrupt generated by the - device. - -Optional nodes: -- regulators: The regulators of s2mpa01 that have to be instantiated should be - included in a sub-node named 'regulators'. Regulator nodes and constraints - included in this sub-node use the standard regulator bindings which are - documented elsewhere. - -Properties for BUCK regulator nodes: -- regulator-ramp-delay: ramp delay in uV/us. May be 6250, 12500 - (default), 25000, or 50000. May be 0 for disabling the ramp delay on - BUCK{1,2,3,4}. - - In the absence of the regulator-ramp-delay property, the default ramp - delay will be used. - - NOTE: Some BUCKs share the ramp rate setting i.e. same ramp value will be set - for a particular group of BUCKs. So provide same regulator-ramp-delay=. - - The following BUCKs share ramp settings: - * 1 and 6 - * 2 and 4 - * 8, 9, and 10 - -The following are the names of the regulators that the s2mpa01 PMIC block -supports. Note: The 'n' in LDOn and BUCKn represents the LDO or BUCK number -as per the datasheet of s2mpa01. - - - LDOn - - valid values for n are 1 to 26 - - Example: LDO1, LD02, LDO26 - - BUCKn - - valid values for n are 1 to 10. - - Example: BUCK1, BUCK2, BUCK9 - -Example: - - s2mpa01_pmic@66 { - compatible = "samsung,s2mpa01-pmic"; - reg = <0x66>; - - regulators { - ldo1_reg: LDO1 { - regulator-name = "VDD_ALIVE"; - regulator-min-microvolt = <1000000>; - regulator-max-microvolt = <1000000>; - }; - - ldo2_reg: LDO2 { - regulator-name = "VDDQ_MMC2"; - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; - regulator-always-on; - }; - - buck1_reg: BUCK1 { - regulator-name = "vdd_mif"; - regulator-min-microvolt = <950000>; - regulator-max-microvolt = <1350000>; - regulator-always-on; - regulator-boot-on; - }; - - buck2_reg: BUCK2 { - regulator-name = "vdd_arm"; - regulator-min-microvolt = <950000>; - regulator-max-microvolt = <1350000>; - regulator-always-on; - regulator-boot-on; - regulator-ramp-delay = <50000>; - }; - }; - }; diff --git a/Documentation/devicetree/bindings/mfd/samsung,sec-core.txt b/Documentation/devicetree/bindings/mfd/samsung,sec-core.txt index 4aeb95c82304..cdd079bfc287 100644 --- a/Documentation/devicetree/bindings/mfd/samsung,sec-core.txt +++ b/Documentation/devicetree/bindings/mfd/samsung,sec-core.txt @@ -4,7 +4,7 @@ Binding for Samsung S2M and S5M family multi-function device This is a part of device tree bindings for S2M and S5M family multi-function devices. -The Samsung S2MPS11/13/14/15, S2MPU02 and S5M8767 is a family +The Samsung S2MPA01, S2MPS11/13/14/15, S2MPU02 and S5M8767 is a family of multi-function devices which include voltage and current regulators, RTC, charger controller, clock outputs and other sub-blocks. It is interfaced to the host controller using an I2C interface. Each sub-block is usually @@ -13,6 +13,7 @@ addressed by the host system using different I2C slave addresses. This document describes bindings for main device node. Optional sub-blocks must be a sub-nodes to it. Bindings for them can be found in: + - bindings/regulator/samsung,s2mpa01.txt - bindings/regulator/samsung,s2mps11.txt - bindings/regulator/samsung,s5m8767.txt - bindings/clock/samsung,s2mps11.txt @@ -20,6 +21,7 @@ must be a sub-nodes to it. Bindings for them can be found in: Required properties: - compatible: Should be one of the following + - "samsung,s2mpa01-pmic", - "samsung,s2mps11-pmic", - "samsung,s2mps13-pmic", - "samsung,s2mps14-pmic", diff --git a/Documentation/devicetree/bindings/regulator/samsung,s2mpa01.txt b/Documentation/devicetree/bindings/regulator/samsung,s2mpa01.txt new file mode 100644 index 000000000000..bae3c7f838cf --- /dev/null +++ b/Documentation/devicetree/bindings/regulator/samsung,s2mpa01.txt @@ -0,0 +1,79 @@ +Binding for Samsung S2MPA01 regulator block +=========================================== + +This is a part of device tree bindings for S2M family multi-function devices. +More information can be found in bindings/mfd/sec-core.txt file. + +The S2MPA01 device provide buck and LDO regulators. + +To register these with regulator framework instantiate under main device node +a sub-node named "regulators" with more sub-nodes for each regulator using the +common regulator binding documented in: + - Documentation/devicetree/bindings/regulator/regulator.txt + + +Names of regulators supported by S2MPA01 device: + - LDOn + - valid values for n are 1 to 26 + - Example: LDO1, LD02, LDO26 + - BUCKn + - valid values for n are 1 to 10. + - Example: BUCK1, BUCK2, BUCK9 +Note: The 'n' in LDOn and BUCKn represents the LDO or BUCK number +as per the datasheet of device. + + +Optional properties of buck regulator nodes under "regulators" sub-node: + - regulator-ramp-delay: ramp delay in uV/us. May be 6250, 12500 + (default), 25000, or 50000. May be 0 for disabling the ramp delay on + BUCK{1,2,3,4}. + + In the absence of the regulator-ramp-delay property, the default ramp + delay will be used. + + Note: Some bucks share the ramp rate setting i.e. same ramp value + will be set for a particular group of bucks so provide the same + regulator-ramp-delay value for them. + Groups sharing ramp rate: + - buck{1,6}, + - buck{2,4}, + - buck{8,9,10}. + +Example: + + s2mpa01_pmic@66 { + compatible = "samsung,s2mpa01-pmic"; + reg = <0x66>; + + regulators { + ldo1_reg: LDO1 { + regulator-name = "VDD_ALIVE"; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + }; + + ldo2_reg: LDO2 { + regulator-name = "VDDQ_MMC2"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-always-on; + }; + + buck1_reg: BUCK1 { + regulator-name = "vdd_mif"; + regulator-min-microvolt = <950000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-boot-on; + }; + + buck2_reg: BUCK2 { + regulator-name = "vdd_arm"; + regulator-min-microvolt = <950000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-boot-on; + regulator-ramp-delay = <50000>; + }; + }; + };