Skip to contentSkip to conversation

socfpga: add missing struct member fifo_triple_byte

PATCH New dinguyen at opensource.altera.com 3 participants 5 messages Nov 26, 2014 – Dec 6, 2014 Arm (32-bit)

lore
Share & tools
lore

dinguyen at opensource.altera.com

author
#0 lore raw

PATCH 1/2 socfpga: add missing struct member fifo_triple_byte

From: Dinh Nguyen <[email protected]>

socfpga_scan_manager structure was missing a data member.

Signed-off-by Dinh Nguyen <[email protected]>
Cc Vince Bridgers <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Wolfgang Denk <[email protected]>
---
 arch/arm/include/asm/arch-socfpga/scan_manager.h | 1 +
 1 file changed, 1 insertion(+)
arch/arm/include/asm/arch-socfpga/scan_manager.h +1 -0
index b2686d3..1155fd3 100644
@@ -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;
 };
Signature · 1 line
2.0.3
author
#1 lore raw

PATCH 2/2 socfpga: correctly increment freeze_controller_base address

From: Dinh Nguyen <[email protected]>

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 <[email protected]>
Cc Vince Bridgers <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Wolfgang Denk <[email protected]>
---
 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(-)
arch/arm/cpu/armv7/socfpga/freeze_controller.c +2 -4
index b8c9bce..0be643c 100644
@@ -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
arch/arm/include/asm/arch-socfpga/freeze_controller.h +0 -1
index 120f20e..f19ad87 100644
@@ -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);
Signature · 1 line
2.0.3
#2 lore raw

PATCH 2/2 socfpga: correctly increment freeze_controller_base address

Quoted 9 lines · dinguyen at opensource.altera.com

From: Dinh Nguyen <[email protected]>

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 <[email protected]>
Cc Vince Bridgers <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Marek Vasut <[email protected]>
Acked-by Pavel Machek <[email protected]>
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Applied
#3 lore raw

PATCH 2/2 socfpga: correctly increment freeze_controller_base address

In reply to dinguyen at opensource.altera.com
Quoted 6 lines · dinguyen at opensource.altera.com

From: Dinh Nguyen <[email protected]>

Correctly increment the base address of the freeze controller. And since SYSMGR_FRZCTRL_VIOCTRL_SHIFT is not needed, remove it from the include file.

Quoted 6 lines
Signed-off-by Dinh Nguyen <[email protected]>
Cc Vince Bridgers <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Wolfgang Denk <[email protected]>

Applied both. Thank you and sorry for the delay. I am now back and catching up.

Best regards,
Marek Vasut

#4 lore raw

PATCH 1/2 socfpga: add missing struct member fifo_triple_byte

In reply to dinguyen at opensource.altera.com
Quoted 8 lines · dinguyen at opensource.altera.com

From: Dinh Nguyen <[email protected]>

socfpga_scan_manager structure was missing a data member.

Signed-off-by Dinh Nguyen <[email protected]>
Cc Vince Bridgers <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Marek Vasut <[email protected]>
Acked-by Pavel Machek <[email protected]>
Signature · 3 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
P