aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/include
diff options
context:
space:
mode:
authorRaffaele Recalcati <raffaele.recalcati@bticino.it>2010-07-06 04:39:03 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-07-06 10:54:06 -0400
commitec6375533748806a1a49dad7ce124cc02886854a (patch)
treec0cc7a1d2472fc735c816d0575d2b9e445333bbc /arch/arm/mach-davinci/include
parenta4c8ea2ddaed2f461606c2828b19786524b551ac (diff)
ASoC: DaVinci: Added selection of clk input pin for McBSP
When McBSP peripheral gets the clock from an external pin, there are three possible chooses, MCBSP_CLKX, MCBSP_CLKR and MCBSP_CLKS. evm-dm365 uses MCBSP_CLKR, instead in bmx board I have a different hardware connection and I use MCBSP_CLKS, so I have added this possibility. This patch has been developed against the: http://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git git tree and has been tested on bmx board (similar to dm365 evm) Signed-off-by: Raffaele Recalcati <raffaele.recalcati@bticino.it> Signed-off-by: Davide Bonfanti <davide.bonfanti@bticino.it> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Acked-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch/arm/mach-davinci/include')
-rw-r--r--arch/arm/mach-davinci/include/mach/asp.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/include/mach/asp.h b/arch/arm/mach-davinci/include/mach/asp.h
index 834725f1e81d..0847d2144f1f 100644
--- a/arch/arm/mach-davinci/include/mach/asp.h
+++ b/arch/arm/mach-davinci/include/mach/asp.h
@@ -63,6 +63,16 @@ struct snd_platform_data {
63 unsigned sram_size_playback; 63 unsigned sram_size_playback;
64 unsigned sram_size_capture; 64 unsigned sram_size_capture;
65 65
66 /*
67 * If McBSP peripheral gets the clock from an external pin,
68 * there are three chooses, that are MCBSP_CLKX, MCBSP_CLKR
69 * and MCBSP_CLKS.
70 * Depending on different hardware connections it is possible
71 * to use this setting to change the behaviour of McBSP
72 * driver. The dm365_clk_input_pin enum is available for dm365
73 */
74 int clk_input_pin;
75
66 /* McASP specific fields */ 76 /* McASP specific fields */
67 int tdm_slots; 77 int tdm_slots;
68 u8 op_mode; 78 u8 op_mode;
@@ -78,6 +88,11 @@ enum {
78 MCASP_VERSION_2, /* DA8xx/OMAPL1x */ 88 MCASP_VERSION_2, /* DA8xx/OMAPL1x */
79}; 89};
80 90
91enum dm365_clk_input_pin {
92 MCBSP_CLKR = 0, /* DM365 */
93 MCBSP_CLKS,
94};
95
81#define INACTIVE_MODE 0 96#define INACTIVE_MODE 0
82#define TX_MODE 1 97#define TX_MODE 1
83#define RX_MODE 2 98#define RX_MODE 2