Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(289)

Unified Diff: sound/soc/tegra/tegra_soc.h

Issue 6577007: CHROMIUM: ASoC: Import entire upstream ASoC tree (Closed)
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sound/soc/tegra/tegra_pcm.c ('k') | sound/soc/tegra/tegra_soc.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sound/soc/tegra/tegra_soc.h
diff --git a/sound/soc/tegra/tegra_soc.h b/sound/soc/tegra/tegra_soc.h
deleted file mode 100755
index 34645d97bd04591151721fec5d809907e84b5fc2..0000000000000000000000000000000000000000
--- a/sound/soc/tegra/tegra_soc.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * tegra_soc.h -- SoC audio for tegra
- *
- * (c) 2009 Nvidia Graphics Pvt. Ltd.
- * http://www.nvidia.com
- *
- * Copyright 2007 Wolfson Microelectronics PLC.
- * Author: Graeme Gregory
- * graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.com
- *
- * 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.
- *
- */
-
-#ifndef __TEGRA_AUDIO__
-#define __TEGRA_AUDIO__
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/device.h>
-#include <linux/delay.h>
-#include <linux/clk.h>
-#include <linux/jiffies.h>
-#include <linux/io.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
-#include <linux/dma-mapping.h>
-#include <linux/kthread.h>
-#include <linux/moduleparam.h>
-#include <linux/timer.h>
-#include <linux/interrupt.h>
-#include <linux/i2c.h>
-#include <linux/io.h>
-#include <mach/iomap.h>
-#include <mach/i2s_api.h>
-#include <mach/irqs.h>
-#include <mach/pinmux.h>
-#include <mach/audio.h>
-#include <mach/dma.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/pcm_params.h>
-#include <sound/initval.h>
-#include <sound/soc.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/soc-dapm.h>
-#include <sound/soc-dai.h>
-#include <sound/tlv.h>
-#include <asm/mach-types.h>
-#include <asm/hardware/scoop.h>
-
-#define STATE_INIT 0
-#define STATE_ABORT 1
-#define STATE_EXIT 2
-#define STATE_EXITED 3
-#define STATE_INVALID 4
-
-#define APB_MISC_DAS_DAP_CTRL_SEL_0 0xc00
-#define APB_MISC_DAS_DAC_INPUT_DATA_CLK_SEL_0 0xc40
-
-#define FIFO1 0
-#define FIFO2 1
-
-#define I2S_IFC 0
-#define I2S_INT INT_I2S1
-#define I2S_NAME "i2s1"
-#define I2S_FIFO_TX FIFO1
-#define I2S_I2S_FIFO_TX_BUSY I2S_I2S_STATUS_FIFO1_BSY
-#define I2S_I2S_FIFO_TX_QS I2S_I2S_STATUS_QS_FIFO1
-#define I2S_FIFO_RX FIFO2
-#define I2S_I2S_FIFO_RX_BUSY I2S_I2S_STATUS_FIFO2_BSY
-#define I2S_I2S_FIFO_RX_QS I2S_I2S_STATUS_QS_FIFO2
-
-#define I2S_CLK 11289600
-#define TEGRA_DEFAULT_SR 44100
-
-#define TEGRA_SAMPLE_RATES \
- (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
- SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
-
-struct tegra_dma_channel;
-
-struct tegra_runtime_data {
- struct snd_pcm_substream *substream;
- int size;
- int dma_pos;
- struct tegra_dma_req dma_req1, dma_req2;
- atomic_t state;
- int period_index;
- struct tegra_dma_channel *dma_chan;
- struct clk *i2s_clk;
- struct clk *dap_mclk;
- struct clk *audio_sync_clk;
-};
-
-#endif
« no previous file with comments | « sound/soc/tegra/tegra_pcm.c ('k') | sound/soc/tegra/tegra_soc.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698