diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:49:27 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:49:27 +0200 |
commit | 2b3bf599b3e1fd1719030839c730ec4f3a53a52e (patch) | |
tree | 7cbd87ede1c381bda6e6ed43365bcbb621490248 /arch/arm/mach-samsung/include | |
parent | 6bd25d752897b8688a66a76278e32ed92a433978 (diff) | |
parent | 483808b9e7a200957b3c9ade9cecda870118a2a8 (diff) | |
download | barebox-2b3bf599b3e1fd1719030839c730ec4f3a53a52e.tar.gz barebox-2b3bf599b3e1fd1719030839c730ec4f3a53a52e.tar.xz |
Merge branch 'for-next/friendlyarm'
Diffstat (limited to 'arch/arm/mach-samsung/include')
-rw-r--r-- | arch/arm/mach-samsung/include/mach/s3c-generic.h | 6 | ||||
-rw-r--r-- | arch/arm/mach-samsung/include/mach/s5pcxx-iomap.h | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-samsung/include/mach/s3c-generic.h b/arch/arm/mach-samsung/include/mach/s3c-generic.h index 11b083d4a8..329c2b47f2 100644 --- a/arch/arm/mach-samsung/include/mach/s3c-generic.h +++ b/arch/arm/mach-samsung/include/mach/s3c-generic.h @@ -24,6 +24,8 @@ * MA 02111-1307 USA */ +#include <common.h> + uint32_t s3c_get_mpllclk(void); uint32_t s3c_get_upllclk(void); uint32_t s3c_get_fclk(void); @@ -40,4 +42,8 @@ void s3c24xx_disable_second_sdram_bank(void); #ifdef CONFIG_ARCH_S5PCxx void s5p_init_pll(void); +void s5p_init_dram_bank_lpddr(phys_addr_t base, uint32_t mc0, uint32_t mc1, int bus16); +void s5p_init_dram_bank_lpddr2(phys_addr_t base, uint32_t mc0, uint32_t mc1, int bus16); +void s5p_init_dram_bank_ddr2(phys_addr_t base, uint32_t mc0, uint32_t mc1, int bus16); +uint32_t s5p_get_memory_size(void); #endif diff --git a/arch/arm/mach-samsung/include/mach/s5pcxx-iomap.h b/arch/arm/mach-samsung/include/mach/s5pcxx-iomap.h index cb055272ff..248f868b1b 100644 --- a/arch/arm/mach-samsung/include/mach/s5pcxx-iomap.h +++ b/arch/arm/mach-samsung/include/mach/s5pcxx-iomap.h @@ -47,3 +47,6 @@ #define S3C_UART3_SIZE 0x400 #define S3C_UART_HAS_UBRDIVSLOT #define S3C_UART_HAS_UINTM + +#define S5P_DMC0_BASE 0xF0000000 +#define S5P_DMC1_BASE 0xF1400000 |