From patchwork Tue Nov 16 12:37:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Schwarz X-Patchwork-Id: 71391 X-Patchwork-Delegate: kim.phillips@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 0416FB710C for ; Tue, 16 Nov 2010 23:38:01 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8F028284E1; Tue, 16 Nov 2010 13:37:58 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mSQW9ikcTdCP; Tue, 16 Nov 2010 13:37:58 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id ECAF8284E3; Tue, 16 Nov 2010 13:37:57 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 11F0B284E3 for ; Tue, 16 Nov 2010 13:37:57 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Jhy+NhDuhbEJ for ; Tue, 16 Nov 2010 13:37:55 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail1.matrix-vision.com (mail1.matrix-vision.com [78.47.19.71]) by theia.denx.de (Postfix) with ESMTPS id 084B6284E1 for ; Tue, 16 Nov 2010 13:37:53 +0100 (CET) Received: from mail1.matrix-vision.com (localhost [127.0.0.1]) by mail1.matrix-vision.com (Postfix) with ESMTP id 3B97E726A1; Tue, 16 Nov 2010 13:37:53 +0100 (CET) Received: from erinome (g2.matrix-vision.com [80.152.136.245]) by mail1.matrix-vision.com (Postfix) with ESMTPA id 1740B72687; Tue, 16 Nov 2010 13:37:53 +0100 (CET) Received: from erinome (localhost [127.0.0.1]) by erinome (Postfix) with ESMTP id 873546F8A; Tue, 16 Nov 2010 13:37:52 +0100 (CET) Received: by erinome (Postfix, from userid 108) id 7A8936F9C; Tue, 16 Nov 2010 13:37:52 +0100 (CET) Received: from localhost.localdomain (host65-105.intern.matrix-vision.de [192.168.65.105]) by erinome (Postfix) with ESMTPA id 6147F6F8A; Tue, 16 Nov 2010 13:37:52 +0100 (CET) From: Andre Schwarz To: kim.phillips@freescale.com Date: Tue, 16 Nov 2010 13:37:50 +0100 Message-Id: <1289911070-21742-1-git-send-email-andre.schwarz@matrix-vision.de> X-Mailer: git-send-email 1.7.0.4 X-AV-Checked: ClamAV using ClamSMTP (erinome) X-AV-Checked: ClamAV using ClamSMTP (mail1) Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH] [MPC837x v2] Make it work again with USB. X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de USB register range IMMR+0x00-0xff is reserved and hangs the CPU. Signed-off-by: Andre Schwarz --- arch/powerpc/cpu/mpc83xx/cpu_init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c index 7a1cae7..cfead18 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c @@ -327,7 +327,7 @@ void cpu_init_f (volatile immap_t * im) im->gpio[1].dir = CONFIG_SYS_GPIO2_DIR; #endif #ifdef CONFIG_USB_EHCI_FSL -#ifndef CONFIG_MPC834x +#if !defined(CONFIG_MPC834x) && !defined(CONFIG_MPC837x) uint32_t temp; struct usb_ehci *ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB_ADDR;