From patchwork Wed Jan 11 14:55:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 6156 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 8983D23E0E for ; Wed, 11 Jan 2012 14:55:53 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id 7F48DA18538 for ; Wed, 11 Jan 2012 14:55:53 +0000 (UTC) Received: by mail-ey0-f180.google.com with SMTP id e12so239857eaa.11 for ; Wed, 11 Jan 2012 06:55:53 -0800 (PST) Received: by 10.205.26.67 with SMTP id rl3mr3333316bkb.45.1326293753330; Wed, 11 Jan 2012 06:55:53 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.82.144 with SMTP id ac16cs110607bkc; Wed, 11 Jan 2012 06:55:53 -0800 (PST) Received: by 10.180.19.130 with SMTP id f2mr11406763wie.12.1326293751883; Wed, 11 Jan 2012 06:55:51 -0800 (PST) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id u47si787647weq.26.2012.01.11.06.55.51 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Jan 2012 06:55:51 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of daniel.lezcano@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of daniel.lezcano@linaro.org) smtp.mail=daniel.lezcano@linaro.org Received: by mail-we0-f178.google.com with SMTP id p12so799825wer.37 for ; Wed, 11 Jan 2012 06:55:51 -0800 (PST) Received: by 10.216.132.82 with SMTP id n60mr2970674wei.1.1326293750868; Wed, 11 Jan 2012 06:55:50 -0800 (PST) Received: from localhost.localdomain (AToulouse-159-1-69-110.w92-134.abo.wanadoo.fr. [92.134.92.110]) by mx.google.com with ESMTPS id a6sm4608647wiy.6.2012.01.11.06.55.48 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Jan 2012 06:55:49 -0800 (PST) From: Daniel Lezcano To: linux@arm.linux.org.uk Cc: robherring2@gmail.com, khilman@ti.com, len.brown@intel.com, linux-pm@vger.kernel.org, magnus.damm@gmail.com, s.hauer@pengutronix.de, nicolas.ferre@atmel.com, nsekhar@ti.com, linux@maxim.org.za, arnd.bergmann@linaro.org, rob.lee@linaro.org, shawn.guo@freescale.com, linux-arm-kernel@lists.infradead.org, amit.kucheria@linaro.org Subject: [PATCH 3/7] at91 : group headers inclusion for the memory controller Date: Wed, 11 Jan 2012 15:55:36 +0100 Message-Id: <1326293740-15735-4-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1326293740-15735-1-git-send-email-daniel.lezcano@linaro.org> References: <1326293740-15735-1-git-send-email-daniel.lezcano@linaro.org> Group the headers inclusion depending on the arch in a single memory controller file in order to clarify the pm.h header. Signed-off-by: Daniel Lezcano --- arch/arm/mach-at91/include/mach/at91_mc.h | 22 ++++++++++++++++++++++ arch/arm/mach-at91/pm.h | 6 ++---- 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 arch/arm/mach-at91/include/mach/at91_mc.h diff --git a/arch/arm/mach-at91/include/mach/at91_mc.h b/arch/arm/mach-at91/include/mach/at91_mc.h new file mode 100644 index 0000000..c705ba9 --- /dev/null +++ b/arch/arm/mach-at91/include/mach/at91_mc.h @@ -0,0 +1,22 @@ +/* + * AT91 Memory controller + * + * Copyright (C) 2012 Daniel Lezcano + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ +#ifndef __ARCH_ARM_MACH_AT91_MC +#define __ARCH_ARM_MACH_AT91_MC + +#ifdef CONFIG_ARCH_AT91RM9200 +#include +#elif defined(CONFIG_ARCH_AT91CAP9) +#include +#else +#include +#endif + +#endif diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h index 325ef76..fc48bef 100644 --- a/arch/arm/mach-at91/pm.h +++ b/arch/arm/mach-at91/pm.h @@ -11,8 +11,9 @@ #ifndef __ARCH_ARM_MACH_AT91_PM #define __ARCH_ARM_MACH_AT91_PM +#include + #ifdef CONFIG_ARCH_AT91RM9200 -#include /* * The AT91RM9200 goes into self-refresh mode with this command, and will @@ -41,7 +42,6 @@ static inline u32 sdram_selfrefresh_enable(void) : : "r" (0)) #elif defined(CONFIG_ARCH_AT91CAP9) -#include static inline u32 sdram_selfrefresh_enable(void) { @@ -62,7 +62,6 @@ static inline u32 sdram_selfrefresh_enable(void) cpu_do_idle() #elif defined(CONFIG_ARCH_AT91SAM9G45) -#include /* We manage both DDRAM/SDRAM controllers, we need more than one value to * remember. @@ -100,7 +99,6 @@ static inline u32 sdram_selfrefresh_enable(void) #define wait_for_interrupt_enable() cpu_do_idle() #else -#include #ifdef CONFIG_ARCH_AT91SAM9263 /*