From patchwork Wed Apr 18 02:07:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 153363 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D21BAB707E for ; Wed, 18 Apr 2012 12:11:32 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SKKKC-0007dQ-2p; Wed, 18 Apr 2012 02:08:52 +0000 Received: from mail-out.m-online.net ([2001:a60:0:70:0:1:25:1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SKKJc-0007ZE-4P for linux-arm-kernel@lists.infradead.org; Wed, 18 Apr 2012 02:08:24 +0000 Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3VXRYt5Mt9z4LDdt; Wed, 18 Apr 2012 04:08:02 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.8.164]) by mail.m-online.net (Postfix) with ESMTP id 3VXRYt4Wtbz4KK3x; Wed, 18 Apr 2012 04:08:02 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from smtp-auth.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.8.164]) (amavisd-new, port 10024) with ESMTP id ONgze8IUuRt8; Wed, 18 Apr 2012 04:08:01 +0200 (CEST) Received: from mashiro.lan (unknown [195.140.253.167]) by smtp-auth.mnet-online.de (Postfix) with ESMTPA; Wed, 18 Apr 2012 04:08:00 +0200 (CEST) From: Marek Vasut To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 03/10] MXS: Fixup i.MX233 USB base address name Date: Wed, 18 Apr 2012 04:07:42 +0200 Message-Id: <1334714869-19282-4-git-send-email-marex@denx.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1334714869-19282-1-git-send-email-marex@denx.de> References: <1334657751-27678-1-git-send-email-marex@denx.de> <1334714869-19282-1-git-send-email-marex@denx.de> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Marek Vasut , Li Frank-B20596 , Tony Lin , Lin Tony-B19295 , Detlev Zundel , Chen Peter-B29397 , Sascha Hauer , Linux USB , Stefano Babic , Wolfgang Denk , Shawn Guo , Fabio Estevam , Shawn Guo , Subodh Nijsure X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Modify USB EHCI and USB PHY base addresses on the i.MX233 to nicely fit into the whole USB registration scheme. Based on code by: Tony Lin Signed-off-by: Marek Vasut Cc: Chen Peter-B29397 Cc: Detlev Zundel Cc: Fabio Estevam Cc: Li Frank-B20596 Cc: Lin Tony-B19295 Cc: Linux USB Cc: Sascha Hauer Cc: Shawn Guo Cc: Shawn Guo Cc: Stefano Babic Cc: Subodh Nijsure Cc: Tony Lin Cc: Wolfgang Denk --- arch/arm/mach-mxs/include/mach/mx23.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-mxs/include/mach/mx23.h b/arch/arm/mach-mxs/include/mach/mx23.h index 599094b..7955b75 100644 --- a/arch/arm/mach-mxs/include/mach/mx23.h +++ b/arch/arm/mach-mxs/include/mach/mx23.h @@ -64,8 +64,8 @@ #define MX23_AUART1_BASE_ADDR (MX23_IO_BASE_ADDR + 0x06c000) #define MX23_AUART2_BASE_ADDR (MX23_IO_BASE_ADDR + 0x06e000) #define MX23_DUART_BASE_ADDR (MX23_IO_BASE_ADDR + 0x070000) -#define MX23_USBPHY_BASE_ADDR (MX23_IO_BASE_ADDR + 0x07c000) -#define MX23_USBCTRL_BASE_ADDR (MX23_IO_BASE_ADDR + 0x080000) +#define MX23_USBPHY0_BASE_ADDR (MX23_IO_BASE_ADDR + 0x07c000) +#define MX23_USBCTRL0_BASE_ADDR (MX23_IO_BASE_ADDR + 0x080000) #define MX23_DRAM_BASE_ADDR (MX23_IO_BASE_ADDR + 0x0e0000) #define MX23_IO_P2V(x) MXS_IO_P2V(x) @@ -89,8 +89,8 @@ #define MX23_INT_SPDIF_ERROR 10 #define MX23_INT_SAIF1_IRQ 10 #define MX23_INT_SAIF2_IRQ 10 -#define MX23_INT_USB_CTRL 11 -#define MX23_INT_USB_WAKEUP 12 +#define MX23_INT_USB0 11 +#define MX23_INT_USB0_WAKEUP 12 #define MX23_INT_GPMI_DMA 13 #define MX23_INT_SSP1_DMA 14 #define MX23_INT_SSP1_ERROR 15