diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2019-05-23 17:39:39 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-05-27 10:07:00 +0200 |
| commit | cdab4dd1fde9a6b870daf75b5922220bc39fe709 (patch) | |
| tree | 6fd11f975616c7f959e4fd41dd0b58b271551677 /arch/arm/mach-at91 | |
| parent | 794589136e4c1732f5127e8fefbee36a0321e52e (diff) | |
| download | barebox-cdab4dd1fde9a6b870daf75b5922220bc39fe709.tar.gz barebox-cdab4dd1fde9a6b870daf75b5922220bc39fe709.tar.xz | |
ARM: at91: remove #ifdefery around *_get_ddram_size helpers
c16bcbc644 ("ARM: at91: remove unused defines") removed the
conflicting defintions from these headers, so it's ok to
include them at the same time now. Do this and remove the
noise.
Suggested-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-at91')
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91sam9_ddrsdr.h | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/arch/arm/mach-at91/include/mach/at91sam9_ddrsdr.h b/arch/arm/mach-at91/include/mach/at91sam9_ddrsdr.h index b0c003cd1e..835fdea259 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9_ddrsdr.h +++ b/arch/arm/mach-at91/include/mach/at91sam9_ddrsdr.h @@ -137,6 +137,7 @@ Banks [not SAM9G45] */ #ifndef __ASSEMBLY__ #include <io.h> +#include <mach/hardware.h> static inline u32 at91_get_ddram_size(void * __iomem base, bool is_nb) { @@ -175,8 +176,6 @@ static inline u32 at91_get_ddram_size(void * __iomem base, bool is_nb) return size; } -#ifdef CONFIG_SOC_AT91SAM9G45 -#include <mach/at91sam9g45.h> static inline u32 at91sam9g45_get_ddram_size(int bank) { switch (bank) { @@ -188,41 +187,17 @@ static inline u32 at91sam9g45_get_ddram_size(int bank) return 0; } } -#else -static inline u32 at91sam9g45_get_ddram_size(int bank) -{ - return 0; -} -#endif -#ifdef CONFIG_SOC_AT91SAM9X5 -#include <mach/at91sam9x5.h> static inline u32 at91sam9x5_get_ddram_size(void) { return at91_get_ddram_size(IOMEM(AT91SAM9X5_BASE_DDRSDRC0), true); } -#else -static inline u32 at91sam9x5_get_ddram_size(void) -{ - return 0; -} -#endif -#ifdef CONFIG_SOC_AT91SAM9N12 -#include <mach/at91sam9n12.h> static inline u32 at91sam9n12_get_ddram_size(void) { return at91_get_ddram_size(IOMEM(AT91SAM9N12_BASE_DDRSDRC0), true); } -#else -static inline u32 at91sam9n12_get_ddram_size(void) -{ - return 0; -} -#endif -#ifdef CONFIG_SOC_SAMA5 -#include <mach/sama5d3.h> static inline u32 at91sama5_get_ddram_size(void) { u32 cr; @@ -252,12 +227,6 @@ static inline u32 at91sama5_get_ddram_size(void) return size; } -#else -static inline u32 at91sama5_get_ddram_size(void) -{ - return 0; -} -#endif #endif |