From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v7,1/7] dmaengine: fsldma: Replace DMA_IN/OUT by FSL_DMA_IN/OUT From: Wen He Message-Id: <20180725112919.31340-1-wen.he_1@nxp.com> Date: Wed, 25 Jul 2018 19:29:13 +0800 To: vkoul@kernel.org, dmaengine@vger.kernel.org Cc: robh+dt@kernel.org, devicetree@vger.kernel.org, leoyang.li@nxp.com, jiafei.pan@nxp.com, jiaheng.fan@nxp.com, wen.he_1@nxp.com List-ID: VGhpcyBwYXRjaCBpbXBsZW1lbnQgYSBzdGFuZGFyZCBtYWNybyBjYWxsIGZ1bmN0aW9ucyBpcwp1 c2VkIHRvIE5YUCBkbWEgZHJpdmVycy4KClNpZ25lZC1vZmYtYnk6IFdlbiBIZSA8d2VuLmhlXzFA bnhwLmNvbT4KLS0tCiBkcml2ZXJzL2RtYS9mc2xkbWEuYyB8ICAgMTYgKysrKysrKystLS0tLS0t LQogZHJpdmVycy9kbWEvZnNsZG1hLmggfCAgICA0ICsrLS0KIDIgZmlsZXMgY2hhbmdlZCwgMTAg aW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9kbWEv ZnNsZG1hLmMgYi9kcml2ZXJzL2RtYS9mc2xkbWEuYwppbmRleCAxMTE3YjUxLi4zOTg3MWUwIDEw MDY0NAotLS0gYS9kcml2ZXJzL2RtYS9mc2xkbWEuYworKysgYi9kcml2ZXJzL2RtYS9mc2xkbWEu YwpAQCAtNTMsNDIgKzUzLDQyIEBACiAKIHN0YXRpYyB2b2lkIHNldF9zcihzdHJ1Y3QgZnNsZG1h X2NoYW4gKmNoYW4sIHUzMiB2YWwpCiB7Ci0JRE1BX09VVChjaGFuLCAmY2hhbi0+cmVncy0+c3Is IHZhbCwgMzIpOworCUZTTF9ETUFfT1VUKGNoYW4sICZjaGFuLT5yZWdzLT5zciwgdmFsLCAzMik7 CiB9CiAKIHN0YXRpYyB1MzIgZ2V0X3NyKHN0cnVjdCBmc2xkbWFfY2hhbiAqY2hhbikKIHsKLQly ZXR1cm4gRE1BX0lOKGNoYW4sICZjaGFuLT5yZWdzLT5zciwgMzIpOworCXJldHVybiBGU0xfRE1B X0lOKGNoYW4sICZjaGFuLT5yZWdzLT5zciwgMzIpOwogfQogCiBzdGF0aWMgdm9pZCBzZXRfbXIo c3RydWN0IGZzbGRtYV9jaGFuICpjaGFuLCB1MzIgdmFsKQogewotCURNQV9PVVQoY2hhbiwgJmNo YW4tPnJlZ3MtPm1yLCB2YWwsIDMyKTsKKwlGU0xfRE1BX09VVChjaGFuLCAmY2hhbi0+cmVncy0+ bXIsIHZhbCwgMzIpOwogfQogCiBzdGF0aWMgdTMyIGdldF9tcihzdHJ1Y3QgZnNsZG1hX2NoYW4g KmNoYW4pCiB7Ci0JcmV0dXJuIERNQV9JTihjaGFuLCAmY2hhbi0+cmVncy0+bXIsIDMyKTsKKwly ZXR1cm4gRlNMX0RNQV9JTihjaGFuLCAmY2hhbi0+cmVncy0+bXIsIDMyKTsKIH0KIAogc3RhdGlj IHZvaWQgc2V0X2NkYXIoc3RydWN0IGZzbGRtYV9jaGFuICpjaGFuLCBkbWFfYWRkcl90IGFkZHIp CiB7Ci0JRE1BX09VVChjaGFuLCAmY2hhbi0+cmVncy0+Y2RhciwgYWRkciB8IEZTTF9ETUFfU05F TiwgNjQpOworCUZTTF9ETUFfT1VUKGNoYW4sICZjaGFuLT5yZWdzLT5jZGFyLCBhZGRyIHwgRlNM X0RNQV9TTkVOLCA2NCk7CiB9CiAKIHN0YXRpYyBkbWFfYWRkcl90IGdldF9jZGFyKHN0cnVjdCBm c2xkbWFfY2hhbiAqY2hhbikKIHsKLQlyZXR1cm4gRE1BX0lOKGNoYW4sICZjaGFuLT5yZWdzLT5j ZGFyLCA2NCkgJiB+RlNMX0RNQV9TTkVOOworCXJldHVybiBGU0xfRE1BX0lOKGNoYW4sICZjaGFu LT5yZWdzLT5jZGFyLCA2NCkgJiB+RlNMX0RNQV9TTkVOOwogfQogCiBzdGF0aWMgdm9pZCBzZXRf YmNyKHN0cnVjdCBmc2xkbWFfY2hhbiAqY2hhbiwgdTMyIHZhbCkKIHsKLQlETUFfT1VUKGNoYW4s ICZjaGFuLT5yZWdzLT5iY3IsIHZhbCwgMzIpOworCUZTTF9ETUFfT1VUKGNoYW4sICZjaGFuLT5y ZWdzLT5iY3IsIHZhbCwgMzIpOwogfQogCiBzdGF0aWMgdTMyIGdldF9iY3Ioc3RydWN0IGZzbGRt YV9jaGFuICpjaGFuKQogewotCXJldHVybiBETUFfSU4oY2hhbiwgJmNoYW4tPnJlZ3MtPmJjciwg MzIpOworCXJldHVybiBGU0xfRE1BX0lOKGNoYW4sICZjaGFuLT5yZWdzLT5iY3IsIDMyKTsKIH0K IAogLyoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZG1hL2ZzbGRtYS5oIGIvZHJpdmVycy9kbWEvZnNs ZG1hLmgKaW5kZXggNDc4N2Q0OC4uOTgyODQ1YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9kbWEvZnNs ZG1hLmgKKysrIGIvZHJpdmVycy9kbWEvZnNsZG1hLmgKQEAgLTIyMywxMCArMjIzLDEwIEBAIHN0 YXRpYyB2b2lkIG91dF9sZTY0KHU2NCBfX2lvbWVtICphZGRyLCB1NjQgdmFsKQogfQogI2VuZGlm CiAKLSNkZWZpbmUgRE1BX0lOKGZzbF9jaGFuLCBhZGRyLCB3aWR0aCkJCQkJCVwKKyNkZWZpbmUg RlNMX0RNQV9JTihmc2xfY2hhbiwgYWRkciwgd2lkdGgpCQkJCVwKIAkJKCgoZnNsX2NoYW4pLT5m ZWF0dXJlICYgRlNMX0RNQV9CSUdfRU5ESUFOKSA/CQlcCiAJCQlpbl9iZSMjd2lkdGgoYWRkcikg OiBpbl9sZSMjd2lkdGgoYWRkcikpCi0jZGVmaW5lIERNQV9PVVQoZnNsX2NoYW4sIGFkZHIsIHZh bCwgd2lkdGgpCQkJCVwKKyNkZWZpbmUgRlNMX0RNQV9PVVQoZnNsX2NoYW4sIGFkZHIsIHZhbCwg d2lkdGgpCQkJXAogCQkoKChmc2xfY2hhbiktPmZlYXR1cmUgJiBGU0xfRE1BX0JJR19FTkRJQU4p ID8JCVwKIAkJCW91dF9iZSMjd2lkdGgoYWRkciwgdmFsKSA6IG91dF9sZSMjd2lkdGgoYWRkciwg dmFsKSkKIAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Wen He Subject: [v7 1/7] dmaengine: fsldma: Replace DMA_IN/OUT by FSL_DMA_IN/OUT Date: Wed, 25 Jul 2018 19:29:13 +0800 Message-Id: <20180725112919.31340-1-wen.he_1@nxp.com> To: vkoul@kernel.org, dmaengine@vger.kernel.org Cc: robh+dt@kernel.org, devicetree@vger.kernel.org, leoyang.li@nxp.com, jiafei.pan@nxp.com, jiaheng.fan@nxp.com, wen.he_1@nxp.com List-ID: This patch implement a standard macro call functions is used to NXP dma drivers. Signed-off-by: Wen He --- drivers/dma/fsldma.c | 16 ++++++++-------- drivers/dma/fsldma.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c index 1117b51..39871e0 100644 --- a/drivers/dma/fsldma.c +++ b/drivers/dma/fsldma.c @@ -53,42 +53,42 @@ static void set_sr(struct fsldma_chan *chan, u32 val) { - DMA_OUT(chan, &chan->regs->sr, val, 32); + FSL_DMA_OUT(chan, &chan->regs->sr, val, 32); } static u32 get_sr(struct fsldma_chan *chan) { - return DMA_IN(chan, &chan->regs->sr, 32); + return FSL_DMA_IN(chan, &chan->regs->sr, 32); } static void set_mr(struct fsldma_chan *chan, u32 val) { - DMA_OUT(chan, &chan->regs->mr, val, 32); + FSL_DMA_OUT(chan, &chan->regs->mr, val, 32); } static u32 get_mr(struct fsldma_chan *chan) { - return DMA_IN(chan, &chan->regs->mr, 32); + return FSL_DMA_IN(chan, &chan->regs->mr, 32); } static void set_cdar(struct fsldma_chan *chan, dma_addr_t addr) { - DMA_OUT(chan, &chan->regs->cdar, addr | FSL_DMA_SNEN, 64); + FSL_DMA_OUT(chan, &chan->regs->cdar, addr | FSL_DMA_SNEN, 64); } static dma_addr_t get_cdar(struct fsldma_chan *chan) { - return DMA_IN(chan, &chan->regs->cdar, 64) & ~FSL_DMA_SNEN; + return FSL_DMA_IN(chan, &chan->regs->cdar, 64) & ~FSL_DMA_SNEN; } static void set_bcr(struct fsldma_chan *chan, u32 val) { - DMA_OUT(chan, &chan->regs->bcr, val, 32); + FSL_DMA_OUT(chan, &chan->regs->bcr, val, 32); } static u32 get_bcr(struct fsldma_chan *chan) { - return DMA_IN(chan, &chan->regs->bcr, 32); + return FSL_DMA_IN(chan, &chan->regs->bcr, 32); } /* diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h index 4787d48..982845b 100644 --- a/drivers/dma/fsldma.h +++ b/drivers/dma/fsldma.h @@ -223,10 +223,10 @@ static void out_le64(u64 __iomem *addr, u64 val) } #endif -#define DMA_IN(fsl_chan, addr, width) \ +#define FSL_DMA_IN(fsl_chan, addr, width) \ (((fsl_chan)->feature & FSL_DMA_BIG_ENDIAN) ? \ in_be##width(addr) : in_le##width(addr)) -#define DMA_OUT(fsl_chan, addr, val, width) \ +#define FSL_DMA_OUT(fsl_chan, addr, val, width) \ (((fsl_chan)->feature & FSL_DMA_BIG_ENDIAN) ? \ out_be##width(addr, val) : out_le##width(addr, val)) -- 1.7.1