From patchwork Thu Dec 18 19:59:46 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Erickson X-Patchwork-Id: 14720 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id CFD61DDF2D for ; Fri, 19 Dec 2008 07:00:41 +1100 (EST) X-Original-To: linuxppc-dev@ozlabs.org Delivered-To: linuxppc-dev@ozlabs.org Received: from relay02.pair.com (relay02.pair.com [209.68.5.16]) by ozlabs.org (Postfix) with SMTP id 49492DDEE9 for ; Fri, 19 Dec 2008 06:59:48 +1100 (EST) Received: (qmail 14937 invoked by uid 0); 18 Dec 2008 19:59:47 -0000 Received: from 66.134.71.115 (HELO localhost.localdomain) (66.134.71.115) by relay02.pair.com with SMTP; 18 Dec 2008 19:59:47 -0000 X-pair-Authenticated: 66.134.71.115 From: Grant Erickson To: linuxppc-dev@ozlabs.org Subject: [PATCH v3] powerpc/4xx: DTS: Add Add'l SDRAM0 Compatible and Interrupt Info Date: Thu, 18 Dec 2008 11:59:46 -0800 Message-Id: <1229630386-28380-1-git-send-email-gerickson@nuovations.com> X-Mailer: git-send-email 1.6.0.5 Organization: Nuovation System Designs, LLC Cc: bluesmoke-devel@lists.sourceforge.net X-BeenThere: linuxppc-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Added additional information for type and compatibility strings and interrupt information to the SDRAM0 memory-controller device tree nodes for AMCC PowerPC 405EX[r]-based boards to facilitate binding with the new "ibm,sdram-4xx-ddr2" EDAC memory controller adapter driver. Signed-off-by: Grant Erickson --- As support in the associated EDAC adapter driver is added over time, similar changes will/should be made to the DTS files for boards leveraging realizations of this "ibm,sdram-4xx-ddr2" controller, including the 440SP, 440SPe, 460EX, 460GT and 460SX. Patch v2, based on review from David Gibson, removes the 'device_type' field because it is only used for legacy OpenFirmware method interfaces and no such compatibility is warranted here. In addition, removed address- and size-cells as this node has no children. Patch v3, based on review from Josh Boyer and Stefan Roese, simplifies the interrupt specification because both the SEC and DED interrupts are mapped to the same interrupt parent. arch/powerpc/boot/dts/haleakala.dts | 5 +- arch/powerpc/boot/dts/kilauea.dts | 5 +- arch/powerpc/boot/dts/makalu.dts | 5 +- 3 files changed, 12 insertions(+), 3 deletions(-) 1.6.0.5 diff --git a/arch/powerpc/boot/dts/haleakala.dts b/arch/powerpc/boot/dts/haleakala.dts index 513bc43..09522f3 100644 --- a/arch/powerpc/boot/dts/haleakala.dts +++ b/arch/powerpc/boot/dts/haleakala.dts @@ -89,8 +89,11 @@ clock-frequency = <0>; /* Filled in by U-Boot */ SDRAM0: memory-controller { - compatible = "ibm,sdram-405exr"; + compatible = "ibm,sdram-405exr", "ibm,sdram-4xx-ddr2"; dcr-reg = <0x010 0x002>; + interrupt-parent = <&UIC2>; + interrupt-map = <0x5 0x4 /* ECC DED Error */ + 0x6 0x4>; /* ECC SEC Error */ }; MAL0: mcmal { diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts index dececc4..68c88e2 100644 --- a/arch/powerpc/boot/dts/kilauea.dts +++ b/arch/powerpc/boot/dts/kilauea.dts @@ -90,8 +90,11 @@ clock-frequency = <0>; /* Filled in by U-Boot */ SDRAM0: memory-controller { - compatible = "ibm,sdram-405ex"; + compatible = "ibm,sdram-405ex", "ibm,sdram-4xx-ddr2"; dcr-reg = <0x010 0x002>; + interrupt-parent = <&UIC2>; + interrupt-map = <0x5 0x4 /* ECC DED Error */ + 0x6 0x4>; /* ECC SEC Error */ }; MAL0: mcmal { diff --git a/arch/powerpc/boot/dts/makalu.dts b/arch/powerpc/boot/dts/makalu.dts index 945508c..537d21f 100644 --- a/arch/powerpc/boot/dts/makalu.dts +++ b/arch/powerpc/boot/dts/makalu.dts @@ -90,9 +90,11 @@ clock-frequency = <0>; /* Filled in by U-Boot */ SDRAM0: memory-controller { - compatible = "ibm,sdram-405ex"; + compatible = "ibm,sdram-405ex", "ibm,sdram-4xx-ddr2"; dcr-reg = <0x010 0x002>; + interrupt-parent = <&UIC2>; + interrupt-map = <0x5 0x4 /* ECC DED Error */ + 0x6 0x4>; /* ECC SEC Error */ }; MAL0: mcmal { --