From patchwork Fri Jan 24 13:04:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 23673 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f198.google.com (mail-ob0-f198.google.com [209.85.214.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 24CE2203C5 for ; Fri, 24 Jan 2014 13:04:38 +0000 (UTC) Received: by mail-ob0-f198.google.com with SMTP id wp4sf11068035obc.9 for ; Fri, 24 Jan 2014 05:04:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=qMekyauBG/L0yHSv8GYt4XJ8Xm1kHbTu1oK3jk6QcSg=; b=m1Z8kP5e7CqaPEbWtoxuPRGZkwAlM5f1ICtByYHvJ1o6IZ43xjXjYAdG6I/b0kBV4n bdNj0Ub5D282MZcWKlezF6TZPE7F00TVVhXRIRTDyoCw8/OjECQNWpQTZNB+chp1q2GE iZcAVzKfjX5gC+ljUULBHLrrfTXK3L2SCbIfa2X57uGVlRhI05TZEyPkb6e0KPMMd/qF x+bao9QETvBcfnNuAXtR1KCqbDp2+N38Rgm/nNXDUTBajZ64+uLngVzyuBMjVGKZqylA dzK+hBhXQWgSErCvosRsYQw2N0oVx42MWGdwpeUlBf+FpS9tMfpXgknv1wTqw9p2V7IF 33IQ== X-Gm-Message-State: ALoCoQlcM9/rCU//B+23ZScSGhkBhRegXPuF0HlpjiDvj8EnoXAuPL74CPo25UjO2wkcAxJ4uRct X-Received: by 10.50.78.166 with SMTP id c6mr1846745igx.1.1390568677246; Fri, 24 Jan 2014 05:04:37 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.81.16 with SMTP id e16ls577547qgd.63.gmail; Fri, 24 Jan 2014 05:04:37 -0800 (PST) X-Received: by 10.58.161.46 with SMTP id xp14mr72809veb.37.1390568677101; Fri, 24 Jan 2014 05:04:37 -0800 (PST) Received: from mail-vb0-f49.google.com (mail-vb0-f49.google.com [209.85.212.49]) by mx.google.com with ESMTPS id dq5si469406vcb.99.2014.01.24.05.04.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 24 Jan 2014 05:04:37 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.49 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.49; Received: by mail-vb0-f49.google.com with SMTP id x14so1794091vbb.8 for ; Fri, 24 Jan 2014 05:04:37 -0800 (PST) X-Received: by 10.220.188.70 with SMTP id cz6mr944vcb.59.1390568676996; Fri, 24 Jan 2014 05:04:36 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp100767vcz; Fri, 24 Jan 2014 05:04:36 -0800 (PST) X-Received: by 10.180.14.231 with SMTP id s7mr3108440wic.1.1390568675929; Fri, 24 Jan 2014 05:04:35 -0800 (PST) Received: from mail-we0-f180.google.com (mail-we0-f180.google.com [74.125.82.180]) by mx.google.com with ESMTPS id w4si502427wja.116.2014.01.24.05.04.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 24 Jan 2014 05:04:35 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.180 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.180; Received: by mail-we0-f180.google.com with SMTP id q59so2642829wes.11 for ; Fri, 24 Jan 2014 05:04:35 -0800 (PST) X-Received: by 10.194.24.65 with SMTP id s1mr10774524wjf.38.1390568675500; Fri, 24 Jan 2014 05:04:35 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id ay6sm2027940wjb.23.2014.01.24.05.04.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Jan 2014 05:04:34 -0800 (PST) From: Linus Walleij To: arm@kernel.org Cc: linux-arm-kernel@lists.infradead.org, Will Deacon , Linus Walleij Subject: [PATCH] ARM: integrator: restore static map on the CP Date: Fri, 24 Jan 2014 14:04:28 +0100 Message-Id: <1390568668-32270-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.4.2 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.49 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Commit 78d1632183454dba46ca8295484a5e7603acdc18 deleted the static mappings of the core modules, but this static map is still needed on the Integrator/CP (not the Integrator/AP). Restore the static map on the Integrator/CP. Reported-by: Will Deacon Signed-off-by: Linus Walleij --- ARM SoC folks: please apply this fix directly to ARM SoC if you're OK with it. --- arch/arm/mach-integrator/integrator_cp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 5e84149d1790..a3ef961e4a93 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c @@ -64,6 +64,7 @@ static void __iomem *intcp_con_base; /* * Logical Physical + * f1000000 10000000 Core module registers * f1300000 13000000 Counter/Timer * f1400000 14000000 Interrupt controller * f1600000 16000000 UART 0 @@ -75,6 +76,11 @@ static void __iomem *intcp_con_base; static struct map_desc intcp_io_desc[] __initdata __maybe_unused = { { + .virtual = IO_ADDRESS(INTEGRATOR_HDR_BASE), + .pfn = __phys_to_pfn(INTEGRATOR_HDR_BASE), + .length = SZ_4K, + .type = MT_DEVICE + }, { .virtual = IO_ADDRESS(INTEGRATOR_CT_BASE), .pfn = __phys_to_pfn(INTEGRATOR_CT_BASE), .length = SZ_4K,