[PATCH v2 0/2] ARM: DRA7: hwmod: Add dra74x and dra72x specific ocp interface lists

[PATCH v2 0/2] ARM: DRA7: hwmod: Add dra74x and dra72x specific ocp interface lists

[Lokesh Vutla]

This series add seperate ocp interface lists that are specific to dra74x
and dra72x, and moving USB OTG SS4 to dra74x only since its not present
in dra72x. Without this USB OTG SS4 hwmod gives an abort on dra72x.

Adding support for soc_is_dra74x() and soc_is_dra72x() in order to differentiate
between dra74x and dra72x and pass the respective ocp interface lists.

Without this dra72x is crashing on linux-next.
Verified on dra74x evm and dra72x evm using 20140725 linux-next.

dra74x : http://paste.ubuntu.com/7881342/
dra72x : http://paste.ubuntu.com/7881349/

Rajendra Nayak (2):
  ARM: DRA7: Add support for soc_is_dra74x() and soc_is_dra72x()
    variants
  ARM: DRA7: hwmod: Add dra74x and dra72x specific ocp interface lists

 arch/arm/mach-omap2/omap_hwmod.c          |  3 +++
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 22 ++++++++++++++++++++--
 arch/arm/mach-omap2/soc.h                 |  6 ++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

-- 
1.9.1

[PATCH v2 1/2] ARM: DRA7: Add support for soc_is_dra74x() and soc_is_dra72x() variants

[Lokesh Vutla]

From: Rajendra Nayak <rnayak@ti.com>

Use the corresponding compatibles to identify the devices.

Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Acked-by: Nishanth Menon <nm@ti.com>
Tested-by: Nishanth Menon <nm@ti.com>
---
Changes since v1:
	-Removed an extra blank line as suggested by Suman.
 arch/arm/mach-omap2/soc.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h
index 01ca808..4376f59 100644
--- a/arch/arm/mach-omap2/soc.h
+++ b/arch/arm/mach-omap2/soc.h
@@ -245,6 +245,8 @@ IS_AM_SUBCLASS(437x, 0x437)
 #define soc_is_omap54xx()		0
 #define soc_is_omap543x()		0
 #define soc_is_dra7xx()			0
+#define soc_is_dra74x()			0
+#define soc_is_dra72x()			0
 
 #if defined(MULTI_OMAP2)
 # if defined(CONFIG_ARCH_OMAP2)
@@ -393,7 +395,11 @@ IS_OMAP_TYPE(3430, 0x3430)
 
 #if defined(CONFIG_SOC_DRA7XX)
 #undef soc_is_dra7xx
+#undef soc_is_dra74x
+#undef soc_is_dra72x
 #define soc_is_dra7xx()	(of_machine_is_compatible("ti,dra7"))
+#define soc_is_dra74x()	(of_machine_is_compatible("ti,dra74"))
+#define soc_is_dra72x()	(of_machine_is_compatible("ti,dra72"))
 #endif
 
 /* Various silicon revisions for omap2 */
-- 
1.9.1

[PATCH v2 1/2] ARM: DRA7: Add support for soc_is_dra74x() and soc_is_dra72x() variants

[Paul Walmsley]

On Mon, 28 Jul 2014, Lokesh Vutla wrote:

> From: Rajendra Nayak <rnayak@ti.com>
> 
> Use the corresponding compatibles to identify the devices.
> 
> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
> Acked-by: Nishanth Menon <nm@ti.com>
> Tested-by: Nishanth Menon <nm@ti.com>

Thanks, queued for (hopefully) early v3.17-rc.


- Paul

[PATCH v2 1/2] ARM: DRA7: Add support for soc_is_dra74x() and soc_is_dra72x() variants

[Lokesh Vutla]

On Monday 28 July 2014 10:59 AM, Paul Walmsley wrote:
> On Mon, 28 Jul 2014, Lokesh Vutla wrote:
> 
>> From: Rajendra Nayak <rnayak@ti.com>
>>
>> Use the corresponding compatibles to identify the devices.
>>
>> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
>> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
>> Acked-by: Nishanth Menon <nm@ti.com>
>> Tested-by: Nishanth Menon <nm@ti.com>
> 
> Thanks, queued for (hopefully) early v3.17-rc.
Thanks Paul.

Regards,
Lokesh
> 
> 
> - Paul
> 

