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

Commit 1e69653d authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Vinod Koul
Browse files

DMA: shdma: add r8a73a4 DMAC data to the device ID table 



This configuration data will be used, when DMAC DT support is added to
r8a73a4.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 8eb742a0

drivers/dma/sh/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -22,3 +22,7 @@ config SUDMAC 
	depends on SH_DMAE_BASE

	help

	  Enable support for the Renesas SUDMAC controllers.



config SHDMA_R8A73A4

	def_bool y

	depends on ARCH_R8A73A4 && SH_DMAE != n

drivers/dma/sh/Makefile

+3 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_SH_DMAE_BASE) += shdma-base.o shdma-of.o

obj-$(CONFIG_SH_DMAE) += shdma.o

shdma-y := shdmac.o

ifeq ($(CONFIG_OF),y)

shdma-$(CONFIG_SHDMA_R8A73A4) += shdma-r8a73a4.o

endif

shdma-objs := $(shdma-y)

obj-$(CONFIG_SUDMAC) += sudmac.o

drivers/dma/sh/shdma-r8a73a4.c

0 → 100644
+77 −0
Original line number Diff line number Diff line 
/*

 * Renesas SuperH DMA Engine support for r8a73a4 (APE6) SoCs

 *

 * Copyright (C) 2013 Renesas Electronics, Inc.

 *

 * This is free software; you can redistribute it and/or modify it under the

 * terms of version 2 the GNU General Public License as published by the Free

 * Software Foundation.

 */

#include <linux/sh_dma.h>



#include "shdma-arm.h"



const unsigned int dma_ts_shift[] = SH_DMAE_TS_SHIFT;



static const struct sh_dmae_slave_config dma_slaves[] = {

	{

		.chcr		= CHCR_TX(XMIT_SZ_32BIT),

		.mid_rid	= 0xd1,		/* MMC0 Tx */

	}, {

		.chcr		= CHCR_RX(XMIT_SZ_32BIT),

		.mid_rid	= 0xd2,		/* MMC0 Rx */

	}, {

		.chcr		= CHCR_TX(XMIT_SZ_32BIT),

		.mid_rid	= 0xe1,		/* MMC1 Tx */

	}, {

		.chcr		= CHCR_RX(XMIT_SZ_32BIT),

		.mid_rid	= 0xe2,		/* MMC1 Rx */

	},

};



#define DMAE_CHANNEL(a, b)				\

	{						\

		.offset         = (a) - 0x20,		\

		.dmars          = (a) - 0x20 + 0x40,	\

		.chclr_bit	= (b),			\

		.chclr_offset	= 0x80 - 0x20,		\

	}



static const struct sh_dmae_channel dma_channels[] = {

	DMAE_CHANNEL(0x8000, 0),

	DMAE_CHANNEL(0x8080, 1),

	DMAE_CHANNEL(0x8100, 2),

	DMAE_CHANNEL(0x8180, 3),

	DMAE_CHANNEL(0x8200, 4),

	DMAE_CHANNEL(0x8280, 5),

	DMAE_CHANNEL(0x8300, 6),

	DMAE_CHANNEL(0x8380, 7),

	DMAE_CHANNEL(0x8400, 8),

	DMAE_CHANNEL(0x8480, 9),

	DMAE_CHANNEL(0x8500, 10),

	DMAE_CHANNEL(0x8580, 11),

	DMAE_CHANNEL(0x8600, 12),

	DMAE_CHANNEL(0x8680, 13),

	DMAE_CHANNEL(0x8700, 14),

	DMAE_CHANNEL(0x8780, 15),

	DMAE_CHANNEL(0x8800, 16),

	DMAE_CHANNEL(0x8880, 17),

	DMAE_CHANNEL(0x8900, 18),

	DMAE_CHANNEL(0x8980, 19),

};



const struct sh_dmae_pdata r8a73a4_dma_pdata = {

	.slave		= dma_slaves,

	.slave_num	= ARRAY_SIZE(dma_slaves),

	.channel	= dma_channels,

	.channel_num	= ARRAY_SIZE(dma_channels),

	.ts_low_shift	= TS_LOW_SHIFT,

	.ts_low_mask	= TS_LOW_BIT << TS_LOW_SHIFT,

	.ts_high_shift	= TS_HI_SHIFT,

	.ts_high_mask	= TS_HI_BIT << TS_HI_SHIFT,

	.ts_shift	= dma_ts_shift,

	.ts_shift_num	= ARRAY_SIZE(dma_ts_shift),

	.dmaor_init     = DMAOR_DME,

	.chclr_present	= 1,

	.chclr_bitwise	= 1,

};

drivers/dma/sh/shdma.h

+7 −0
Original line number Diff line number Diff line
@@ -62,4 +62,11 @@ struct sh_dmae_desc { 
#define to_sh_dev(chan) container_of(chan->shdma_chan.dma_chan.device,\

				     struct sh_dmae_device, shdma_dev.dma_dev)



#ifdef CONFIG_SHDMA_R8A73A4

extern const struct sh_dmae_pdata r8a73a4_dma_pdata;

#define r8a73a4_shdma_devid (&r8a73a4_dma_pdata)

#else

#define r8a73a4_shdma_devid NULL

#endif



#endif	/* __DMA_SHDMA_H */

drivers/dma/sh/shdmac.c

+1 −0
Original line number Diff line number Diff line
@@ -677,6 +677,7 @@ static const struct shdma_ops sh_dmae_shdma_ops = { 
};



static const struct of_device_id sh_dmae_of_match[] = {

	{.compatible = "renesas,shdma-r8a73a4", .data = r8a73a4_shdma_devid,},

	{}

};

MODULE_DEVICE_TABLE(of, sh_dmae_of_match);