From patchwork Tue Nov 16 12:30:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Schwarz X-Patchwork-Id: 71390 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 7C451B712A for ; Tue, 16 Nov 2010 23:31:07 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 564A82837A; Tue, 16 Nov 2010 13:31:04 +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 dmWneVoYXh2h; Tue, 16 Nov 2010 13:31:04 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 233B9284B5; Tue, 16 Nov 2010 13:31:02 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3C353284B5 for ; Tue, 16 Nov 2010 13:31:00 +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 Qr-UennEfDVi for ; Tue, 16 Nov 2010 13:30:58 +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 090882837A for ; Tue, 16 Nov 2010 13:30:55 +0100 (CET) Received: from mail1.matrix-vision.com (localhost [127.0.0.1]) by mail1.matrix-vision.com (Postfix) with ESMTP id 70E587277E; Tue, 16 Nov 2010 13:30:55 +0100 (CET) Received: from erinome (g2.matrix-vision.com [80.152.136.245]) by mail1.matrix-vision.com (Postfix) with ESMTPA id 4A7EF72687; Tue, 16 Nov 2010 13:30:55 +0100 (CET) Received: from erinome (localhost [127.0.0.1]) by erinome (Postfix) with ESMTP id 902A76F8A; Tue, 16 Nov 2010 13:30:52 +0100 (CET) Received: by erinome (Postfix, from userid 108) id 816EE6F9C; Tue, 16 Nov 2010 13:30:52 +0100 (CET) Received: from localhost.localdomain (host65-105.intern.matrix-vision.de [192.168.65.105]) by erinome (Postfix) with ESMTPA id 662576F8A; Tue, 16 Nov 2010 13:30:52 +0100 (CET) From: Andre Schwarz To: kim.phillips@freescale.com Date: Tue, 16 Nov 2010 13:30:46 +0100 Message-Id: <1289910646-21393-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] Make it work again with USB. USB register range IMMR+0x00-0xff is reserved and hangs the CPU. 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 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;