On Tue, Apr 28, 2009 at 11:46 AM, Takashi Iwai <tiwai@xxxxxxx> wrote: > At Tue, 28 Apr 2009 16:23:41 +0100, > Mark Brown wrote: >> >> From: Jon Smirl <jonsmirl@xxxxxxxxx> >> >> Basic split of mpc5200 DMA code out from i2s into a standalone file. >> >> [Fixed trailing whitespace -- broonie.] >> >> Signed-off-by: Jon Smirl <jonsmirl@xxxxxxxxx> >> Acked-by: Grant Likely <grant.likely@xxxxxxxxxxxx> >> Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> > > This patch conflicts with the last patch I merged to add > SNDRV_PCM_INFO_BATCH to some drivers including mpc5200. > (It's in fix/pcm-info-batch branch and not merged to */asoc branch > yet. Feel free to pull to your tree by yourself.) > And, the jiffies check shall be anyway fixed in the upstream PCM core > side, thus there is no big merit to hurry to merge the unfinished > changes now. > > So, could you back off mpc5200 changes and wait for a while until the > issue regarding PCM jiffies-check is resolved? This is why I was pushing so hard to get the patches that split the files in. Takashi is going to change the base mpc5200_i2c file and I am going to have to manually fix up up my 14 patches layered on top. Git handles file renames fine, but it doesn't handle the case of splitting a file very well. Once the patches that split the file are in the tree Git handles things ok. > > Note that the info flag should contain SNDRV_PCM_INFO_BATCH unless the > driver provides the precise position reporting in the pointer > callback. The flag can be removed once after you implement that > feature, of course. > > > thanks, > > Takashi > -- Jon Smirl jonsmirl@xxxxxxxxx _______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
