diff mbox

ARM: dts: OMAP: Add usb_otg and glue data to OMAP3+ boards

Message ID 20130511023557.GB28602@atomide.com (mailing list archive)
State New, archived
Headers show

Commit Message

Tony Lindgren May 11, 2013, 2:35 a.m. UTC
Commit ad871c10 (ARM: dts: OMAP: Add usb_otg and glue data to
OMAP3+ boards) added support for MUSB on omap3 for device tree,
but added the interrupts the wrong way probably as they were
copied from the omap4.dtsi file. On omap3 we have TI specific
interrupt controller, not GIC.

Fix this by specifying the interrupt following the TI INTC
binding.

Without this fix MUSB won't work as it is trying to use
irq0 instead of irq92.

Signed-off-by: Tony Lindgren <tony@atomide.com>

Comments

Kishon Vijay Abraham I May 15, 2013, 6:21 a.m. UTC | #1
On Saturday 11 May 2013 08:05 AM, Tony Lindgren wrote:
> Commit ad871c10 (ARM: dts: OMAP: Add usb_otg and glue data to
> OMAP3+ boards) added support for MUSB on omap3 for device tree,
> but added the interrupts the wrong way probably as they were
> copied from the omap4.dtsi file. On omap3 we have TI specific
> interrupt controller, not GIC.
>
> Fix this by specifying the interrupt following the TI INTC
> binding.
>
> Without this fix MUSB won't work as it is trying to use
> irq0 instead of irq92.
>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
Tested in beagleboard-xm

Tested-by: Kishon Vijay Abraham I <kishon@ti.com>
>
> --- a/arch/arm/boot/dts/omap3.dtsi
> +++ b/arch/arm/boot/dts/omap3.dtsi
> @@ -516,7 +516,7 @@
>   		usb_otg_hs: usb_otg_hs@480ab000 {
>   			compatible = "ti,omap3-musb";
>   			reg = <0x480ab000 0x1000>;
> -			interrupts = <0 92 0x4>, <0 93 0x4>;
> +			interrupts = <92>, <93>;
>   			interrupt-names = "mc", "dma";
>   			ti,hwmods = "usb_otg_hs";
>   			multipoint = <1>;
>
Tony Lindgren May 16, 2013, 5:46 p.m. UTC | #2
* Kishon Vijay Abraham I <kishon@ti.com> [130514 23:27]:
> On Saturday 11 May 2013 08:05 AM, Tony Lindgren wrote:
> >Commit ad871c10 (ARM: dts: OMAP: Add usb_otg and glue data to
> >OMAP3+ boards) added support for MUSB on omap3 for device tree,
> >but added the interrupts the wrong way probably as they were
> >copied from the omap4.dtsi file. On omap3 we have TI specific
> >interrupt controller, not GIC.
> >
> >Fix this by specifying the interrupt following the TI INTC
> >binding.
> >
> >Without this fix MUSB won't work as it is trying to use
> >irq0 instead of irq92.
> >
> >Signed-off-by: Tony Lindgren <tony@atomide.com>
> Tested in beagleboard-xm
> 
> Tested-by: Kishon Vijay Abraham I <kishon@ti.com>

Oops thanks, sorry I already pushed it out into omap-for-v3.10/dt-fixes
before noticing your tested-by.

Regards,

Tony

> >--- a/arch/arm/boot/dts/omap3.dtsi
> >+++ b/arch/arm/boot/dts/omap3.dtsi
> >@@ -516,7 +516,7 @@
> >  		usb_otg_hs: usb_otg_hs@480ab000 {
> >  			compatible = "ti,omap3-musb";
> >  			reg = <0x480ab000 0x1000>;
> >-			interrupts = <0 92 0x4>, <0 93 0x4>;
> >+			interrupts = <92>, <93>;
> >  			interrupt-names = "mc", "dma";
> >  			ti,hwmods = "usb_otg_hs";
> >  			multipoint = <1>;
> >
>
diff mbox

Patch

--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -516,7 +516,7 @@ 
 		usb_otg_hs: usb_otg_hs@480ab000 {
 			compatible = "ti,omap3-musb";
 			reg = <0x480ab000 0x1000>;
-			interrupts = <0 92 0x4>, <0 93 0x4>;
+			interrupts = <92>, <93>;
 			interrupt-names = "mc", "dma";
 			ti,hwmods = "usb_otg_hs";
 			multipoint = <1>;