Skip to contentSkip to conversation

mx6ull: Fix WDOG3 base address

PATCH New Fabio Estevam 3 participants 8 messages Nov 23, 2017 – Nov 27, 2017

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm i.MX and Layerscape
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/2 mx6ull: Fix WDOG3 base address

From: Fabio Estevam <[email protected]>

i.MX6ULL has the same WDOG3 base address as i.MX6UL, so take this into account in the base address definition.

Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/include/asm/arch-mx6/imx-regs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/arch-mx6/imx-regs.h +1 -1
index 624ccec..7736b6a 100644
@@ -367,7 +367,7 @@
 #include <asm/types.h>
 
 /* only for i.MX6SX/UL */
-#define WDOG3_BASE_ADDR ((is_mx6ul() ?	\
+#define WDOG3_BASE_ADDR (((is_mx6ul() || is_mx6ull()) ?	\
 			 MX6UL_WDOG3_BASE_ADDR :  MX6SX_WDOG3_BASE_ADDR))
 #define LCDIF1_BASE_ADDR ((is_cpu_type(MXC_CPU_MX6SLL)) ?	\
 			  MX6SLL_LCDIF_BASE_ADDR :		\
Signature · 1 line
2.7.4
author reviewer
#1 lore raw

PATCH 2/2 imx: Also clear powerdown enable bit for WDOG3 on i.MX6ULL

From: Fabio Estevam <[email protected]>

Clear powerdown enable bit for WDOG3 on i.MX6ULL to avoid unwanted kernel reboots.

Suggested-by Ye Li <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/mach-imx/init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-imx/init.c +1 -1
index 720ad67..2a05c59 100644
@@ -78,7 +78,7 @@ void imx_set_wdog_powerdown(bool enable)
 	writew(enable, &wdog1->wmcr);
 	writew(enable, &wdog2->wmcr);
 
-	if (is_mx6sx() || is_mx6ul() || is_mx7())
+	if (is_mx6sx() || is_mx6ul() || is_mx6ull() || is_mx7())
 		writew(enable, &wdog3->wmcr);
 #ifdef CONFIG_MX7D
 	writew(enable, &wdog4->wmcr);
Signature · 1 line
2.7.4
#2 lore raw

PATCH 2/2 imx: Also clear powerdown enable bit for WDOG3 on i.MX6ULL

Quoted 27 lines

-----Original Message-----
From: Fabio Estevam [mailto:festevam at gmail.com]
Sent: Thursday, November 23, 2017 7:19 PM
To: sbabic at denx.de
Cc: u-boot at lists.denx.de; Ye Li <[email protected]>; Peng Fan <[email protected]>; Fabio Estevam <[email protected]>
Subject: [PATCH 2/2] imx: Also clear powerdown enable bit for WDOG3 on i.MX6ULL

From: Fabio Estevam <[email protected]>

Clear powerdown enable bit for WDOG3 on i.MX6ULL to avoid unwanted kernel reboots.

Suggested-by Ye Li <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/mach-imx/init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-imx/init.c index renamed from arch/arm/mach-imx/init.c +0 -0

720ad67..2a05c59 100644

arch/arm/mach-imx/init.c void imx_set_wdog_powerdown(bool enable) · line 84

Quoted 8 lines
arch/arm/mach-imx/init.c +1 -1
@@ -78,7 +78,7 @@ void imx_set_wdog_powerdown(bool enable)
 	writew(enable, &wdog1->wmcr);
 	writew(enable, &wdog2->wmcr);
 
-	if (is_mx6sx() || is_mx6ul() || is_mx7())
+	if (is_mx6sx() || is_mx6ul() || is_mx6ull() || is_mx7())
 		writew(enable, &wdog3->wmcr);
 #ifdef CONFIG_MX7D
 	writew(enable, &wdog4->wmcr);
Reviewed-by Peng Fan <[email protected]>
Quoted 2 lines

--
2.7.4

#3 lore raw

PATCH 2/2 imx: Also clear powerdown enable bit for WDOG3 on i.MX6ULL

In reply to Fabio Estevam
Quoted 17 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Clear powerdown enable bit for WDOG3 on i.MX6ULL to avoid unwanted kernel reboots.

Suggested-by Ye Li <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/mach-imx/init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-imx/init.c +0 -0
index 720ad67..2a05c59 100644

arch/arm/mach-imx/init.c void imx_set_wdog_powerdown(bool enable) · line 84

Quoted 8 lines
arch/arm/mach-imx/init.c +1 -1
@@ -78,7 +78,7 @@ void imx_set_wdog_powerdown(bool enable)
 	writew(enable, &wdog1->wmcr);
 	writew(enable, &wdog2->wmcr);
 
-	if (is_mx6sx() || is_mx6ul() || is_mx7())
+	if (is_mx6sx() || is_mx6ul() || is_mx6ull() || is_mx7())
 		writew(enable, &wdog3->wmcr);
 #ifdef CONFIG_MX7D
 	writew(enable, &wdog4->wmcr);
Reviewed-by Stefano Babic <[email protected]>

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#4 lore raw

