From 6298624f9886a73e05d7e4f07248b32b9c94f81e Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 14 May 2014 16:08:40 +0200
Subject: [PATCH] sdramphy: remove fixed parameters

---
 misoclib/sdramphy/gensdrphy.py | 15 ++++-----------
 misoclib/sdramphy/s6ddrphy.py  |  9 +++------
 targets/mlabs_video.py         |  2 +-
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/misoclib/sdramphy/gensdrphy.py b/misoclib/sdramphy/gensdrphy.py
index 01f79e0c..fbb5bd4e 100644
--- a/misoclib/sdramphy/gensdrphy.py
+++ b/misoclib/sdramphy/gensdrphy.py
@@ -29,14 +29,7 @@ from migen.fhdl.specials import *
 from misoclib import lasmicon
 
 class GENSDRPHY(Module):
-	def __init__(self, pads, memtype, nphases, cl):
-		if memtype not in ["SDR"]:
-			raise NotImplementedError("GENSDRPHY only supports SDR")
-		if cl != 2:
-			raise NotImplementedError("GENSDRPHY only supports CAS LATENCY 2")
-		if nphases > 1:
-			raise NotImplementedError("GENSDRPHY only supports Full Rate (nphases=1)")
-
+	def __init__(self, pads):
 		a = flen(pads.a)
 		ba = flen(pads.ba)
 		d = flen(pads.dq)
@@ -44,17 +37,17 @@ class GENSDRPHY(Module):
 		self.phy_settings = lasmicon.PhySettings(
 			memtype=memtype,
 			dfi_d=d,
-			nphases=nphases,
+			nphases=1,
 			rdphase=0,
 			wrphase=0,
 			rdcmdphase=0,
 			wrcmdphase=0,
-			cl=cl,
+			cl=2,
 			read_latency=4,
 			write_latency=0
 		)
 		
-		self.dfi = Interface(a, ba, nphases*d, nphases)
+		self.dfi = Interface(a, ba, d)
 
 		###
 
diff --git a/misoclib/sdramphy/s6ddrphy.py b/misoclib/sdramphy/s6ddrphy.py
index 7211ca00..bdd9d6be 100644
--- a/misoclib/sdramphy/s6ddrphy.py
+++ b/misoclib/sdramphy/s6ddrphy.py
@@ -21,16 +21,13 @@ from migen.genlib.record import *
 from misoclib import lasmicon
 
 class S6DDRPHY(Module):
-	def __init__(self, pads, memtype, nphases, cl, rd_bitslip, wr_bitslip, dqs_ddr_alignment):
+	def __init__(self, pads, memtype, rd_bitslip, wr_bitslip, dqs_ddr_alignment):
 		if memtype not in ["DDR", "LPDDR", "DDR2"]:
 			raise NotImplementedError("S6DDRPHY only supports DDR, LPDDR and DDR2")
-		if cl != 3:
-			raise NotImplementedError("S6DDRPHY only supports CAS LATENCY 3")
-		if nphases != 2:
-			raise NotImplementedError("S6DDRPHY only supports Half Rate (nphases=2)")
 		a = flen(pads.a)
 		ba = flen(pads.ba)
 		d = flen(pads.dq)
+		nphases = 2
 
 		self.phy_settings = lasmicon.PhySettings(
 			memtype=memtype,
@@ -40,7 +37,7 @@ class S6DDRPHY(Module):
 			wrphase=1,
 			rdcmdphase=1,
 			wrcmdphase=0,
-			cl=cl,
+			cl=3,
 			read_latency=5,
 			write_latency=0
 		)
diff --git a/targets/mlabs_video.py b/targets/mlabs_video.py
index 1df776ea..1b7a1806 100644
--- a/targets/mlabs_video.py
+++ b/targets/mlabs_video.py
@@ -69,7 +69,7 @@ class MiniSoC(SDRAMSoC):
 			write_time=16
 		)
 		self.submodules.ddrphy = s6ddrphy.S6DDRPHY(platform.request("ddram"), memtype="DDR",
-			nphases=2, cl=3, rd_bitslip=0, wr_bitslip=3, dqs_ddr_alignment="C1")
+			rd_bitslip=0, wr_bitslip=3, dqs_ddr_alignment="C1")
 		self.register_sdram_phy(self.ddrphy.dfi, self.ddrphy.phy_settings, sdram_geom, sdram_timing)
 
 		# Wishbone
-- 
2.30.2