From patchwork Thu Dec 18 01:31:40 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Erickson X-Patchwork-Id: 14600 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 9C641DDF58 for ; Thu, 18 Dec 2008 12:33:36 +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 B351DDDDFB for ; Thu, 18 Dec 2008 12:31:43 +1100 (EST) Received: (qmail 16106 invoked by uid 0); 18 Dec 2008 01:31:40 -0000 Received: from 66.134.71.115 (HELO localhost.localdomain) (66.134.71.115) by relay02.pair.com with SMTP; 18 Dec 2008 01:31:40 -0000 X-pair-Authenticated: 66.134.71.115 From: Grant Erickson To: linuxppc-dev@ozlabs.org Subject: [PATCH v2] powerpc/4xx: DTS: Add Add'l SDRAM0 Compatible and Interrupt Info Date: Wed, 17 Dec 2008 17:31:40 -0800 Message-Id: <1229563900-10447-1-git-send-email-gerickson@nuovations.com> X-Mailer: git-send-email 1.6.0.4 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 Acked-by: David Gibson Acked-by: Stefan Roese --- 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. arch/powerpc/boot/dts/haleakala.dts | 8 +- arch/powerpc/boot/dts/kilauea.dts | 8 +- arch/powerpc/boot/dts/makalu.dts | 8 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/boot/dts/haleakala.dts b/arch/powerpc/boot/dts/haleakala.dts index 513bc43..64880ab 100644 --- a/arch/powerpc/boot/dts/haleakala.dts +++ b/arch/powerpc/boot/dts/haleakala.dts @@ -89,8 +89,14 @@ 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-cells = <1>; + interrupt-parent = <&SDRAM0>; + interrupts = <0x0 0x1>; + interrupt-map = ; + interrupt-map-mask = <0xffffffff>; }; MAL0: mcmal { diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts index dececc4..bc32b60 100644 --- a/arch/powerpc/boot/dts/kilauea.dts +++ b/arch/powerpc/boot/dts/kilauea.dts @@ -90,8 +90,14 @@ 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-cells = <1>; + interrupt-parent = <&SDRAM0>; + interrupts = <0x0 0x1>; + interrupt-map = ; + interrupt-map-mask = <0xffffffff>; }; MAL0: mcmal { diff --git a/arch/powerpc/boot/dts/makalu.dts b/arch/powerpc/boot/dts/makalu.dts index 945508c..472d22d 100644 --- a/arch/powerpc/boot/dts/makalu.dts +++ b/arch/powerpc/boot/dts/makalu.dts @@ -90,8 +90,14 @@ 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-cells = <1>; + interrupt-parent = <&SDRAM0>; + interrupts = <0x0 0x1>; + interrupt-map = ; + interrupt-map-mask = <0xffffffff>; }; MAL0: mcmal {