[PATCH v2 0/2] omap4/twl6030: typical connection to omap4 as a separate dtsi file

[PATCH v2 0/2] omap4/twl6030: typical connection to omap4 as a separate dtsi file

[Ruslan Bilovol]

Hello,

There is no functional changes between v1 and v2 - just
added the patch for omap4-var-som - Uri Yosef confirmed
this board have the same connection of OMAP4<->TWL6030 as
SDP4430 board

Ruslan Bilovol (2):
  arm: dts: twl6030: typical connection to omap4 as a separate dtsi
    file
  arm: dts: omap4: configure connection to PMIC on Variscite's SOM

 arch/arm/boot/dts/omap4-panda-common.dtsi |   21 +---------------
 arch/arm/boot/dts/omap4-sdp.dts           |   21 +---------------
 arch/arm/boot/dts/omap4-var-som.dts       |    1 +
 arch/arm/boot/dts/twl6030_omap4.dtsi      |   38 +++++++++++++++++++++++++++++
 4 files changed, 41 insertions(+), 40 deletions(-)
 create mode 100644 arch/arm/boot/dts/twl6030_omap4.dtsi

-- 
1.7.9.5

[PATCH v2 1/2] arm: dts: twl6030: typical connection to omap4 as a separate dtsi file

[Ruslan Bilovol]

The OMAP4 SoC family uses specially-designed
PMIC (power management IC) companion chip for power
management needs: TWL6030/TWL6032.
Therefore there is a typical connection of PMIC to OMAP4
so we can figure it out into separate .dtsi file
and do not duplicate over board-specific files.

Tested on OMAP4 SDP board and compile-tested for Panda board

Signed-off-by: Ruslan Bilovol <ruslan.bilovol@ti.com>
---
 arch/arm/boot/dts/omap4-panda-common.dtsi |   21 +---------------
 arch/arm/boot/dts/omap4-sdp.dts           |   21 +---------------
 arch/arm/boot/dts/twl6030_omap4.dtsi      |   38 +++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 40 deletions(-)
 create mode 100644 arch/arm/boot/dts/twl6030_omap4.dtsi

diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
index faa95b5..d796302 100644
--- a/arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
@@ -109,23 +109,9 @@
 	};
 };
 
-&omap4_pmx_wkup {
-	pinctrl-names = "default";
-	pinctrl-0 = <
-			&twl6030_wkup_pins
-	>;
-
-	twl6030_wkup_pins: pinmux_twl6030_wkup_pins {
-		pinctrl-single,pins = <
-			0x14 (PIN_OUTPUT | MUX_MODE2)		/* fref_clk0_out.sys_drm_msecure */
-		>;
-	};
-};
-
 &omap4_pmx_core {
 	pinctrl-names = "default";
 	pinctrl-0 = <
-			&twl6030_pins
 			&twl6040_pins
 			&mcpdm_pins
 			&mcbsp1_pins
@@ -134,12 +120,6 @@
 			&hsusbb1_pins
 	>;
 
-	twl6030_pins: pinmux_twl6030_pins {
-		pinctrl-single,pins = <
-			0x15e (WAKEUP_EN | PIN_INPUT_PULLUP | MUX_MODE0)	/* sys_nirq1.sys_nirq1 */
-		>;
-	};
-
 	twl6040_pins: pinmux_twl6040_pins {
 		pinctrl-single,pins = <
 			0xe0 (PIN_OUTPUT | MUX_MODE3)	/* hdq_sio.gpio_127 */
@@ -265,6 +245,7 @@
 };
 
 #include "twl6030.dtsi"
+#include "twl6030_omap4.dtsi"
 
 &i2c2 {
 	pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index 7951b4e..91030c3 100644
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -142,23 +142,9 @@
 	};
 };
 
-&omap4_pmx_wkup {
-	pinctrl-names = "default";
-	pinctrl-0 = <
-			&twl6030_wkup_pins
-	>;
-
-	twl6030_wkup_pins: pinmux_twl6030_wkup_pins {
-		pinctrl-single,pins = <
-			0x14 (PIN_OUTPUT | MUX_MODE2)		/* fref_clk0_out.sys_drm_msecure */
-		>;
-	};
-};
-
 &omap4_pmx_core {
 	pinctrl-names = "default";
 	pinctrl-0 = <
-			&twl6030_pins
 			&twl6040_pins
 			&mcpdm_pins
 			&dmic_pins
@@ -193,12 +179,6 @@
 		>;
 	};
 
