From patchwork Sat Feb 9 15:54:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joachim Eastwood X-Patchwork-Id: 2120441 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 2C62A3FCA4 for ; Sat, 9 Feb 2013 15:58:25 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U4Clg-0003Rm-Sz; Sat, 09 Feb 2013 15:55:09 +0000 Received: from mail-la0-x22c.google.com ([2a00:1450:4010:c03::22c]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U4ClM-0003PZ-Sf for linux-arm-kernel@lists.infradead.org; Sat, 09 Feb 2013 15:54:50 +0000 Received: by mail-la0-f44.google.com with SMTP id eb20so4706996lab.31 for ; Sat, 09 Feb 2013 07:54:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=iyTnqE+kirK6hw8bCD31Hn1JBHgZhI+NEREWMl2ZmR0=; b=zAdiBlxOyxjWd6VtAHAuGKY8yrlL8sivzl1pSXHGdf8HiDetKCsdWaBukDHOhJyNpd ZLPo1s8pyzc+FLXtFMZTMHk/lfMOSC/dC/ROsg3WpZjWlJdoai4y3hz/7Kez6VnXYM94 xnJNlwCX8yizMAJbia23f7U9V4cn6M/PUPgDY8oF6MC2NNIOD9UXij6Yq3815R/oUuar XRpbFv6M2KMGdd/XfhB87DKeUucXLDhEMquONOQpNAo/z86aId9v0yN9W0BBuoiH4Lkl sqPkVxO6GNnG9N+De3yk1qH+yNoW+mTYJGGb7snHCjH2+yRb/jG8oy2BasEk3VTHMfgg x4qw== X-Received: by 10.152.144.4 with SMTP id si4mr8024610lab.10.1360425286306; Sat, 09 Feb 2013 07:54:46 -0800 (PST) Received: from localhost.localdomain (57.90-149-223.nextgentel.com. [90.149.223.57]) by mx.google.com with ESMTPS id ns7sm18689615lab.5.2013.02.09.07.54.44 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 09 Feb 2013 07:54:45 -0800 (PST) From: Joachim Eastwood To: nicolas.ferre@atmel.com, plagnioj@jcrosoft.com Subject: [PATCH 2/2] ARM: at91: move at91_ramc.h and clean up includes Date: Sat, 9 Feb 2013 16:54:28 +0100 Message-Id: <1360425268-29060-3-git-send-email-manabian@gmail.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1360425268-29060-1-git-send-email-manabian@gmail.com> References: <1360425268-29060-1-git-send-email-manabian@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130209_105449_269340_52B42F21 X-CRM114-Status: GOOD ( 15.87 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (manabian[at]gmail.com) -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: Joachim Eastwood , 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 Now that the ebi interface isn't handled by ramc, make ramc private to mach-at91. And while at it clean up some unnecessary ramc includes in the RM9200 board files. Signed-off-by: Joachim Eastwood --- arch/arm/mach-at91/at91_ramc.h | 31 +++++++++++++++++++++++++++++ arch/arm/mach-at91/at91sam9_alt_reset.S | 2 +- arch/arm/mach-at91/at91sam9g45_reset.S | 2 +- arch/arm/mach-at91/board-cpuat91.c | 2 -- arch/arm/mach-at91/board-kb9202.c | 2 -- arch/arm/mach-at91/board-picotux200.c | 3 --- arch/arm/mach-at91/board-rm9200dk.c | 2 -- arch/arm/mach-at91/board-rm9200ek.c | 2 -- arch/arm/mach-at91/include/mach/at91_ramc.h | 31 ----------------------------- arch/arm/mach-at91/pm.h | 2 +- arch/arm/mach-at91/pm_slowclock.S | 2 +- 11 files changed, 35 insertions(+), 46 deletions(-) create mode 100644 arch/arm/mach-at91/at91_ramc.h delete mode 100644 arch/arm/mach-at91/include/mach/at91_ramc.h diff --git a/arch/arm/mach-at91/at91_ramc.h b/arch/arm/mach-at91/at91_ramc.h new file mode 100644 index 0000000..038041d --- /dev/null +++ b/arch/arm/mach-at91/at91_ramc.h @@ -0,0 +1,31 @@ +/* + * Header file for the Atmel RAM Controller + * + * Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD + * + * Under GPLv2 only + */ + +#ifndef __AT91_RAMC_H__ +#define __AT91_RAMC_H__ + +#ifndef __ASSEMBLY__ +extern void __iomem *at91_ramc_base[]; + +#define at91_ramc_read(id, field) \ + __raw_readl(at91_ramc_base[id] + field) + +#define at91_ramc_write(id, field, value) \ + __raw_writel(value, at91_ramc_base[id] + field) +#else +.extern at91_ramc_base +#endif + +#define AT91_MEMCTRL_MC 0 +#define AT91_MEMCTRL_SDRAMC 1 +#define AT91_MEMCTRL_DDRSDR 2 + +#include +#include + +#endif /* __AT91_RAMC_H__ */ diff --git a/arch/arm/mach-at91/at91sam9_alt_reset.S b/arch/arm/mach-at91/at91sam9_alt_reset.S index f039538..7430f3c 100644 --- a/arch/arm/mach-at91/at91sam9_alt_reset.S +++ b/arch/arm/mach-at91/at91sam9_alt_reset.S @@ -15,7 +15,7 @@ #include #include -#include +#include "at91_ramc.h" #include "at91_rstc.h" .arm diff --git a/arch/arm/mach-at91/at91sam9g45_reset.S b/arch/arm/mach-at91/at91sam9g45_reset.S index 721a1a3..d021154 100644 --- a/arch/arm/mach-at91/at91sam9g45_reset.S +++ b/arch/arm/mach-at91/at91sam9g45_reset.S @@ -12,7 +12,7 @@ #include #include -#include +#include "at91_ramc.h" #include "at91_rstc.h" .arm diff --git a/arch/arm/mach-at91/board-cpuat91.c b/arch/arm/mach-at91/board-cpuat91.c index 42f1353..89a9ea0 100644 --- a/arch/arm/mach-at91/board-cpuat91.c +++ b/arch/arm/mach-at91/board-cpuat91.c @@ -36,8 +36,6 @@ #include #include -#include -#include #include #include "at91_aic.h" diff --git a/arch/arm/mach-at91/board-kb9202.c b/arch/arm/mach-at91/board-kb9202.c index 0c519d9..4d4ef55 100644 --- a/arch/arm/mach-at91/board-kb9202.c +++ b/arch/arm/mach-at91/board-kb9202.c @@ -36,8 +36,6 @@ #include #include -#include -#include #include "at91_aic.h" #include "board.h" diff --git a/arch/arm/mach-at91/board-picotux200.c b/arch/arm/mach-at91/board-picotux200.c index ab2b2ec..69a8bce 100644 --- a/arch/arm/mach-at91/board-picotux200.c +++ b/arch/arm/mach-at91/board-picotux200.c @@ -37,9 +37,6 @@ #include #include -#include -#include - #include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-rm9200dk.c b/arch/arm/mach-at91/board-rm9200dk.c index 690541b..dce4c77 100644 --- a/arch/arm/mach-at91/board-rm9200dk.c +++ b/arch/arm/mach-at91/board-rm9200dk.c @@ -39,8 +39,6 @@ #include #include -#include -#include #include "at91_aic.h" #include "board.h" diff --git a/arch/arm/mach-at91/board-rm9200ek.c b/arch/arm/mach-at91/board-rm9200ek.c index 8b17dad..1369bf6 100644 --- a/arch/arm/mach-at91/board-rm9200ek.c +++ b/arch/arm/mach-at91/board-rm9200ek.c @@ -39,8 +39,6 @@ #include #include -#include -#include #include "at91_aic.h" #include "board.h" diff --git a/arch/arm/mach-at91/include/mach/at91_ramc.h b/arch/arm/mach-at91/include/mach/at91_ramc.h deleted file mode 100644 index 038041d..0000000 --- a/arch/arm/mach-at91/include/mach/at91_ramc.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Header file for the Atmel RAM Controller - * - * Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD - * - * Under GPLv2 only - */ - -#ifndef __AT91_RAMC_H__ -#define __AT91_RAMC_H__ - -#ifndef __ASSEMBLY__ -extern void __iomem *at91_ramc_base[]; - -#define at91_ramc_read(id, field) \ - __raw_readl(at91_ramc_base[id] + field) - -#define at91_ramc_write(id, field, value) \ - __raw_writel(value, at91_ramc_base[id] + field) -#else -.extern at91_ramc_base -#endif - -#define AT91_MEMCTRL_MC 0 -#define AT91_MEMCTRL_SDRAMC 1 -#define AT91_MEMCTRL_DDRSDR 2 - -#include -#include - -#endif /* __AT91_RAMC_H__ */ diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h index c5dd8dc..8f3a4f7 100644 --- a/arch/arm/mach-at91/pm.h +++ b/arch/arm/mach-at91/pm.h @@ -11,7 +11,7 @@ #ifndef __ARCH_ARM_MACH_AT91_PM #define __ARCH_ARM_MACH_AT91_PM -#include +#include "at91_ramc.h" /* * The AT91RM9200 goes into self-refresh mode with this command, and will diff --git a/arch/arm/mach-at91/pm_slowclock.S b/arch/arm/mach-at91/pm_slowclock.S index 098c28d..ac49fd4 100644 --- a/arch/arm/mach-at91/pm_slowclock.S +++ b/arch/arm/mach-at91/pm_slowclock.S @@ -15,7 +15,7 @@ #include #include #include -#include +#include "at91_ramc.h" #ifdef CONFIG_SOC_AT91SAM9263