diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2019-03-01 15:03:50 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-03-01 15:05:54 +0100 |
| commit | 8ceb820b69fe6ff58234ff604146a9e88e6c1974 (patch) | |
| tree | 1e26db2f69aa5ee69971df12fbf5e8a24322870f /include/linux/fsl | |
| parent | Merge tag 'tee-misc-for-v5.1' of https://git.linaro.org/people/jens.wiklander/linux-tee into arm/drivers (diff) | |
| parent | dpaa2-eth: configure the cache stashing amount on a queue (diff) | |
| download | wireguard-linux-8ceb820b69fe6ff58234ff604146a9e88e6c1974.tar.xz wireguard-linux-8ceb820b69fe6ff58234ff604146a9e88e6c1974.zip | |
Merge tag 'soc-fsl-next-v5.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into arm/drivers
NXP/FSL SoC driver updates for v5.1 take4
DPIO driver
- Add support for cache stashing and enable it in dpaa2-eth driver
GUTS driver
- Make fsl_guts_get_svr() API internal in favor of more generic
soc_device_match()
* tag 'soc-fsl-next-v5.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux:
dpaa2-eth: configure the cache stashing amount on a queue
soc: fsl: dpio: configure cache stashing destination
soc: fsl: dpio: enable frame data cache stashing per software portal
soc: fsl: guts: make fsl_guts_get_svr() static
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux/fsl')
| -rw-r--r-- | include/linux/fsl/guts.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/fsl/guts.h b/include/linux/fsl/guts.h index 941b11811f85..1fc0edd71c52 100644 --- a/include/linux/fsl/guts.h +++ b/include/linux/fsl/guts.h @@ -135,8 +135,6 @@ struct ccsr_guts { u32 srds2cr1; /* 0x.0f44 - SerDes2 Control Register 0 */ } __attribute__ ((packed)); -u32 fsl_guts_get_svr(void); - /* Alternate function signal multiplex control */ #define MPC85xx_PMUXCR_QE(x) (0x8000 >> (x)) |