diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-24 10:29:59 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-24 10:29:59 +0100 |
| commit | fae56934a0744a4dd6981323ba8a966646fd7ca5 (patch) | |
| tree | f1eab46cc702aee6c8cd2c2aaeda95d383ed02a6 /arch/arm/cpu/armv7/omap5/prcm-regs.c | |
| parent | 9ed679aeeb9899123bf92ed1eafb7cf6965473dc (diff) | |
| parent | 11f296870659e1375e7116a859458b254cc3156f (diff) | |
| download | talos-obmc-uboot-fae56934a0744a4dd6981323ba8a966646fd7ca5.tar.gz talos-obmc-uboot-fae56934a0744a4dd6981323ba8a966646fd7ca5.zip | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu/armv7/omap5/prcm-regs.c')
| -rw-r--r-- | arch/arm/cpu/armv7/omap5/prcm-regs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/omap5/prcm-regs.c b/arch/arm/cpu/armv7/omap5/prcm-regs.c index ff328070f7..7292161f3c 100644 --- a/arch/arm/cpu/armv7/omap5/prcm-regs.c +++ b/arch/arm/cpu/armv7/omap5/prcm-regs.c @@ -432,7 +432,7 @@ struct omap_sys_ctrl_regs const dra7xx_ctrl = { .control_srcomp_code_latch = 0x4A002E84, .control_ddr_control_ext_0 = 0x4A002E88, .control_padconf_core_base = 0x4A003400, - .control_std_fuse_opp_vdd_mpu_2 = 0x4A003B24, + .control_std_fuse_opp_vdd_mpu_2 = 0x4A003B20, .control_port_emif1_sdram_config = 0x4AE0C110, .control_port_emif1_lpddr2_nvm_config = 0x4AE0C114, .control_port_emif2_sdram_config = 0x4AE0C118, |
