[alsa-devel] [PATCH 2/4 v2] ASoC: fsi: Add FIFO size calculate

[Kuninori Morimoto]

Dear Mark

Thank you for comment.

> On Thu, Mar 25, 2010 at 07:15:51PM +0900, Kuninori Morimoto wrote:
> > Signed-off-by: Kuninori Morimoto <morimoto.kuninori at renesas.com>
> > ---
> > v1 -> v2
> > 
> > o move calculate area to fsi_fifo_init
> > o modify fifo calculation way
> > o Add tiny document for fifo calculation
> 
> This patch is fine but it doesn't apply against for-2.6.35.  Could you
> please check and resubmit?  I suspect a collision with the previously
> applied patches.

Hmm strange...
I created it on "for-2.6.35"
and it works well in my environment on it

-----------
[morimoto] git checkout asoc/for-2.6.35
Previous HEAD position was afa9f82... ASoC: fsi: Add FSI2 device support
HEAD is now at 10ea76c... ASoC: fsi: IRQ related process had be united

[morimoto] git am -3 /tmp/${[PATCH 2/4 v2]}
Applying: ASoC: fsi: Add FIFO size calculate

[morimoto] git am -3 /tmp/${[PATCH 4/4 v2]}
Applying: ASoC: fsi: Add FSI2 device support
-----------

Ahhh...
Sorry. my mail server seems little strange.
I guess you got my mail [4/4] -> [2/4] order ?

correct order is [2/4] -> [4/4]

Below is your issue ?
it is [4/4] -> [2/4] order.
If so, please change [2/4] -> [4/4] order.
So sorry.
---------------
[morimoto] git checkout asoc/for-2.6.35
Previous HEAD position was afa9f82... ASoC: fsi: Add FSI2 device support
HEAD is now at 10ea76c... ASoC: fsi: IRQ related process had be united

[morimoto] git am -3 /tmp/${[PATCH 4/4 v2]}
Applying: ASoC: fsi: Add FSI2 device support
error: patch failed: sound/soc/sh/fsi.c:47
error: sound/soc/sh/fsi.c: patch does not apply
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging sound/soc/sh/fsi.c
CONFLICT (content): Merge conflict in sound/soc/sh/fsi.c
Failed to merge in the changes.
Patch failed at 0001 ASoC: fsi: Add FSI2 device support
When you have resolved this problem run "git am -3 --resolved".
If you would prefer to skip this patch, instead run "git am -3 --skip".
To restore the original branch and stop patching run "git am -3 --abort".

[morimoto] git diff
diff --cc sound/soc/sh/fsi.c
index 7c295df,f14bbb0..0000000
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@@ -46,8 -50,9 +50,14 @@@
  #define MUTE          0x020C
  #define CLK_RST               0x0210
  #define SOFT_RST      0x0214
++<<<<<<< HEAD:sound/soc/sh/fsi.c
 +#define MREG_START    INT_ST
 +#define MREG_END      SOFT_RST
++=======
+ #define FIFO_SZ               0x0218
+ #define MREG_START    CPU_INT_ST
+ #define MREG_END      FIFO_SZ
++>>>>>>> ASoC: fsi: Add FSI2 device support:sound/soc/sh/fsi.c
  
  /* DO_FMT */
  /* DI_FMT */
---------------

Best regards
--
Kuninori Morimoto