diff mbox

[v5,1/4] dt-bindings: mfd: s2mps11: add documentation for s2mps15 PMIC

Message ID 1446186334-16510-2-git-send-email-alim.akhtar@samsung.com
State Changes Requested, archived
Headers show

Commit Message

Alim Akhtar Oct. 30, 2015, 6:25 a.m. UTC
From: Thomas Abraham <thomas.ab@samsung.com>

Add dt-binding documentation for s2mps15 PMIC device. The s2mps15 device
is similar to s2mps11/14 PMIC device and has 27 LDO and 10 buck regulators.
This also supports RTC and three 32.768KHz clock outputs.

Cc: devicetree@vger.kernel.org
Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
---
 Documentation/devicetree/bindings/mfd/s2mps11.txt |   21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

Comments

Krzysztof Kozlowski Oct. 30, 2015, 7:42 a.m. UTC | #1
On 30.10.2015 15:25, Alim Akhtar wrote:
> From: Thomas Abraham <thomas.ab@samsung.com>
> 
> Add dt-binding documentation for s2mps15 PMIC device. The s2mps15 device
> is similar to s2mps11/14 PMIC device and has 27 LDO and 10 buck regulators.
> This also supports RTC and three 32.768KHz clock outputs.
> 
> Cc: devicetree@vger.kernel.org
> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
> ---
>  Documentation/devicetree/bindings/mfd/s2mps11.txt |   21 ++++++++++++++-------
>  1 file changed, 14 insertions(+), 7 deletions(-)
> 

Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>

Best regards,
Krzysztof

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alim Akhtar Oct. 30, 2015, 9:25 a.m. UTC | #2
On 10/30/2015 01:12 PM, Krzysztof Kozlowski wrote:
> On 30.10.2015 15:25, Alim Akhtar wrote:
>> From: Thomas Abraham <thomas.ab@samsung.com>
>>
>> Add dt-binding documentation for s2mps15 PMIC device. The s2mps15 device
>> is similar to s2mps11/14 PMIC device and has 27 LDO and 10 buck regulators.
>> This also supports RTC and three 32.768KHz clock outputs.
>>
>> Cc: devicetree@vger.kernel.org
>> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
>> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
>> ---
>>   Documentation/devicetree/bindings/mfd/s2mps11.txt |   21 ++++++++++++++-------
>>   1 file changed, 14 insertions(+), 7 deletions(-)
>>
>
> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
>
Thanks Krzysztof.

> Best regards,
> Krzysztof
>
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Lee Jones Oct. 30, 2015, 5:24 p.m. UTC | #3
On Fri, 30 Oct 2015, Alim Akhtar wrote:

> From: Thomas Abraham <thomas.ab@samsung.com>
> 
> Add dt-binding documentation for s2mps15 PMIC device. The s2mps15 device
> is similar to s2mps11/14 PMIC device and has 27 LDO and 10 buck regulators.
> This also supports RTC and three 32.768KHz clock outputs.
> 
> Cc: devicetree@vger.kernel.org
> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
> ---
>  Documentation/devicetree/bindings/mfd/s2mps11.txt |   21 ++++++++++++++-------
>  1 file changed, 14 insertions(+), 7 deletions(-)

Applied, thanks.

> diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Documentation/devicetree/bindings/mfd/s2mps11.txt
> index 890f0b0e1643..4c0543ceec25 100644
> --- a/Documentation/devicetree/bindings/mfd/s2mps11.txt
> +++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt
> @@ -1,5 +1,5 @@
>  
> -* Samsung S2MPS11, S2MPS13, S2MPS14 and S2MPU02 Voltage and Current Regulator
> +* Samsung S2MPS11/13/14/15 and S2MPU02 Voltage and Current Regulator
>  
>  The Samsung S2MPS11 is a multi-function device which includes voltage and
>  current regulators, RTC, charger controller and other sub-blocks. It is
> @@ -7,8 +7,12 @@ 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,s2mps11-pmic" or "samsung,s2mps13-pmic"
> -	      or "samsung,s2mps14-pmic" or "samsung,s2mpu02-pmic".
> +- compatible: Should be one of the following
> +	- "samsung,s2mps11-pmic"
> +	- "samsung,s2mps13-pmic"
> +	- "samsung,s2mps14-pmic"
> +	- "samsung,s2mps15-pmic"
> +	- "samsung,s2mpu02-pmic".
>  - reg: Specifies the I2C slave address of the pmic block. It should be 0x66.
>  
>  Optional properties:
> @@ -24,7 +28,7 @@ Optional properties:
>    unwanted buck warm reset (setting buck voltages to default values).
>  
>  Optional nodes:
> -- clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768
> +- clocks: s2mps11, s2mps13, s2mps15 and s5m8767 provide three(AP/CP/BT) buffered 32.768
>    KHz outputs, so to register these as clocks with common clock framework
>    instantiate a sub-node named "clocks". It uses the common clock binding
>    documented in :
> @@ -37,12 +41,13 @@ Optional nodes:
>      the clock which they consume.
>      Clock               ID           Devices
>      ----------------------------------------------------------
> -    32KhzAP		0            S2MPS11, S2MPS13, S2MPS14, S5M8767
> -    32KhzCP		1            S2MPS11, S2MPS13, S5M8767
> -    32KhzBT		2            S2MPS11, S2MPS13, S2MPS14, S5M8767
> +    32KhzAP		0            S2MPS11, S2MPS13, S2MPS14, S2MPS15, S5M8767
> +    32KhzCP		1            S2MPS11, S2MPS13, S2MPS15, S5M8767
> +    32KhzBT		2            S2MPS11, S2MPS13, S2MPS14, S2MPS15, S5M8767
>  
>    - compatible: Should be one of: "samsung,s2mps11-clk", "samsung,s2mps13-clk",
>  		"samsung,s2mps14-clk", "samsung,s5m8767-clk"
> +    The s2msp15 uses the same compatible as s2mps13, as both provides similar clocks.
>  
>  - regulators: The regulators of s2mps11 that have to be instantiated should be
>  included in a sub-node named 'regulators'. Regulator nodes included in this
> @@ -90,6 +95,7 @@ as per the datasheet of s2mps11.
>  			- S2MPS11: 1 to 38
>  			- S2MPS13: 1 to 40
>  			- S2MPS14: 1 to 25
> +			- S2MPS15: 1 to 27
>  			- S2MPU02: 1 to 28
>  		  - Example: LDO1, LDO2, LDO28
>  	- BUCKn
> @@ -97,6 +103,7 @@ as per the datasheet of s2mps11.
>  			- S2MPS11: 1 to 10
>  			- S2MPS13: 1 to 10
>  			- S2MPS14: 1 to 5
> +			- S2MPS15: 1 to 10
>  			- S2MPU02: 1 to 7
>  		  - Example: BUCK1, BUCK2, BUCK9
>
Rob Herring (Arm) Nov. 6, 2015, 10:33 p.m. UTC | #4
On Fri, Oct 30, 2015 at 11:55:31AM +0530, Alim Akhtar wrote:
> From: Thomas Abraham <thomas.ab@samsung.com>
> 
> Add dt-binding documentation for s2mps15 PMIC device. The s2mps15 device
> is similar to s2mps11/14 PMIC device and has 27 LDO and 10 buck regulators.
> This also supports RTC and three 32.768KHz clock outputs.
> 
> Cc: devicetree@vger.kernel.org
> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
> ---
>  Documentation/devicetree/bindings/mfd/s2mps11.txt |   21 ++++++++++++++-------
>  1 file changed, 14 insertions(+), 7 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Documentation/devicetree/bindings/mfd/s2mps11.txt
> index 890f0b0e1643..4c0543ceec25 100644
> --- a/Documentation/devicetree/bindings/mfd/s2mps11.txt
> +++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt
> @@ -1,5 +1,5 @@
>  
> -* Samsung S2MPS11, S2MPS13, S2MPS14 and S2MPU02 Voltage and Current Regulator
> +* Samsung S2MPS11/13/14/15 and S2MPU02 Voltage and Current Regulator
>  
>  The Samsung S2MPS11 is a multi-function device which includes voltage and
>  current regulators, RTC, charger controller and other sub-blocks. It is
> @@ -7,8 +7,12 @@ 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,s2mps11-pmic" or "samsung,s2mps13-pmic"
> -	      or "samsung,s2mps14-pmic" or "samsung,s2mpu02-pmic".
> +- compatible: Should be one of the following
> +	- "samsung,s2mps11-pmic"
> +	- "samsung,s2mps13-pmic"
> +	- "samsung,s2mps14-pmic"
> +	- "samsung,s2mps15-pmic"
> +	- "samsung,s2mpu02-pmic".
>  - reg: Specifies the I2C slave address of the pmic block. It should be 0x66.
>  
>  Optional properties:
> @@ -24,7 +28,7 @@ Optional properties:
>    unwanted buck warm reset (setting buck voltages to default values).
>  
>  Optional nodes:
> -- clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768
> +- clocks: s2mps11, s2mps13, s2mps15 and s5m8767 provide three(AP/CP/BT) buffered 32.768

s5m8767 doesn't seem to be documented. Can you please fix or remove.

Rob
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alim Akhtar Nov. 7, 2015, 1:11 a.m. UTC | #5
Hi Rob,

On Sat, Nov 7, 2015 at 4:03 AM, Rob Herring <robh@kernel.org> wrote:
> On Fri, Oct 30, 2015 at 11:55:31AM +0530, Alim Akhtar wrote:
>> From: Thomas Abraham <thomas.ab@samsung.com>
>>
>> Add dt-binding documentation for s2mps15 PMIC device. The s2mps15 device
>> is similar to s2mps11/14 PMIC device and has 27 LDO and 10 buck regulators.
>> This also supports RTC and three 32.768KHz clock outputs.
>>
>> Cc: devicetree@vger.kernel.org
>> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
>> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
>> ---
>>  Documentation/devicetree/bindings/mfd/s2mps11.txt |   21 ++++++++++++++-------
>>  1 file changed, 14 insertions(+), 7 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Documentation/devicetree/bindings/mfd/s2mps11.txt
>> index 890f0b0e1643..4c0543ceec25 100644
>> --- a/Documentation/devicetree/bindings/mfd/s2mps11.txt
>> +++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt
>> @@ -1,5 +1,5 @@
>>
>> -* Samsung S2MPS11, S2MPS13, S2MPS14 and S2MPU02 Voltage and Current Regulator
>> +* Samsung S2MPS11/13/14/15 and S2MPU02 Voltage and Current Regulator
>>
>>  The Samsung S2MPS11 is a multi-function device which includes voltage and
>>  current regulators, RTC, charger controller and other sub-blocks. It is
>> @@ -7,8 +7,12 @@ 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,s2mps11-pmic" or "samsung,s2mps13-pmic"
>> -           or "samsung,s2mps14-pmic" or "samsung,s2mpu02-pmic".
>> +- compatible: Should be one of the following
>> +     - "samsung,s2mps11-pmic"
>> +     - "samsung,s2mps13-pmic"
>> +     - "samsung,s2mps14-pmic"
>> +     - "samsung,s2mps15-pmic"
>> +     - "samsung,s2mpu02-pmic".
>>  - reg: Specifies the I2C slave address of the pmic block. It should be 0x66.
>>
>>  Optional properties:
>> @@ -24,7 +28,7 @@ Optional properties:
>>    unwanted buck warm reset (setting buck voltages to default values).
>>
>>  Optional nodes:
>> -- clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768
>> +- clocks: s2mps11, s2mps13, s2mps15 and s5m8767 provide three(AP/CP/BT) buffered 32.768
>
> s5m8767 doesn't seem to be documented. Can you please fix or remove.
>
Ok, will take a look.

