diff mbox

[V3,2/4] clk: Combine DT binding doc for max77686 and max77802

Message ID 1466160667-28451-3-git-send-email-ldewangan@nvidia.com (mailing list archive)
State Accepted, archived
Delegated to: Stephen Boyd
Headers show

Commit Message

Laxman Dewangan June 17, 2016, 10:51 a.m. UTC
The clock IP used on the Maxim PMICs max77686 and max77802 are
same. The configuration of clock register is also same except
the number of clocks.

Define the common DT binding file for the clocks of Maxim PMICs
MAX77686 and MAX77802. For this, remove the separate DT binding
document file for maxim,max77802 and move all information to
maxim,max77686 DT binding document.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
CC: Krzysztof Kozlowski <k.kozlowski@samsung.com>
CC: Javier Martinez Canillas <javier@dowhile0.org>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>

---
Changes from V1:
- Rewrite description to remvoe ref to driver.
- Taken care of comment from Krzysztof on the supported clocks and
  DT bindings.

Changes from V2:
- Collected RBs.
---
 .../devicetree/bindings/clock/maxim,max77686.txt   | 82 ++++++++++++++++------
 .../devicetree/bindings/clock/maxim,max77802.txt   | 44 ------------
 2 files changed, 59 insertions(+), 67 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/clock/maxim,max77802.txt

Comments

Rob Herring June 20, 2016, 4:39 p.m. UTC | #1
On Fri, Jun 17, 2016 at 04:21:05PM +0530, Laxman Dewangan wrote:
> The clock IP used on the Maxim PMICs max77686 and max77802 are
> same. The configuration of clock register is also same except
> the number of clocks.
> 
> Define the common DT binding file for the clocks of Maxim PMICs
> MAX77686 and MAX77802. For this, remove the separate DT binding
> document file for maxim,max77802 and move all information to
> maxim,max77686 DT binding document.
> 
> Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
> CC: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> CC: Javier Martinez Canillas <javier@dowhile0.org>
> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
> 
> ---
> Changes from V1:
> - Rewrite description to remvoe ref to driver.
> - Taken care of comment from Krzysztof on the supported clocks and
>   DT bindings.
> 
> Changes from V2:
> - Collected RBs.
> ---
>  .../devicetree/bindings/clock/maxim,max77686.txt   | 82 ++++++++++++++++------
>  .../devicetree/bindings/clock/maxim,max77802.txt   | 44 ------------
>  2 files changed, 59 insertions(+), 67 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/clock/maxim,max77802.txt
> 
> diff --git a/Documentation/devicetree/bindings/clock/maxim,max77686.txt b/Documentation/devicetree/bindings/clock/maxim,max77686.txt
> index 9c40739..4d973b5 100644
> --- a/Documentation/devicetree/bindings/clock/maxim,max77686.txt
> +++ b/Documentation/devicetree/bindings/clock/maxim,max77686.txt
> @@ -1,11 +1,15 @@
> -Binding for Maxim MAX77686 32k clock generator block
> +Binding for Maxim MAX77686/MAX77802 32k clock generator block
>  
> -This is a part of device tree bindings of MAX77686 multi-function device.
> -More information can be found in bindings/mfd/max77686.txt file.
> +This is a part of device tree bindings of MAX77686/MAX77802 multi-function
> +device. More information can be found in bindings/mfd/max77686.txt file for
> +MAX77686 and bindings/mfd/max77802.txt for MAX77802.
>  
>  The MAX77686 contains three 32.768khz clock outputs that can be controlled
>  (gated/ungated) over I2C.
>  
> +The MAX77802 contains two 32.768khz clock outputs that can be controlled
> +(gated/ungated) over I2C.
> +
>  Following properties should be presend in main device node of the MFD chip.
>  
>  Required properties:

I'd expect to see compatible strings updated...

