From 7b50e1599f4e6551a3348ca5f061a596f6f6896e Mon Sep 17 00:00:00 2001 From: Lokesh Vutla Date: Tue, 28 Jul 2015 14:16:44 +0530 Subject: ARM: keystone2: Fix dev and arm speed detection Use common devspeed and armspeed definitions. Also fix reading efuse bootrom register. Reviewed-by: Tom Rini Reviewed-by: Vitaly Andrianov Signed-off-by: Lokesh Vutla --- board/ti/ks2_evm/board_k2e.c | 32 ++++++++++++++++++++++++-------- board/ti/ks2_evm/board_k2hk.c | 18 +++++++++--------- board/ti/ks2_evm/board_k2l.c | 18 +++++++++--------- 3 files changed, 42 insertions(+), 26 deletions(-) (limited to 'board') diff --git a/board/ti/ks2_evm/board_k2e.c b/board/ti/ks2_evm/board_k2e.c index 98acc96e1c..2043759533 100644 --- a/board/ti/ks2_evm/board_k2e.c +++ b/board/ti/ks2_evm/board_k2e.c @@ -26,14 +26,30 @@ unsigned int external_clk[ext_clk_count] = { [usb_clk] = 100000000, }; -static struct pll_init_data core_pll_config[] = { - CORE_PLL_800, - CORE_PLL_850, - CORE_PLL_1000, - CORE_PLL_1250, - CORE_PLL_1350, - CORE_PLL_1400, - CORE_PLL_1500, +static struct pll_init_data core_pll_config[NUM_SPDS] = { + [SPD800] = CORE_PLL_800, + [SPD850] = CORE_PLL_850, + [SPD1000] = CORE_PLL_1000, + [SPD1250] = CORE_PLL_1250, + [SPD1350] = CORE_PLL_1350, + [SPD1400] = CORE_PLL_1400, + [SPD1500] = CORE_PLL_1500, +}; + +/* DEV and ARM speed definitions as specified in DEVSPEED register */ +int speeds[DEVSPEED_NUMSPDS] = { + SPD850, + SPD1000, + SPD1250, + SPD1350, + SPD1400, + SPD1500, + SPD1400, + SPD1350, + SPD1250, + SPD1000, + SPD850, + SPD800, }; s16 divn_val[16] = { diff --git a/board/ti/ks2_evm/board_k2hk.c b/board/ti/ks2_evm/board_k2hk.c index cb64934c24..6c0a092c96 100644 --- a/board/ti/ks2_evm/board_k2hk.c +++ b/board/ti/ks2_evm/board_k2hk.c @@ -29,10 +29,10 @@ unsigned int external_clk[ext_clk_count] = { [rp1_clk] = 123456789 }; -static struct pll_init_data core_pll_config[] = { - CORE_PLL_799, - CORE_PLL_999, - CORE_PLL_1200, +static struct pll_init_data core_pll_config[NUM_SPDS] = { + [SPD800] = CORE_PLL_799, + [SPD1000] = CORE_PLL_999, + [SPD1200] = CORE_PLL_1200, }; s16 divn_val[16] = { @@ -40,11 +40,11 @@ s16 divn_val[16] = { }; static struct pll_init_data tetris_pll_config[] = { - TETRIS_PLL_800, - TETRIS_PLL_1000, - TETRIS_PLL_1200, - TETRIS_PLL_1350, - TETRIS_PLL_1400, + [SPD800] = TETRIS_PLL_800, + [SPD1000] = TETRIS_PLL_1000, + [SPD1200] = TETRIS_PLL_1200, + [SPD1350] = TETRIS_PLL_1350, + [SPD1400] = TETRIS_PLL_1400, }; static struct pll_init_data pa_pll_config = diff --git a/board/ti/ks2_evm/board_k2l.c b/board/ti/ks2_evm/board_k2l.c index 2c433ee01a..d6c0492d76 100644 --- a/board/ti/ks2_evm/board_k2l.c +++ b/board/ti/ks2_evm/board_k2l.c @@ -25,10 +25,10 @@ unsigned int external_clk[ext_clk_count] = { [usb_clk] = 100000000, }; -static struct pll_init_data core_pll_config[] = { - CORE_PLL_799, - CORE_PLL_1000, - CORE_PLL_1198, +static struct pll_init_data core_pll_config[NUM_SPDS] = { + [SPD800] = CORE_PLL_799, + [SPD1000] = CORE_PLL_1000, + [SPD800] = CORE_PLL_1198, }; s16 divn_val[16] = { @@ -36,11 +36,11 @@ s16 divn_val[16] = { }; static struct pll_init_data tetris_pll_config[] = { - TETRIS_PLL_799, - TETRIS_PLL_1000, - TETRIS_PLL_1198, - TETRIS_PLL_1352, - TETRIS_PLL_1401, + [SPD800] = TETRIS_PLL_799, + [SPD1000] = TETRIS_PLL_1000, + [SPD1200] = TETRIS_PLL_1198, + [SPD1350] = TETRIS_PLL_1352, + [SPD1400] = TETRIS_PLL_1401, }; static struct pll_init_data pa_pll_config = -- cgit v1.2.3