| Message ID | 1426545886-19162-3-git-send-email-alexandre.belloni@free-electrons.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
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 >
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
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> --- arch/arm/mach-at91/include/mach/at91_ramc.h | 4 ---- arch/arm/mach-at91/pm.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-)