diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-04-01 17:00:08 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-04-01 17:00:08 +0530 |
| commit | 677368f44ce65fe2292f696f0bfd568d3ac78436 (patch) | |
| tree | e8317363967fbeef2680f4bca50bbda970d17f61 /arch | |
| parent | a8a882acd1b12930328b0090ff40a984f754eda6 (diff) | |
| parent | 17a2400a982bbf7aaabe89d7bacf32f600d4e751 (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts:
drivers/serial/tegra_hsuart.c
drivers/usb/host/ehci-tegra.c
Change-Id: Ief6c03a63615a41e85de59ad14dedef309d0b2fb
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/common.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/dma.c | 22 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/dma.h | 1 |
3 files changed, 2 insertions, 24 deletions
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index 725765ec7a09..71b86b5238e2 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -100,10 +100,9 @@ void __init tegra_init_cache(void) writel(0x331, p + L2X0_TAG_LATENCY_CTRL); writel(0x441, p + L2X0_DATA_LATENCY_CTRL); - writel(7, p + L2X0_PREFETCH_OFFSET); writel(2, p + L2X0_PWR_CTRL); - l2x0_init(p, 0x7C480001, 0x8200c3fe); + l2x0_init(p, 0x6C480001, 0x8200c3fe); #endif } diff --git a/arch/arm/mach-tegra/dma.c b/arch/arm/mach-tegra/dma.c index a80c71819c19..eb8590f836d1 100644 --- a/arch/arm/mach-tegra/dma.c +++ b/arch/arm/mach-tegra/dma.c @@ -135,24 +135,6 @@ static void tegra_dma_update_hw_partial(struct tegra_dma_channel *ch, struct tegra_dma_req *req); static void tegra_dma_stop(struct tegra_dma_channel *ch); -void tegra_dma_flush(struct tegra_dma_channel *ch) -{ -} -EXPORT_SYMBOL(tegra_dma_flush); - -void tegra_dma_dequeue(struct tegra_dma_channel *ch) -{ - struct tegra_dma_req *req; - - if (tegra_dma_is_empty(ch)) - return; - - req = list_entry(ch->list.next, typeof(*req), node); - - tegra_dma_dequeue_req(ch, req); - return; -} - void tegra_dma_stop(struct tegra_dma_channel *ch) { u32 csr; @@ -280,7 +262,7 @@ int tegra_dma_dequeue_req(struct tegra_dma_channel *ch, } if (!found) { spin_unlock_irqrestore(&ch->lock, irq_flags); - return 0; + return -EINVAL; } if (!stop) @@ -301,8 +283,6 @@ skip_status: spin_unlock_irqrestore(&ch->lock, irq_flags); - /* Callback should be called without any lock */ - req->complete(req); return 0; } EXPORT_SYMBOL(tegra_dma_dequeue_req); diff --git a/arch/arm/mach-tegra/include/mach/dma.h b/arch/arm/mach-tegra/include/mach/dma.h index cb0248cca615..257367980614 100644 --- a/arch/arm/mach-tegra/include/mach/dma.h +++ b/arch/arm/mach-tegra/include/mach/dma.h @@ -142,7 +142,6 @@ int tegra_dma_enqueue_req(struct tegra_dma_channel *ch, struct tegra_dma_req *req); int tegra_dma_dequeue_req(struct tegra_dma_channel *ch, struct tegra_dma_req *req); -void tegra_dma_dequeue(struct tegra_dma_channel *ch); void tegra_dma_flush(struct tegra_dma_channel *ch); bool tegra_dma_is_req_inflight(struct tegra_dma_channel *ch, |