From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752573AbbCWKPI (ORCPT <rfc822;w@1wt.eu>);
	Mon, 23 Mar 2015 06:15:08 -0400
Received: from eusmtp01.atmel.com ([212.144.249.243]:26733 "EHLO
	eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751873AbbCWKPF (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 23 Mar 2015 06:15:05 -0400
Message-ID: <550FE7A7.9050900@atmel.com>
Date: Mon, 23 Mar 2015 11:15:03 +0100
From: Nicolas Ferre <nicolas.ferre@atmel.com>
Organization: atmel
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0
MIME-Version: 1.0
To: Alexandre Belloni <alexandre.belloni@free-electrons.com>
CC: Lee Jones <lee.jones@linaro.org>,
        Boris Brezillon <boris.brezillon@free-electrons.com>,
        Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
        <linux-kernel@vger.kernel.org>, Tejun Heo <tj@kernel.org>,
        <linux-ide@vger.kernel.org>, <linux-pcmcia@lists.infradead.org>,
        <linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH 02/10] ARM: at91/pm: move AT91_MEMCTRL_* to pm.h
References: <1426545886-19162-1-git-send-email-alexandre.belloni@free-electrons.com> <1426545886-19162-3-git-send-email-alexandre.belloni@free-electrons.com>
In-Reply-To: <1426545886-19162-3-git-send-email-alexandre.belloni@free-electrons.com>
Content-Type: text/plain; charset="windows-1252"
Content-Transfer-Encoding: 8bit
X-Originating-IP: [10.161.30.18]
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Le 16/03/2015 23:44, Alexandre Belloni a écrit :
> the AT91_MEMCTRL_* defines are only used by the pm code, move them to pm.h
> 
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
>  arch/arm/mach-at91/include/mach/at91_ramc.h | 4 ----
>  arch/arm/mach-at91/pm.h                     | 4 ++++
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mach-at91/include/mach/at91_ramc.h b/arch/arm/mach-at91/include/mach/at91_ramc.h
> index e4492b151fee..493bc486e858 100644
> --- a/arch/arm/mach-at91/include/mach/at91_ramc.h
> +++ b/arch/arm/mach-at91/include/mach/at91_ramc.h
> @@ -21,10 +21,6 @@ extern void __iomem *at91_ramc_base[];
>  .extern at91_ramc_base
>  #endif
>  
> -#define AT91_MEMCTRL_MC		0
> -#define AT91_MEMCTRL_SDRAMC	1
> -#define AT91_MEMCTRL_DDRSDR	2
> -
>  #include <soc/at91/at91rm9200_sdramc.h>
>  #include <soc/at91/at91sam9_ddrsdr.h>
>  #include <soc/at91/at91sam9_sdramc.h>
> diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h
> index 3223967d3460..ecd875a91d52 100644
> --- a/arch/arm/mach-at91/pm.h
> +++ b/arch/arm/mach-at91/pm.h
> @@ -15,6 +15,10 @@
>  
>  #include <mach/at91_ramc.h>
>  
> +#define AT91_MEMCTRL_MC		0
> +#define AT91_MEMCTRL_SDRAMC	1
> +#define AT91_MEMCTRL_DDRSDR	2
> +
>  #define	AT91_PM_MEMTYPE_MASK	0x0f
>  
>  #define	AT91_PM_MODE_OFFSET	4
> 


-- 
Nicolas Ferre