diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-10-02 08:10:36 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-10-02 08:10:36 +0200 |
commit | 5c8d5b6fc15fc2c52d74c266d9fe6eb5f75cbcb4 (patch) | |
tree | 10c4a86397d7ac6ae9a6bcc0e9438dd620246404 /arch/arm/cpu/armv7/am33xx/clock_am33xx.c | |
parent | 12eba1b49380988fd87cc0b3af44014cca8b71c4 (diff) | |
parent | 827512fb1154c05c6eb1e2259e936df55c98a535 (diff) | |
download | blackbird-obmc-uboot-5c8d5b6fc15fc2c52d74c266d9fe6eb5f75cbcb4.tar.gz blackbird-obmc-uboot-5c8d5b6fc15fc2c52d74c266d9fe6eb5f75cbcb4.zip |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu/armv7/am33xx/clock_am33xx.c')
-rw-r--r-- | arch/arm/cpu/armv7/am33xx/clock_am33xx.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/am33xx/clock_am33xx.c b/arch/arm/cpu/armv7/am33xx/clock_am33xx.c index e5f287b338..fabe2595a3 100644 --- a/arch/arm/cpu/armv7/am33xx/clock_am33xx.c +++ b/arch/arm/cpu/armv7/am33xx/clock_am33xx.c @@ -51,10 +51,14 @@ const struct dpll_regs dpll_ddr_regs = { .cm_div_m2_dpll = CM_WKUP + 0xA0, }; -const struct dpll_params dpll_mpu = { +struct dpll_params dpll_mpu_opp100 = { CONFIG_SYS_MPUCLK, OSC-1, 1, -1, -1, -1, -1}; -const struct dpll_params dpll_core = { +const struct dpll_params dpll_core_opp100 = { 1000, OSC-1, -1, -1, 10, 8, 4}; +const struct dpll_params dpll_mpu = { + MPUPLL_M_300, OSC-1, 1, -1, -1, -1, -1}; +const struct dpll_params dpll_core = { + 50, OSC-1, -1, -1, 1, 1, 1}; const struct dpll_params dpll_per = { 960, OSC-1, 5, -1, -1, -1, -1}; |