Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 272642
b: refs/heads/master
c: cf28cba
h: refs/heads/master
v: v3
  • Loading branch information
Olof Johansson committed Oct 13, 2011
1 parent c38bbca commit ffac8b5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 87c6e46a2c96ce2081070701237c58ed7eec94e7
refs/heads/master: cf28cba0ab02ce3e41a7b2606423eb21f1841b7a
14 changes: 9 additions & 5 deletions trunk/arch/arm/mach-tegra/dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,17 @@

#define NV_DMA_MAX_TRASFER_SIZE 0x10000

const unsigned int ahb_addr_wrap_table[8] = {
static const unsigned int ahb_addr_wrap_table[8] = {
0, 32, 64, 128, 256, 512, 1024, 2048
};

const unsigned int apb_addr_wrap_table[8] = {0, 1, 2, 4, 8, 16, 32, 64};
static const unsigned int apb_addr_wrap_table[8] = {
0, 1, 2, 4, 8, 16, 32, 64
};

const unsigned int bus_width_table[5] = {8, 16, 32, 64, 128};
static const unsigned int bus_width_table[5] = {
8, 16, 32, 64, 128
};

#define TEGRA_DMA_NAME_SIZE 16
struct tegra_dma_channel {
Expand Down Expand Up @@ -157,7 +161,7 @@ void tegra_dma_dequeue(struct tegra_dma_channel *ch)
return;
}

void tegra_dma_stop(struct tegra_dma_channel *ch)
static void tegra_dma_stop(struct tegra_dma_channel *ch)
{
u32 csr;
u32 status;
Expand All @@ -174,7 +178,7 @@ void tegra_dma_stop(struct tegra_dma_channel *ch)
writel(status, ch->addr + APB_DMA_CHAN_STA);
}

int tegra_dma_cancel(struct tegra_dma_channel *ch)
static int tegra_dma_cancel(struct tegra_dma_channel *ch)
{
u32 csr;
unsigned long irq_flags;
Expand Down

0 comments on commit ffac8b5

Please sign in to comment.