[PATCH v2 1/2] ARM: DRA7: Add support for soc_is_dra74x() and soc_is_dra72x() variants

[Nishanth Menon]

On Mon, Jul 28, 2014 at 12:34 AM, Lokesh Vutla <lokeshvutla@ti.com> wrote:
> On Monday 28 July 2014 10:59 AM, Paul Walmsley wrote:
>> On Mon, 28 Jul 2014, Lokesh Vutla wrote:
>>
>>> From: Rajendra Nayak <rnayak@ti.com>
>>>
>>> Use the corresponding compatibles to identify the devices.
>>>
>>> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
>>> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
>>> Acked-by: Nishanth Menon <nm@ti.com>
>>> Tested-by: Nishanth Menon <nm@ti.com>
>>
>> Thanks, queued for (hopefully) early v3.17-rc.
> Thanks Paul.
>
Paul, Tony,

we are at 3.17-rc2 today, unfortunately..
http://slexy.org/view/s20MbRgipa dra72-evm is still broken due to
this. Needs:
https://patchwork.kernel.org/patch/4632161/ and
https://patchwork.kernel.org/patch/4632171/

What can we do to help speed this along?
-- 
---
Regards,
Nishanth Menon

[PATCH v2 1/2] ARM: DRA7: Add support for soc_is_dra74x() and soc_is_dra72x() variants

[Paul Walmsley]

On Wed, 27 Aug 2014, Nishanth Menon wrote:

> On Mon, Jul 28, 2014 at 12:34 AM, Lokesh Vutla <lokeshvutla@ti.com> wrote:
> > On Monday 28 July 2014 10:59 AM, Paul Walmsley wrote:
> >> On Mon, 28 Jul 2014, Lokesh Vutla wrote:
> >>
> >>> From: Rajendra Nayak <rnayak@ti.com>
> >>>
> >>> Use the corresponding compatibles to identify the devices.
> >>>
> >>> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> >>> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
> >>> Acked-by: Nishanth Menon <nm@ti.com>
> >>> Tested-by: Nishanth Menon <nm@ti.com>
> >>
> >> Thanks, queued for (hopefully) early v3.17-rc.
> > Thanks Paul.
> >
> Paul, Tony,
> 
> we are at 3.17-rc2 today, unfortunately..
> http://slexy.org/view/s20MbRgipa dra72-evm is still broken due to
> this. Needs:
> https://patchwork.kernel.org/patch/4632161/ and
> https://patchwork.kernel.org/patch/4632171/
> 
> What can we do to help speed this along?

A simple reminder, like this one, is good.  Also providing boards and 
documentation generally helps, so the patches can be tested and reviewed.


- Paul

[PATCH v2 1/2] ARM: DRA7: Add support for soc_is_dra74x() and soc_is_dra72x() variants

[Nishanth Menon]

On Thu, Aug 28, 2014 at 1:19 AM, Paul Walmsley <paul@pwsan.com> wrote:
> On Wed, 27 Aug 2014, Nishanth Menon wrote:
>
>> On Mon, Jul 28, 2014 at 12:34 AM, Lokesh Vutla <lokeshvutla@ti.com> wrote:
>> > On Monday 28 July 2014 10:59 AM, Paul Walmsley wrote:
>> >> On Mon, 28 Jul 2014, Lokesh Vutla wrote:
>> >>
>> >>> From: Rajendra Nayak <rnayak@ti.com>
>> >>>
>> >>> Use the corresponding compatibles to identify the devices.
>> >>>
>> >>> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
>> >>> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
>> >>> Acked-by: Nishanth Menon <nm@ti.com>
>> >>> Tested-by: Nishanth Menon <nm@ti.com>
>> >>
>> >> Thanks, queued for (hopefully) early v3.17-rc.
>> > Thanks Paul.
>> >
>> Paul, Tony,
>>
>> we are at 3.17-rc2 today, unfortunately..
>> http://slexy.org/view/s20MbRgipa dra72-evm is still broken due to
>> this. Needs:
>> https://patchwork.kernel.org/patch/4632161/ and
>> https://patchwork.kernel.org/patch/4632171/
>>
>> What can we do to help speed this along?
>
> A simple reminder, like this one, is good.  Also providing boards and
> documentation generally helps, so the patches can be tested and reviewed.

TI is working diligently towards a public TRM and potentially a
related platform as well for all.

Unfortunately, I am not yet aware of a official finalized release
date.. hopefully this year..

In the meanwhile, we will try to provide test logs that you may desire
for at least the
platforms we have functioning and access to. please feel free to
request specific test
vectors if you feel our coverage is not good enough.

-- 
---
Regards,
Nishanth Menon

[PATCH v2 1/2] ARM: DRA7: Add support for soc_is_dra74x() and soc_is_dra72x() variants

[Paul Walmsley]

On Thu, 28 Aug 2014, Nishanth Menon wrote:

> On Thu, Aug 28, 2014 at 1:19 AM, Paul Walmsley <paul@pwsan.com> wrote:
> > On Wed, 27 Aug 2014, Nishanth Menon wrote:
> >
> >> On Mon, Jul 28, 2014 at 12:34 AM, Lokesh Vutla <lokeshvutla@ti.com> wrote:
> >> > On Monday 28 July 2014 10:59 AM, Paul Walmsley wrote:
> >> >> On Mon, 28 Jul 2014, Lokesh Vutla wrote:
> >> >>
> >> >>> From: Rajendra Nayak <rnayak@ti.com>
> >> >>>
> >> >>> Use the corresponding compatibles to identify the devices.
> >> >>>
> >> >>> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> >> >>> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
> >> >>> Acked-by: Nishanth Menon <nm@ti.com>
> >> >>> Tested-by: Nishanth Menon <nm@ti.com>
> >> >>
> >> >> Thanks, queued for (hopefully) early v3.17-rc.
> >> > Thanks Paul.
> >> >
> >> Paul, Tony,
> >>
> >> we are at 3.17-rc2 today, unfortunately..
> >> http://slexy.org/view/s20MbRgipa dra72-evm is still broken due to
> >> this. Needs:
> >> https://patchwork.kernel.org/patch/4632161/ and
> >> https://patchwork.kernel.org/patch/4632171/
> >>
> >> What can we do to help speed this along?
> >
> > A simple reminder, like this one, is good.  Also providing boards and
> > documentation generally helps, so the patches can be tested and reviewed.
> 
> TI is working diligently towards a public TRM and potentially a
> related platform as well for all.
> 
> Unfortunately, I am not yet aware of a official finalized release
> date.. hopefully this year..

OK

> In the meanwhile, we will try to provide test logs that you may desire 
> for at least the platforms we have functioning and access to. please 
> feel free to request specific test vectors if you feel our coverage is 
> not good enough.

Thanks.  You've been showing a lot of great leadership in proactively 
posting test logs.  What I'd suggest doing is to keep that up, and if 
possible, post one of the test reports for each patch series that's 
posted, if possible. 


- Paul

[PATCH v2 1/2] ARM: DRA7: Add support for soc_is_dra74x() and soc_is_dra72x() variants

[Nishanth Menon]

On 09/05/2014 01:08 PM, Paul Walmsley wrote:
[...]
>> In the meanwhile, we will try to provide test logs that you may desire 
>> for at least the platforms we have functioning and access to. please 
>> feel free to request specific test vectors if you feel our coverage is 
>> not good enough.
> 
> Thanks.  You've been showing a lot of great leadership in proactively 
> posting test logs.  What I'd suggest doing is to keep that up, and if 
> possible, post one of the test reports for each patch series that's 
> posted, if possible. 

I do have automated scripts verifying various defconfigs on a daily
basis for linux-next and master tags..
https://github.com/nmenon/kernel-test-logs/ (based on each tag).

Every TI engineer does have access to these platforms as well as I do.
Realistically, few platforms do go offline and online as time goes on.
we will try to post test reports for each series as much as our TI
policies let us.

-- 
Regards,
Nishanth Menon

public trm am572x (was Re: Re: [PATCH v2 1/2] ARM: DRA7: Add support for soc_is_dra74x() and soc_is_dra72x() variants)

[Nishanth Menon]

On 09/05/2014 01:14 PM, Menon, Nishanth wrote:
> On 09/05/2014 01:08 PM, Paul Walmsley wrote:
> [...]

Just adding to this: public version of AM572x is now available here:


http://www.ti.com/lit/spruhz6




-- 
Regards,
Nishanth Menon

