Skip to content

Instantly share code, notes, and snippets.

@fat-tire
Created July 3, 2012 09:20
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save fat-tire/2395d0aa1cc6aeec46ed to your computer and use it in GitHub Desktop.
Save fat-tire/2395d0aa1cc6aeec46ed to your computer and use it in GitHub Desktop.
a patch to hw_params stuff in the encore 3.0 kernel (this is where it's having trouble)
git diff
diff --git a/sound/soc/codecs/tlv320aic3100.c b/sound/soc/codecs/tlv320aic3100.c
index cb99b81..41e2fdb 100644
--- a/sound/soc/codecs/tlv320aic3100.c
+++ b/sound/soc/codecs/tlv320aic3100.c
@@ -91,7 +91,6 @@
#define CODEC_POWER_OFF
#define AIC3100_CODEC_SUPPORT
#define ACCLAIM_SUPPORT
-/*#define AIC3110_CODEC_SUPPORT */
/******************************************************************************
* GLOBAL VARIABLES AND FUNCTION DECLARATIONS
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 4c64185..3a62f77 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -157,7 +157,7 @@ static int omap_mcbsp_dai_startup(struct snd_pcm_substream *substream,
* 2 channels (stereo): size is 128 / 2 = 64 frames (2 * 64 words)
* 4 channels: size is 128 / 4 = 32 frames (4 * 32 words)
*/
- if (cpu_is_omap34xx() || cpu_is_omap44xx()) {
+ if (cpu_is_omap34xx() || cpu_is_omap44xx() || cpu_is_omap3630()) {
/*
* Rule for the buffer size. We should not allow
* smaller buffer than the FIFO size to avoid underruns
@@ -290,7 +290,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
default:
return -EINVAL;
}
- if (cpu_is_omap34xx() || cpu_is_omap44xx()) {
+ if (cpu_is_omap34xx() || cpu_is_omap44xx() || cpu_is_omap3630()) {
dma_data->set_threshold = omap_mcbsp_set_threshold;
/* TODO: Currently, MODE_ELEMENT == MODE_FRAME */
if (omap_mcbsp_get_dma_op_mode(bus_id) ==
@@ -441,11 +441,11 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai,
regs->spcr2 |= XINTM(3) | FREE;
regs->spcr1 |= RINTM(3);
/* RFIG and XFIG are not defined in 34xx */
- if (!cpu_is_omap34xx() && !cpu_is_omap44xx()) {
+ if (!cpu_is_omap34xx() && !cpu_is_omap44xx() && !cpu_is_omap3630()) {
regs->rcr2 |= RFIG;
regs->xcr2 |= XFIG;
}
- if (cpu_is_omap2430() || cpu_is_omap34xx() || cpu_is_omap44xx()) {
+ if (cpu_is_omap2430() || cpu_is_omap34xx() || cpu_is_omap44xx() || cpu_is_omap3630()) {
regs->xccr = DXENDLY(1) | XDMAEN | XDISABLE;
regs->rccr = RFULL_CYCLE | RDMAEN | RDISABLE;
}
@@ -768,7 +768,7 @@ static const struct snd_kcontrol_new omap_mcbsp3_st_controls[] = {
int omap_mcbsp_st_add_controls(struct snd_soc_codec *codec, int mcbsp_id)
{
- if (!cpu_is_omap34xx())
+ if (!cpu_is_omap34xx() && !cpu_is_omap3630())
return -ENODEV;
switch (mcbsp_id) {
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment