powerpc: dts: Fix canyonlands EMAC interrupt map

[Tanmay Inamdar]

On Tue, Nov 22, 2011 at 5:00 PM, Josh Boyer <jwboyer at gmail.com> wrote:

> On Tue, Nov 22, 2011 at 2:11 AM, Tanmay Inamdar <tinamdar at apm.com> wrote:
> > Fixing interrupt mapping of EMAC for canyonlands
> >
> > Signed-off-by: Tanmay Inamdar <tinamdar at apm.com>
>
> As far as I can tell, your changes aren't really changing anything
> just making it a bit clearer, correct?  If so, do you mind if I change
> the commit log to "clear up" instead of fix?
>

Actually Rob Herring's commit (
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commit;h=dc9372808412edbc653a675a526c2ee6c0c14a91)
breaks the interrupt mapping in EMAC driver.
I am trying to fix this issue by mapping interrupts in different way.

If you think "clear up" is fine, then please go ahead.

Thanks,
Tanmay

>
> josh
>
> > ---
> >  arch/powerpc/boot/dts/canyonlands.dts |   16 ++++++----------
> >  1 files changed, 6 insertions(+), 10 deletions(-)
> >
> > diff --git a/arch/powerpc/boot/dts/canyonlands.dts
> b/arch/powerpc/boot/dts/canyonlands.dts
> > index 3dc75de..c76bbcd 100644
> > --- a/arch/powerpc/boot/dts/canyonlands.dts
> > +++ b/arch/powerpc/boot/dts/canyonlands.dts
> > @@ -360,13 +360,11 @@
> >                        EMAC0: ethernet at ef600e00 {
> >                                device_type = "network";
> >                                compatible = "ibm,emac-460ex",
> "ibm,emac4sync";
> > -                               interrupt-parent = <&EMAC0>;
> > -                               interrupts = <0x0 0x1>;
> > -                               #interrupt-cells = <1>;
> > +                               interrupt-parent = <&UIC2>;
> >                                #address-cells = <0>;
> >                                #size-cells = <0>;
> > -                               interrupt-map = </*Status*/ 0x0 &UIC2
> 0x10 0x4
> > -                                                /*Wake*/   0x1 &UIC2
> 0x14 0x4>;
> > +                               interrupts = </*Status*/0x10 0x4
> > +                                               /*Wake*/0x14 0x4>;
> >                                reg = <0xef600e00 0x000000c4>;
> >                                local-mac-address = [000000000000]; /*
> Filled in by U-Boot */
> >                                mal-device = <&MAL0>;
> > @@ -390,13 +388,11 @@
> >                        EMAC1: ethernet at ef600f00 {
> >                                device_type = "network";
> >                                compatible = "ibm,emac-460ex",
> "ibm,emac4sync";
> > -                               interrupt-parent = <&EMAC1>;
> > -                               interrupts = <0x0 0x1>;
> > -                               #interrupt-cells = <1>;
> > +                               interrupt-parent = <&UIC2>;
> >                                #address-cells = <0>;
> >                                #size-cells = <0>;
> > -                               interrupt-map = </*Status*/ 0x0 &UIC2
> 0x11 0x4
> > -                                                /*Wake*/   0x1 &UIC2
> 0x15 0x4>;
> > +                               interrupts = </*Status*/0x11 0x4
> > +                                               /*Wake*/0x15 0x4>;
> >                                reg = <0xef600f00 0x000000c4>;
> >                                local-mac-address = [000000000000]; /*
> Filled in by U-Boot */
> >                                mal-device = <&MAL0>;
> > --
> > 1.6.1.rc3
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-kernel"
> in
> > the body of a message to majordomo at vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> > Please read the FAQ at  http://www.tux.org/lkml/
> >
>

CONFIDENTIALITY NOTICE: This e-mail message, including any attachments, 
is for the sole use of the intended recipient(s) and contains information 
that is confidential and proprietary to AppliedMicro Corporation or its subsidiaries. 
It is to be used solely for the purpose of furthering the parties' business relationship. 
All unauthorized review, use, disclosure or distribution is prohibited. 
If you are not the intended recipient, please contact the sender by reply e-mail 
and destroy all copies of the original message.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20111122/aa80709e/attachment-0001.html>