summaryrefslogtreecommitdiffstats
path: root/include/soc
diff options
context:
space:
mode:
authorChristophe Leroy <christophe.leroy@c-s.fr>2017-02-07 10:05:09 +0100
committerScott Wood <oss@buserror.net>2017-04-30 01:26:32 -0500
commit8b8642af15ed14b9a7a34d3401afbcc274533e13 (patch)
tree93bd7a92a7e915fae8427a30a24384529ee94485 /include/soc
parentfd615f69a18a9d4aa5ef02a1dc83f319f75da8e7 (diff)
downloadlinux-stable-8b8642af15ed14b9a7a34d3401afbcc274533e13.tar.gz
linux-stable-8b8642af15ed14b9a7a34d3401afbcc274533e13.tar.bz2
linux-stable-8b8642af15ed14b9a7a34d3401afbcc274533e13.zip
net: ethernet: ucc_geth: fix MEM_PART_MURAM mode
Since commit 5093bb965a163 ("powerpc/QE: switch to the cpm_muram implementation"), muram area is not part of immrbar mapping anymore so immrbar_virt_to_phys() is not usable anymore. Fixes: 5093bb965a163 ("powerpc/QE: switch to the cpm_muram implementation") Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Acked-by: David S. Miller <davem@davemloft.net> Acked-by: Li Yang <pku.leo@gmail.com> Signed-off-by: Scott Wood <oss@buserror.net>
Diffstat (limited to 'include/soc')
-rw-r--r--include/soc/fsl/qe/qe.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/soc/fsl/qe/qe.h b/include/soc/fsl/qe/qe.h
index 70339d7958c0..0cd4c11479b1 100644
--- a/include/soc/fsl/qe/qe.h
+++ b/include/soc/fsl/qe/qe.h
@@ -243,6 +243,7 @@ static inline int qe_alive_during_sleep(void)
#define qe_muram_free cpm_muram_free
#define qe_muram_addr cpm_muram_addr
#define qe_muram_offset cpm_muram_offset
+#define qe_muram_dma cpm_muram_dma
#define qe_setbits32(_addr, _v) iowrite32be(ioread32be(_addr) | (_v), (_addr))
#define qe_clrbits32(_addr, _v) iowrite32be(ioread32be(_addr) & ~(_v), (_addr))