PATCH 2/2 imx: Also clear powerdown enable bit for WDOG3 on i.MX6ULL

In reply to Fabio Estevam
Quoted 17 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Clear powerdown enable bit for WDOG3 on i.MX6ULL to avoid unwanted kernel reboots.

Suggested-by Ye Li <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/mach-imx/init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-imx/init.c +0 -0
index 720ad67..2a05c59 100644

arch/arm/mach-imx/init.c void imx_set_wdog_powerdown(bool enable) · line 84

Quoted 8 lines
arch/arm/mach-imx/init.c +1 -1
@@ -78,7 +78,7 @@ void imx_set_wdog_powerdown(bool enable)
 	writew(enable, &wdog1->wmcr);
 	writew(enable, &wdog2->wmcr);
 
-	if (is_mx6sx() || is_mx6ul() || is_mx7())
+	if (is_mx6sx() || is_mx6ul() || is_mx6ull() || is_mx7())
 		writew(enable, &wdog3->wmcr);
 #ifdef CONFIG_MX7D
 	writew(enable, &wdog4->wmcr);

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#5 lore raw

PATCH 1/2 mx6ull: Fix WDOG3 base address

In reply to Fabio Estevam
Quoted 34 lines

-----Original Message-----
From: Fabio Estevam [mailto:festevam at gmail.com]
Sent: Thursday, November 23, 2017 7:19 PM
To: sbabic at denx.de
Cc: u-boot at lists.denx.de; Ye Li <[email protected]>; Peng Fan <[email protected]>; Fabio Estevam <[email protected]>
Subject: [PATCH 1/2] mx6ull: Fix WDOG3 base address

From: Fabio Estevam <[email protected]>

i.MX6ULL has the same WDOG3 base address as i.MX6UL, so take this into account in the base address definition.

Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/include/asm/arch-mx6/imx-regs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/arch-mx6/imx-regs.h +1 -1
index 624ccec..7736b6a 100644
@@ -367,7 +367,7 @@
 #include <asm/types.h>
 
 /* only for i.MX6SX/UL */
-#define WDOG3_BASE_ADDR ((is_mx6ul() ?	\
+#define WDOG3_BASE_ADDR (((is_mx6ul() || is_mx6ull()) ?	\
 			 MX6UL_WDOG3_BASE_ADDR :
 MX6SX_WDOG3_BASE_ADDR))
 #define LCDIF1_BASE_ADDR ((is_cpu_type(MXC_CPU_MX6SLL)) ?	\
Quoted 1 line

MX6SLL_LCDIF_BASE_ADDR : \

Reviewed-by Peng Fan <[email protected]>
Quoted 2 lines

--
2.7.4

#6 lore raw

PATCH 1/2 mx6ull: Fix WDOG3 base address

In reply to Fabio Estevam
Quoted 16 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

i.MX6ULL has the same WDOG3 base address as i.MX6UL, so take this into account in the base address definition.

Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/include/asm/arch-mx6/imx-regs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/arch-mx6/imx-regs.h +0 -0
index 624ccec..7736b6a 100644

arch/arm/include/asm/arch-mx6/imx-regs.h line 373

Quoted 8 lines
arch/arm/include/asm/arch-mx6/imx-regs.h +1 -1
@@ -367,7 +367,7 @@
 #include <asm/types.h>
 
 /* only for i.MX6SX/UL */
-#define WDOG3_BASE_ADDR ((is_mx6ul() ?	\
+#define WDOG3_BASE_ADDR (((is_mx6ul() || is_mx6ull()) ?	\
 			 MX6UL_WDOG3_BASE_ADDR :  MX6SX_WDOG3_BASE_ADDR))
 #define LCDIF1_BASE_ADDR ((is_cpu_type(MXC_CPU_MX6SLL)) ?	\
 			  MX6SLL_LCDIF_BASE_ADDR :		\
Reviewed-by Stefano Babic <[email protected]>

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#7 lore raw

PATCH 1/2 mx6ull: Fix WDOG3 base address

In reply to Fabio Estevam
Quoted 16 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

i.MX6ULL has the same WDOG3 base address as i.MX6UL, so take this into account in the base address definition.

Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/include/asm/arch-mx6/imx-regs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/arch-mx6/imx-regs.h +0 -0
index 624ccec..7736b6a 100644

arch/arm/include/asm/arch-mx6/imx-regs.h line 373

Quoted 8 lines
arch/arm/include/asm/arch-mx6/imx-regs.h +1 -1
@@ -367,7 +367,7 @@
 #include <asm/types.h>
 
 /* only for i.MX6SX/UL */
-#define WDOG3_BASE_ADDR ((is_mx6ul() ?	\
+#define WDOG3_BASE_ADDR (((is_mx6ul() || is_mx6ull()) ?	\
 			 MX6UL_WDOG3_BASE_ADDR :  MX6SX_WDOG3_BASE_ADDR))
 #define LCDIF1_BASE_ADDR ((is_cpu_type(MXC_CPU_MX6SLL)) ?	\
 			  MX6SLL_LCDIF_BASE_ADDR :		\

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================