> @@ -17,30 +21,62 @@ Optional properties:
--
To unsubscribe from this list: send the line "unsubscribe linux-clk" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Laxman Dewangan June 21, 2016, 6:46 a.m. UTC | #2
On Monday 20 June 2016 10:09 PM, Rob Herring wrote:
> On Fri, Jun 17, 2016 at 04:21:05PM +0530, Laxman Dewangan wrote:
>> The clock IP used on the Maxim PMICs max77686 and max77802 are
>> same. The configuration of clock register is also same except
>> the number of clocks.
>>
>> Define the common DT binding file for the clocks of Maxim PMICs
>> MAX77686 and MAX77802. For this, remove the separate DT binding
>> document file for maxim,max77802 and move all information to
>> maxim,max77686 DT binding document.
>>
>> Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
>> CC: Krzysztof Kozlowski <k.kozlowski@samsung.com>
>> CC: Javier Martinez Canillas <javier@dowhile0.org>
>> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
>> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
>>
>> ---
>> Changes from V1:
>> - Rewrite description to remvoe ref to driver.
>> - Taken care of comment from Krzysztof on the supported clocks and
>>    DT bindings.
>>
>> Changes from V2:
>> - Collected RBs.
>> ---
>>   .../devicetree/bindings/clock/maxim,max77686.txt   | 82 ++++++++++++++++------
>>   .../devicetree/bindings/clock/maxim,max77802.txt   | 44 ------------
>>   2 files changed, 59 insertions(+), 67 deletions(-)
>>   delete mode 100644 Documentation/devicetree/bindings/clock/maxim,max77802.txt
>>
>> diff --git a/Documentation/devicetree/bindings/clock/maxim,max77686.txt b/Documentation/devicetree/bindings/clock/maxim,max77686.txt
>> index 9c40739..4d973b5 100644
>> --- a/Documentation/devicetree/bindings/clock/maxim,max77686.txt
>> +++ b/Documentation/devicetree/bindings/clock/maxim,max77686.txt
>> @@ -1,11 +1,15 @@
>> -Binding for Maxim MAX77686 32k clock generator block
>> +Binding for Maxim MAX77686/MAX77802 32k clock generator block
>>   
>> -This is a part of device tree bindings of MAX77686 multi-function device.
>> -More information can be found in bindings/mfd/max77686.txt file.
>> +This is a part of device tree bindings of MAX77686/MAX77802 multi-function
>> +device. More information can be found in bindings/mfd/max77686.txt file for
>> +MAX77686 and bindings/mfd/max77802.txt for MAX77802.
>>   
>>   The MAX77686 contains three 32.768khz clock outputs that can be controlled
>>   (gated/ungated) over I2C.
>>   
>> +The MAX77802 contains two 32.768khz clock outputs that can be controlled
>> +(gated/ungated) over I2C.
>> +
>>   Following properties should be presend in main device node of the MFD chip.
>>   
>>   Required properties:
> I'd expect to see compatible strings updated...
>

There is no separate compatible string for clock. The clock nodes is the 
parent node only and the compatible described in the parent DT binding doc.


Do we also need to add same thing here?


--
To unsubscribe from this list: send the line "unsubscribe linux-clk" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Laxman Dewangan June 28, 2016, 11:28 a.m. UTC | #3
Hi Rob,

On Tuesday 21 June 2016 12:16 PM, Laxman Dewangan wrote:
>
> On Monday 20 June 2016 10:09 PM, Rob Herring wrote:
>> On Fri, Jun 17, 2016 at 04:21:05PM +0530, Laxman Dewangan wrote:
>>>
>>> diff --git 
>>> a/Documentation/devicetree/bindings/clock/maxim,max77686.txt 
>>> b/Documentation/devicetree/bindings/clock/maxim,max77686.txt
>>> index 9c40739..4d973b5 100644
>>> --- a/Documentation/devicetree/bindings/clock/maxim,max77686.txt
>>> +++ b/Documentation/devicetree/bindings/clock/maxim,max77686.txt
>>> @@ -1,11 +1,15 @@
>>> -Binding for Maxim MAX77686 32k clock generator block
>>> +Binding for Maxim MAX77686/MAX77802 32k clock generator block
>>>   -This is a part of device tree bindings of MAX77686 multi-function 
>>> device.
>>> -More information can be found in bindings/mfd/max77686.txt file.
>>> +This is a part of device tree bindings of MAX77686/MAX77802 
>>> multi-function
>>> +device. More information can be found in bindings/mfd/max77686.txt 
>>> file for
>>> +MAX77686 and bindings/mfd/max77802.txt for MAX77802.
>>>     The MAX77686 contains three 32.768khz clock outputs that can be 
>>> controlled
>>>   (gated/ungated) over I2C.
>>>   +The MAX77802 contains two 32.768khz clock outputs that can be 
>>> controlled
>>> +(gated/ungated) over I2C.
>>> +
>>>   Following properties should be presend in main device node of the 
>>> MFD chip.
>>>     Required properties:
>> I'd expect to see compatible strings updated...
>>
>
> There is no separate compatible string for clock. The clock nodes is 
> the parent node only and the compatible described in the parent DT 
> binding doc.
>
>
> Do we also need to add same thing here?

