Skip to contentSkip to conversation

clk: mvebu: armada-38x: add support for missing clocks

PATCH Applied Richard Genoud 2 participants 2 messages Mar 13, 2018 – Mar 19, 2018

Subsystems (3)
Stable branch Common clk Arm/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SoC support
lore
Share & tools
lore

Richard Genoud

author
#0 lore raw

PATCH v2 1/1 clk: mvebu: armada-38x: add support for missing clocks

Clearfog boards can come with a CPU clocked at 1600MHz (commercial) or 1333MHz (industrial).

They have also some dip-switches to select a different clock (666, 800, 1066, 1200).

The funny thing is that the recovery button is on the MPP34 fq selector. So, when booting an industrial board with this button down, the frequency 666MHz is selected (and the kernel didn't boot).

This patch add all the missing clocks.

The only mode I didn't test is 2GHz (uboot found 4294MHz instead :/ ).

Fixes 0e85aeced4d6 ("clk: mvebu: add clock support for Armada 380/385")
Cc <[email protected]> # 3.16.x: 9593f4f56cf5: clk: mvebu: armada-38x: add support for 1866MHz variants
Cc <[email protected]> # 3.16.x
Signed-off-by Richard Genoud <[email protected]>
Acked-by Gregory CLEMENT <[email protected]>
---
 drivers/clk/mvebu/armada-38x.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/clk/mvebu/armada-38x.c +7 -7
index 394aa6f03f01..9ff4ea63932d 100644
@@ -46,11 +46,11 @@ static u32 __init armada_38x_get_tclk_freq(void __iomem *sar)
 }
 
 static const u32 armada_38x_cpu_frequencies[] __initconst = {
-	0, 0, 0, 0,
-	1066 * 1000 * 1000, 0, 0, 0,
+	666 * 1000 * 1000,  0, 800 * 1000 * 1000, 0,
+	1066 * 1000 * 1000, 0, 1200 * 1000 * 1000, 0,
 	1332 * 1000 * 1000, 0, 0, 0,
 	1600 * 1000 * 1000, 0, 0, 0,
-	1866 * 1000 * 1000,
+	1866 * 1000 * 1000, 0, 0, 2000 * 1000 * 1000,
 };
 
 static u32 __init armada_38x_get_cpu_freq(void __iomem *sar)

@@ -76,11 +76,11 @@ static const struct coreclk_ratio armada_38x_coreclk_ratios[] __initconst = {
 };
 
 static const int armada_38x_cpu_l2_ratios[32][2] __initconst = {
-	{0, 1}, {0, 1}, {0, 1}, {0, 1},
-	{1, 2}, {0, 1}, {0, 1}, {0, 1},
-	{1, 2}, {0, 1}, {0, 1}, {0, 1},
+	{1, 2}, {0, 1}, {1, 2}, {0, 1},
+	{1, 2}, {0, 1}, {1, 2}, {0, 1},
 	{1, 2}, {0, 1}, {0, 1}, {0, 1},
 	{1, 2}, {0, 1}, {0, 1}, {0, 1},
+	{1, 2}, {0, 1}, {0, 1}, {1, 2},
 	{0, 1}, {0, 1}, {0, 1}, {0, 1},
 	{0, 1}, {0, 1}, {0, 1}, {0, 1},
 	{0, 1}, {0, 1}, {0, 1}, {0, 1},

@@ -91,7 +91,7 @@ static const int armada_38x_cpu_ddr_ratios[32][2] __initconst = {
 	{1, 2}, {0, 1}, {0, 1}, {0, 1},
 	{1, 2}, {0, 1}, {0, 1}, {0, 1},
 	{1, 2}, {0, 1}, {0, 1}, {0, 1},
-	{1, 2}, {0, 1}, {0, 1}, {0, 1},
+	{1, 2}, {0, 1}, {0, 1}, {7, 15},
 	{0, 1}, {0, 1}, {0, 1}, {0, 1},
 	{0, 1}, {0, 1}, {0, 1}, {0, 1},
 	{0, 1}, {0, 1}, {0, 1}, {0, 1},
maintainer Applied
#1 lore raw

Quoting Richard Genoud (2018-03-13 08:27:02)

Quoted 13 lines

Clearfog boards can come with a CPU clocked at 1600MHz (commercial) or 1333MHz (industrial).
=

They have also some dip-switches to select a different clock (666, 800, 1066, 1200).
=

The funny thing is that the recovery button is on the MPP34 fq selector. So, when booting an industrial board with this button down, the frequency 666MHz is selected (and the kernel didn't boot).
=

Quoted 8 lines

This patch add all the missing clocks.
=

The only mode I didn't test is 2GHz (uboot found 4294MHz instead :/ ). =

Fixes 0e85aeced4d6 ("clk: mvebu: add clock support for Armada 380/385")
Cc <[email protected]> # 3.16.x: 9593f4f56cf5: clk: mvebu: armada-3=

8x: add support for 1866MHz variants

Quoted 6 lines

Cc: <[email protected]> # 3.16.x
=

Signed-off-by Richard Genoud <[email protected]>
Acked-by Gregory CLEMENT <[email protected]>

---

Applied to clk-next