Skip to contentSkip to conversation

ARM: arch-mx6: fix PLL2_PFD2_FREQ

PATCH New Markus Niebel 4 participants 8 messages Sep 11, 2013 – Oct 10, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: arch-mx6: fix PLL2_PFD2_FREQ

From: Markus Niebel <[email protected]>

according to the manual frequency of PLL2 PFD2 is 396.000.000 instead of 400.000.000

---
 arch/arm/include/asm/arch-mx6/crm_regs.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/arch-mx6/crm_regs.h +1 -1
index 74aefe6..2813593 100644
@@ -892,7 +892,7 @@ struct mxc_ccm_reg {
 
 #define PLL2_PFD0_FREQ		352000000
 #define PLL2_PFD1_FREQ		594000000
-#define PLL2_PFD2_FREQ		400000000
+#define PLL2_PFD2_FREQ		396000000
 #define PLL2_PFD2_DIV_FREQ	200000000
 #define PLL3_PFD0_FREQ		720000000
 #define PLL3_PFD1_FREQ		540000000
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 ARM: i.MX6: add i.MX6D to detected variants

From: Markus Niebel <[email protected]>

Currently the dual cora variant is detected and displayed as quad core. Add a define for MXC_CPU_MX6DUAL and implement the same SCU based approach done for MX6DL / MX6S

---
 arch/arm/cpu/armv7/mx6/soc.c              |    6 ++++++
 arch/arm/imx-common/cpu.c                 |    2 ++
 arch/arm/include/asm/arch-mx5/sys_proto.h |    1 +
 arch/arm/include/asm/arch-mx6/sys_proto.h |    1 +
 4 files changed, 10 insertions(+)
arch/arm/cpu/armv7/mx6/soc.c +6 -0
index a390296..1f65d85 100644
@@ -42,6 +42,12 @@ u32 get_cpu_rev(void)
 
 			if (!cfg)
 				type = MXC_CPU_MX6SOLO;
+		} else if (type == MXC_CPU_MX6Q) {
+			struct scu_regs *scu = (struct scu_regs *)SCU_BASE_ADDR;
+			u32 cfg = readl(&scu->config) & 3;
+
+			if (1 == cfg)
+				type = MXC_CPU_MX6DUAL;
 		}
 	}
 	reg &= 0xff;		/* mx6 silicon revision */
