From patchwork Mon Oct 12 16:06:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Phillips X-Patchwork-Id: 35785 X-Patchwork-Delegate: galak@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id E77A3B7F44 for ; Tue, 13 Oct 2009 03:06:34 +1100 (EST) Received: from az33egw02.freescale.net (az33egw02.freescale.net [192.88.158.103]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "az33egw02.freescale.net", Issuer "Thawte Premium Server CA" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id CE935B7B72 for ; Tue, 13 Oct 2009 03:06:26 +1100 (EST) Received: from de01smr02.am.mot.com (de01smr02.freescale.net [10.208.0.151]) by az33egw02.freescale.net (8.14.3/az33egw02) with ESMTP id n9CG6MlF003535 for ; Mon, 12 Oct 2009 09:06:23 -0700 (MST) Received: from az33exm22.fsl.freescale.net (az33exm22.am.freescale.net [10.64.32.10]) by de01smr02.am.mot.com (8.13.1/8.13.0) with ESMTP id n9CG9H8h023685 for ; Mon, 12 Oct 2009 11:09:18 -0500 (CDT) Received: from widmer.am.freescale.net ([10.82.123.5]) by az33exm22.fsl.freescale.net with Microsoft SMTPSVC(6.0.3790.3959); Mon, 12 Oct 2009 10:06:19 -0600 Date: Mon, 12 Oct 2009 11:06:19 -0500 From: Kim Phillips To: Kumar Gala Subject: Re: [PATCH] * mpc8313erdb.dts: Fixed eTSEC interrupt assignment. Message-Id: <20091012110619.972d0f61.kim.phillips@freescale.com> In-Reply-To: References: <25940478.1252060285938.JavaMail.root@viefep11.chello.at> <20090909182227.GA8215@b07421-ec1.am.freescale.net> Organization: Freescale Semiconductor, Inc. X-Mailer: Sylpheed 2.6.0 (GTK+ 2.16.1; x86_64-pc-linux-gnu) Mime-Version: 1.0 X-OriginalArrivalTime: 12 Oct 2009 16:06:19.0830 (UTC) FILETIME=[EFA43560:01CA4B55] X-Brightmail-Tracker: AAAAAQAAAWE= X-Brightmail-Tracker: AAAAAQAAAWE= Cc: Scott Wood , u-boot@lists.denx.de, linuxppc-dev , Roland Lezuo X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org On Wed, 9 Sep 2009 15:28:01 -0500 Kumar Gala wrote: > > On Sep 9, 2009, at 1:22 PM, Scott Wood wrote: > > > On Fri, Sep 04, 2009 at 12:31:25PM +0200, Roland Lezuo wrote: > >> The following patch is needed to correctly assign the IRQs for the > >> gianfar driver on the MPC8313ERDB-revc boards. ERR and TX are swapped > >> as well as the interrupt lines for the two devices. > > > > And it will incorrectly assign them on older revisions of the chip. > > > > We really should have a u-boot fixup based on SVR. Roland, is it possible for you to test this u-boot patch?: From 44c73137acf20626e930e3f4142e60054d8bd46f Mon Sep 17 00:00:00 2001 From: Kim Phillips Date: Mon, 12 Oct 2009 10:51:20 -0500 Subject: [PATCH] mpc83xx: mpc8313 - handle erratum IPIC1 (TSEC IRQ number swappage) mpc8313e erratum IPIC1 swapped TSEC interrupt ID numbers on rev. 1 h/w (see AN3545). The base device tree in use has rev. 1 ID numbers, so if on Rev. 2 (and higher) h/w, we fix them up here. Signed-off-by: Kim Phillips --- cpu/mpc83xx/fdt.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/cpu/mpc83xx/fdt.c b/cpu/mpc83xx/fdt.c index 13443cb..daf73a6 100644 --- a/cpu/mpc83xx/fdt.c +++ b/cpu/mpc83xx/fdt.c @@ -69,6 +69,45 @@ void ft_cpu_setup(void *blob, bd_t *bd) defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3) ||\ defined(CONFIG_HAS_ETH4) || defined(CONFIG_HAS_ETH5) fdt_fixup_ethernet(blob); +#ifdef CONFIG_MPC8313 + /* + * mpc8313e erratum IPIC1 swapped TSEC interrupt ID numbers on rev. 1 + * h/w (see AN3545). The base device tree in use has rev. 1 ID numbers, + * so if on Rev. 2 (and higher) h/w, we fix them up here + */ + if (REVID_MAJOR(immr->sysconf.spridr) >= 2) { + int nodeoffset, path; + const char *prop; + + nodeoffset = fdt_path_offset(blob, "/aliases"); + if (nodeoffset >= 0) { +#if defined(CONFIG_HAS_ETH0) + prop = fdt_getprop(blob, nodeoffset, "ethernet0", NULL); + if (prop) { + u32 tmp[] = { 32, 0x8, 33, 0x8, 34, 0x8 }; + + path = fdt_path_offset(blob, prop); + prop = fdt_getprop(blob, path, "interrupts", 0); + if (prop) + fdt_setprop(blob, path, "interrupts", + &tmp, sizeof(tmp)); + } +#endif +#if defined(CONFIG_HAS_ETH1) + prop = fdt_getprop(blob, nodeoffset, "ethernet1", NULL); + if (prop) { + u32 tmp[] = { 35, 0x8, 36, 0x8, 37, 0x8 }; + + path = fdt_path_offset(blob, prop); + prop = fdt_getprop(blob, path, "interrupts", 0); + if (prop) + fdt_setprop(blob, path, "interrupts", + &tmp, sizeof(tmp)); + } +#endif + } + } +#endif #endif do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,