diff options
author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-10-24 13:50:11 +0000 |
---|---|---|
committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-10-24 13:50:11 +0000 |
commit | 62a2176cb1446f865b58299f080493f26ce53573 (patch) | |
tree | 4613cca2c570d5eefc520620ba3bac85f7015a4b /target/linux/generic/patches-3.12/130-mips_remove_plat_dma_functions.patch | |
parent | 844db040b986ac718bf6a7732e1dcd770de0f727 (diff) |
[generic:] preliminary 3.12 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38528 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.12/130-mips_remove_plat_dma_functions.patch')
-rw-r--r-- | target/linux/generic/patches-3.12/130-mips_remove_plat_dma_functions.patch | 185 |
1 files changed, 185 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.12/130-mips_remove_plat_dma_functions.patch b/target/linux/generic/patches-3.12/130-mips_remove_plat_dma_functions.patch new file mode 100644 index 0000000000..eec5ad8b49 --- /dev/null +++ b/target/linux/generic/patches-3.12/130-mips_remove_plat_dma_functions.patch @@ -0,0 +1,185 @@ +From 151c4e4a06b0b8d16c2fd392bb0e33868b12357f Mon Sep 17 00:00:00 2001 +From: Felix Fietkau <nbd@openwrt.org> +Date: Mon, 12 Aug 2013 12:45:52 +0200 +Subject: [PATCH] MIPS: remove unnecessary platform dma helper functions + +Signed-off-by: Felix Fietkau <nbd@openwrt.org> +--- + arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h | 12 ------------ + arch/mips/include/asm/mach-generic/dma-coherence.h | 10 ---------- + arch/mips/include/asm/mach-ip27/dma-coherence.h | 10 ---------- + arch/mips/include/asm/mach-ip32/dma-coherence.h | 11 ----------- + arch/mips/include/asm/mach-jazz/dma-coherence.h | 10 ---------- + arch/mips/include/asm/mach-loongson/dma-coherence.h | 10 ---------- + arch/mips/include/asm/mach-powertv/dma-coherence.h | 10 ---------- + arch/mips/mm/dma-default.c | 4 +--- + 8 files changed, 1 insertion(+), 76 deletions(-) + +--- a/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h ++++ b/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h +@@ -52,23 +52,11 @@ static inline int plat_dma_supported(str + return 0; + } + +-static inline void plat_extra_sync_for_device(struct device *dev) +-{ +- BUG(); +-} +- + static inline int plat_device_is_coherent(struct device *dev) + { + return 1; + } + +-static inline int plat_dma_mapping_error(struct device *dev, +- dma_addr_t dma_addr) +-{ +- BUG(); +- return 0; +-} +- + dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr); + phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr); + +--- a/arch/mips/include/asm/mach-generic/dma-coherence.h ++++ b/arch/mips/include/asm/mach-generic/dma-coherence.h +@@ -47,16 +47,6 @@ static inline int plat_dma_supported(str + return 1; + } + +-static inline void plat_extra_sync_for_device(struct device *dev) +-{ +-} +- +-static inline int plat_dma_mapping_error(struct device *dev, +- dma_addr_t dma_addr) +-{ +- return 0; +-} +- + static inline int plat_device_is_coherent(struct device *dev) + { + #ifdef CONFIG_DMA_COHERENT +--- a/arch/mips/include/asm/mach-ip27/dma-coherence.h ++++ b/arch/mips/include/asm/mach-ip27/dma-coherence.h +@@ -58,16 +58,6 @@ static inline int plat_dma_supported(str + return 1; + } + +-static inline void plat_extra_sync_for_device(struct device *dev) +-{ +-} +- +-static inline int plat_dma_mapping_error(struct device *dev, +- dma_addr_t dma_addr) +-{ +- return 0; +-} +- + static inline int plat_device_is_coherent(struct device *dev) + { + return 1; /* IP27 non-cohernet mode is unsupported */ +--- a/arch/mips/include/asm/mach-ip32/dma-coherence.h ++++ b/arch/mips/include/asm/mach-ip32/dma-coherence.h +@@ -80,17 +80,6 @@ static inline int plat_dma_supported(str + return 1; + } + +-static inline void plat_extra_sync_for_device(struct device *dev) +-{ +- return; +-} +- +-static inline int plat_dma_mapping_error(struct device *dev, +- dma_addr_t dma_addr) +-{ +- return 0; +-} +- + static inline int plat_device_is_coherent(struct device *dev) + { + return 0; /* IP32 is non-cohernet */ +--- a/arch/mips/include/asm/mach-jazz/dma-coherence.h ++++ b/arch/mips/include/asm/mach-jazz/dma-coherence.h +@@ -48,16 +48,6 @@ static inline int plat_dma_supported(str + return 1; + } + +-static inline void plat_extra_sync_for_device(struct device *dev) +-{ +-} +- +-static inline int plat_dma_mapping_error(struct device *dev, +- dma_addr_t dma_addr) +-{ +- return 0; +-} +- + static inline int plat_device_is_coherent(struct device *dev) + { + return 0; +--- a/arch/mips/include/asm/mach-loongson/dma-coherence.h ++++ b/arch/mips/include/asm/mach-loongson/dma-coherence.h +@@ -53,16 +53,6 @@ static inline int plat_dma_supported(str + return 1; + } + +-static inline void plat_extra_sync_for_device(struct device *dev) +-{ +-} +- +-static inline int plat_dma_mapping_error(struct device *dev, +- dma_addr_t dma_addr) +-{ +- return 0; +-} +- + static inline int plat_device_is_coherent(struct device *dev) + { + return 0; +--- a/arch/mips/include/asm/mach-powertv/dma-coherence.h ++++ b/arch/mips/include/asm/mach-powertv/dma-coherence.h +@@ -99,16 +99,6 @@ static inline int plat_dma_supported(str + return 1; + } + +-static inline void plat_extra_sync_for_device(struct device *dev) +-{ +-} +- +-static inline int plat_dma_mapping_error(struct device *dev, +- dma_addr_t dma_addr) +-{ +- return 0; +-} +- + static inline int plat_device_is_coherent(struct device *dev) + { + return 0; +--- a/arch/mips/mm/dma-default.c ++++ b/arch/mips/mm/dma-default.c +@@ -297,7 +297,6 @@ static void mips_dma_sync_single_for_cpu + static void mips_dma_sync_single_for_device(struct device *dev, + dma_addr_t dma_handle, size_t size, enum dma_data_direction direction) + { +- plat_extra_sync_for_device(dev); + if (!plat_device_is_coherent(dev)) + __dma_sync(dma_addr_to_page(dev, dma_handle), + dma_handle & ~PAGE_MASK, size, direction); +@@ -327,7 +326,7 @@ static void mips_dma_sync_sg_for_device( + + int mips_dma_mapping_error(struct device *dev, dma_addr_t dma_addr) + { +- return plat_dma_mapping_error(dev, dma_addr); ++ return 0; + } + + int mips_dma_supported(struct device *dev, u64 mask) +@@ -340,7 +339,6 @@ void dma_cache_sync(struct device *dev, + { + BUG_ON(direction == DMA_NONE); + +- plat_extra_sync_for_device(dev); + if (!plat_device_is_coherent(dev)) + __dma_sync_virtual(vaddr, size, direction); + } |