diff options
Diffstat (limited to 'arch/blackfin/include/asm')
| -rw-r--r-- | arch/blackfin/include/asm/dma-mapping.h | 36 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/nand.h | 4 |
2 files changed, 2 insertions, 38 deletions
diff --git a/arch/blackfin/include/asm/dma-mapping.h b/arch/blackfin/include/asm/dma-mapping.h index f9172ff30e5c..413a30314a6f 100644 --- a/arch/blackfin/include/asm/dma-mapping.h +++ b/arch/blackfin/include/asm/dma-mapping.h | |||
| @@ -65,13 +65,6 @@ _dma_sync(dma_addr_t addr, size_t size, enum dma_data_direction dir) | |||
| 65 | } | 65 | } |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | /* | ||
| 69 | * Map a single buffer of the indicated size for DMA in streaming mode. | ||
| 70 | * The 32-bit bus address to use is returned. | ||
| 71 | * | ||
| 72 | * Once the device is given the dma address, the device owns this memory | ||
| 73 | * until either pci_unmap_single or pci_dma_sync_single is performed. | ||
| 74 | */ | ||
| 75 | static inline dma_addr_t | 68 | static inline dma_addr_t |
| 76 | dma_map_single(struct device *dev, void *ptr, size_t size, | 69 | dma_map_single(struct device *dev, void *ptr, size_t size, |
| 77 | enum dma_data_direction dir) | 70 | enum dma_data_direction dir) |
| @@ -88,14 +81,6 @@ dma_map_page(struct device *dev, struct page *page, | |||
| 88 | return dma_map_single(dev, page_address(page) + offset, size, dir); | 81 | return dma_map_single(dev, page_address(page) + offset, size, dir); |
| 89 | } | 82 | } |
| 90 | 83 | ||
| 91 | /* | ||
| 92 | * Unmap a single streaming mode DMA translation. The dma_addr and size | ||
| 93 | * must match what was provided for in a previous pci_map_single call. All | ||
| 94 | * other usages are undefined. | ||
| 95 | * | ||
| 96 | * After this call, reads by the cpu to the buffer are guarenteed to see | ||
| 97 | * whatever the device wrote there. | ||
| 98 | */ | ||
| 99 | static inline void | 84 | static inline void |
| 100 | dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, | 85 | dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, |
| 101 | enum dma_data_direction dir) | 86 | enum dma_data_direction dir) |
| @@ -110,30 +95,9 @@ dma_unmap_page(struct device *dev, dma_addr_t dma_addr, size_t size, | |||
| 110 | dma_unmap_single(dev, dma_addr, size, dir); | 95 | dma_unmap_single(dev, dma_addr, size, dir); |
| 111 | } | 96 | } |
| 112 | 97 | ||
| 113 | /* | ||
| 114 | * Map a set of buffers described by scatterlist in streaming | ||
| 115 | * mode for DMA. This is the scather-gather version of the | ||
| 116 | * above pci_map_single interface. Here the scatter gather list | ||
| 117 | * elements are each tagged with the appropriate dma address | ||
| 118 | * and length. They are obtained via sg_dma_{address,length}(SG). | ||
| 119 | * | ||
| 120 | * NOTE: An implementation may be able to use a smaller number of | ||
| 121 | * DMA address/length pairs than there are SG table elements. | ||
| 122 | * (for example via virtual mapping capabilities) | ||
| 123 | * The routine returns the number of addr/length pairs actually | ||
| 124 | * used, at most nents. | ||
| 125 | * | ||
| 126 | * Device ownership issues as mentioned above for pci_map_single are | ||
| 127 | * the same here. | ||
| 128 | */ | ||
| 129 | extern int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, | 98 | extern int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, |
| 130 | enum dma_data_direction dir); | 99 | enum dma_data_direction dir); |
| 131 | 100 | ||
| 132 | /* | ||
| 133 | * Unmap a set of streaming mode DMA translations. | ||
| 134 | * Again, cpu read rules concerning calls here are the same as for | ||
| 135 | * pci_unmap_single() above. | ||
| 136 | */ | ||
| 137 | static inline void | 101 | static inline void |
| 138 | dma_unmap_sg(struct device *dev, struct scatterlist *sg, | 102 | dma_unmap_sg(struct device *dev, struct scatterlist *sg, |
| 139 | int nhwentries, enum dma_data_direction dir) | 103 | int nhwentries, enum dma_data_direction dir) |
diff --git a/arch/blackfin/include/asm/nand.h b/arch/blackfin/include/asm/nand.h index 3ae8b569edfc..3a1e79dfc8d9 100644 --- a/arch/blackfin/include/asm/nand.h +++ b/arch/blackfin/include/asm/nand.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * BF5XX - NAND flash controller platfrom_device info | 2 | * BF5XX - NAND flash controller platform_device info |
| 3 | * | 3 | * |
| 4 | * Copyright 2007-2008 Analog Devices, Inc. | 4 | * Copyright 2007-2008 Analog Devices, Inc. |
| 5 | * | 5 | * |
| @@ -8,7 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | /* struct bf5xx_nand_platform | 9 | /* struct bf5xx_nand_platform |
| 10 | * | 10 | * |
| 11 | * define a interface between platfrom board specific code and | 11 | * define a interface between platform board specific code and |
| 12 | * bf54x NFC driver. | 12 | * bf54x NFC driver. |
| 13 | * | 13 | * |
| 14 | * nr_partitions = number of partitions pointed to be partitoons (or zero) | 14 | * nr_partitions = number of partitions pointed to be partitoons (or zero) |
