Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 584ec227 authored by Dan Williams's avatar Dan Williams
Browse files

ioat: move to drivers/dma/ioat/ 



When first created the ioat driver was the only inhabitant of
drivers/dma/.  Now, it is the only multi-file (more than a .c and a .h)
driver in the directory.  Moving it to an ioat/ subdirectory allows the
naming convention to be cleaned up, and allows for future splitting of
the source files by hardware version (v1, v2, and v3).

Signed-off-by: default avatarMaciej Sosnowski <maciej.sosnowski@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 07a2039b

drivers/dma/Makefile

+1 −2
Original line number Diff line number Diff line 
obj-$(CONFIG_DMA_ENGINE) += dmaengine.o

obj-$(CONFIG_NET_DMA) += iovlock.o

obj-$(CONFIG_DMATEST) += dmatest.o

obj-$(CONFIG_INTEL_IOATDMA) += ioatdma.o

ioatdma-objs := ioat.o ioat_dma.o ioat_dca.o

obj-$(CONFIG_INTEL_IOATDMA) += ioat/

obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adma.o

obj-$(CONFIG_FSL_DMA) += fsldma.o

obj-$(CONFIG_MV_XOR) += mv_xor.o

drivers/dma/ioat/Makefile

0 → 100644
+2 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_INTEL_IOATDMA) += ioatdma.o

ioatdma-objs := pci.o dma.o dca.o

drivers/dma/ioat_dca.c→drivers/dma/ioat/dca.c

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ 
#define cpu_physical_id(cpu) (cpuid_ebx(1) >> 24)

#endif



#include "ioatdma.h"

#include "ioatdma_registers.h"

#include "dma.h"

#include "registers.h"



/*

 * Bit 7 of a tag map entry is the "valid" bit, if it is set then bits 0:6

drivers/dma/ioat_dma.c→drivers/dma/ioat/dma.c

+3 −3
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ 
#include <linux/dma-mapping.h>

#include <linux/workqueue.h>

#include <linux/i7300_idle.h>

#include "ioatdma.h"

#include "ioatdma_registers.h"

#include "ioatdma_hw.h"

#include "dma.h"

#include "registers.h"

#include "hw.h"



#define to_ioat_chan(chan) container_of(chan, struct ioat_dma_chan, common)

#define to_ioatdma_device(dev) container_of(dev, struct ioatdma_device, common)

drivers/dma/ioatdma.h→drivers/dma/ioat/dma.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#define IOATDMA_H



#include <linux/dmaengine.h>

#include "ioatdma_hw.h"

#include "hw.h"

#include <linux/init.h>

#include <linux/dmapool.h>

#include <linux/cache.h>