Skip to content

Commit

Permalink
ARM: tegra: remove <mach/dma.h>
Browse files Browse the repository at this point in the history
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: Stephen Warren <swarren@nvidia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Stephen Warren committed Nov 5, 2012
1 parent cc95e34 commit 8a5d51f
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 60 deletions.
3 changes: 0 additions & 3 deletions arch/arm/mach-tegra/apbio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;

Expand Down
54 changes: 0 additions & 54 deletions arch/arm/mach-tegra/include/mach/dma.h

This file was deleted.

1 change: 0 additions & 1 deletion sound/soc/tegra/tegra30_ahub.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 0 additions & 2 deletions sound/soc/tegra/tegra_pcm.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 8a5d51f

Please sign in to comment.