[U-Boot] [PATCH 10/14] ARM: AM43xx: clocks: Update DPLL details for EPOS EVM
Lokesh Vutla
lokeshvutla at ti.com
Wed Nov 6 14:36:22 CET 2013
On Wednesday 06 November 2013 06:18 PM, Vaibhav Bedia wrote:
> On Mon, Nov 4, 2013 at 11:20 PM, Lokesh Vutla <lokeshvutla at ti.com> wrote:
>> Updating the Multiplier and Dividers values for all DPLLs for EPOS EVM.
>> Following are the DPLL locking frequencies at OPP NOM:
>> MPU locks at 600MHz
>> Core locks at 1000MHz
>> Per locks at 960MHz
>> DDR locks at 266MHz
>>
>
> Why is this not reading the eFuses to detect what speeds are actually supported
> on a device? If the eFuses are not currently blown it's much much safer to start
> off from the slowest OPP. Things might be working fine now but dialing to a high
> frequency without detecting the supported rates is going to come back to haunt
> us later.
Currently these values are not blown in eFuse. Both EPOS and GP evms support
OPP NOM. So there is no harm in booting at OPP NOM here.
Shekar can comment more on this.
Thanks and regards,
Lokesh
>
>> Signed-off-by: Lokesh Vutla <lokeshvutla at ti.com>
>> ---
>> arch/arm/cpu/armv7/am33xx/clock.c | 12 +++++++---
>> arch/arm/cpu/armv7/am33xx/clock_am33xx.c | 15 ++++++++++++
>> arch/arm/cpu/armv7/am33xx/clock_am43xx.c | 8 +------
>> arch/arm/include/asm/arch-am33xx/clock.h | 7 +++---
>> board/ti/am43xx/board.c | 38 +++++++++++++++++++++++++++---
>> board/ti/am43xx/board.h | 1 +
>> board/ti/am43xx/mux.c | 5 ++++
>> 7 files changed, 69 insertions(+), 17 deletions(-)
>>
>> diff --git a/arch/arm/cpu/armv7/am33xx/clock.c b/arch/arm/cpu/armv7/am33xx/clock.c
>> index 8e5f3c6..0672798 100644
>> --- a/arch/arm/cpu/armv7/am33xx/clock.c
>> +++ b/arch/arm/cpu/armv7/am33xx/clock.c
>> @@ -101,9 +101,15 @@ void do_setup_dpll(const struct dpll_regs *dpll_regs,
>> static void setup_dplls(void)
>> {
>> const struct dpll_params *params;
>> - do_setup_dpll(&dpll_core_regs, &dpll_core);
>> - do_setup_dpll(&dpll_mpu_regs, &dpll_mpu);
>> - do_setup_dpll(&dpll_per_regs, &dpll_per);
>> +
>> + params = get_dpll_core_params();
>> + do_setup_dpll(&dpll_core_regs, params);
>> +
>> + params = get_dpll_mpu_params();
>> + do_setup_dpll(&dpll_mpu_regs, params);
>> +
>> + params = get_dpll_per_params();
>> + do_setup_dpll(&dpll_per_regs, params);
>> writel(0x300, &cmwkup->clkdcoldodpllper);
>>
>> params = get_dpll_ddr_params();
>> diff --git a/arch/arm/cpu/armv7/am33xx/clock_am33xx.c b/arch/arm/cpu/armv7/am33xx/clock_am33xx.c
>> index fabe259..92142c8 100644
>> --- a/arch/arm/cpu/armv7/am33xx/clock_am33xx.c
>> +++ b/arch/arm/cpu/armv7/am33xx/clock_am33xx.c
>> @@ -62,6 +62,21 @@ const struct dpll_params dpll_core = {
>> const struct dpll_params dpll_per = {
>> 960, OSC-1, 5, -1, -1, -1, -1};
>>
>> +const struct dpll_params *get_dpll_mpu_params(void)
>> +{
>> + return &dpll_mpu;
>> +}
>> +
>> +const struct dpll_params *get_dpll_core_params(void)
>> +{
>> + return &dpll_core;
>> +}
>> +
>> +const struct dpll_params *get_dpll_per_params(void)
>> +{
>> + return &dpll_per;
>> +}
>> +
>> void setup_clocks_for_console(void)
>> {
>> clrsetbits_le32(&cmwkup->wkclkstctrl, CD_CLKCTRL_CLKTRCTRL_MASK,
>> diff --git a/arch/arm/cpu/armv7/am33xx/clock_am43xx.c b/arch/arm/cpu/armv7/am33xx/clock_am43xx.c
>> index 22963b7..97c00b4 100644
>> --- a/arch/arm/cpu/armv7/am33xx/clock_am43xx.c
>> +++ b/arch/arm/cpu/armv7/am33xx/clock_am43xx.c
>> @@ -48,15 +48,9 @@ const struct dpll_regs dpll_ddr_regs = {
>> .cm_idlest_dpll = CM_WKUP + 0x5A4,
>> .cm_clksel_dpll = CM_WKUP + 0x5AC,
>> .cm_div_m2_dpll = CM_WKUP + 0x5B0,
>> + .cm_div_m4_dpll = CM_WKUP + 0x5B8,
>> };
>>
>> -const struct dpll_params dpll_mpu = {
>> - -1, -1, -1, -1, -1, -1, -1};
>> -const struct dpll_params dpll_core = {
>> - -1, -1, -1, -1, -1, -1, -1};
>> -const struct dpll_params dpll_per = {
>> - -1, -1, -1, -1, -1, -1, -1};
>> -
>> void setup_clocks_for_console(void)
>> {
>> /* Do not add any spl_debug prints in this function */
>> diff --git a/arch/arm/include/asm/arch-am33xx/clock.h b/arch/arm/include/asm/arch-am33xx/clock.h
>> index 519249e..7637457 100644
>> --- a/arch/arm/include/asm/arch-am33xx/clock.h
>> +++ b/arch/arm/include/asm/arch-am33xx/clock.h
>> @@ -98,13 +98,12 @@ extern const struct dpll_regs dpll_mpu_regs;
>> extern const struct dpll_regs dpll_core_regs;
>> extern const struct dpll_regs dpll_per_regs;
>> extern const struct dpll_regs dpll_ddr_regs;
>> -extern const struct dpll_params dpll_mpu;
>> -extern const struct dpll_params dpll_core;
>> -extern const struct dpll_params dpll_per;
>> -extern const struct dpll_params dpll_ddr;
>>
>> extern struct cm_wkuppll *const cmwkup;
>>
>> +const struct dpll_params *get_dpll_mpu_params(void);
>> +const struct dpll_params *get_dpll_core_params(void);
>> +const struct dpll_params *get_dpll_per_params(void);
>> const struct dpll_params *get_dpll_ddr_params(void);
>> void do_setup_dpll(const struct dpll_regs *, const struct dpll_params *);
>> void prcm_init(void);
>> diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
>> index 723d0ca..e28e844 100644
>> --- a/board/ti/am43xx/board.c
>> +++ b/board/ti/am43xx/board.c
>> @@ -65,12 +65,44 @@ static int read_eeprom(struct am43xx_board_id *header)
>>
>> #ifdef CONFIG_SPL_BUILD
>>
>> -const struct dpll_params dpll_ddr = {
>> - -1, -1, -1, -1, -1, -1, -1};
>> +const struct dpll_params epos_evm_dpll_ddr = {
>> + 266, 24, 1, -1, 1, -1, -1};
>> +const struct dpll_params epos_evm_dpll_mpu = {
>> + 600, 24, 1, -1, -1, -1, -1};
>> +const struct dpll_params epos_evm_dpll_core = {
>> + 1000, 24, -1, -1, 10, 8, 4};
>> +const struct dpll_params epos_evm_dpll_per = {
>> + 960, 24, 5, -1, -1, -1, -1};
>>
>> const struct dpll_params *get_dpll_ddr_params(void)
>> {
>> - return &dpll_ddr;
>> + if (board_is_eposevm())
>> + return &epos_evm_dpll_ddr;
>> +}
>> +
>> +const struct dpll_params *get_dpll_mpu_params(void)
>> +{
>> + if (board_is_eposevm())
>> + return &epos_evm_dpll_mpu;
>> +}
>> +
>> +const struct dpll_params *get_dpll_core_params(void)
>> +{
>> + struct am43xx_board_id header;
>> +
>> + enable_i2c0_pin_mux();
>> + i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
>> + if (read_eeprom(&header) < 0)
>> + puts("Could not get board ID.\n");
>> +
>> + if (board_is_eposevm())
>> + return &epos_evm_dpll_core;
>> +}
>> +
>> +const struct dpll_params *get_dpll_per_params(void)
>> +{
>> + if (board_is_eposevm())
>> + return &epos_evm_dpll_per;
>> }
>>
>> void set_uart_mux_conf(void)
>> diff --git a/board/ti/am43xx/board.h b/board/ti/am43xx/board.h
>> index 9268895..beee770 100644
>> --- a/board/ti/am43xx/board.h
>> +++ b/board/ti/am43xx/board.h
>> @@ -46,4 +46,5 @@ static inline int board_is_gpevm(void)
>>
>> void enable_uart0_pin_mux(void);
>> void enable_board_pin_mux(void);
>> +void enable_i2c0_pin_mux(void);
>> #endif
>> diff --git a/board/ti/am43xx/mux.c b/board/ti/am43xx/mux.c
>> index 818a046..341214d 100644
>> --- a/board/ti/am43xx/mux.c
>> +++ b/board/ti/am43xx/mux.c
>> @@ -45,3 +45,8 @@ void enable_board_pin_mux(void)
>> configure_module_pin_mux(mmc0_pin_mux);
>> configure_module_pin_mux(i2c0_pin_mux);
>> }
>> +
>> +void enable_i2c0_pin_mux(void)
>> +{
>> + configure_module_pin_mux(i2c0_pin_mux);
>> +}
>
> This change looks a bit out of place... can you add why this is needed
> in the commit message.
>
> Regards,
> Vaibhav
>
More information about the U-Boot
mailing list