Skip to content

Commit

Permalink
ARM: at91: move sdramc/ddrsdr header to include/soc/at91
Browse files Browse the repository at this point in the history
Move the (DDR) SDRAM controller headers to include/soc/at91 to remove the
dependency on mach/ headers from the at91-reset driver.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
  • Loading branch information
Alexandre Belloni authored and Nicolas Ferre committed Nov 13, 2014
1 parent 93d2cf4 commit f0a0a58
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 6 deletions.
1 change: 1 addition & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -861,6 +861,7 @@ W: http://maxim.org.za/at91_26.html
W: http://www.linux4sam.org
S: Supported
F: arch/arm/mach-at91/
F: include/soc/at91/
F: arch/arm/boot/dts/at91*.dts
F: arch/arm/boot/dts/at91*.dtsi
F: arch/arm/boot/dts/sama*.dts
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/mach-at91/include/mach/at91_ramc.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ extern void __iomem *at91_ramc_base[];
#define AT91_MEMCTRL_SDRAMC 1
#define AT91_MEMCTRL_DDRSDR 2

#include <mach/at91rm9200_sdramc.h>
#include <mach/at91sam9_ddrsdr.h>
#include <mach/at91sam9_sdramc.h>
#include <soc/at91/at91rm9200_sdramc.h>
#include <soc/at91/at91sam9_ddrsdr.h>
#include <soc/at91/at91sam9_sdramc.h>

#endif /* __AT91_RAMC_H__ */
1 change: 0 additions & 1 deletion arch/arm/mach-at91/pm.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <asm/proc-fns.h>

#include <mach/at91_ramc.h>
#include <mach/at91rm9200_sdramc.h>

#ifdef CONFIG_PM
extern void at91_pm_set_standby(void (*at91_standby)(void));
Expand Down
4 changes: 2 additions & 2 deletions drivers/power/reset/at91-reset.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

#include <asm/system_misc.h>

#include <mach/at91sam9_ddrsdr.h>
#include <mach/at91sam9_sdramc.h>
#include <soc/at91/at91sam9_ddrsdr.h>
#include <soc/at91/at91sam9_sdramc.h>

#define AT91_RSTC_CR 0x00 /* Reset Controller Control Register */
#define AT91_RSTC_PROCRST BIT(0) /* Processor Reset */
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit f0a0a58

Please sign in to comment.