arch/arm/imx-common/cpu.c +2 -0
index 0cd2538..77ef912 100644
@@ -104,6 +104,8 @@ unsigned imx_ddr_size(void)
 const char *get_imx_type(u32 imxtype)
 {
 	switch (imxtype) {
+	case MXC_CPU_MX6DUAL:
+		return "6D";	/* Dual-core version of the mx6 */
 	case MXC_CPU_MX6Q:
 		return "6Q";	/* Quad-core version of the mx6 */
 	case MXC_CPU_MX6DL:
arch/arm/include/asm/arch-mx5/sys_proto.h +1 -0
index 9949ad1..c2bec45 100644
@@ -14,6 +14,7 @@
 #define MXC_CPU_MX6DL		0x61
 #define MXC_CPU_MX6SOLO		0x62
 #define MXC_CPU_MX6Q		0x63
+#define MXC_CPU_MX6DUAL		0x64
 
 #define is_soc_rev(rev)	((get_cpu_rev() & 0xFF) - rev)
 u32 get_cpu_rev(void);
arch/arm/include/asm/arch-mx6/sys_proto.h +1 -0
index 8c21364..227998c 100644
@@ -16,6 +16,7 @@
 #define MXC_CPU_MX6DL		0x61
 #define MXC_CPU_MX6SOLO		0x62
 #define MXC_CPU_MX6Q		0x63
+#define MXC_CPU_MX6DUAL		0x64
 
 #define is_soc_rev(rev)	((get_cpu_rev() & 0xFF) - rev)
 u32 get_cpu_rev(void);
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 1/1 ARM: arch-mx6: fix PLL2_PFD2_FREQ

In reply to Markus Niebel
Quoted 16 lines · Markus Niebel

From: Markus Niebel <[email protected]>

according to the manual frequency of PLL2 PFD2 is 396.000.000 instead of 400.000.000

---
 arch/arm/include/asm/arch-mx6/crm_regs.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/arch-mx6/crm_regs.h +0 -0
index 74aefe6..2813593 100644

arch/arm/include/asm/arch-mx6/crm_regs.h struct mxc_ccm_reg { · line 898

Quoted 8 lines
arch/arm/include/asm/arch-mx6/crm_regs.h +1 -1
@@ -892,7 +892,7 @@ struct mxc_ccm_reg {
 
 #define PLL2_PFD0_FREQ		352000000
 #define PLL2_PFD1_FREQ		594000000
-#define PLL2_PFD2_FREQ		400000000
+#define PLL2_PFD2_FREQ		396000000
 #define PLL2_PFD2_DIV_FREQ	200000000
 #define PLL3_PFD0_FREQ		720000000
 #define PLL3_PFD1_FREQ		540000000

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
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
=====================================================================
#3 lore raw

PATCH 1/1 ARM: arch-mx6: fix PLL2_PFD2_FREQ

Stefano Babic wrote

Quoted 37 lines · Markus Niebel
Quoted 1 line

From: Markus Niebel &lt;

Markus.Niebel@

&gt;

Quoted 5 lines

according to the manual frequency of PLL2 PFD2 is 396.000.000 instead of 400.000.000

Signed-off-by Markus Niebel &lt;

Markus.Niebel@

&gt;

Quoted 11 lines
---
 arch/arm/include/asm/arch-mx6/crm_regs.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/arch-mx6/crm_regs.h +0 -0
index 74aefe6..2813593 100644

arch/arm/include/asm/arch-mx6/crm_regs.h struct mxc_ccm_reg { · line 898

Quoted 8 lines
arch/arm/include/asm/arch-mx6/crm_regs.h +1 -1
@@ -892,7 +892,7 @@ struct mxc_ccm_reg {
 
 #define PLL2_PFD0_FREQ		352000000
 #define PLL2_PFD1_FREQ		594000000
-#define PLL2_PFD2_FREQ		400000000
+#define PLL2_PFD2_FREQ		396000000
 #define PLL2_PFD2_DIV_FREQ	200000000
 #define PLL3_PFD0_FREQ		720000000
 #define PLL3_PFD1_FREQ		540000000
Acked-by Stefano Babic &lt;
Quoted 3 lines

sbabic@

&gt;

Hello Markus, Hello Stephano
I think it's better to compute this frequencies rather than hard coding values. The default PFD frequencies are not the same for the Quad and for the other Socs.
Furthermore, if you modify PLL2_PFD2_FREQ, you must also change PLL2_PFD2_DIV_FREQ.

Please, see the patch I've submitted yesterday ([PATCH V2] mx6: compute PLL PFD frequencies rather than using defines)

Best regards

--
View this message in context: http://u-boot.10912.n7.nabble.com/PATCH-ARM-arch-mx6-fix-PLL2-PFD2-FREQ-tp162976p163654.html
Sent from the U-Boot mailing list archive at Nabble.com.

#4 lore raw

PATCH 1/1 ARM: arch-mx6: fix PLL2_PFD2_FREQ

Hello Pierre,

Am 20.09.2013 16:32, wrote Pierre Aubert:

Quoted 38 lines

Stefano Babic wrote

Quoted 36 lines · Markus Niebel
Quoted 1 line

From: Markus Niebel &lt;

Markus.Niebel@

&gt;

Quoted 5 lines

according to the manual frequency of PLL2 PFD2 is 396.000.000 instead of 400.000.000

Signed-off-by Markus Niebel &lt;

Markus.Niebel@

&gt;

Quoted 11 lines
---
 arch/arm/include/asm/arch-mx6/crm_regs.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/arch-mx6/crm_regs.h +0 -0
index 74aefe6..2813593 100644

arch/arm/include/asm/arch-mx6/crm_regs.h struct mxc_ccm_reg { · line 898

Quoted 8 lines
arch/arm/include/asm/arch-mx6/crm_regs.h +1 -1
@@ -892,7 +892,7 @@ struct mxc_ccm_reg {
 
 #define PLL2_PFD0_FREQ		352000000
 #define PLL2_PFD1_FREQ		594000000
-#define PLL2_PFD2_FREQ		400000000
+#define PLL2_PFD2_FREQ		396000000
 #define PLL2_PFD2_DIV_FREQ	200000000
 #define PLL3_PFD0_FREQ		720000000
 #define PLL3_PFD1_FREQ		540000000
Acked-by Stefano Babic &lt;
Quoted 8 lines
Quoted 3 lines

sbabic@

&gt;

Hello Markus, Hello Stephano
I think it's better to compute this frequencies rather than hard coding values. The default PFD frequencies are not the same for the Quad and for the other Socs.

As far as I read the manual for i.MX6Q/D and i.MX6DL/S have the same default values.

Quoted 6 lines

Furthermore, if you modify PLL2_PFD2_FREQ, you must also change PLL2_PFD2_DIV_FREQ.

Please, see the patch I've submitted yesterday ([PATCH V2] mx6: compute PLL PFD frequencies rather than using defines)

Hmm. Sounds reasonable.Do you expect any side effects? (We came accross the mismatch that was fixed with my original patch when looking over DRAM configuration)

Quoted 13 lines

Best regards

--
View this message in context: http://u-boot.10912.n7.nabble.com/PATCH-ARM-arch-mx6-fix-PLL2-PFD2-FREQ-tp162976p163654.html
Sent from the U-Boot mailing list archive at Nabble.com.
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

#5 lore raw

PATCH 1/1 ARM: arch-mx6: fix PLL2_PFD2_FREQ

Hello Markus,

Le 25/09/2013 09:24, Markus Niebel a ?crit :

Quoted 22 lines

Hello Pierre,

---
  arch/arm/include/asm/arch-mx6/crm_regs.h |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/arch-mx6/crm_regs.h +1 -1
index 74aefe6..2813593 100644
@@ -892,7 +892,7 @@ struct mxc_ccm_reg {
 
  #define PLL2_PFD0_FREQ		352000000
  #define PLL2_PFD1_FREQ		594000000
-#define PLL2_PFD2_FREQ		400000000
+#define PLL2_PFD2_FREQ		396000000
  #define PLL2_PFD2_DIV_FREQ	200000000
  #define PLL3_PFD0_FREQ		720000000
  #define PLL3_PFD1_FREQ		540000000
Quoted 2 lines
Quoted 5 lines
Quoted 4 lines

Hello Markus, Hello Stephano
I think it's better to compute this frequencies rather than hard coding values. The default PFD frequencies are not the same for the Quad and for the other Socs.

As far as I read the manual for i.MX6Q/D and i.MX6DL/S have the same default values.

For the i.MX6Q/D, the PLL2-PFD0 is 352MHz and the PLL2-PFD1 is 594MHz. For the i.MX6DL/S, the PLL2-PFD0 is 302.58MHz and the PLL2-PFD1 is 528MHz. The definitions in the crm_regs.h are for the i.MX6Q/D.

Quoted 11 lines
Quoted 7 lines

Furthermore, if you modify PLL2_PFD2_FREQ, you must also change PLL2_PFD2_DIV_FREQ.

Please, see the patch I've submitted yesterday ([PATCH V2] mx6: compute PLL PFD frequencies rather than using defines)

Hmm. Sounds reasonable.Do you expect any side effects? (We came accross the mismatch that was fixed with my original patch when looking over DRAM configuration)

I've tested it on the SabreSD with i.MX6DL and on a custom board with i.MX6Q and i.MX6S and I didn't noticed any side effects.

Best regards

#6 lore raw

PATCH 1/1 ARM: arch-mx6: fix PLL2_PFD2_FREQ

In reply to Pierre Aubert
Quoted 11 lines

Hello Markus, Hello Stephano
I think it's better to compute this frequencies rather than hard coding values. The default PFD frequencies are not the same for the Quad and for the other Socs.
Furthermore, if you modify PLL2_PFD2_FREQ, you must also change PLL2_PFD2_DIV_FREQ.

Please, see the patch I've submitted yesterday ([PATCH V2] mx6: compute PLL PFD frequencies rather than using defines)

This V2 patch: applied to u-boot-imx, -next branch, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
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/1 ARM: arch-mx6: fix PLL2_PFD2_FREQ

In reply to Markus Niebel
Quoted 7 lines · Markus Niebel

From: Markus Niebel <[email protected]>

according to the manual frequency of PLL2 PFD2 is 396.000.000 instead of 400.000.000

---

Applied to u-boot-imx, thanks!

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
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
=====================================================================