From patchwork Wed Dec 4 16:35:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 22026 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 66B7123FCB for ; Wed, 4 Dec 2013 16:35:52 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id id10sf34706574vcb.8 for ; Wed, 04 Dec 2013 08:35:52 -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=eJfuVg/zz9hMZqdJ1MCYCELBFRtDycTyHXfhqw63CO0=; b=if4ynTstBdrqkeIQVqlsOMUhb1pChGked2I/5TSNNrkWCS7rb0hSDKh2Hd0UbAfMVZ ViWpM9IbOCQYKPoEZcX06sRDzbZ918SleNKkc/25z/qb9hVPU4AHADVs1Oc5OaXRB4es FN4dWtW8q9k2b10B53cl4x4w4yZQkZhZnV7eYigDw9s0KtOtycDVpbHqtCF+RtOZG26v vyRsatPS4zrSkFDaMVTNTtxXf4bzdOonoSKTsxClC3kKEBQAQal22Fcp53iiCb1Usd5p LeJ5/0BjM9UNYiGMjVGUsAeyOPMpLVKQO8M12tb+JOQ6PzZ87BV4pcrgT+BR7rnDT8Uv HpdQ== X-Gm-Message-State: ALoCoQkzpd8MgWA/w/+nV0J5lyFLIt1Hge5CdGGwmf3uPn9VA3wIeOaERfGZxqaLiIpn3APX8Uof X-Received: by 10.224.50.69 with SMTP id y5mr978826qaf.5.1386174952031; Wed, 04 Dec 2013 08:35:52 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.83.2 with SMTP id m2ls312574qey.37.gmail; Wed, 04 Dec 2013 08:35:51 -0800 (PST) X-Received: by 10.52.113.194 with SMTP id ja2mr814989vdb.61.1386174951898; Wed, 04 Dec 2013 08:35:51 -0800 (PST) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id uw1si8117968vdc.71.2013.12.04.08.35.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 04 Dec 2013 08:35:51 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id ia6so11625590vcb.18 for ; Wed, 04 Dec 2013 08:35:51 -0800 (PST) X-Received: by 10.221.16.200 with SMTP id pz8mr1021839vcb.53.1386174951422; Wed, 04 Dec 2013 08:35:51 -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 u4csp306139vcz; Wed, 4 Dec 2013 08:35:50 -0800 (PST) X-Received: by 10.152.19.131 with SMTP id f3mr1459lae.87.1386174950056; Wed, 04 Dec 2013 08:35:50 -0800 (PST) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com [209.85.217.171]) by mx.google.com with ESMTPS id x7si30280696lag.141.2013.12.04.08.35.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 04 Dec 2013 08:35:50 -0800 (PST) Received-SPF: neutral (google.com: 209.85.217.171 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.217.171; Received: by mail-lb0-f171.google.com with SMTP id q8so9419161lbi.16 for ; Wed, 04 Dec 2013 08:35:49 -0800 (PST) X-Received: by 10.112.138.70 with SMTP id qo6mr2855031lbb.34.1386174949312; Wed, 04 Dec 2013 08:35:49 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id tc8sm12664892lbb.9.2013.12.04.08.35.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Dec 2013 08:35:47 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Cc: Linus Walleij Subject: [PATCH 1/2] ARM: integrator: delete static core module mappings Date: Wed, 4 Dec 2013 17:35:39 +0100 Message-Id: <1386174939-5801-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 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.220.173 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: , Now that the core module base is taken from the device tree both for platform initialization and cpufreq, let's delete the static mappings. Signed-off-by: Linus Walleij --- arch/arm/mach-integrator/integrator_ap.c | 8 +------- arch/arm/mach-integrator/integrator_cp.c | 8 -------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index d50dc2dbfd89..a762712bc2f2 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -64,6 +64,7 @@ /* Base address to the AP system controller */ void __iomem *ap_syscon_base; + /* * All IO addresses are mapped onto VA 0xFFFx.xxxx, where x.xxxx * is the (PA >> 12). @@ -73,12 +74,10 @@ void __iomem *ap_syscon_base; */ #define VA_IC_BASE __io_address(INTEGRATOR_IC_BASE) #define VA_EBI_BASE __io_address(INTEGRATOR_EBI_BASE) -#define VA_CMIC_BASE __io_address(INTEGRATOR_HDR_IC) /* * Logical Physical * ef000000 Cache flush - * f1000000 10000000 Core module registers * f1100000 11000000 System controller registers * f1200000 12000000 EBI registers * f1300000 13000000 Counter/Timer @@ -91,11 +90,6 @@ void __iomem *ap_syscon_base; static struct map_desc ap_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_EBI_BASE), .pfn = __phys_to_pfn(INTEGRATOR_EBI_BASE), .length = SZ_4K, diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 4fc0a195de01..916c0f345a3a 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c @@ -64,8 +64,6 @@ static void __iomem *intcp_con_base; /* * Logical Physical - * f1000000 10000000 Core module registers - * f1100000 11000000 System controller registers * f1200000 12000000 EBI registers * f1300000 13000000 Counter/Timer * f1400000 14000000 Interrupt controller @@ -74,16 +72,10 @@ static void __iomem *intcp_con_base; * f1a00000 1a000000 Debug LEDs * fc900000 c9000000 GPIO * fca00000 ca000000 SIC - * fcb00000 cb000000 CP system control */ 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_EBI_BASE), .pfn = __phys_to_pfn(INTEGRATOR_EBI_BASE), .length = SZ_4K,