diff options
author | Tom Rini <trini@ti.com> | 2014-07-29 09:41:35 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-07-29 09:41:35 -0400 |
commit | 362f16b1e9e94024a511adae9977d145ef942b50 (patch) | |
tree | e0e359fb074493fa8deab65abe0feb4b8fefde3a /arch/arm/cpu/armv7/keystone/init.c | |
parent | 302e609fe653baf1ae3a7573d2f4eafd86ab696b (diff) | |
parent | 9d195a546179bc732aba9eacccf0a9a3db591288 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/armv7/keystone/init.c')
-rw-r--r-- | arch/arm/cpu/armv7/keystone/init.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/arch/arm/cpu/armv7/keystone/init.c b/arch/arm/cpu/armv7/keystone/init.c index 4df5ae1cae..a8f8aee8ab 100644 --- a/arch/arm/cpu/armv7/keystone/init.c +++ b/arch/arm/cpu/armv7/keystone/init.c @@ -10,13 +10,14 @@ #include <common.h> #include <ns16550.h> #include <asm/io.h> +#include <asm/arch/msmc.h> #include <asm/arch/clock.h> #include <asm/arch/hardware.h> void chip_configuration_unlock(void) { - __raw_writel(KEYSTONE_KICK0_MAGIC, KEYSTONE_KICK0); - __raw_writel(KEYSTONE_KICK1_MAGIC, KEYSTONE_KICK1); + __raw_writel(KS2_KICK0_MAGIC, KS2_KICK0); + __raw_writel(KS2_KICK1_MAGIC, KS2_KICK1); } int arch_cpu_init(void) @@ -24,11 +25,12 @@ int arch_cpu_init(void) chip_configuration_unlock(); icache_enable(); -#ifdef CONFIG_SOC_K2HK - share_all_segments(8); - share_all_segments(9); - share_all_segments(10); /* QM PDSP */ - share_all_segments(11); /* PCIE */ + msmc_share_all_segments(8); /* TETRIS */ + msmc_share_all_segments(9); /* NETCP */ + msmc_share_all_segments(10); /* QM PDSP */ + msmc_share_all_segments(11); /* PCIE 0 */ +#ifdef CONFIG_SOC_K2E + msmc_share_all_segments(13); /* PCIE 1 */ #endif /* |