[PATCH v3 0/3] ARM: OMAP2+: wkup_m3_rproc support patches

[PATCH v3 0/3] ARM: OMAP2+: wkup_m3_rproc support patches

[Dave Gerlach]

This series adds the mach-omap2 code and DT nodes for v3 of the
wkup_m3_rproc driver submitted here [1]. pdata-quirks patch requires
the pdata added with patch 4 of the aforementioned series. Based on
previous discussion here [2], the wkup_m3 DT node has been moved as a
child of the l4_wkup as is done for l4_wkup components in Tero Kristo's
series "PRCM+SCM cleanup against 4.0-rc1" found here [3]. Because of that,
this series applies cleanly on top of that series in order to leverage the
l4_wkup parent node introduced there.

In addition to the move of the wkup_m3 node for am33xx, a new patch
has been added to introduce the wkup_m3 node in the same fashion for
am43xx as both SoCs use the same configuration. With this change
support was also added to pdata-quirks for passing reset handlers to
the driver for the am43xx binding as was already done for am33xx.

I have pushed a branch containing all patches for am335x suspend
here for a big picture view of how all patches fit together with
these wkup_m3_rproc series [4].

v2->v3:
-Change ti,am3353-wkup-m3 compat to ti,am3352-wkup-m3 to reflect
 binding documentation change
-Add ti,am4372-wkup-m3 node to am4372 SoC dt file
-Add am4372 support to pdata-quirks for reset handlers

Regards,
Dave

[1] https://www.mail-archive.com/linux-omap at vger.kernel.org/msg115869.html
[2] http://www.spinics.net/lists/linux-omap/msg116366.html
[3] http://www.spinics.net/lists/arm-kernel/msg409842.html
[4] https://github.com/dgerlach/linux-pm/tree/pm-v4.0-rc5-am335x-suspend

Dave Gerlach (1):
  ARM: OMAP2+: Use pdata-quirks for wkup_m3 reset management

Suman Anna (2):
  ARM: dts: AM33xx: Update and move wkup_m3 node to l4 node
  ARM: dts: AM4372: Add the wkupm3 rproc node

 arch/arm/boot/dts/am33xx.dtsi      | 17 +++++++++--------
 arch/arm/boot/dts/am4372.dtsi      |  9 +++++++++
 arch/arm/mach-omap2/pdata-quirks.c | 15 +++++++++++++++
 3 files changed, 33 insertions(+), 8 deletions(-)

-- 
2.3.0

[PATCH v3 1/3] ARM: OMAP2+: Use pdata-quirks for wkup_m3 reset management

[Dave Gerlach]

Use pdata-quirks to provide platform data required for reset
management during boot and shutdown of the wkup_m3 processor
on both the AM33xx and AM43xx SoCs. The WkupM3 remote processor
is used to implement and achieve low-power functionality on
the AM33xx & AM43xx SoCs.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
---
 arch/arm/mach-omap2/pdata-quirks.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index e642b07..7b4a4c1 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -18,6 +18,7 @@
 
 #include <linux/platform_data/pinctrl-single.h>
 #include <linux/platform_data/iommu-omap.h>
+#include <linux/platform_data/wkup_m3.h>
 
 #include "common.h"
 #include "common-board-devices.h"
@@ -314,6 +315,14 @@ static struct iommu_platform_data omap4_iommu_pdata = {
 };
 #endif
 