> Rob
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Krzysztof Kozlowski Nov. 7, 2015, 3:09 a.m. UTC | #6
W dniu 07.11.2015 o 07:33, Rob Herring pisze:
> On Fri, Oct 30, 2015 at 11:55:31AM +0530, Alim Akhtar wrote:
>> From: Thomas Abraham <thomas.ab@samsung.com>
>>
>> Add dt-binding documentation for s2mps15 PMIC device. The s2mps15 device
>> is similar to s2mps11/14 PMIC device and has 27 LDO and 10 buck regulators.
>> This also supports RTC and three 32.768KHz clock outputs.
>>
>> Cc: devicetree@vger.kernel.org
>> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
>> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
>> ---
>>  Documentation/devicetree/bindings/mfd/s2mps11.txt |   21 ++++++++++++++-------
>>  1 file changed, 14 insertions(+), 7 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Documentation/devicetree/bindings/mfd/s2mps11.txt
>> index 890f0b0e1643..4c0543ceec25 100644
>> --- a/Documentation/devicetree/bindings/mfd/s2mps11.txt
>> +++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt
>> @@ -1,5 +1,5 @@
>>  
>> -* Samsung S2MPS11, S2MPS13, S2MPS14 and S2MPU02 Voltage and Current Regulator
>> +* Samsung S2MPS11/13/14/15 and S2MPU02 Voltage and Current Regulator
>>  
>>  The Samsung S2MPS11 is a multi-function device which includes voltage and
>>  current regulators, RTC, charger controller and other sub-blocks. It is
>> @@ -7,8 +7,12 @@ 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,s2mps11-pmic" or "samsung,s2mps13-pmic"
>> -	      or "samsung,s2mps14-pmic" or "samsung,s2mpu02-pmic".
>> +- compatible: Should be one of the following
>> +	- "samsung,s2mps11-pmic"
>> +	- "samsung,s2mps13-pmic"
>> +	- "samsung,s2mps14-pmic"
>> +	- "samsung,s2mps15-pmic"
>> +	- "samsung,s2mpu02-pmic".
>>  - reg: Specifies the I2C slave address of the pmic block. It should be 0x66.
>>  
>>  Optional properties:
>> @@ -24,7 +28,7 @@ Optional properties:
>>    unwanted buck warm reset (setting buck voltages to default values).
>>  
>>  Optional nodes:
>> -- clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768
>> +- clocks: s2mps11, s2mps13, s2mps15 and s5m8767 provide three(AP/CP/BT) buffered 32.768
> 
> s5m8767 doesn't seem to be documented. Can you please fix or remove.

What exactly do you have in mind?

The s5m8767-clk is already documented as part of clk-s2mps11.c driver:
Documentation/devicetree/bindings/mfd/s2mps11.txt

The main s5m8767 MFD driver is documented as part of regulator driver:
Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt

Yes, this may be confusing... They S2M and S5M family devices share:
 - main mfd driver,
 - rtc driver,
 - clk driver.

but regulator drivers are separate.

Best regards,
Krzysztof

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alim Akhtar Nov. 9, 2015, 5:54 a.m. UTC | #7
Hi Krzysztof,

On 11/07/2015 08:39 AM, Krzysztof Kozlowski wrote:
> W dniu 07.11.2015 o 07:33, Rob Herring pisze:
>> On Fri, Oct 30, 2015 at 11:55:31AM +0530, Alim Akhtar wrote:
>>> From: Thomas Abraham <thomas.ab@samsung.com>
>>>
>>> Add dt-binding documentation for s2mps15 PMIC device. The s2mps15 device
>>> is similar to s2mps11/14 PMIC device and has 27 LDO and 10 buck regulators.
>>> This also supports RTC and three 32.768KHz clock outputs.
>>>
>>> Cc: devicetree@vger.kernel.org
>>> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
>>> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
>>> ---
>>>   Documentation/devicetree/bindings/mfd/s2mps11.txt |   21 ++++++++++++++-------
>>>   1 file changed, 14 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Documentation/devicetree/bindings/mfd/s2mps11.txt
>>> index 890f0b0e1643..4c0543ceec25 100644
>>> --- a/Documentation/devicetree/bindings/mfd/s2mps11.txt
>>> +++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt
>>> @@ -1,5 +1,5 @@
>>>
>>> -* Samsung S2MPS11, S2MPS13, S2MPS14 and S2MPU02 Voltage and Current Regulator
>>> +* Samsung S2MPS11/13/14/15 and S2MPU02 Voltage and Current Regulator
>>>
>>>   The Samsung S2MPS11 is a multi-function device which includes voltage and
>>>   current regulators, RTC, charger controller and other sub-blocks. It is
>>> @@ -7,8 +7,12 @@ 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,s2mps11-pmic" or "samsung,s2mps13-pmic"
>>> -	      or "samsung,s2mps14-pmic" or "samsung,s2mpu02-pmic".
>>> +- compatible: Should be one of the following
>>> +	- "samsung,s2mps11-pmic"
>>> +	- "samsung,s2mps13-pmic"
>>> +	- "samsung,s2mps14-pmic"
>>> +	- "samsung,s2mps15-pmic"
>>> +	- "samsung,s2mpu02-pmic".
>>>   - reg: Specifies the I2C slave address of the pmic block. It should be 0x66.
>>>
>>>   Optional properties:
>>> @@ -24,7 +28,7 @@ Optional properties:
>>>     unwanted buck warm reset (setting buck voltages to default values).
>>>
>>>   Optional nodes:
>>> -- clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768
>>> +- clocks: s2mps11, s2mps13, s2mps15 and s5m8767 provide three(AP/CP/BT) buffered 32.768
>>
>> s5m8767 doesn't seem to be documented. Can you please fix or remove.
>
> What exactly do you have in mind?
>
> The s5m8767-clk is already documented as part of clk-s2mps11.c driver:
> Documentation/devicetree/bindings/mfd/s2mps11.txt
>
> The main s5m8767 MFD driver is documented as part of regulator driver:
> Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt
>
> Yes, this may be confusing... They S2M and S5M family devices share:
>   - main mfd driver,
>   - rtc driver,
>   - clk driver.
>
> but regulator drivers are separate.
>
Indeed things are documented but in very confusing manners, e.g. 
compatible name "samsung,s5m8767-pmic" belongs to MFD not regulator.
It should have being in */bindings/mfd/s2mps11.txt
Not sure if it make sense to change it though.

