kernel: use "field-desc.h", not "zio-utils.h"

We plan to base the FMC-ADC release on an official ZIO version. So, this allows removing the register descrition commit from the ZIO submodule. Federico agrees, as far as I know. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

kernel: use "field-desc.h", not "zio-utils.h"
We plan to base the FMC-ADC release on an official ZIO version. So, this allows removing the register descrition commit from the ZIO submodule. Federico agrees, as far as I know. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
61ab0ba9 · Alessandro Rubini · c1bf3fdb · 61ab0ba9 · 61ab0ba9 · 61ab0ba9
Commit 61ab0ba9 authored Jun 24, 2013 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 11 deletions

fa-regtable.c kernel/fa-regtable.c +1 -1

fa-zio-drv.c kernel/fa-zio-drv.c +0 -1

fa-zio-trg.c kernel/fa-zio-trg.c +0 -1

fmc-adc.h kernel/fmc-adc.h +4 -8

No files found.
--- a/kernel/fa-regtable.c
+++ b/kernel/fa-regtable.c
@@ -7,7 +7,7 @@
 #include "fmc-adc.h"

 /* Definition of the fmc-adc registers address - mask - mask offset */
-const struct zio_field_desc zfad_regs[] = {
+const struct zfa_field_desc zfad_regs[] = {
 	/* Control registers */
 	[ZFA_CTL_FMS_CMD] =		{FA_ADC_MEM_OFF + 0x00, 0x0003, 0},
 	[ZFA_CTL_CLK_EN] =		{FA_ADC_MEM_OFF + 0x00, 0x0001, 2},

--- a/kernel/fa-zio-drv.c
+++ b/kernel/fa-zio-drv.c
@@ -20,7 +20,6 @@
 #include <linux/zio.h>
 #include <linux/zio-buffer.h>
 #include <linux/zio-trigger.h>
-#include <linux/zio-utils.h>

 #include "fmc-adc.h"


--- a/kernel/fa-zio-trg.c
+++ b/kernel/fa-zio-trg.c
@@ -19,7 +19,6 @@
 #include <linux/zio-sysfs.h>
 #include <linux/zio-buffer.h>
 #include <linux/zio-trigger.h>
-#include <linux/zio-utils.h>

 #include "fmc-adc.h"


--- a/kernel/fmc-adc.h
+++ b/kernel/fmc-adc.h
@@ -8,11 +8,9 @@
 #ifndef _fa_dev_H_
 #define _fa_dev_H_
 #include <linux/scatterlist.h>
-
 #include <linux/fmc.h>
-
 #include <linux/zio.h>
-#include <linux/zio-utils.h>
+#include "field-desc.h"

 #define FA_GATEWARE_DEFAULT_NAME "fmc/spec-fmc-adc-v1.1.bin"
 extern int enable_auto_start;
@@ -259,7 +257,7 @@ enum zfadc_dregs_enum {
 	ZFA_SW_R_NOADDERS_AUTO,
 };
 /* Registers lists used in fd-zio-drv.c */
-extern const struct zio_field_desc zfad_regs[];
+extern const struct zfa_field_desc zfad_regs[];

 /*
 * ZFA_CHx_MULT
@@ -291,9 +289,7 @@ enum zfat_irq {
 };

 #ifdef __KERNEL__ /* All the rest is only of kernel users */
-#include <linux/zio.h>
 #include <linux/zio-trigger.h>
-#include <linux/zio-utils.h>

 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
@@ -364,7 +360,7 @@ static inline int zfa_common_conf_set(struct fa_dev *fa,
 	}
 	/* Read current register*/
 	cur = fmc_readl(fa->fmc, zfad_regs[index].addr);
-	val = zio_set_field(&zfad_regs[index], cur, usr_val);
+	val = zfa_set_field(&zfad_regs[index], cur, usr_val);
 	/* FIXME re-write usr_val when possible (zio need a patch) */
 	/* If the attribute has a valid address */
 	fmc_writel(fa->fmc, val, zfad_regs[index].addr);
@@ -379,7 +375,7 @@ static inline void zfa_common_info_get(struct fa_dev *fa,
 	/* Read current register*/
 	cur = fmc_readl(fa->fmc, zfad_regs[index].addr);
 	/* Return the value */
-	*usr_val = zio_get_field(&zfad_regs[index], cur);
+	*usr_val = zfa_get_field(&zfad_regs[index], cur);
 }