[PATCH v2 2/2] ARM: DRA7: hwmod: Add dra74x and dra72x specific ocp interface lists

[Lokesh Vutla]

From: Rajendra Nayak <rnayak@ti.com>

To deal with IPs which are specific to dra74x and dra72x, maintain seperate
ocp interface lists, while keeping the common list for all common IPs.

Move USB OTG SS4 to dra74x only list since its unavailable in
dra72x and is giving an abort during boot. The dra72x only list
is empty for now and a placeholder for future hwmod additions which
are specific to dra72x.

Fixes: d904b38df0db13 ("ARM: DRA7: hwmod: Add SYSCONFIG for usb_otg_ss")
Reported-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Tested-by: Nishanth Menon <nm@ti.com>
---
Changes Since V1:
	- Updated commit log as suggested by Nishanth.
 arch/arm/mach-omap2/omap_hwmod.c          |  3 +++
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 22 ++++++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 6c074f3..ec0389f 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -3345,6 +3345,9 @@ int __init omap_hwmod_register_links(struct omap_hwmod_ocp_if **ois)
 	if (!ois)
 		return 0;
 
+	if (ois[0] == NULL) /* Empty list*/
+		return 0;
+
 	if (!linkspace) {
 		if (_alloc_linkspace(ois)) {
 			pr_err("omap_hwmod: could not allocate link space\n");
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
index 284324f..c95033c 100644
--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
@@ -35,6 +35,7 @@
 #include "i2c.h"
 #include "mmc.h"
 #include "wd_timer.h"
+#include "soc.h"
 
 /* Base offset for all DRA7XX interrupts external to MPUSS */
 #define DRA7XX_IRQ_GIC_START	32
@@ -2705,7 +2706,6 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {
 	&dra7xx_l4_per3__usb_otg_ss1,
 	&dra7xx_l4_per3__usb_otg_ss2,
 	&dra7xx_l4_per3__usb_otg_ss3,
-	&dra7xx_l4_per3__usb_otg_ss4,
 	&dra7xx_l3_main_1__vcp1,
 	&dra7xx_l4_per2__vcp1,
 	&dra7xx_l3_main_1__vcp2,
@@ -2714,8 +2714,26 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {
 	NULL,
 };
 
+static struct omap_hwmod_ocp_if *dra74x_hwmod_ocp_ifs[] __initdata = {
+	&dra7xx_l4_per3__usb_otg_ss4,
+	NULL,
+};
+
+static struct omap_hwmod_ocp_if *dra72x_hwmod_ocp_ifs[] __initdata = {
+	NULL,
+};
+
 int __init dra7xx_hwmod_init(void)
 {
+	int ret;
+
 	omap_hwmod_init();
-	return omap_hwmod_register_links(dra7xx_hwmod_ocp_ifs);
+	ret = omap_hwmod_register_links(dra7xx_hwmod_ocp_ifs);
+
+	if (!ret && soc_is_dra74x())
+		return omap_hwmod_register_links(dra74x_hwmod_ocp_ifs);
+	else if (!ret && soc_is_dra72x())
+		return omap_hwmod_register_links(dra72x_hwmod_ocp_ifs);
+
+	return ret;
 }
-- 
1.9.1

[PATCH v2 2/2] ARM: DRA7: hwmod: Add dra74x and dra72x specific ocp interface lists

[Paul Walmsley]

On Mon, 28 Jul 2014, Lokesh Vutla wrote:

> From: Rajendra Nayak <rnayak@ti.com>
> 
> To deal with IPs which are specific to dra74x and dra72x, maintain seperate
> ocp interface lists, while keeping the common list for all common IPs.
> 
> Move USB OTG SS4 to dra74x only list since its unavailable in
> dra72x and is giving an abort during boot. The dra72x only list
> is empty for now and a placeholder for future hwmod additions which
> are specific to dra72x.
> 
> Fixes: d904b38df0db13 ("ARM: DRA7: hwmod: Add SYSCONFIG for usb_otg_ss")
> Reported-by: Keerthy <j-keerthy@ti.com>
> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
> Tested-by: Nishanth Menon <nm@ti.com>

Queued with a fix for the comment style - i.e.,

+       if (ois[0] == NULL) /* Empty list */

rather than 

+       if (ois[0] == NULL) /* Empty list*/

Please keep an eye out for this.


- Paul