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

Commit 8a5d51fd authored by Stephen Warren's avatar Stephen Warren
Browse files

ARM: tegra: remove <mach/dma.h> 



Remove includes of <mach/dma.h> from sound/soc; nothing from it is used.

Remove include of <mach/dma.h> from mach-tegra/apbio.c; since the DMA
transfers made by this file don't need flow-control with any peripheral,
there's no need to set any slave ID.

Once those changes are made, there are no remaining users of <mach/dma.h>
so remove it. Drivers should get this information from device tree. This
removal is necessary for single zImage.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent cc95e347

arch/arm/mach-tegra/apbio.c

+0 −3
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 
#include <linux/sched.h>

#include <linux/mutex.h>



#include <mach/dma.h>



#include "apbio.h"



#if defined(CONFIG_TEGRA20_APB_DMA)
@@ -71,7 +69,6 @@ bool tegra_apb_dma_init(void) 


	dma_sconfig.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;

	dma_sconfig.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;

	dma_sconfig.slave_id = TEGRA_DMA_REQ_SEL_CNTR;

	dma_sconfig.src_maxburst = 1;

	dma_sconfig.dst_maxburst = 1;

arch/arm/mach-tegra/include/mach/dma.h

deleted100644 → 0
+0 −54
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-tegra/include/mach/dma.h

 *

 * Copyright (c) 2008-2009, NVIDIA Corporation.

 *

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

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along

 * with this program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

 */



#ifndef __MACH_TEGRA_DMA_H

#define __MACH_TEGRA_DMA_H



#include <linux/list.h>



#define TEGRA_DMA_REQ_SEL_CNTR			0

#define TEGRA_DMA_REQ_SEL_I2S_2			1

#define TEGRA_DMA_REQ_SEL_I2S_1			2

#define TEGRA_DMA_REQ_SEL_SPD_I			3

#define TEGRA_DMA_REQ_SEL_UI_I			4

#define TEGRA_DMA_REQ_SEL_MIPI			5

#define TEGRA_DMA_REQ_SEL_I2S2_2		6

#define TEGRA_DMA_REQ_SEL_I2S2_1		7

#define TEGRA_DMA_REQ_SEL_UARTA			8

#define TEGRA_DMA_REQ_SEL_UARTB			9

#define TEGRA_DMA_REQ_SEL_UARTC			10

#define TEGRA_DMA_REQ_SEL_SPI			11

#define TEGRA_DMA_REQ_SEL_AC97			12

#define TEGRA_DMA_REQ_SEL_ACMODEM		13

#define TEGRA_DMA_REQ_SEL_SL4B			14

#define TEGRA_DMA_REQ_SEL_SL2B1			15

#define TEGRA_DMA_REQ_SEL_SL2B2			16

#define TEGRA_DMA_REQ_SEL_SL2B3			17

#define TEGRA_DMA_REQ_SEL_SL2B4			18

#define TEGRA_DMA_REQ_SEL_UARTD			19

#define TEGRA_DMA_REQ_SEL_UARTE			20

#define TEGRA_DMA_REQ_SEL_I2C			21

#define TEGRA_DMA_REQ_SEL_I2C2			22

#define TEGRA_DMA_REQ_SEL_I2C3			23

#define TEGRA_DMA_REQ_SEL_DVC_I2C		24

#define TEGRA_DMA_REQ_SEL_OWR			25

#define TEGRA_DMA_REQ_SEL_INVALID		31



#endif

sound/soc/tegra/tegra30_ahub.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/regmap.h>

#include <linux/slab.h>

#include <mach/clk.h>

#include <mach/dma.h>

#include <sound/soc.h>

#include "tegra30_ahub.h"

sound/soc/tegra/tegra_pcm.h

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ 
#ifndef __TEGRA_PCM_H__

#define __TEGRA_PCM_H__



#include <mach/dma.h>



struct tegra_pcm_dma_params {

	unsigned long addr;

	unsigned long wrap;