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

Commit 8735fde2 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

arm/imx/dma-v1: protect #ifdef'd blocks additionally by cpu_is_... 



This is necessary for a multi-SoC kernel.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent e9f49d41

arch/arm/plat-mxc/dma-mx1-mx2.c

+30 −23
Original line number Diff line number Diff line
@@ -476,7 +476,8 @@ void imx_dma_enable(int channel) 
		CCR_ACRPT, DMA_CCR(channel));



#ifdef CONFIG_ARCH_MX2

	if (imxdma->sg && imx_dma_hw_chain(imxdma)) {

	if ((cpu_is_mx21() || cpu_is_mx27()) &&

			imxdma->sg && imx_dma_hw_chain(imxdma)) {

		imxdma->sg = sg_next(imxdma->sg);

		if (imxdma->sg) {

			u32 tmp;
@@ -654,6 +655,7 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id) 
	int i, disr;



#ifdef CONFIG_ARCH_MX2

	if (cpu_is_mx21() || cpu_is_mx27())

		dma_err_handler(irq, dev_id);

#endif
@@ -702,17 +704,19 @@ int imx_dma_request(int channel, const char *name) 
	local_irq_restore(flags); /* request_irq() can block */



#ifdef CONFIG_ARCH_MX2

	ret = request_irq(MX2x_INT_DMACH0 + channel, dma_irq_handler, 0, "DMA",

			NULL);

	if (cpu_is_mx21() || cpu_is_mx27()) {

		ret = request_irq(MX2x_INT_DMACH0 + channel,

				dma_irq_handler, 0, "DMA", NULL);

		if (ret) {

			imxdma->name = NULL;

		printk(KERN_CRIT "Can't register IRQ %d for DMA channel %d\n",

			pr_crit("Can't register IRQ %d for DMA channel %d\n",

					MX2x_INT_DMACH0 + channel, channel);

			return ret;

		}

		init_timer(&imxdma->watchdog);

		imxdma->watchdog.function = &imx_dma_watchdog;

		imxdma->watchdog.data = channel;

	}

#endif



	return ret;
@@ -741,6 +745,7 @@ void imx_dma_free(int channel) 
	imxdma->name = NULL;



#ifdef CONFIG_ARCH_MX2

	if (cpu_is_mx21() || cpu_is_mx27())

		free_irq(MX2x_INT_DMACH0 + channel, NULL);

#endif
@@ -823,18 +828,20 @@ static int __init imx_dma_init(void) 
	imx_dmav1_writel(DCR_DRST, DMA_DCR);



#ifdef CONFIG_ARCH_MX1

	ret = request_irq(DMA_INT, dma_irq_handler, 0, "DMA", NULL);

	if (cpu_is_mx1()) {

		ret = request_irq(MX1_DMA_INT, dma_irq_handler, 0, "DMA", NULL);

		if (ret) {

		printk(KERN_CRIT "Wow!  Can't register IRQ for DMA\n");

			pr_crit("Wow!  Can't register IRQ for DMA\n");

			return ret;

		}



	ret = request_irq(DMA_ERR, dma_err_handler, 0, "DMA", NULL);

		ret = request_irq(MX1_DMA_ERR, dma_err_handler, 0, "DMA", NULL);

		if (ret) {

		printk(KERN_CRIT "Wow!  Can't register ERRIRQ for DMA\n");

		free_irq(DMA_INT, NULL);

			pr_crit("Wow!  Can't register ERRIRQ for DMA\n");

			free_irq(MX1_DMA_INT, NULL);

			return ret;

		}

	}

#endif

	/* enable DMA module */

	imx_dmav1_writel(DCR_DEN, DMA_DCR);