From patchwork Sun Aug 26 21:35:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaccon Bastiaansen X-Patchwork-Id: 1375851 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 3CD52DFABE for ; Sun, 26 Aug 2012 21:39:28 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T5kVb-00081b-5f; Sun, 26 Aug 2012 21:36:39 +0000 Received: from mail-wg0-f45.google.com ([74.125.82.45]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T5kVX-00081N-Kj for linux-arm-kernel@lists.infradead.org; Sun, 26 Aug 2012 21:36:36 +0000 Received: by wgbdq12 with SMTP id dq12so2449590wgb.26 for ; Sun, 26 Aug 2012 14:36:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=E8y9jq3BWEVKB702b1V9BWZnjH1l8WkcUzesyCYnN5g=; b=RDxJrIe5dGknwCza260bKgb00n09FSjjcNU4s8Ycoj6VMRI1ZzU7kZHRgXJ+6pFaS9 RV6Cz03Hxd2/qEaVVicY3RBuHu9SqmT3qXPc1rdrIvaPJ6CsiVgpmkdvlYBtLdQtv1N1 8VguQ8qHfBWgLXmYwr5FSzDH/GJSJHQhenVcXhuUm92xCnUtU7nPinYtK9gKru3hQOe4 mLFcJXHdB0WvIy/oYB8M1eUlZftPWPmftCsp8ryfSjIzUI13hMpC8zV5VXcv8Kj9yh6g WG21r9PWS5JR2b1s8tt9Dw92xkG3mDv1kRZxg5e6waTtd1nHeHn0VL0epFyOKDeOkfNe aa9A== Received: by 10.180.105.6 with SMTP id gi6mr20476197wib.4.1346016990408; Sun, 26 Aug 2012 14:36:30 -0700 (PDT) Received: from localhost.localdomain (s529d540e.adsl.wanadoo.nl. [82.157.84.14]) by mx.google.com with ESMTPS id t7sm17241196wix.6.2012.08.26.14.36.28 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 26 Aug 2012 14:36:29 -0700 (PDT) From: Jaccon Bastiaansen To: s.hauer@pengutronix.de Subject: [PATCH] imx21ads : avoid overlapping static i/o mappings Date: Sun, 26 Aug 2012 23:35:38 +0200 Message-Id: <1346016938-28175-1-git-send-email-jaccon.bastiaansen@gmail.com> X-Mailer: git-send-email 1.7.1 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (jaccon.bastiaansen[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.45 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Jaccon Bastiaansen , festevam@gmail.com, kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The static I/O mappings for the cs89x0 ethernet controller and the secondary AHB port 1 (SAHB1) overlapped, causing a kernel crash at startup. This is fixed by mapping the cs89x0 to 0xf6000000 (which is free to use according to arch/arm/plat-mxc/include/mach/hardware.h). Signed-off-by: Jaccon Bastiaansen --- arch/arm/mach-imx/mach-mx21ads.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-imx/mach-mx21ads.c b/arch/arm/mach-imx/mach-mx21ads.c index ed22e3f..712c90e 100644 --- a/arch/arm/mach-imx/mach-mx21ads.c +++ b/arch/arm/mach-imx/mach-mx21ads.c @@ -31,7 +31,7 @@ /* * Memory-mapped I/O on MX21ADS base board */ -#define MX21ADS_MMIO_BASE_ADDR 0xf5000000 +#define MX21ADS_MMIO_BASE_ADDR 0xf6000000 #define MX21ADS_MMIO_SIZE 0xc00000 #define MX21ADS_REG_ADDR(offset) (void __force __iomem *) \