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

Commit aad7ad2a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

dma: iop-adma: allow building without platform headers 

Now that iop3xx and iop13xx are gone, the iop-adma driver no
longer needs to deal with incompatible register layout defined
in machine specific header files.

Move the iop32x specific definitions into drivers/dma/iop-adma.h
and the platform_data into include/linux/platform_data/dma-iop32x.h,
and change the machine code to no longer reference those.

The DMA0_ID/DMA1_ID/AAU_ID macros are required as part of the
platform data interface and still need to be visible, so move
those from one header to the other.

Link: https://lore.kernel.org/r/20190809163334.489360-4-arnd@arndb.de


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 00c97555

arch/arm/mach-iop32x/include/mach/adma.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef IOP32X_ADMA_H

#define IOP32X_ADMA_H

#include <asm/hardware/iop3xx-adma.h>

#endif

arch/arm/plat-iop/adma.c

+1 −2
Original line number Diff line number Diff line
@@ -6,8 +6,7 @@ 
#include <linux/platform_device.h>

#include <asm/hardware/iop3xx.h>

#include <linux/dma-mapping.h>

#include <mach/adma.h>

#include <asm/hardware/iop_adma.h>

#include <linux/platform_data/dma-iop32x.h>



#define IRQ_DMA0_EOT IRQ_IOP32X_DMA0_EOT

#define IRQ_DMA0_EOC IRQ_IOP32X_DMA0_EOC

drivers/dma/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -294,8 +294,8 @@ config INTEL_IOATDMA 
	  If unsure, say N.



config INTEL_IOP_ADMA

	tristate "Intel IOP ADMA support"

	depends on ARCH_IOP32X

	tristate "Intel IOP32x ADMA support"

	depends on ARCH_IOP32X || COMPILE_TEST

	select DMA_ENGINE

	select ASYNC_TX_ENABLE_CHANNEL_SWITCH

	help

drivers/dma/iop-adma.c

+1 −2
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ 
#include <linux/raid/pq.h>

#include <linux/slab.h>



#include <mach/adma.h>



#include "iop-adma.h"

#include "dmaengine.h"



#define to_iop_adma_chan(chan) container_of(chan, struct iop_adma_chan, common)

arch/arm/include/asm/hardware/iop3xx-adma.h→drivers/dma/iop-adma.h

+1 −6
Original line number Diff line number Diff line
@@ -6,8 +6,7 @@ 
#define _ADMA_H

#include <linux/types.h>

#include <linux/io.h>

#include <mach/hardware.h>

#include <asm/hardware/iop_adma.h>

#include <linux/platform_data/dma-iop32x.h>



/* Memory copy units */

#define DMA_CCR(chan)		(chan->mmr_base + 0x0)
@@ -34,10 +33,6 @@ 
#define AAU_EDCR1_IDX	17

#define AAU_EDCR2_IDX	26



#define DMA0_ID 0

#define DMA1_ID 1

#define AAU_ID 2



struct iop3xx_aau_desc_ctrl {

	unsigned int int_en:1;

	unsigned int blk1_cmd_ctrl:3;