* [U-Boot] [PATCH 1/2] socfpga: add missing struct member fifo_triple_byte
@ 2014-11-26 18:14 dinguyen at opensource.altera.com
2014-11-26 18:14 ` [U-Boot] [PATCH 2/2] socfpga: correctly increment freeze_controller_base address dinguyen at opensource.altera.com
2014-11-27 19:53 ` [U-Boot] [PATCH 1/2] socfpga: add missing struct member fifo_triple_byte Pavel Machek
0 siblings, 2 replies; 6+ messages in thread
From: dinguyen at opensource.altera.com @ 2014-11-26 18:14 UTC (permalink / raw)
To: u-boot
From: Dinh Nguyen <dinguyen@opensource.altera.com>
socfpga_scan_manager structure was missing a data member.
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>
Cc: Pavel Machek <pavel@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
---
arch/arm/include/asm/arch-socfpga/scan_manager.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/include/asm/arch-socfpga/scan_manager.h b/arch/arm/include/asm/arch-socfpga/scan_manager.h
index b2686d3..1155fd3 100644
--- a/arch/arm/include/asm/arch-socfpga/scan_manager.h
+++ b/arch/arm/include/asm/arch-socfpga/scan_manager.h
@@ -13,6 +13,7 @@ struct socfpga_scan_manager {
u32 padding[2];
u32 fifo_single_byte;
u32 fifo_double_byte;
+ u32 fifo_triple_byte;
u32 fifo_quad_byte;
};
--
2.0.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 2/2] socfpga: correctly increment freeze_controller_base address
2014-11-26 18:14 [U-Boot] [PATCH 1/2] socfpga: add missing struct member fifo_triple_byte dinguyen at opensource.altera.com
@ 2014-11-26 18:14 ` dinguyen at opensource.altera.com
2014-11-27 19:53 ` Pavel Machek
2014-12-06 12:54 ` Marek Vasut
2014-11-27 19:53 ` [U-Boot] [PATCH 1/2] socfpga: add missing struct member fifo_triple_byte Pavel Machek
1 sibling, 2 replies; 6+ messages in thread
From: dinguyen at opensource.altera.com @ 2014-11-26 18:14 UTC (permalink / raw)
To: u-boot
From: Dinh Nguyen <dinguyen@opensource.altera.com>
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>
Cc: Pavel Machek <pavel@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
---
arch/arm/cpu/armv7/socfpga/freeze_controller.c | 6 ++----
arch/arm/include/asm/arch-socfpga/freeze_controller.h | 1 -
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/arch/arm/cpu/armv7/socfpga/freeze_controller.c b/arch/arm/cpu/armv7/socfpga/freeze_controller.c
index b8c9bce..0be643c 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
diff --git a/arch/arm/include/asm/arch-socfpga/freeze_controller.h b/arch/arm/include/asm/arch-socfpga/freeze_controller.h
index 120f20e..f19ad87 100644
--- a/arch/arm/include/asm/arch-socfpga/freeze_controller.h
+++ b/arch/arm/include/asm/arch-socfpga/freeze_controller.h
@@ -42,7 +42,6 @@ typedef enum {
#define SYSMGR_FRZCTRL_HWCTRL_VIO1REQ_MASK 0x00000001
#define SYSMGR_FRZCTRL_HWCTRL_VIO1STATE_ENUM_FROZEN 0x2
#define SYSMGR_FRZCTRL_HWCTRL_VIO1STATE_ENUM_THAWED 0x1
-#define SYSMGR_FRZCTRL_VIOCTRL_SHIFT 0x2
void sys_mgr_frzctrl_freeze_req(void);
void sys_mgr_frzctrl_thaw_req(void);
--
2.0.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 1/2] socfpga: add missing struct member fifo_triple_byte
2014-11-26 18:14 [U-Boot] [PATCH 1/2] socfpga: add missing struct member fifo_triple_byte dinguyen at opensource.altera.com
2014-11-26 18:14 ` [U-Boot] [PATCH 2/2] socfpga: correctly increment freeze_controller_base address dinguyen at opensource.altera.com
@ 2014-11-27 19:53 ` Pavel Machek
1 sibling, 0 replies; 6+ messages in thread
From: Pavel Machek @ 2014-11-27 19:53 UTC (permalink / raw)
To: u-boot
On Wed 2014-11-26 12:14:32, dinguyen at opensource.altera.com wrote:
> From: Dinh Nguyen <dinguyen@opensource.altera.com>
>
> socfpga_scan_manager structure was missing a data member.
>
> 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>
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
P
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 2/2] socfpga: correctly increment freeze_controller_base address
2014-11-26 18:14 ` [U-Boot] [PATCH 2/2] socfpga: correctly increment freeze_controller_base address dinguyen at opensource.altera.com
@ 2014-11-27 19:53 ` Pavel Machek
2014-12-06 12:54 ` Marek Vasut
1 sibling, 0 replies; 6+ messages in thread
From: Pavel Machek @ 2014-11-27 19:53 UTC (permalink / raw)
To: u-boot
On Wed 2014-11-26 12:14:33, dinguyen at opensource.altera.com wrote:
> From: Dinh Nguyen <dinguyen@opensource.altera.com>
>
> 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>
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 2/2] socfpga: correctly increment freeze_controller_base address
2014-11-26 18:14 ` [U-Boot] [PATCH 2/2] socfpga: correctly increment freeze_controller_base address dinguyen at opensource.altera.com
2014-11-27 19:53 ` Pavel Machek
@ 2014-12-06 12:54 ` Marek Vasut
1 sibling, 0 replies; 6+ messages in thread
From: Marek Vasut @ 2014-12-06 12:54 UTC (permalink / raw)
To: u-boot
On Wednesday, November 26, 2014 at 07:14:33 PM, dinguyen at opensource.altera.com
wrote:
> From: Dinh Nguyen <dinguyen@opensource.altera.com>
>
> 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>
> Cc: Pavel Machek <pavel@denx.de>
> Cc: Wolfgang Denk <wd@denx.de>
Applied both. Thank you and sorry for the delay. I am now back and catching up.
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 2/2] socfpga: correctly increment freeze_controller_base address
2014-11-26 18:00 dinguyen at opensource.altera.com
@ 2014-11-26 18:00 ` dinguyen at opensource.altera.com
0 siblings, 0 replies; 6+ messages in thread
From: dinguyen at opensource.altera.com @ 2014-11-26 18:00 UTC (permalink / raw)
To: u-boot
From: Dinh Nguyen <dinguyen@opensource.altera.com>
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>
Cc: Pavel Machek <pavel@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
---
arch/arm/cpu/armv7/socfpga/freeze_controller.c | 6 ++----
arch/arm/include/asm/arch-socfpga/freeze_controller.h | 1 -
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/arch/arm/cpu/armv7/socfpga/freeze_controller.c b/arch/arm/cpu/armv7/socfpga/freeze_controller.c
index b8c9bce..0be643c 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
diff --git a/arch/arm/include/asm/arch-socfpga/freeze_controller.h b/arch/arm/include/asm/arch-socfpga/freeze_controller.h
index 120f20e..f19ad87 100644
--- a/arch/arm/include/asm/arch-socfpga/freeze_controller.h
+++ b/arch/arm/include/asm/arch-socfpga/freeze_controller.h
@@ -42,7 +42,6 @@ typedef enum {
#define SYSMGR_FRZCTRL_HWCTRL_VIO1REQ_MASK 0x00000001
#define SYSMGR_FRZCTRL_HWCTRL_VIO1STATE_ENUM_FROZEN 0x2
#define SYSMGR_FRZCTRL_HWCTRL_VIO1STATE_ENUM_THAWED 0x1
-#define SYSMGR_FRZCTRL_VIOCTRL_SHIFT 0x2
void sys_mgr_frzctrl_freeze_req(void);
void sys_mgr_frzctrl_thaw_req(void);
--
2.0.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-12-06 12:54 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-26 18:14 [U-Boot] [PATCH 1/2] socfpga: add missing struct member fifo_triple_byte dinguyen at opensource.altera.com
2014-11-26 18:14 ` [U-Boot] [PATCH 2/2] socfpga: correctly increment freeze_controller_base address dinguyen at opensource.altera.com
2014-11-27 19:53 ` Pavel Machek
2014-12-06 12:54 ` Marek Vasut
2014-11-27 19:53 ` [U-Boot] [PATCH 1/2] socfpga: add missing struct member fifo_triple_byte Pavel Machek
-- strict thread matches above, loose matches on Subject: below --
2014-11-26 18:00 dinguyen at opensource.altera.com
2014-11-26 18:00 ` [U-Boot] [PATCH 2/2] socfpga: correctly increment freeze_controller_base address dinguyen at opensource.altera.com
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.