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

Merge tag 'davinci-for-v3.11/soc-v2' of... 

Merge tag 'davinci-for-v3.11/soc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc

From Sekhar Nori:

DaVinci SoC changes for v3.11

This pull request moves DaVinci EDMA library to
arch/arm/common so it can be used by OMAP based AM335x.
This is a temporary step until all drivers are converted
to use the dmaengine driver in drivers/dma/edma.c.

Several drivers like SPI, MMC/SD have already been converted.
Some like audio are pending.

The other two patches in the pull request are cleanup in nature.

* tag 'davinci-for-v3.11/soc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

:
  ARM: edma: remove unused transfer controller handlers
  ARM: davinci: move private EDMA API to arm/common
  ARM: davinci: remove __init atrribute from function declaration

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 688c240b 7bb5d75c

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -825,6 +825,7 @@ config ARCH_DAVINCI 
	select GENERIC_IRQ_CHIP

	select HAVE_IDE

	select NEED_MACH_GPIO_H

	select TI_PRIV_EDMA

	select USE_OF

	select ZONE_DMA

	help

arch/arm/common/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -17,3 +17,6 @@ config SHARP_PARAM 


config SHARP_SCOOP

	bool



config TI_PRIV_EDMA

	bool

arch/arm/common/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -16,3 +16,4 @@ obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o 
obj-$(CONFIG_MCPM)		+= mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o

AFLAGS_mcpm_head.o		:= -march=armv7-a

AFLAGS_vlock.o			:= -march=armv7-a

obj-$(CONFIG_TI_PRIV_EDMA)	+= edma.o

arch/arm/mach-davinci/dma.c→arch/arm/common/edma.c

+1 −38
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <linux/io.h>

#include <linux/slab.h>



#include <mach/edma.h>

#include <linux/platform_data/edma.h>



/* Offsets matching "struct edmacc_param" */

#define PARM_OPT		0x00
@@ -494,26 +494,6 @@ static irqreturn_t dma_ccerr_handler(int irq, void *data) 
	return IRQ_HANDLED;

}



/******************************************************************************

 *

 * Transfer controller error interrupt handlers

 *

 *****************************************************************************/



#define tc_errs_handled	false	/* disabled as long as they're NOPs */



static irqreturn_t dma_tc0err_handler(int irq, void *data)

{

	dev_dbg(data, "dma_tc0err_handler\n");

	return IRQ_HANDLED;

}



static irqreturn_t dma_tc1err_handler(int irq, void *data)

{

	dev_dbg(data, "dma_tc1err_handler\n");

	return IRQ_HANDLED;

}



static int reserve_contiguous_slots(int ctlr, unsigned int id,

				     unsigned int num_slots,

				     unsigned int start_slot)
@@ -1541,23 +1521,6 @@ static int __init edma_probe(struct platform_device *pdev) 
		arch_num_cc++;

	}



	if (tc_errs_handled) {

		status = request_irq(IRQ_TCERRINT0, dma_tc0err_handler, 0,

					"edma_tc0", &pdev->dev);

		if (status < 0) {

			dev_dbg(&pdev->dev, "request_irq %d failed --> %d\n",

				IRQ_TCERRINT0, status);

			return status;

		}

		status = request_irq(IRQ_TCERRINT, dma_tc1err_handler, 0,

					"edma_tc1", &pdev->dev);

		if (status < 0) {

			dev_dbg(&pdev->dev, "request_irq %d --> %d\n",

				IRQ_TCERRINT, status);

			return status;

		}

	}



	return 0;



fail:

arch/arm/mach-davinci/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


# Common objects

obj-y 			:= time.o clock.o serial.o psc.o \

			   dma.o usb.o common.o sram.o aemif.o

			   usb.o common.o sram.o aemif.o



obj-$(CONFIG_DAVINCI_MUX)		+= mux.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE