From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 466CB1007D5 for ; Wed, 23 Nov 2011 08:16:49 +1100 (EST) Message-ID: <1321996600.14573.0.camel@pasglop> Subject: Re: powerpc: dts: Fix canyonlands EMAC interrupt map From: Benjamin Herrenschmidt To: Tanmay Inamdar Date: Wed, 23 Nov 2011 08:16:40 +1100 In-Reply-To: <1321945877-22802-1-git-send-email-tinamdar@apm.com> References: <1321945877-22802-1-git-send-email-tinamdar@apm.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Tue, 2011-11-22 at 12:41 +0530, Tanmay Inamdar wrote: > Fixing interrupt mapping of EMAC for canyonlands The previous stuff was odd .... but was it broken ? It was done this way because the EMAC actually has more interrupts than that which are routed to different UICs, and so doing a local map this way allows to target multiple parents. Cheers, Ben. > Signed-off-by: Tanmay Inamdar > --- > 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@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 = - /*Wake*/ 0x1 &UIC2 0x14 0x4>; > + interrupts = + /*Wake*/0x14 0x4>; > reg = <0xef600e00 0x000000c4>; > local-mac-address = [000000000000]; /* Filled in by U-Boot */ > mal-device = <&MAL0>; > @@ -390,13 +388,11 @@ > EMAC1: ethernet@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 = - /*Wake*/ 0x1 &UIC2 0x15 0x4>; > + interrupts = + /*Wake*/0x15 0x4>; > reg = <0xef600f00 0x000000c4>; > local-mac-address = [000000000000]; /* Filled in by U-Boot */ > mal-device = <&MAL0>;