diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2012-09-17 20:57:07 -0400 |
---|---|---|
committer | Ben Hutchings <bhutchings@solarflare.com> | 2013-08-21 14:44:20 -0400 |
commit | 8b8a95a11aa985b7f6f6df8a0ffa597e56ff8310 (patch) | |
tree | 2ccd095bdc7233855ade747d1ed84392d18ca2f9 /drivers/net/ethernet | |
parent | caa7558655d5ae1997c6d52f87b59f8ec6f2c3af (diff) |
sfc: Rename Falcon-architecture register definitions
The EF10 architecture has a very different register layout from
previous controllers, so we'll use separate files for the two sets of
register definitions. Use 'farch' as an abbreviation for
Falcon-architecture.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r-- | drivers/net/ethernet/sfc/falcon.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/farch_regs.h (renamed from drivers/net/ethernet/sfc/regs.h) | 6 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/filter.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/mcdi.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/nic.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/ptp.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/siena.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/siena_sriov.c | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/ethernet/sfc/falcon.c b/drivers/net/ethernet/sfc/falcon.c index 395d89d3963e..f87710e9f8cd 100644 --- a/drivers/net/ethernet/sfc/falcon.c +++ b/drivers/net/ethernet/sfc/falcon.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include "efx.h" | 21 | #include "efx.h" |
22 | #include "spi.h" | 22 | #include "spi.h" |
23 | #include "nic.h" | 23 | #include "nic.h" |
24 | #include "regs.h" | 24 | #include "farch_regs.h" |
25 | #include "io.h" | 25 | #include "io.h" |
26 | #include "phy.h" | 26 | #include "phy.h" |
27 | #include "workarounds.h" | 27 | #include "workarounds.h" |
diff --git a/drivers/net/ethernet/sfc/regs.h b/drivers/net/ethernet/sfc/farch_regs.h index 27ad348d5c01..00ef17a59187 100644 --- a/drivers/net/ethernet/sfc/regs.h +++ b/drivers/net/ethernet/sfc/farch_regs.h | |||
@@ -8,8 +8,8 @@ | |||
8 | * by the Free Software Foundation, incorporated herein by reference. | 8 | * by the Free Software Foundation, incorporated herein by reference. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #ifndef EFX_REGS_H | 11 | #ifndef EFX_FARCH_REGS_H |
12 | #define EFX_REGS_H | 12 | #define EFX_FARCH_REGS_H |
13 | 13 | ||
14 | /* | 14 | /* |
15 | * Falcon hardware architecture definitions have a name prefix following | 15 | * Falcon hardware architecture definitions have a name prefix following |
@@ -2925,4 +2925,4 @@ | |||
2925 | #define FSF_AZ_DRV_GEN_EV_MAGIC_LBN 0 | 2925 | #define FSF_AZ_DRV_GEN_EV_MAGIC_LBN 0 |
2926 | #define FSF_AZ_DRV_GEN_EV_MAGIC_WIDTH 32 | 2926 | #define FSF_AZ_DRV_GEN_EV_MAGIC_WIDTH 32 |
2927 | 2927 | ||
2928 | #endif /* EFX_REGS_H */ | 2928 | #endif /* EFX_FARCH_REGS_H */ |
diff --git a/drivers/net/ethernet/sfc/filter.c b/drivers/net/ethernet/sfc/filter.c index 30d744235d27..fb01fdbce90b 100644 --- a/drivers/net/ethernet/sfc/filter.c +++ b/drivers/net/ethernet/sfc/filter.c | |||
@@ -13,7 +13,7 @@ | |||
13 | #include "filter.h" | 13 | #include "filter.h" |
14 | #include "io.h" | 14 | #include "io.h" |
15 | #include "nic.h" | 15 | #include "nic.h" |
16 | #include "regs.h" | 16 | #include "farch_regs.h" |
17 | 17 | ||
18 | /* "Fudge factors" - difference between programmed value and actual depth. | 18 | /* "Fudge factors" - difference between programmed value and actual depth. |
19 | * Due to pipelined implementation we need to program H/W with a value that | 19 | * Due to pipelined implementation we need to program H/W with a value that |
diff --git a/drivers/net/ethernet/sfc/mcdi.c b/drivers/net/ethernet/sfc/mcdi.c index d7d3a8a9cd15..dffadb24b364 100644 --- a/drivers/net/ethernet/sfc/mcdi.c +++ b/drivers/net/ethernet/sfc/mcdi.c | |||
@@ -11,7 +11,7 @@ | |||
11 | #include "net_driver.h" | 11 | #include "net_driver.h" |
12 | #include "nic.h" | 12 | #include "nic.h" |
13 | #include "io.h" | 13 | #include "io.h" |
14 | #include "regs.h" | 14 | #include "farch_regs.h" |
15 | #include "mcdi_pcol.h" | 15 | #include "mcdi_pcol.h" |
16 | #include "phy.h" | 16 | #include "phy.h" |
17 | 17 | ||
diff --git a/drivers/net/ethernet/sfc/nic.c b/drivers/net/ethernet/sfc/nic.c index 372891c5f846..f758333b4d85 100644 --- a/drivers/net/ethernet/sfc/nic.c +++ b/drivers/net/ethernet/sfc/nic.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include "bitfield.h" | 19 | #include "bitfield.h" |
20 | #include "efx.h" | 20 | #include "efx.h" |
21 | #include "nic.h" | 21 | #include "nic.h" |
22 | #include "regs.h" | 22 | #include "farch_regs.h" |
23 | #include "io.h" | 23 | #include "io.h" |
24 | #include "workarounds.h" | 24 | #include "workarounds.h" |
25 | 25 | ||
diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c index 56a8b8898c47..59e09e1840d3 100644 --- a/drivers/net/ethernet/sfc/ptp.c +++ b/drivers/net/ethernet/sfc/ptp.c | |||
@@ -46,7 +46,7 @@ | |||
46 | #include "mcdi.h" | 46 | #include "mcdi.h" |
47 | #include "mcdi_pcol.h" | 47 | #include "mcdi_pcol.h" |
48 | #include "io.h" | 48 | #include "io.h" |
49 | #include "regs.h" | 49 | #include "farch_regs.h" |
50 | #include "nic.h" | 50 | #include "nic.h" |
51 | 51 | ||
52 | /* Maximum number of events expected to make up a PTP event */ | 52 | /* Maximum number of events expected to make up a PTP event */ |
diff --git a/drivers/net/ethernet/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c index f0ae262b91ab..d0eeb03a9bb7 100644 --- a/drivers/net/ethernet/sfc/siena.c +++ b/drivers/net/ethernet/sfc/siena.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include "efx.h" | 19 | #include "efx.h" |
20 | #include "nic.h" | 20 | #include "nic.h" |
21 | #include "spi.h" | 21 | #include "spi.h" |
22 | #include "regs.h" | 22 | #include "farch_regs.h" |
23 | #include "io.h" | 23 | #include "io.h" |
24 | #include "phy.h" | 24 | #include "phy.h" |
25 | #include "workarounds.h" | 25 | #include "workarounds.h" |
diff --git a/drivers/net/ethernet/sfc/siena_sriov.c b/drivers/net/ethernet/sfc/siena_sriov.c index 6258e7f934e4..4d214bce8969 100644 --- a/drivers/net/ethernet/sfc/siena_sriov.c +++ b/drivers/net/ethernet/sfc/siena_sriov.c | |||
@@ -15,7 +15,7 @@ | |||
15 | #include "mcdi.h" | 15 | #include "mcdi.h" |
16 | #include "filter.h" | 16 | #include "filter.h" |
17 | #include "mcdi_pcol.h" | 17 | #include "mcdi_pcol.h" |
18 | #include "regs.h" | 18 | #include "farch_regs.h" |
19 | #include "vfdi.h" | 19 | #include "vfdi.h" |
20 | 20 | ||
21 | /* Number of longs required to track all the VIs in a VF */ | 21 | /* Number of longs required to track all the VIs in a VF */ |