From patchwork Mon Jun 25 16:37:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luke Lowrey X-Patchwork-Id: 167207 X-Patchwork-Delegate: prafulla@marvell.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 63520B6FAF for ; Tue, 26 Jun 2012 04:28:02 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A0E97280A4; Mon, 25 Jun 2012 20:27:53 +0200 (CEST) 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 mqm8DYzv84kj; Mon, 25 Jun 2012 20:27:53 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AFC482807E; Mon, 25 Jun 2012 20:27:44 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F0EE02807F for ; Mon, 25 Jun 2012 18:42:16 +0200 (CEST) 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 At0izbis-x0p for ; Mon, 25 Jun 2012 18:42:16 +0200 (CEST) X-Greylist: delayed 302 seconds by postgrey-1.27 at theia; Mon, 25 Jun 2012 18:42:14 CEST 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 moutng.kundenserver.de (moutng.kundenserver.de [212.227.17.9]) by theia.denx.de (Postfix) with ESMTP id 747452807E for ; Mon, 25 Jun 2012 18:42:14 +0200 (CEST) Received: from localhost.localdomain (host86-174-134-56.range86-174.btcentralplus.com [86.174.134.56]) by mrelayeu.kundenserver.de (node=mreu3) with ESMTP (Nemesis) id 0LmRp1-1SAgPl1R4d-00aByi; Mon, 25 Jun 2012 18:37:10 +0200 From: Luke Lowrey To: u-boot@lists.denx.de Date: Mon, 25 Jun 2012 17:37:09 +0100 Message-Id: <1340642229-13511-1-git-send-email-luke@chamsys.co.uk> X-Mailer: git-send-email 1.5.6.5 X-Provags-ID: V02:K0:GxUMR5jotBAfy3yFXrZWFa74Xs+B7uAcR06NI6dAiSi UMvxIn9lm6SC+V/MzgAM4khKbL/9Ua3ZpD3vixML8tqhf6VhQd Jjdbv1+7ZHiN12i7E6MMDrz9qruk6Xx38YKJZG6obOqsZDPer+ xM1VBsABUHYOkbQ6D1WbuQHUkHe3oSsFiUUS8Q7RfcjqTz40m6 pGL6tqoo2bN1GKrsgbZDqmzToM0lhx53p4SeLGZ18o78MEiPTB jEHo3ntPz+pQBqZgiElXgDrqT3TeiMk3rR4AGskYnrIHsisiAW b+fe8cNlkhUA+R+y2Gb1UWtD83/IiWLBBqHvfkgVlQfkwX98Sp T2HKXp3R+8eBltr8UALuZLUSVFyy6VtFUPV8hmSG9PYUQDj0vL UORfwV2vrELBA== X-Mailman-Approved-At: Mon, 25 Jun 2012 20:27:40 +0200 Subject: [U-Boot] [PATCH] arch-kirkwood: Ethernet port macro returning incorrect address X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 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 Modified the arch-kirkwood header so KWGBE_PORT_SERIAL_CONTROL1_REG(x) returns the correct address. Originally calling KWGBE_PORT_SERIAL_CONTROL1_REG(1) returned the address for port 0 and vice versa. Doesn't have any knock on effects to the u-boot code as the only time they're used is to do the same function to both addresses Signed-off-by: Luke Lowrey Acked-by: Prafulla Wadaskar Acked-by: Heiko Schocher --- arch/arm/include/asm/arch-kirkwood/cpu.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/include/asm/arch-kirkwood/cpu.h b/arch/arm/include/asm/arch-kirkwood/cpu.h index d28c51a..784ba87 100644 --- a/arch/arm/include/asm/arch-kirkwood/cpu.h +++ b/arch/arm/include/asm/arch-kirkwood/cpu.h @@ -33,7 +33,7 @@ | (attr << 8) | (kw_winctrl_calcsize(size) << 16)) #define KWGBE_PORT_SERIAL_CONTROL1_REG(_x) \ - ((_x ? KW_EGIGA0_BASE : KW_EGIGA1_BASE) + 0x44c) + ((_x ? KW_EGIGA1_BASE : KW_EGIGA0_BASE) + 0x44c) #define KW_REG_PCIE_DEVID (KW_REG_PCIE_BASE + 0x00) #define KW_REG_PCIE_REVID (KW_REG_PCIE_BASE + 0x08)