diff options
| author | John Crispin <blogic@openwrt.org> | 2015-02-11 10:17:55 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-02-11 10:17:55 +0000 |
| commit | c291f76d24a4190551a42b7b77a2cfeb3f4d36f9 (patch) | |
| tree | 8f9211217d7e2cbaa78d10b596d81e646b3b9aad /target/linux/brcm2708/patches-3.18/0057-Revert-ARM-dma-Use-dma_pfn_offset-for-dma-address-tr.patch | |
| parent | 0e26998162921c65cbfe2814e500c81ca7b50dad (diff) | |
| download | master-187ad058-c291f76d24a4190551a42b7b77a2cfeb3f4d36f9.tar.gz master-187ad058-c291f76d24a4190551a42b7b77a2cfeb3f4d36f9.tar.bz2 master-187ad058-c291f76d24a4190551a42b7b77a2cfeb3f4d36f9.zip | |
brcm2708: update to v3.18
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44392 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm2708/patches-3.18/0057-Revert-ARM-dma-Use-dma_pfn_offset-for-dma-address-tr.patch')
| -rwxr-xr-x | target/linux/brcm2708/patches-3.18/0057-Revert-ARM-dma-Use-dma_pfn_offset-for-dma-address-tr.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-3.18/0057-Revert-ARM-dma-Use-dma_pfn_offset-for-dma-address-tr.patch b/target/linux/brcm2708/patches-3.18/0057-Revert-ARM-dma-Use-dma_pfn_offset-for-dma-address-tr.patch new file mode 100755 index 0000000000..d46b5ac740 --- /dev/null +++ b/target/linux/brcm2708/patches-3.18/0057-Revert-ARM-dma-Use-dma_pfn_offset-for-dma-address-tr.patch @@ -0,0 +1,57 @@ +From 48c48c4437603bad79eb848ac03b21a86cc3bb90 Mon Sep 17 00:00:00 2001 +From: popcornmix <popcornmix@gmail.com> +Date: Thu, 7 Aug 2014 02:03:50 +0100 +Subject: [PATCH 057/114] Revert "ARM: dma: Use dma_pfn_offset for dma address + translation" + +This reverts commit 6ce0d20016925d031f1e24d64302e4c976d7cec6. +--- + arch/arm/include/asm/dma-mapping.h | 18 +----------------- + 1 file changed, 1 insertion(+), 17 deletions(-) + +diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h +index 85738b2..9477f09 100644 +--- a/arch/arm/include/asm/dma-mapping.h ++++ b/arch/arm/include/asm/dma-mapping.h +@@ -58,37 +58,21 @@ static inline int dma_set_mask(struct device *dev, u64 mask) + #ifndef __arch_pfn_to_dma + static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn) + { +- if (dev) +- pfn -= dev->dma_pfn_offset; + return (dma_addr_t)__pfn_to_bus(pfn); + } + + static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr) + { +- unsigned long pfn = __bus_to_pfn(addr); +- +- if (dev) +- pfn += dev->dma_pfn_offset; +- +- return pfn; ++ return __bus_to_pfn(addr); + } + + static inline void *dma_to_virt(struct device *dev, dma_addr_t addr) + { +- if (dev) { +- unsigned long pfn = dma_to_pfn(dev, addr); +- +- return phys_to_virt(__pfn_to_phys(pfn)); +- } +- + return (void *)__bus_to_virt((unsigned long)addr); + } + + static inline dma_addr_t virt_to_dma(struct device *dev, void *addr) + { +- if (dev) +- return pfn_to_dma(dev, virt_to_pfn(addr)); +- + return (dma_addr_t)__virt_to_bus((unsigned long)(addr)); + } + +-- +1.8.3.2 + |