Skip to content

F
FMC TDC 1ns 5cha - Software
Commit 5b17fc17 authored by Samuel Iglesias Gonsálvez's avatar Samuel Iglesias Gonsálvez
Browse files
Options

tdc: rename tdc-spec.c to tdc-fmc.c 

Change the name of the functions accordingly.
Signed-off-by: Samuel Iglesias Gonsálvez's avatarSamuel Iglesias Gonsálvez <siglesias@igalia.com>
parent dab28a17
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 31 deletions
Makefile
View file @ 5b17fc17
...@@ -13,7 +13,7 @@ subdirs-ccflags-y = $(ccflags-y) ...@@ -13,7 +13,7 @@ subdirs-ccflags-y = $(ccflags-y)
obj-m := spec-tdc.o obj-m := spec-tdc.o
spec-tdc-objs = tdc-core.o tdc-zio.o tdc-spec.o tdc-acam.o spec-tdc-objs = tdc-core.o tdc-zio.o tdc-fmc.o tdc-acam.o
all: modules all: modules
......
tdc-core.c
View file @ 5b17fc17
...@@ -92,7 +92,7 @@ static int tdc_init(void) ...@@ -92,7 +92,7 @@ static int tdc_init(void)
if (err < 0) if (err < 0)
return err; return err;
err = tdc_spec_init(); err = tdc_fmc_init();
if (err < 0) { if (err < 0) {
tdc_zio_exit(); tdc_zio_exit();
return err; return err;
...@@ -103,7 +103,7 @@ static int tdc_init(void) ...@@ -103,7 +103,7 @@ static int tdc_init(void)
static void tdc_exit(void) static void tdc_exit(void)
{ {
tdc_spec_exit(); tdc_fmc_exit();
tdc_zio_exit(); tdc_zio_exit();
} }
......
tdc-spec.c → tdc-fmc.c
View file @ 5b17fc17
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
static struct fmc_driver tdc_fmc_driver; static struct fmc_driver tdc_fmc_driver;
static void tdc_gennum_setup_local_clock(struct spec_tdc *tdc, int freq) static void tdc_fmc_gennum_setup_local_clock(struct spec_tdc *tdc, int freq)
{ {
unsigned int divot; unsigned int divot;
unsigned int data; unsigned int data;
...@@ -30,16 +30,16 @@ static void tdc_gennum_setup_local_clock(struct spec_tdc *tdc, int freq) ...@@ -30,16 +30,16 @@ static void tdc_gennum_setup_local_clock(struct spec_tdc *tdc, int freq)
writel(0x0001F04C, tdc->gn412x_regs + TDC_PCI_CLK_CSR); writel(0x0001F04C, tdc->gn412x_regs + TDC_PCI_CLK_CSR);
} }
static void tdc_fw_reset(struct spec_tdc *tdc) static void tdc_fmc_fw_reset(struct spec_tdc *tdc)
{ {
/* Reset FPGA. Assert ~RSTOUT33 and de-assert it. BAR 4.*/ /* Reset FPGA. Assert ~RSTOUT33 and de-assert it. BAR 4.*/
writel(0x00021040, tdc->gn412x_regs + TDC_PCI_SYS_CFG_SYSTEM); writel(0x00021040, tdc->gn412x_regs + TDC_PCI_SYS_CFG_SYSTEM);
mdelay(10); mdelay(10);
writel(0x00025000, tdc->gn412x_regs + TDC_PCI_SYS_CFG_SYSTEM); writel(0x00025000, tdc->gn412x_regs + TDC_PCI_SYS_CFG_SYSTEM);
mdelay(5000); mdelay(600);
} }
int tdc_probe(struct fmc_device *dev) int tdc_fmc_probe(struct fmc_device *dev)
{ {
struct spec_tdc *tdc; struct spec_tdc *tdc;
struct spec_dev *spec; struct spec_dev *spec;
...@@ -69,32 +69,16 @@ int tdc_probe(struct fmc_device *dev) ...@@ -69,32 +69,16 @@ int tdc_probe(struct fmc_device *dev)
tdc->gn412x_regs = spec->remap[2]; /* BAR 4 */ tdc->gn412x_regs = spec->remap[2]; /* BAR 4 */
/* Setup the Gennum 412x local clock frequency */ /* Setup the Gennum 412x local clock frequency */
tdc_gennum_setup_local_clock(tdc, 160); tdc_fmc_gennum_setup_local_clock(tdc, 160);
/* Reset FPGA to load the firmware */ /* Reset FPGA to load the firmware */
tdc_fw_reset(tdc); tdc_fmc_fw_reset(tdc);
#if 0
/* Load ACAM configuration */
tdc_acam_load_config(tdc);
/* Reset ACAM configuration */
tdc_acam_reset(tdc);
#endif
#if 1
/* XXX: Delete this part as it is for testing the FW */
pr_err("SIG: tdc->base 0x%p\n", tdc->base);
tdc_set_utc_time(tdc);
mdelay(20);
pr_err("SIG: current UTC 0x%x\n", readl(tdc->base + TDC_CURRENT_UTC));
#endif
/* TODO: */ /* TODO: */
return tdc_zio_register_device(tdc); return tdc_zio_register_device(tdc);
} }
int tdc_remove(struct fmc_device *dev) int tdc_fmc_remove(struct fmc_device *dev)
{ {
struct spec_dev *spec = dev->carrier_data; struct spec_dev *spec = dev->carrier_data;
struct spec_tdc *tdc; struct spec_tdc *tdc;
...@@ -106,7 +90,7 @@ int tdc_remove(struct fmc_device *dev) ...@@ -106,7 +90,7 @@ int tdc_remove(struct fmc_device *dev)
} }
int tdc_spec_init(void) int tdc_fmc_init(void)
{ {
tdc_fmc_driver.probe = tdc_probe; tdc_fmc_driver.probe = tdc_probe;
tdc_fmc_driver.remove = tdc_remove; tdc_fmc_driver.remove = tdc_remove;
...@@ -114,7 +98,7 @@ int tdc_spec_init(void) ...@@ -114,7 +98,7 @@ int tdc_spec_init(void)
return 0; return 0;
} }
void tdc_spec_exit(void) void tdc_fmc_exit(void)
{ {
fmc_driver_unregister(&tdc_fmc_driver); fmc_driver_unregister(&tdc_fmc_driver);
} }
......
tdc.h
View file @ 5b17fc17
...@@ -45,9 +45,9 @@ extern void tdc_zio_remove(struct spec_tdc *tdc); ...@@ -45,9 +45,9 @@ extern void tdc_zio_remove(struct spec_tdc *tdc);
extern int tdc_zio_init(void); extern int tdc_zio_init(void);
extern void tdc_zio_exit(void); extern void tdc_zio_exit(void);
/* SPEC helper functions */ /* FMC helper functions */
int tdc_spec_init(void); int tdc_fmc_init(void);
void tdc_spec_exit(void); void tdc_fmc_exit(void);
/* ACAM helper functions */ /* ACAM helper functions */
void tdc_acam_reset(struct spec_tdc *tdc); void tdc_acam_reset(struct spec_tdc *tdc);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment