[1/1] drivers: bus: Move the OMAP interconnect driver to drivers/bus/

Commit Message

Arnd Bergmann Sept. 19, 2012, 6:57 p.m. UTC

On Monday 17 September 2012, Tony Lindgren wrote:
> * Santosh Shilimkar <[e-mail]> [120914 02:21]:
> > OMAP interconnect drivers are used for the interconnect error handling.
> > Since they are bus driver, lets move it to newly created drivers/bus.
> > 
> > Cc: Arnd Bergmann <[e-mail]>
> > Cc: Tony Lindgren <[e-mail]>
> > Tested-by: Lokesh Vutla <[e-mail]>
> > Signed-off-by: Santosh Shilimkar <[e-mail]>
> > ---
> > Patch just moves OMAP interconnect drivers as is to the newly created
> > driver/bus/* directory. Patch is generated against "arm-soc/drivers/ocp2scp"
> > tree and test on all OMAP boards.
> 
> Great, looks like this should not conflict with other
> omap patches queued, so Arnd should probably take this into
> the bus branch:
> 
> Acked-by: Tony Lindgren <[e-mail]>

It turns out that the patch actually did conflict and we now have a broken
omap2plus_defconfig. The patch below seems to fix it, but please verify
that this makes sense.

Signed-off-by: Arnd Bergmann <[e-mail]>

Comments

Tony Lindgren Sept. 19, 2012, 7:11 p.m. UTC | #1

* Arnd Bergmann <[e-mail]> [120919 11:59]:
> On Monday 17 September 2012, Tony Lindgren wrote:
> > * Santosh Shilimkar <[e-mail]> [120914 02:21]:
> > > OMAP interconnect drivers are used for the interconnect error handling.
> > > Since they are bus driver, lets move it to newly created drivers/bus.
> > > 
> > > Cc: Arnd Bergmann <[e-mail]>
> > > Cc: Tony Lindgren <[e-mail]>
> > > Tested-by: Lokesh Vutla <[e-mail]>
> > > Signed-off-by: Santosh Shilimkar <[e-mail]>
> > > ---
> > > Patch just moves OMAP interconnect drivers as is to the newly created
> > > driver/bus/* directory. Patch is generated against "arm-soc/drivers/ocp2scp"
> > > tree and test on all OMAP boards.
> > 
> > Great, looks like this should not conflict with other
> > omap patches queued, so Arnd should probably take this into
> > the bus branch:
> > 
> > Acked-by: Tony Lindgren <[e-mail]>
> 
> It turns out that the patch actually did conflict and we now have a broken
> omap2plus_defconfig. The patch below seems to fix it, but please verify
> that this makes sense.

Heh a conflict caused by hard coded irqs for the error message :)
Looks like a good fix that removes some unncecessary dependencies:

Acked-by: Tony Lindgren <[e-mail]>
 
> Signed-off-by: Arnd Bergmann <[e-mail]>
> 
> diff --git a/drivers/bus/omap_l3_noc.c b/drivers/bus/omap_l3_noc.c
> index f447e02..ab911a3 100644
> --- a/drivers/bus/omap_l3_noc.c
> +++ b/drivers/bus/omap_l3_noc.c
> @@ -28,7 +28,6 @@
>  #include <linux/kernel.h>
>  #include <linux/slab.h>
>  
> -#include "soc.h"
>  #include "omap_l3_noc.h"
>  
>  /*
> @@ -191,7 +190,7 @@ static int __devinit omap4_l3_probe(struct platform_device *pdev)
>  			IRQF_DISABLED, "l3-dbg-irq", l3);
>  	if (ret) {
>  		pr_crit("L3: request_irq failed to register for 0x%x\n",
> -						9 + OMAP44XX_IRQ_GIC_START);
> +						l3->debug_irq);
>  		goto err3;
>  	}
>  
> @@ -201,7 +200,7 @@ static int __devinit omap4_l3_probe(struct platform_device *pdev)
>  			IRQF_DISABLED, "l3-app-irq", l3);
>  	if (ret) {
>  		pr_crit("L3: request_irq failed to register for 0x%x\n",
> -						10 + OMAP44XX_IRQ_GIC_START);
> +						l3->app_irq);
>  		goto err4;
>  	}
>

Santosh Shilimkar Sept. 20, 2012, 5:56 a.m. UTC | #2

On Thu, Sep 20, 2012 at 12:27 AM, Arnd Bergmann <[e-mail]> wrote:
> On Monday 17 September 2012, Tony Lindgren wrote:
>> * Santosh Shilimkar <[e-mail]> [120914 02:21]:
>> > OMAP interconnect drivers are used for the interconnect error handling.
>> > Since they are bus driver, lets move it to newly created drivers/bus.
>> >
>> > Cc: Arnd Bergmann <[e-mail]>
>> > Cc: Tony Lindgren <[e-mail]>
>> > Tested-by: Lokesh Vutla <[e-mail]>
>> > Signed-off-by: Santosh Shilimkar <[e-mail]>
>> > ---
>> > Patch just moves OMAP interconnect drivers as is to the newly created
>> > driver/bus/* directory. Patch is generated against "arm-soc/drivers/ocp2scp"
>> > tree and test on all OMAP boards.
>>
>> Great, looks like this should not conflict with other
>> omap patches queued, so Arnd should probably take this into
>> the bus branch:
>>
>> Acked-by: Tony Lindgren <[e-mail]>
>
> It turns out that the patch actually did conflict and we now have a broken
> omap2plus_defconfig. The patch below seems to fix it, but please verify
> that this makes sense.
>
> Signed-off-by: Arnd Bergmann <[e-mail]>
>
Looks correct.

Acked-by: Santosh Shilimkar <[e-mail]>

Olof Johansson Sept. 20, 2012, 11:22 p.m. UTC | #3

On Wed, Sep 19, 2012 at 10:56 PM, Shilimkar, Santosh
<[e-mail]> wrote:
> On Thu, Sep 20, 2012 at 12:27 AM, Arnd Bergmann <[e-mail]> wrote:
>> On Monday 17 September 2012, Tony Lindgren wrote:
>>> * Santosh Shilimkar <[e-mail]> [120914 02:21]:
>>> > OMAP interconnect drivers are used for the interconnect error handling.
>>> > Since they are bus driver, lets move it to newly created drivers/bus.
>>> >
>>> > Cc: Arnd Bergmann <[e-mail]>
>>> > Cc: Tony Lindgren <[e-mail]>
>>> > Tested-by: Lokesh Vutla <[e-mail]>
>>> > Signed-off-by: Santosh Shilimkar <[e-mail]>
>>> > ---
>>> > Patch just moves OMAP interconnect drivers as is to the newly created
>>> > driver/bus/* directory. Patch is generated against "arm-soc/drivers/ocp2scp"
>>> > tree and test on all OMAP boards.
>>>
>>> Great, looks like this should not conflict with other
>>> omap patches queued, so Arnd should probably take this into
>>> the bus branch:
>>>
>>> Acked-by: Tony Lindgren <[e-mail]>
>>
>> It turns out that the patch actually did conflict and we now have a broken
>> omap2plus_defconfig. The patch below seems to fix it, but please verify
>> that this makes sense.
>>
>> Signed-off-by: Arnd Bergmann <[e-mail]>
>>
> Looks correct.
>
> Acked-by: Santosh Shilimkar <[e-mail]>

I ended up applying something very similar to this and carried the
ACKs on that, but I broke it up in two pieces; one for the
drivers/ocp2scp branch to fix the irq numbers, and another to just
for-next to deal with the soc.h include file (since that should
probably have been fixed at branch merge time).

Pushed out to for-next as well.


-Olof

Tony Lindgren Sept. 20, 2012, 11:54 p.m. UTC | #4

* Olof Johansson <[e-mail]> [120920 16:23]:
> On Wed, Sep 19, 2012 at 10:56 PM, Shilimkar, Santosh
> <[e-mail]> wrote:
> > On Thu, Sep 20, 2012 at 12:27 AM, Arnd Bergmann <[e-mail]> wrote:
> >> On Monday 17 September 2012, Tony Lindgren wrote:
> >>> * Santosh Shilimkar <[e-mail]> [120914 02:21]:
> >>> > OMAP interconnect drivers are used for the interconnect error handling.
> >>> > Since they are bus driver, lets move it to newly created drivers/bus.
> >>> >
> >>> > Cc: Arnd Bergmann <[e-mail]>
> >>> > Cc: Tony Lindgren <[e-mail]>
> >>> > Tested-by: Lokesh Vutla <[e-mail]>
> >>> > Signed-off-by: Santosh Shilimkar <[e-mail]>
> >>> > ---
> >>> > Patch just moves OMAP interconnect drivers as is to the newly created
> >>> > driver/bus/* directory. Patch is generated against "arm-soc/drivers/ocp2scp"
> >>> > tree and test on all OMAP boards.
> >>>
> >>> Great, looks like this should not conflict with other
> >>> omap patches queued, so Arnd should probably take this into
> >>> the bus branch:
> >>>
> >>> Acked-by: Tony Lindgren <[e-mail]>
> >>
> >> It turns out that the patch actually did conflict and we now have a broken
> >> omap2plus_defconfig. The patch below seems to fix it, but please verify
> >> that this makes sense.
> >>
> >> Signed-off-by: Arnd Bergmann <[e-mail]>
> >>
> > Looks correct.
> >
> > Acked-by: Santosh Shilimkar <[e-mail]>
> 
> I ended up applying something very similar to this and carried the
> ACKs on that, but I broke it up in two pieces; one for the
> drivers/ocp2scp branch to fix the irq numbers, and another to just
> for-next to deal with the soc.h include file (since that should
> probably have been fixed at branch merge time).
> 
> Pushed out to for-next as well.

OK thanks!

Tony

Patch

diff --git a/drivers/bus/omap_l3_noc.c b/drivers/bus/omap_l3_noc.c
index f447e02..ab911a3 100644
--- a/drivers/bus/omap_l3_noc.c
+++ b/drivers/bus/omap_l3_noc.c
@@ -28,7 +28,6 @@ 
 #include <linux/kernel.h>
 #include <linux/slab.h>
 
-#include "soc.h"
 #include "omap_l3_noc.h"
 
 /*
@@ -191,7 +190,7 @@  static int __devinit omap4_l3_probe(struct platform_device *pdev)
 			IRQF_DISABLED, "l3-dbg-irq", l3);
 	if (ret) {
 		pr_crit("L3: request_irq failed to register for 0x%x\n",
-						9 + OMAP44XX_IRQ_GIC_START);
+						l3->debug_irq);
 		goto err3;
 	}
 
@@ -201,7 +200,7 @@  static int __devinit omap4_l3_probe(struct platform_device *pdev)
 			IRQF_DISABLED, "l3-app-irq", l3);
 	if (ret) {
 		pr_crit("L3: request_irq failed to register for 0x%x\n",
-						10 + OMAP44XX_IRQ_GIC_START);
+						l3->app_irq);
 		goto err4;
 	}