Are you fine with the above? As there is no compatible string for clock 
(clock does not have separate node), do I still need to add explicitly here?

--
To unsubscribe from this list: send the line "unsubscribe linux-clk" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Laxman Dewangan Aug. 10, 2016, 9:40 a.m. UTC | #4
Hi,

On Tuesday 28 June 2016 04:58 PM, Laxman Dewangan wrote:
> Hi Rob,
>
> On Tuesday 21 June 2016 12:16 PM, Laxman Dewangan wrote:
>>
>> On Monday 20 June 2016 10:09 PM, Rob Herring wrote:
>>> On Fri, Jun 17, 2016 at 04:21:05PM +0530, Laxman Dewangan wrote:
>>>>
>>>>
>>>> +
>>>>   Following properties should be presend in main device node of the 
>>>> MFD chip.
>>>>     Required properties:
>>> I'd expect to see compatible strings updated...
>>>
>>
>> There is no separate compatible string for clock. The clock nodes is 
>> the parent node only and the compatible described in the parent DT 
>> binding doc.
>>
>>
>> Do we also need to add same thing here?
>
> Are you fine with the above? As there is no compatible string for 
> clock (clock does not have separate node), do I still need to add 
> explicitly here?
>


Can you please help here to review? If required, I can rebase and 
re-send the patches.


Thanks,
Laxman

--
To unsubscribe from this list: send the line "unsubscribe linux-clk" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rob Herring Aug. 10, 2016, 12:43 p.m. UTC | #5
On Wed, Aug 10, 2016 at 4:40 AM, Laxman Dewangan <ldewangan@nvidia.com> wrote:
> Hi,
>
> On Tuesday 28 June 2016 04:58 PM, Laxman Dewangan wrote:
>>
>> Hi Rob,
>>
>> On Tuesday 21 June 2016 12:16 PM, Laxman Dewangan wrote:
>>>
>>>
>>> On Monday 20 June 2016 10:09 PM, Rob Herring wrote:
>>>>
>>>> On Fri, Jun 17, 2016 at 04:21:05PM +0530, Laxman Dewangan wrote:
>>>>>
>>>>>
>>>>>
>>>>> +
>>>>>   Following properties should be presend in main device node of the MFD
>>>>> chip.
>>>>>     Required properties:
>>>>
>>>> I'd expect to see compatible strings updated...
>>>>
>>>
>>> There is no separate compatible string for clock. The clock nodes is the
>>> parent node only and the compatible described in the parent DT binding doc.
>>>
>>>
>>> Do we also need to add same thing here?
>>
>>
>> Are you fine with the above? As there is no compatible string for clock
>> (clock does not have separate node), do I still need to add explicitly here?
>>
>
>
> Can you please help here to review? If required, I can rebase and re-send
> the patches.

It is fine.

Acked-by: Rob Herring <robh@kernel.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-clk" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Stephen Boyd Aug. 15, 2016, 10:40 p.m. UTC | #6
On 06/17, Laxman Dewangan wrote:
> The clock IP used on the Maxim PMICs max77686 and max77802 are
> same. The configuration of clock register is also same except
> the number of clocks.
> 
> Define the common DT binding file for the clocks of Maxim PMICs
> MAX77686 and MAX77802. For this, remove the separate DT binding
> document file for maxim,max77802 and move all information to
> maxim,max77686 DT binding document.
> 
> Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
> CC: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> CC: Javier Martinez Canillas <javier@dowhile0.org>
> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
> 
> ---

Applied to clk-next
diff mbox

Patch

diff --git a/Documentation/devicetree/bindings/clock/maxim,max77686.txt b/Documentation/devicetree/bindings/clock/maxim,max77686.txt
index 9c40739..4d973b5 100644
--- a/Documentation/devicetree/bindings/clock/maxim,max77686.txt
+++ b/Documentation/devicetree/bindings/clock/maxim,max77686.txt
@@ -1,11 +1,15 @@ 
-Binding for Maxim MAX77686 32k clock generator block
+Binding for Maxim MAX77686/MAX77802 32k clock generator block
 
-This is a part of device tree bindings of MAX77686 multi-function device.
-More information can be found in bindings/mfd/max77686.txt file.
+This is a part of device tree bindings of MAX77686/MAX77802 multi-function
+device. More information can be found in bindings/mfd/max77686.txt file for
+MAX77686 and bindings/mfd/max77802.txt for MAX77802.
 
 The MAX77686 contains three 32.768khz clock outputs that can be controlled
 (gated/ungated) over I2C.
 