> Best regards,
> Krzysztof
>
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Krzysztof Kozlowski Nov. 9, 2015, 6:40 a.m. UTC | #8
On 09.11.2015 14:54, Alim Akhtar wrote:
> Hi Krzysztof,
> 
> On 11/07/2015 08:39 AM, Krzysztof Kozlowski wrote:
>> W dniu 07.11.2015 o 07:33, Rob Herring pisze:
>>> On Fri, Oct 30, 2015 at 11:55:31AM +0530, Alim Akhtar wrote:
>>>> From: Thomas Abraham <thomas.ab@samsung.com>
>>>>
>>>> Add dt-binding documentation for s2mps15 PMIC device. The s2mps15
>>>> device
>>>> is similar to s2mps11/14 PMIC device and has 27 LDO and 10 buck
>>>> regulators.
>>>> This also supports RTC and three 32.768KHz clock outputs.
>>>>
>>>> Cc: devicetree@vger.kernel.org
>>>> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
>>>> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
>>>> ---
>>>>   Documentation/devicetree/bindings/mfd/s2mps11.txt |   21
>>>> ++++++++++++++-------
>>>>   1 file changed, 14 insertions(+), 7 deletions(-)
>>>>
>>>> diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt
>>>> b/Documentation/devicetree/bindings/mfd/s2mps11.txt
>>>> index 890f0b0e1643..4c0543ceec25 100644
>>>> --- a/Documentation/devicetree/bindings/mfd/s2mps11.txt
>>>> +++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt
>>>> @@ -1,5 +1,5 @@
>>>>
>>>> -* Samsung S2MPS11, S2MPS13, S2MPS14 and S2MPU02 Voltage and Current
>>>> Regulator
>>>> +* Samsung S2MPS11/13/14/15 and S2MPU02 Voltage and Current Regulator
>>>>
>>>>   The Samsung S2MPS11 is a multi-function device which includes
>>>> voltage and
>>>>   current regulators, RTC, charger controller and other sub-blocks.
>>>> It is
>>>> @@ -7,8 +7,12 @@ 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,s2mps11-pmic" or
>>>> "samsung,s2mps13-pmic"
>>>> -          or "samsung,s2mps14-pmic" or "samsung,s2mpu02-pmic".
>>>> +- compatible: Should be one of the following
>>>> +    - "samsung,s2mps11-pmic"
>>>> +    - "samsung,s2mps13-pmic"
>>>> +    - "samsung,s2mps14-pmic"
>>>> +    - "samsung,s2mps15-pmic"
>>>> +    - "samsung,s2mpu02-pmic".
>>>>   - reg: Specifies the I2C slave address of the pmic block. It
>>>> should be 0x66.
>>>>
>>>>   Optional properties:
>>>> @@ -24,7 +28,7 @@ Optional properties:
>>>>     unwanted buck warm reset (setting buck voltages to default values).
>>>>
>>>>   Optional nodes:
>>>> -- clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT)
>>>> buffered 32.768
>>>> +- clocks: s2mps11, s2mps13, s2mps15 and s5m8767 provide
>>>> three(AP/CP/BT) buffered 32.768
>>>
>>> s5m8767 doesn't seem to be documented. Can you please fix or remove.
>>
>> What exactly do you have in mind?
>>
>> The s5m8767-clk is already documented as part of clk-s2mps11.c driver:
>> Documentation/devicetree/bindings/mfd/s2mps11.txt
>>
>> The main s5m8767 MFD driver is documented as part of regulator driver:
>> Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt
>>
>> Yes, this may be confusing... They S2M and S5M family devices share:
>>   - main mfd driver,
>>   - rtc driver,
>>   - clk driver.
>>
>> but regulator drivers are separate.
>>
> Indeed things are documented but in very confusing manners, e.g.
> compatible name "samsung,s5m8767-pmic" belongs to MFD not regulator.

