lkml.org 
[lkml]   [2011]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: powerpc: dts: Fix canyonlands EMAC interrupt map
From
Date
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 <tinamdar@apm.com>
> ---
> 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 = </*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@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>;




\
 
 \ /
  Last update: 2011-11-22 22:19    [W:0.063 / U:0.224 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site