Mark Brown <[email protected]> writes: > On Mon, Jul 06, 2009 at 02:14:41PM -0700, Kevin Hilman wrote: >> From: Chaithrika U S <[email protected]> >> >> Adds McASP clock support for the two instances of mcasp (mcasp0,mcasp1). This >> patch is part of the audio support for dm646x series. >> >> Signed-off-by: Naresh Medisetty <[email protected]> >> Signed-off-by: Chaithrika U S <[email protected]> >> Signed-off-by: Kevin Hilman <[email protected]> > > I guess it's safe for me to go ahead and merge the ASoC changes that > were waiting for this now, then?
Yes, go ahead. > IIRC it's runtime dependencies only so there should be no merge > issues. There shouldn't be any merge issues, but there will be some compile issues. The DaVinci core had some EDMA changes which are now part of my 'davinci-next' queue in DaVinci git[1]. Also, in the same tree, I have a 'davinci-next-drivers' branch which includes a commit for the ASoC changes needed on top of the EDMA API changes, as well as another unrelated change for default volume. I'll send those to alsa-devel shortly. Kevin [1] http://git.kernel.org/?p=linux/kernel/git/khilman/linux-davinci.git _______________________________________________ Davinci-linux-open-source mailing list [email protected] http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