+#if defined(CONFIG_SOC_AM33XX) || defined(CONFIG_SOC_AM43XX)
+static struct wkup_m3_platform_data wkup_m3_data = {
+	.reset_name = "wkup_m3",
+	.assert_reset = omap_device_assert_hardreset,
+	.deassert_reset = omap_device_deassert_hardreset,
+};
+#endif
+
 #ifdef CONFIG_SOC_AM33XX
 static void __init am335x_evmsk_legacy_init(void)
 {
@@ -383,6 +392,10 @@ struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
 	OF_DEV_AUXDATA("ti,am3517-emac", 0x5c000000, "davinci_emac.0",
 		       &am35xx_emac_pdata),
 #endif
+#ifdef CONFIG_SOC_AM33XX
+	OF_DEV_AUXDATA("ti,am3352-wkup-m3", 0x44d00000, "44d00000.wkup_m3",
+		       &wkup_m3_data),
+#endif
 #ifdef CONFIG_ARCH_OMAP4
 	OF_DEV_AUXDATA("ti,omap4-padconf", 0x4a100040, "4a100040.pinmux", &pcs_pdata),
 	OF_DEV_AUXDATA("ti,omap4-padconf", 0x4a31e040, "4a31e040.pinmux", &pcs_pdata),
@@ -396,6 +409,8 @@ struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
 #endif
 #ifdef CONFIG_SOC_AM43XX
 	OF_DEV_AUXDATA("ti,am437-padconf", 0x44e10800, "44e10800.pinmux", &pcs_pdata),
+	OF_DEV_AUXDATA("ti,am4372-wkup-m3", 0x44d00000, "44d00000.wkup_m3",
+		       &wkup_m3_data),
 #endif
 #if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)
 	OF_DEV_AUXDATA("ti,omap4-iommu", 0x4a066000, "4a066000.mmu",
-- 
2.3.0

[PATCH v3 2/3] ARM: dts: AM33xx: Update and move wkup_m3 node to l4 node

[Dave Gerlach]

From: Suman Anna <s-anna@ti.com>

The WakeupM3 remote processor device node has been moved to
be a child node of the newly created l4_wkup node, to reflect
its presence properly within the SoC. The node was added
previously before any driver support, it is now updated as
per the wkup_m3_rproc bindings added alongside the driver
support.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
---
 arch/arm/boot/dts/am33xx.dtsi | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 21fcc44..4c1b4a8 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -103,6 +103,15 @@
 			#size-cells = <1>;
 			ranges = <0 0x44c00000 0x280000>;
 
+			wkup_m3: wkup_m3 at 100000 {
+				compatible = "ti,am3352-wkup-m3";
+				reg = <0x100000 0x4000>,
+				      <0x180000	0x2000>;
+				reg-names = "umem", "dmem";
+				ti,hwmods = "wkup_m3";
+				ti,pm-firmware = "am335x-pm-firmware.elf";
+			};
+
 			prcm: prcm at 200000 {
 				compatible = "ti,am3-prcm";
 				reg = <0x200000 0x4000>;
@@ -762,14 +771,6 @@
 			reg = <0x40300000 0x10000>; /* 64k */
 		};
 
-		wkup_m3: wkup_m3 at 44d00000 {
-			compatible = "ti,am3353-wkup-m3";
-			reg = <0x44d00000 0x4000	/* M3 UMEM */
-			       0x44d80000 0x2000>;	/* M3 DMEM */
-			ti,hwmods = "wkup_m3";
-			ti,no-reset-on-init;
-		};
-
 		elm: elm at 48080000 {
 			compatible = "ti,am3352-elm";
 			reg = <0x48080000 0x2000>;
-- 
2.3.0

[PATCH v3 3/3] ARM: dts: AM4372: Add the wkupm3 rproc node

[Dave Gerlach]

From: Suman Anna <s-anna@ti.com>

Add the Wakeup M3 remote processor device node for
the AM4372 SoC. The WkupM3 remote processor is used
to implement and achieve low-power functionality on
the AM33xx & AM43xx SoCs.

This node is added as a child of the recently added
l4_wkup node to reflect its presence within the SoC.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
---
 arch/arm/boot/dts/am4372.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index f8a02a2..821bb772 100644
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -74,6 +74,15 @@
 			#size-cells = <1>;
 			ranges = <0 0x44c00000 0x287000>;
 
+			wkup_m3: wkup_m3 at 100000 {
+				compatible = "ti,am4372-wkup-m3";
+				reg = <0x100000 0x4000>,
+				      <0x180000	0x2000>;
+				reg-names = "umem", "dmem";
+				ti,hwmods = "wkup_m3";
+				ti,pm-firmware = "am335x-pm-firmware.elf";
+			};
+
 			prcm: prcm at 1f0000 {
 				compatible = "ti,am4-prcm";
 				reg = <0x1f0000 0x11000>;
-- 
2.3.0

[PATCH v3 0/3] ARM: OMAP2+: wkup_m3_rproc support patches

[Dave Gerlach]

Tony,
On 04/01/2015 02:47 PM, Dave Gerlach wrote:
> This series adds the mach-omap2 code and DT nodes for v3 of the
> wkup_m3_rproc driver submitted here [1]. pdata-quirks patch requires
> the pdata added with patch 4 of the aforementioned series. Based on
> previous discussion here [2], the wkup_m3 DT node has been moved as a
> child of the l4_wkup as is done for l4_wkup components in Tero Kristo's
> series "PRCM+SCM cleanup against 4.0-rc1" found here [3]. Because of that,
> this series applies cleanly on top of that series in order to leverage the
> l4_wkup parent node introduced there.
> 
> In addition to the move of the wkup_m3 node for am33xx, a new patch
> has been added to introduce the wkup_m3 node in the same fashion for
> am43xx as both SoCs use the same configuration. With this change
> support was also added to pdata-quirks for passing reset handlers to
> the driver for the am43xx binding as was already done for am33xx.
> 
> I have pushed a branch containing all patches for am335x suspend
> here for a big picture view of how all patches fit together with
> these wkup_m3_rproc series [4].
> 
> v2->v3:
> -Change ti,am3353-wkup-m3 compat to ti,am3352-wkup-m3 to reflect
>  binding documentation change
> -Add ti,am4372-wkup-m3 node to am4372 SoC dt file
> -Add am4372 support to pdata-quirks for reset handlers

Now that Ohad has sent a pull request for the wkup_m3_rproc driver [1] and it
has been merged is it possible for this series with the DT nodes and pdata-quirk
to get picked up? Let me know and I can rebase and resend if you'd like.

Regards,
Dave

[1] https://lkml.org/lkml/2015/7/1/354

> 
> Regards,
> Dave
> 
> [1] https://www.mail-archive.com/linux-omap at vger.kernel.org/msg115869.html
> [2] http://www.spinics.net/lists/linux-omap/msg116366.html
> [3] http://www.spinics.net/lists/arm-kernel/msg409842.html
> [4] https://github.com/dgerlach/linux-pm/tree/pm-v4.0-rc5-am335x-suspend
> 
> Dave Gerlach (1):
>   ARM: OMAP2+: Use pdata-quirks for wkup_m3 reset management
> 
> Suman Anna (2):
>   ARM: dts: AM33xx: Update and move wkup_m3 node to l4 node
>   ARM: dts: AM4372: Add the wkupm3 rproc node
> 
>  arch/arm/boot/dts/am33xx.dtsi      | 17 +++++++++--------
>  arch/arm/boot/dts/am4372.dtsi      |  9 +++++++++
>  arch/arm/mach-omap2/pdata-quirks.c | 15 +++++++++++++++
>  3 files changed, 33 insertions(+), 8 deletions(-)
> 

[PATCH v3 0/3] ARM: OMAP2+: wkup_m3_rproc support patches

[Tony Lindgren]

* Dave Gerlach <d-gerlach@ti.com> [150709 12:53]:
> Tony,
> On 04/01/2015 02:47 PM, Dave Gerlach wrote:
> > This series adds the mach-omap2 code and DT nodes for v3 of the
> > wkup_m3_rproc driver submitted here [1]. pdata-quirks patch requires
> > the pdata added with patch 4 of the aforementioned series. Based on
> > previous discussion here [2], the wkup_m3 DT node has been moved as a
> > child of the l4_wkup as is done for l4_wkup components in Tero Kristo's
> > series "PRCM+SCM cleanup against 4.0-rc1" found here [3]. Because of that,
> > this series applies cleanly on top of that series in order to leverage the
> > l4_wkup parent node introduced there.
> > 
> > In addition to the move of the wkup_m3 node for am33xx, a new patch
> > has been added to introduce the wkup_m3 node in the same fashion for
> > am43xx as both SoCs use the same configuration. With this change
> > support was also added to pdata-quirks for passing reset handlers to
> > the driver for the am43xx binding as was already done for am33xx.
> > 
> > I have pushed a branch containing all patches for am335x suspend
> > here for a big picture view of how all patches fit together with
> > these wkup_m3_rproc series [4].
> > 
> > v2->v3:
> > -Change ti,am3353-wkup-m3 compat to ti,am3352-wkup-m3 to reflect
> >  binding documentation change
> > -Add ti,am4372-wkup-m3 node to am4372 SoC dt file
> > -Add am4372 support to pdata-quirks for reset handlers
> 
> Now that Ohad has sent a pull request for the wkup_m3_rproc driver [1] and it
> has been merged is it possible for this series with the DT nodes and pdata-quirk
> to get picked up? Let me know and I can rebase and resend if you'd like.

Yes this series looks good to me now, will queue for v4.3.

Regards,

Tony
 
> [1] https://lkml.org/lkml/2015/7/1/354
> 
> > 
> > Regards,
> > Dave
> > 
> > [1] https://www.mail-archive.com/linux-omap at vger.kernel.org/msg115869.html
> > [2] http://www.spinics.net/lists/linux-omap/msg116366.html
> > [3] http://www.spinics.net/lists/arm-kernel/msg409842.html
> > [4] https://github.com/dgerlach/linux-pm/tree/pm-v4.0-rc5-am335x-suspend
> > 
> > Dave Gerlach (1):
> >   ARM: OMAP2+: Use pdata-quirks for wkup_m3 reset management
> > 
> > Suman Anna (2):
> >   ARM: dts: AM33xx: Update and move wkup_m3 node to l4 node
> >   ARM: dts: AM4372: Add the wkupm3 rproc node
> > 
> >  arch/arm/boot/dts/am33xx.dtsi      | 17 +++++++++--------
> >  arch/arm/boot/dts/am4372.dtsi      |  9 +++++++++
> >  arch/arm/mach-omap2/pdata-quirks.c | 15 +++++++++++++++
> >  3 files changed, 33 insertions(+), 8 deletions(-)
> > 
> 

[PATCH v3 0/3] ARM: OMAP2+: wkup_m3_rproc support patches

[Tony Lindgren]

* Tony Lindgren <tony@atomide.com> [150713 00:28]:
> * Dave Gerlach <d-gerlach@ti.com> [150709 12:53]:
> > Tony,
> > On 04/01/2015 02:47 PM, Dave Gerlach wrote:
> > > This series adds the mach-omap2 code and DT nodes for v3 of the
> > > wkup_m3_rproc driver submitted here [1]. pdata-quirks patch requires
> > > the pdata added with patch 4 of the aforementioned series. Based on
> > > previous discussion here [2], the wkup_m3 DT node has been moved as a
> > > child of the l4_wkup as is done for l4_wkup components in Tero Kristo's
> > > series "PRCM+SCM cleanup against 4.0-rc1" found here [3]. Because of that,
> > > this series applies cleanly on top of that series in order to leverage the
> > > l4_wkup parent node introduced there.
> > > 
> > > In addition to the move of the wkup_m3 node for am33xx, a new patch
> > > has been added to introduce the wkup_m3 node in the same fashion for
> > > am43xx as both SoCs use the same configuration. With this change
> > > support was also added to pdata-quirks for passing reset handlers to
> > > the driver for the am43xx binding as was already done for am33xx.
> > > 
> > > I have pushed a branch containing all patches for am335x suspend
> > > here for a big picture view of how all patches fit together with
> > > these wkup_m3_rproc series [4].
> > > 
> > > v2->v3:
> > > -Change ti,am3353-wkup-m3 compat to ti,am3352-wkup-m3 to reflect
> > >  binding documentation change
> > > -Add ti,am4372-wkup-m3 node to am4372 SoC dt file
> > > -Add am4372 support to pdata-quirks for reset handlers
> > 
> > Now that Ohad has sent a pull request for the wkup_m3_rproc driver [1] and it
> > has been merged is it possible for this series with the DT nodes and pdata-quirk
> > to get picked up? Let me know and I can rebase and resend if you'd like.
> 
> Yes this series looks good to me now, will queue for v4.3.

Looks like you need to repost this series again against v4.2-rc2 
to apply though.
 
Regards,

Tony
 
> > [1] https://lkml.org/lkml/2015/7/1/354

[PATCH v3 0/3] ARM: OMAP2+: wkup_m3_rproc support patches

[Dave Gerlach]

On 07/13/2015 02:27 AM, Tony Lindgren wrote:
> * Tony Lindgren <tony@atomide.com> [150713 00:28]:
>> * Dave Gerlach <d-gerlach@ti.com> [150709 12:53]:
>>> Tony,
>>> On 04/01/2015 02:47 PM, Dave Gerlach wrote:
>>>> This series adds the mach-omap2 code and DT nodes for v3 of the
>>>> wkup_m3_rproc driver submitted here [1]. pdata-quirks patch requires
>>>> the pdata added with patch 4 of the aforementioned series. Based on
>>>> previous discussion here [2], the wkup_m3 DT node has been moved as a
>>>> child of the l4_wkup as is done for l4_wkup components in Tero Kristo's
>>>> series "PRCM+SCM cleanup against 4.0-rc1" found here [3]. Because of that,
>>>> this series applies cleanly on top of that series in order to leverage the
>>>> l4_wkup parent node introduced there.
>>>>
>>>> In addition to the move of the wkup_m3 node for am33xx, a new patch
>>>> has been added to introduce the wkup_m3 node in the same fashion for
>>>> am43xx as both SoCs use the same configuration. With this change
>>>> support was also added to pdata-quirks for passing reset handlers to
>>>> the driver for the am43xx binding as was already done for am33xx.
>>>>
>>>> I have pushed a branch containing all patches for am335x suspend
>>>> here for a big picture view of how all patches fit together with
>>>> these wkup_m3_rproc series [4].
>>>>
>>>> v2->v3:
>>>> -Change ti,am3353-wkup-m3 compat to ti,am3352-wkup-m3 to reflect
>>>>  binding documentation change
>>>> -Add ti,am4372-wkup-m3 node to am4372 SoC dt file
>>>> -Add am4372 support to pdata-quirks for reset handlers
>>>
>>> Now that Ohad has sent a pull request for the wkup_m3_rproc driver [1] and it
>>> has been merged is it possible for this series with the DT nodes and pdata-quirk
>>> to get picked up? Let me know and I can rebase and resend if you'd like.
>>
>> Yes this series looks good to me now, will queue for v4.3.
> 
> Looks like you need to repost this series again against v4.2-rc2 
> to apply though.

Ok will do, thanks!

Regards,
Dave

>  
> Regards,
> 
> Tony
>  
>>> [1] https://lkml.org/lkml/2015/7/1/354