+The MAX77802 contains two 32.768khz clock outputs that can be controlled
+(gated/ungated) over I2C.
+
 Following properties should be presend in main device node of the MFD chip.
 
 Required properties:
@@ -17,30 +21,62 @@  Optional properties:
 
 Each clock is assigned an identifier and client nodes can use this identifier
 to specify the clock which they consume. Following indices are allowed:
-    - 0: 32khz_ap clock,
-    - 1: 32khz_cp clock,
-    - 2: 32khz_pmic clock.
+    - 0: 32khz_ap clock (max77686, max77802),
+    - 1: 32khz_cp clock (max77686, max77802),
+    - 2: 32khz_pmic clock (max77686).
 
 Clocks are defined as preprocessor macros in dt-bindings/clock/maxim,max77686.h
-header and can be used in device tree sources.
+header for MAX77686 and dt-bindings/clock/maxim,max77802.h for MAX77802 and can
+be used in device tree sources.
+
+Example:
+
+1. With MAX77686:
+
+#include <dt-bindings/clock/maxim,max77686.h>
+/* ... */
+
+	Node of the MFD chip
+		max77686: max77686@09 {
+			compatible = "maxim,max77686";
+			interrupt-parent = <&wakeup_eint>;
+			interrupts = <26 0>;
+			reg = <0x09>;
+			#clock-cells = <1>;
+
+			/* ... */
+		};
+
+	Clock consumer node
+
+		foo@0 {
+			compatible = "bar,foo";
+			/* ... */
+			clock-names = "my-clock";
+			clocks = <&max77686 MAX77686_CLK_PMIC>;
+		};
+
+2. With MAX77802:
 
-Example: Node of the MFD chip
+#include <dt-bindings/clock/maxim,max77802.h>
+/* ... */
 
-	max77686: max77686@09 {
-		compatible = "maxim,max77686";
-		interrupt-parent = <&wakeup_eint>;
-		interrupts = <26 0>;
-		reg = <0x09>;
-		#clock-cells = <1>;
+	Node of the MFD chip
+		max77802: max77802@09 {
+			compatible = "maxim,max77802";
+			interrupt-parent = <&wakeup_eint>;
+			interrupts = <26 0>;
+			reg = <0x09>;
+			#clock-cells = <1>;
 
-		/* ... */
-	};
+			/* ... */
+		};
 
-Example: Clock consumer node
+	Clock consumer node
 
-	foo@0 {
-		compatible = "bar,foo";
-		/* ... */
-		clock-names = "my-clock";
-		clocks = <&max77686 MAX77686_CLK_PMIC>;
-	};
+		foo@0 {
+			compatible = "bar,foo";
+			/* ... */
+			clock-names = "my-clock";
+			clocks = <&max77802 MAX77802_CLK_32K_AP>;
+		};
diff --git a/Documentation/devicetree/bindings/clock/maxim,max77802.txt b/Documentation/devicetree/bindings/clock/maxim,max77802.txt
deleted file mode 100644
index c6dc783..0000000
--- a/Documentation/devicetree/bindings/clock/maxim,max77802.txt
+++ /dev/null
@@ -1,44 +0,0 @@ 
-Binding for Maxim MAX77802 32k clock generator block
-
-This is a part of device tree bindings of MAX77802 multi-function device.
-More information can be found in bindings/mfd/max77802.txt file.
-
-The MAX77802 contains two 32.768khz clock outputs that can be controlled
-(gated/ungated) over I2C.
-
-Following properties should be present in main device node of the MFD chip.
-
-Required properties:
-- #clock-cells: From common clock binding; shall be set to 1.
-
-Optional properties:
-- clock-output-names: From common clock binding.
-
-Each clock is assigned an identifier and client nodes can use this identifier
-to specify the clock which they consume. Following indices are allowed:
-     - 0: 32khz_ap clock,
-     - 1: 32khz_cp clock.
-
-Clocks are defined as preprocessor macros in dt-bindings/clock/maxim,max77802.h
-header and can be used in device tree sources.
-
-Example: Node of the MFD chip
-
-	max77802: max77802@09 {
-		compatible = "maxim,max77802";
-		interrupt-parent = <&wakeup_eint>;
-		interrupts = <26 0>;
-		reg = <0x09>;
-		#clock-cells = <1>;
-
-		/* ... */
-	};
-
-Example: Clock consumer node
-
-	foo@0 {
-		compatible = "bar,foo";
-		/* ... */
-		clock-names = "my-clock";
-		clocks = <&max77802 MAX77802_CLK_32K_AP>;
-	};