The compatible itself belongs to MFD but in the same time the required
properties for regulator driver (which expects to be child of that
compatible) are stored next to it.

> It should have being in */bindings/mfd/s2mps11.txt
> Not sure if it make sense to change it though.

Then the naming would be confusing. :)

Actually I have it on my todo list to fix things up. Truth is that all
of these devices are tightly coupled.

Best regards,
Krzysztof

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Documentation/devicetree/bindings/mfd/s2mps11.txt
index 890f0b0e1643..4c0543ceec25 100644
--- a/Documentation/devicetree/bindings/mfd/s2mps11.txt
+++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt
@@ -1,5 +1,5 @@ 
 
-* Samsung S2MPS11, S2MPS13, S2MPS14 and S2MPU02 Voltage and Current Regulator
+* Samsung S2MPS11/13/14/15 and S2MPU02 Voltage and Current Regulator
 
 The Samsung S2MPS11 is a multi-function device which includes voltage and
 current regulators, RTC, charger controller and other sub-blocks. It is
@@ -7,8 +7,12 @@  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,s2mps11-pmic" or "samsung,s2mps13-pmic"
-	      or "samsung,s2mps14-pmic" or "samsung,s2mpu02-pmic".
+- compatible: Should be one of the following
+	- "samsung,s2mps11-pmic"
+	- "samsung,s2mps13-pmic"
+	- "samsung,s2mps14-pmic"
+	- "samsung,s2mps15-pmic"
+	- "samsung,s2mpu02-pmic".
 - reg: Specifies the I2C slave address of the pmic block. It should be 0x66.
 
 Optional properties:
@@ -24,7 +28,7 @@  Optional properties:
   unwanted buck warm reset (setting buck voltages to default values).
 
 Optional nodes:
-- clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768
+- clocks: s2mps11, s2mps13, s2mps15 and s5m8767 provide three(AP/CP/BT) buffered 32.768
   KHz outputs, so to register these as clocks with common clock framework
   instantiate a sub-node named "clocks". It uses the common clock binding
   documented in :
@@ -37,12 +41,13 @@  Optional nodes:
     the clock which they consume.
     Clock               ID           Devices
     ----------------------------------------------------------
-    32KhzAP		0            S2MPS11, S2MPS13, S2MPS14, S5M8767
-    32KhzCP		1            S2MPS11, S2MPS13, S5M8767
-    32KhzBT		2            S2MPS11, S2MPS13, S2MPS14, S5M8767
+    32KhzAP		0            S2MPS11, S2MPS13, S2MPS14, S2MPS15, S5M8767
+    32KhzCP		1            S2MPS11, S2MPS13, S2MPS15, S5M8767
+    32KhzBT		2            S2MPS11, S2MPS13, S2MPS14, S2MPS15, S5M8767
 
   - compatible: Should be one of: "samsung,s2mps11-clk", "samsung,s2mps13-clk",
 		"samsung,s2mps14-clk", "samsung,s5m8767-clk"
+    The s2msp15 uses the same compatible as s2mps13, as both provides similar clocks.
 
 - regulators: The regulators of s2mps11 that have to be instantiated should be
 included in a sub-node named 'regulators'. Regulator nodes included in this
@@ -90,6 +95,7 @@  as per the datasheet of s2mps11.
 			- S2MPS11: 1 to 38
 			- S2MPS13: 1 to 40
 			- S2MPS14: 1 to 25
+			- S2MPS15: 1 to 27
 			- S2MPU02: 1 to 28
 		  - Example: LDO1, LDO2, LDO28
 	- BUCKn
@@ -97,6 +103,7 @@  as per the datasheet of s2mps11.
 			- S2MPS11: 1 to 10
 			- S2MPS13: 1 to 10
 			- S2MPS14: 1 to 5
+			- S2MPS15: 1 to 10
 			- S2MPU02: 1 to 7
 		  - Example: BUCK1, BUCK2, BUCK9