softpll-unify: support different parameters in wrs/wrnode

This has no effect on wrc.bin. The commit unifies the directory softpll/ between wr-switch and wr-node. No differences are left. This is an ugly ifdef, but I prefer merging the code base (removing duplicates) before addressing the configuration problem. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

softpll-unify: support different parameters in wrs/wrnode
This has no effect on wrc.bin. The commit unifies the directory softpll/ between wr-switch and wr-node. No differences are left. This is an ugly ifdef, but I prefer merging the code base (removing duplicates) before addressing the configuration problem. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
c3ef35fe · Alessandro Rubini · 5566c822 · c3ef35fe · c3ef35fe · c3ef35fe
Commit c3ef35fe authored Dec 05, 2013 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 24 additions and 2 deletions

Kconfig Kconfig +9 -0

spll_external.c softpll/spll_external.c +6 -0

spll_main.c softpll/spll_main.c +9 -2

No files found.
--- a/Kconfig
+++ b/Kconfig
 mainmenu "WR PTP Core software configuration"
+# Later we'll build wr_cpu.bin for wr-switch from this code base
+config WR_SWITCH
+	bool
+	default n
+config WR_NODE
+	bool
+	default y
 # most options with no prompt here are prompted-for in the "advanced" section
 config RAMSIZE

--- a/softpll/spll_external.c
+++ b/softpll/spll_external.c
@@ -28,7 +28,13 @@ void external_init(volatile struct spll_external_state *s, int ext_ref,
 	s->pi.bias = 32768;
 	/* Phase branch lock detection */
+#if defined(CONFIG_WR_SWITCH)
+	s->ld.threshold = 250;
+#elif defined(CONFIG_WR_NODE)
 	s->ld.threshold = 400;
+#else
+#error "Please set CONFIG for wr switch or wr node"
+#endif
 	s->ld.lock_samples = 10000;
 	s->ld.delock_samples = 9990;
 	s->ref_src = ext_ref;

--- a/softpll/spll_main.c
+++ b/softpll/spll_main.c
@@ -28,8 +28,15 @@ void mpll_init(struct spll_main_state *s, int id_ref,
 	s->pi.y_max = 65530;
 	s->pi.anti_windup = 1;
 	s->pi.bias = 65000;
-	s->pi.kp = 1100;	// / 2;
+#if defined(CONFIG_WR_SWITCH)
-	s->pi.ki = 30;		// / 2;
+	s->pi.kp = 1500;		// / 2;
+	s->pi.ki = 7;			// / 2;
+#elif defined(CONFIG_WR_NODE)
+	s->pi.kp = 1100;		// / 2;
+	s->pi.ki = 30;			// / 2;
+#else
+#error "Please set CONFIG for wr switch or wr node"
+#endif
 	s->delock_count = 0;
 	/* Freqency branch lock detection */