-	twl6030_pins: pinmux_twl6030_pins {
-		pinctrl-single,pins = <
-			0x15e (WAKEUP_EN | PIN_INPUT_PULLUP | MUX_MODE0)	/* sys_nirq1.sys_nirq1 */
-		>;
-	};
-
 	twl6040_pins: pinmux_twl6040_pins {
 		pinctrl-single,pins = <
 			0xe0 (PIN_OUTPUT | MUX_MODE3)		/* hdq_sio.gpio_127 */
@@ -337,6 +317,7 @@
 };
 
 #include "twl6030.dtsi"
+#include "twl6030_omap4.dtsi"
 
 &i2c2 {
 	pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/twl6030_omap4.dtsi b/arch/arm/boot/dts/twl6030_omap4.dtsi
new file mode 100644
index 0000000..a4fa570
--- /dev/null
+++ b/arch/arm/boot/dts/twl6030_omap4.dtsi
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+&twl {
+	/*
+	 * On most OMAP4 platforms, the twl6030 IRQ line is connected
+	 * to the SYS_NIRQ1 line on OMAP and the twl6030 MSECURE line is
+	 * connected to the fref_clk0_out.sys_drm_msecure line.
+	 * Therefore, configure the defaults for the SYS_NIRQ1 and
+	 * fref_clk0_out.sys_drm_msecure pins here.
+	 */
+	pinctrl-names = "default";
+	pinctrl-0 = <
+		&twl6030_pins
+		&twl6030_wkup_pins
+	>;
+};
+
+&omap4_pmx_wkup {
+	twl6030_wkup_pins: pinmux_twl6030_wkup_pins {
+		pinctrl-single,pins = <
+			0x14 (PIN_OUTPUT | MUX_MODE2)		/* fref_clk0_out.sys_drm_msecure */
+		>;
+	};
+};
+
+&omap4_pmx_core {
+	twl6030_pins: pinmux_twl6030_pins {
+		pinctrl-single,pins = <
+			0x15e (WAKEUP_EN | PIN_INPUT_PULLUP | MUX_MODE0)	/* sys_nirq1.sys_nirq1 */
+		>;
+	};
+};
-- 
1.7.9.5

[PATCH v2 2/2] arm: dts: omap4: configure connection to PMIC on Variscite's SOM

[Ruslan Bilovol]

Now when typical OMAP4 to PMIC connection is figured out
into separate .dtsi file, ve can configure properly OMAP4
pins connected to TWL6030 just including one.

Signed-off-by: Ruslan Bilovol <ruslan.bilovol@ti.com>
---
 arch/arm/boot/dts/omap4-var-som.dts |    1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/omap4-var-som.dts b/arch/arm/boot/dts/omap4-var-som.dts
index b41269e..6f0b763 100644
--- a/arch/arm/boot/dts/omap4-var-som.dts
+++ b/arch/arm/boot/dts/omap4-var-som.dts
@@ -40,6 +40,7 @@
 };
 
 #include "twl6030.dtsi"
