diff options
| author | Dinh Nguyen <dinguyen@opensource.altera.com> | 2014-11-26 12:14:33 -0600 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2014-12-06 13:53:57 +0100 |
| commit | b9b5cf0ea3c5c141f31cc0c4c8edebbfd9ff5866 (patch) | |
| tree | cfb4d8c33092f064336cc928a94275096f60f3c1 /arch/arm/cpu/armv7/socfpga | |
| parent | 5d2f930de0e5222957e103c8eb5df2b7238dd4b4 (diff) | |
| download | blackbird-obmc-uboot-b9b5cf0ea3c5c141f31cc0c4c8edebbfd9ff5866.tar.gz blackbird-obmc-uboot-b9b5cf0ea3c5c141f31cc0c4c8edebbfd9ff5866.zip | |
socfpga: correctly increment freeze_controller_base address
Correctly increment the base address of the freeze controller. And since
SYSMGR_FRZCTRL_VIOCTRL_SHIFT is not needed, remove it from the include file.
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Vince Bridgers <vbridger@opensource.altera.com>
Cc: Chin Liang See <clsee@altera.com>
Cc: Marek Vasut <marex@denx.de>
Acked-by: Pavel Machek <pavel@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch/arm/cpu/armv7/socfpga')
| -rw-r--r-- | arch/arm/cpu/armv7/socfpga/freeze_controller.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/cpu/armv7/socfpga/freeze_controller.c b/arch/arm/cpu/armv7/socfpga/freeze_controller.c index b8c9bce1e0..0be643c817 100644 --- a/arch/arm/cpu/armv7/socfpga/freeze_controller.c +++ b/arch/arm/cpu/armv7/socfpga/freeze_controller.c @@ -38,8 +38,7 @@ void sys_mgr_frzctrl_freeze_req(void) /* Freeze channel 0 to 2 */ for (channel_id = 0; channel_id <= 2; channel_id++) { ioctrl_reg_offset = (u32)( - &freeze_controller_base->vioctrl + - (channel_id << SYSMGR_FRZCTRL_VIOCTRL_SHIFT)); + &freeze_controller_base->vioctrl + channel_id); /* * Assert active low enrnsl, plniotri @@ -120,8 +119,7 @@ void sys_mgr_frzctrl_thaw_req(void) /* Thaw channel 0 to 2 */ for (channel_id = 0; channel_id <= 2; channel_id++) { ioctrl_reg_offset - = (u32)(&freeze_controller_base->vioctrl - + (channel_id << SYSMGR_FRZCTRL_VIOCTRL_SHIFT)); + = (u32)(&freeze_controller_base->vioctrl + channel_id); /* * Assert active low bhniotri signal and |