+#include "twl6030_omap4.dtsi"
 
 &i2c2 {
 	clock-frequency = <400000>;
-- 
1.7.9.5

[PATCH v2 0/2] omap4/twl6030: typical connection to omap4 as a separate dtsi file

[Benoit Cousson]

Hi Ruslan,

On 14/08/2013 10:35, Ruslan Bilovol wrote:
> Hello,
>
> There is no functional changes between v1 and v2 - just
> added the patch for omap4-var-som - Uri Yosef confirmed
> this board have the same connection of OMAP4<->TWL6030 as
> SDP4430 board

The series looks good to me, but it will be good to have a test for 
Panda and Variscite boards before merging it.

Regards,
Benoit

[PATCH v2 0/2] omap4/twl6030: typical connection to omap4 as a separate dtsi file

[Ruslan Bilovol]

Hi Benoit,

On Wed, Aug 14, 2013 at 4:51 PM, Benoit Cousson <bcousson@baylibre.com> wrote:
> Hi Ruslan,
>
> On 14/08/2013 10:35, Ruslan Bilovol wrote:
>>
>> Hello,
>>
>> There is no functional changes between v1 and v2 - just
>> added the patch for omap4-var-som - Uri Yosef confirmed
>> this board have the same connection of OMAP4<->TWL6030 as
>> SDP4430 board
>
>
> The series looks good to me, but it will be good to have a test for Panda
> and Variscite boards before merging it.

Okay, so I just verified this patch series on PandaBoard ES2. Should I
resubmit this series with
fixed commit message?
However I cannot verify the patch for Variscite board because I do not
own any such board so
you can drop that patch. But maybe Uri Yosef can verify it. Uri?

>
> Regards,
> Benoit

-- 
Best regards,
Ruslan Bilvol

[PATCH v2 0/2] omap4/twl6030: typical connection to omap4 as a separate dtsi file

[Benoit Cousson]

Hi Uri,

On 16/08/2013 14:30, Uri Yosef wrote:
> Hi,
>
> I am on vacation until Aug 25th, I will test it when I back.

OK, but it will be too late for this merge window. I'll drop it for 3.12 
then.

Thanks,
Benoit

>
> Regards,
> Uri Yosef
>
>
> On Fri, Aug 16, 2013 at 3:04 PM, Ruslan Bilovol <ruslan.bilovol@ti.com
> <mailto:ruslan.bilovol@ti.com>> wrote:
>
>     Hi Benoit,
>
>     On Wed, Aug 14, 2013 <tel:2013> at 4:51 PM, Benoit Cousson
>     <bcousson at baylibre.com <mailto:bcousson@baylibre.com>> wrote:
>      > Hi Ruslan,
>      >
>      > On 14/08/2013 10:35, Ruslan Bilovol wrote:
>      >>
>      >> Hello,
>      >>
>      >> There is no functional changes between v1 and v2 - just
>      >> added the patch for omap4-var-som - Uri Yosef confirmed
>      >> this board have the same connection of OMAP4<->TWL6030 as
>      >> SDP4430 board
>      >
>      >
>      > The series looks good to me, but it will be good to have a test
>     for Panda
>      > and Variscite boards before merging it.
>
>     Okay, so I just verified this patch series on PandaBoard ES2. Should I
>     resubmit this series with
>     fixed commit message?
>     However I cannot verify the patch for Variscite board because I do not
>     own any such board so
>     you can drop that patch. But maybe Uri Yosef can verify it. Uri?
>
>      >
>      > Regards,
>      > Benoit
>
>     --
>     Best regards,
>     Ruslan Bilvol
>
>

[PATCH v2 0/2] omap4/twl6030: typical connection to omap4 as a separate dtsi file

[Benoit Cousson]

Hi Ruslan,

On 16/08/2013 14:04, Ruslan Bilovol wrote:
> Hi Benoit,
> 
> On Wed, Aug 14, 2013 at 4:51 PM, Benoit Cousson <bcousson@baylibre.com> wrote:
>> Hi Ruslan,
>>
>> On 14/08/2013 10:35, Ruslan Bilovol wrote:
>>>
>>> Hello,
>>>
>>> There is no functional changes between v1 and v2 - just
>>> added the patch for omap4-var-som - Uri Yosef confirmed
>>> this board have the same connection of OMAP4<->TWL6030 as
>>> SDP4430 board
>>
>>
>> The series looks good to me, but it will be good to have a test for Panda
>> and Variscite boards before merging it.
> 
> Okay, so I just verified this patch series on PandaBoard ES2. Should I
> resubmit this series with
> fixed commit message?

No, that's fine, I already applied it and fixed the subject and the changelog.

Here it is:

commit 2e25df1e5a4af906a9b25332719ace000063eb0d
Author: Ruslan Bilovol <ruslan.bilovol@ti.com>
Date:   Wed Aug 14 11:35:47 2013 +0300

    ARM: dts: twl6030: Move common configuration for OMAP4 boards in a separate dtsi file
    
    The OMAP4 SoC family uses specially-designed PMIC (power management IC)
    companion chip for power management needs: TWL6030/TWL6032.
    Therefore there is a typical connection of PMIC to OMAP4 so we can
    move it into separate .dtsi file and do not duplicate over
    board-specific files.
    
    Tested on OMAP4 SDP board and compile-tested for Panda board
    
    Signed-off-by: Ruslan Bilovol <ruslan.bilovol@ti.com>
    Signed-off-by: Benoit Cousson <bcousson@baylibre.com>


Just let me know if you are OK with the updated version.

> However I cannot verify the patch for Variscite board because I do not
> own any such board so
> you can drop that patch. But maybe Uri Yosef can verify it. Uri?

It seems that Uri cannot test it right now, so I will have to drop that one.

Thanks,
Benoit

[PATCH v2 0/2] omap4/twl6030: typical connection to omap4 as a separate dtsi file

[Ruslan Bilovol]

Hi Benoit,

On Fri, Aug 16, 2013 at 4:20 PM, Benoit Cousson <bcousson@baylibre.com> wrote:
> Hi Ruslan,
>
> On 16/08/2013 14:04, Ruslan Bilovol wrote:
>> Hi Benoit,
>>
>> On Wed, Aug 14, 2013 at 4:51 PM, Benoit Cousson <bcousson@baylibre.com> wrote:
>>> Hi Ruslan,
>>>
>>> On 14/08/2013 10:35, Ruslan Bilovol wrote:
>>>>
>>>> Hello,
>>>>
>>>> There is no functional changes between v1 and v2 - just
>>>> added the patch for omap4-var-som - Uri Yosef confirmed
>>>> this board have the same connection of OMAP4<->TWL6030 as
>>>> SDP4430 board
>>>
>>>
>>> The series looks good to me, but it will be good to have a test for Panda
>>> and Variscite boards before merging it.
>>
>> Okay, so I just verified this patch series on PandaBoard ES2. Should I
>> resubmit this series with
>> fixed commit message?
>
> No, that's fine, I already applied it and fixed the subject and the changelog.
>
> Here it is:
>
> commit 2e25df1e5a4af906a9b25332719ace000063eb0d
> Author: Ruslan Bilovol <ruslan.bilovol@ti.com>
> Date:   Wed Aug 14 11:35:47 2013 +0300
>
>     ARM: dts: twl6030: Move common configuration for OMAP4 boards in a separate dtsi file
>
>     The OMAP4 SoC family uses specially-designed PMIC (power management IC)
>     companion chip for power management needs: TWL6030/TWL6032.
>     Therefore there is a typical connection of PMIC to OMAP4 so we can
>     move it into separate .dtsi file and do not duplicate over
>     board-specific files.
>
>     Tested on OMAP4 SDP board and compile-tested for Panda board

Just for archives: I've successfully tested it on PandaBoard ES2 last
week as well.

>
>     Signed-off-by: Ruslan Bilovol <ruslan.bilovol@ti.com>
>     Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
>
>
> Just let me know if you are OK with the updated version.

Yes, this version looks good to me. Thanks for picking it up!

>
>> However I cannot verify the patch for Variscite board because I do not
>> own any such board so
>> you can drop that patch. But maybe Uri Yosef can verify it. Uri?
>
> It seems that Uri cannot test it right now, so I will have to drop that one.

Okay, let's wait for Uri's verification.

Best regards,
Ruslan

>
> Thanks,
> Benoit
>
>

[PATCH v2 0/2] omap4/twl6030: typical connection to omap4 as a separate dtsi file

[Benoit Cousson]

Hi Ruslan,

On 19/08/2013 08:14, Ruslan Bilovol wrote:
> Hi Benoit,
>
> On Fri, Aug 16, 2013 at 4:20 PM, Benoit Cousson <bcousson@baylibre.com> wrote:
>> Hi Ruslan,
>>
>> On 16/08/2013 14:04, Ruslan Bilovol wrote:
>>> Hi Benoit,
>>>
>>> On Wed, Aug 14, 2013 at 4:51 PM, Benoit Cousson <bcousson@baylibre.com> wrote:
>>>> Hi Ruslan,
>>>>
>>>> On 14/08/2013 10:35, Ruslan Bilovol wrote:
>>>>>
>>>>> Hello,
>>>>>
>>>>> There is no functional changes between v1 and v2 - just
>>>>> added the patch for omap4-var-som - Uri Yosef confirmed
>>>>> this board have the same connection of OMAP4<->TWL6030 as
>>>>> SDP4430 board
>>>>
>>>>
>>>> The series looks good to me, but it will be good to have a test for Panda
>>>> and Variscite boards before merging it.
>>>
>>> Okay, so I just verified this patch series on PandaBoard ES2. Should I
>>> resubmit this series with
>>> fixed commit message?
>>
>> No, that's fine, I already applied it and fixed the subject and the changelog.
>>
>> Here it is:
>>
>> commit 2e25df1e5a4af906a9b25332719ace000063eb0d
>> Author: Ruslan Bilovol <ruslan.bilovol@ti.com>
>> Date:   Wed Aug 14 11:35:47 2013 +0300
>>
>>      ARM: dts: twl6030: Move common configuration for OMAP4 boards in a separate dtsi file
>>
>>      The OMAP4 SoC family uses specially-designed PMIC (power management IC)
>>      companion chip for power management needs: TWL6030/TWL6032.
>>      Therefore there is a typical connection of PMIC to OMAP4 so we can
>>      move it into separate .dtsi file and do not duplicate over
>>      board-specific files.
>>
>>      Tested on OMAP4 SDP board and compile-tested for Panda board
>
> Just for archives: I've successfully tested it on PandaBoard ES2 last
> week as well.

Great, I'll update the changelog before pushing it.

>>      Signed-off-by: Ruslan Bilovol <ruslan.bilovol@ti.com>
>>      Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
>>
>>
>> Just let me know if you are OK with the updated version.
>
> Yes, this version looks good to me. Thanks for picking it up!
>
>>
>>> However I cannot verify the patch for Variscite board because I do not
>>> own any such board so
>>> you can drop that patch. But maybe Uri Yosef can verify it. Uri?
>>
>> It seems that Uri cannot test it right now, so I will have to drop that one.
>
> Okay, let's wait for Uri's verification.

I'll keep it for 3.13.

Thanks,
Benoit