<feed xmlns='http://www.w3.org/2005/Atom'>
<title>linux-toradex.git/sound/soc/codecs/wm8728.c, branch v3.2.67</title>
<subtitle>Linux kernel for Apalis and Colibri modules</subtitle>
<link rel='alternate' type='text/html' href='https://git.toradex.cn/cgit/linux-toradex.git/'/>
<entry>
<title>ASoC: Add device tree binding for WM8728</title>
<updated>2011-08-14T04:42:09+00:00</updated>
<author>
<name>Mark Brown</name>
<email>broonie@opensource.wolfsonmicro.com</email>
</author>
<published>2011-08-03T07:53:02+00:00</published>
<link rel='alternate' type='text/html' href='https://git.toradex.cn/cgit/linux-toradex.git/commit/?id=45b4d043da571c71500add0fa3ea17c9b8f1f648'/>
<id>45b4d043da571c71500add0fa3ea17c9b8f1f648</id>
<content type='text'>
Signed-off-by: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;
Acked-by: Liam Girdwood &lt;lrg@ti.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Signed-off-by: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;
Acked-by: Liam Girdwood &lt;lrg@ti.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>ASoC: Remove some more redundant -codecs from driver names</title>
<updated>2011-08-09T15:17:56+00:00</updated>
<author>
<name>Mark Brown</name>
<email>broonie@opensource.wolfsonmicro.com</email>
</author>
<published>2011-08-03T07:52:10+00:00</published>
<link rel='alternate' type='text/html' href='https://git.toradex.cn/cgit/linux-toradex.git/commit/?id=0473e61b9aeb92e167516a90bf045aa925aa3782'/>
<id>0473e61b9aeb92e167516a90bf045aa925aa3782</id>
<content type='text'>
Signed-off-by: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;
Acked-by: Liam Girdwood &lt;lrg@ti.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Signed-off-by: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;
Acked-by: Liam Girdwood &lt;lrg@ti.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>ASoC: Use data based init for wm8728 DAPM</title>
<updated>2011-03-30T21:22:10+00:00</updated>
<author>
<name>Lu Guanqun</name>
<email>guanqun.lu@intel.com</email>
</author>
<published>2011-03-30T13:53:14+00:00</published>
<link rel='alternate' type='text/html' href='https://git.toradex.cn/cgit/linux-toradex.git/commit/?id=8428edf96ebb9e8c8a5bec257568101b6ba01dc3'/>
<id>8428edf96ebb9e8c8a5bec257568101b6ba01dc3</id>
<content type='text'>
Signed-off-by: Lu Guanqun &lt;guanqun.lu@intel.com&gt;
Acked-by: Liam Girdwood &lt;lrg@ti.com&gt;
Signed-off-by: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Signed-off-by: Lu Guanqun &lt;guanqun.lu@intel.com&gt;
Acked-by: Liam Girdwood &lt;lrg@ti.com&gt;
Signed-off-by: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>ASoC: Do not include soc-dapm.h</title>
<updated>2010-11-22T14:04:41+00:00</updated>
<author>
<name>Jarkko Nikula</name>
<email>jhnikula@gmail.com</email>
</author>
<published>2010-11-21T17:48:45+00:00</published>
<link rel='alternate' type='text/html' href='https://git.toradex.cn/cgit/linux-toradex.git/commit/?id=505fb824e754efcc9702ce68d3911e7b86d3c690'/>
<id>505fb824e754efcc9702ce68d3911e7b86d3c690</id>
<content type='text'>
There is no need to include soc-dapm.h since soc.h includes it.

Signed-off-by: Jarkko Nikula &lt;jhnikula@gmail.com&gt;
Acked-by: Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;
Signed-off-by: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
There is no need to include soc-dapm.h since soc.h includes it.

Signed-off-by: Jarkko Nikula &lt;jhnikula@gmail.com&gt;
Acked-by: Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;
Signed-off-by: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>ASoC: Decouple DAPM from CODECs</title>
<updated>2010-11-06T15:28:29+00:00</updated>
<author>
<name>Liam Girdwood</name>
<email>lrg@slimlogic.co.uk</email>
</author>
<published>2010-11-05T13:53:46+00:00</published>
<link rel='alternate' type='text/html' href='https://git.toradex.cn/cgit/linux-toradex.git/commit/?id=ce6120cca2589ede530200c7cfe11ac9f144333c'/>
<id>ce6120cca2589ede530200c7cfe11ac9f144333c</id>
<content type='text'>
Decoupling Dynamic Audio Power Management (DAPM) from codec devices is
required when developing ASoC further. Such as for other ASoC components to
have DAPM widgets or when extending DAPM to handle cross-device paths.

This patch decouples DAPM related variables from struct snd_soc_codec and
moves them to new struct snd_soc_dapm_context that is used to encapsulate
DAPM context of a device. ASoC core and API of DAPM functions are modified
to use DAPM context instead of codec.

This patch does not change current functionality and a large part of changes
come because of structure and internal API changes.

Core implementation is from Liam Girdwood &lt;lrg@slimlogic.co.uk&gt; with some
minor core changes, codecs and machine driver conversions from
Jarkko Nikula &lt;jhnikula@gmail.com&gt;.

Signed-off-by: Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;
Signed-off-by: Jarkko Nikula &lt;jhnikula@gmail.com&gt;
Cc: Nicolas Ferre &lt;nicolas.ferre@atmel.com&gt;
Cc: Manuel Lauss &lt;manuel.lauss@googlemail.com&gt;
Cc: Mike Frysinger &lt;vapier.adi@gmail.com&gt;
Cc: Cliff Cai &lt;cliff.cai@analog.com&gt;
Cc: Kevin Hilman &lt;khilman@deeprootsystems.com&gt;
Cc: Ryan Mallon &lt;ryan@bluewatersys.com&gt;
Cc: Timur Tabi &lt;timur@freescale.com&gt;
Cc: Sascha Hauer &lt;s.hauer@pengutronix.de&gt;
Cc: Lars-Peter Clausen &lt;lars@metafoo.de&gt;
Cc: Arnaud Patard (Rtp) &lt;arnaud.patard@rtp-net.org&gt;
Cc: Wan ZongShun &lt;mcuos.com@gmail.com&gt;
Cc: Eric Miao &lt;eric.y.miao@gmail.com&gt;
Cc: Jassi Brar &lt;jassi.brar@samsung.com&gt;
Cc: Daniel Gloeckner &lt;dg@emlix.com&gt;
Cc: Kuninori Morimoto &lt;morimoto.kuninori@renesas.com&gt;
Signed-off-by: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Decoupling Dynamic Audio Power Management (DAPM) from codec devices is
required when developing ASoC further. Such as for other ASoC components to
have DAPM widgets or when extending DAPM to handle cross-device paths.

This patch decouples DAPM related variables from struct snd_soc_codec and
moves them to new struct snd_soc_dapm_context that is used to encapsulate
DAPM context of a device. ASoC core and API of DAPM functions are modified
to use DAPM context instead of codec.

This patch does not change current functionality and a large part of changes
come because of structure and internal API changes.

Core implementation is from Liam Girdwood &lt;lrg@slimlogic.co.uk&gt; with some
minor core changes, codecs and machine driver conversions from
Jarkko Nikula &lt;jhnikula@gmail.com&gt;.

Signed-off-by: Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;
Signed-off-by: Jarkko Nikula &lt;jhnikula@gmail.com&gt;
Cc: Nicolas Ferre &lt;nicolas.ferre@atmel.com&gt;
Cc: Manuel Lauss &lt;manuel.lauss@googlemail.com&gt;
Cc: Mike Frysinger &lt;vapier.adi@gmail.com&gt;
Cc: Cliff Cai &lt;cliff.cai@analog.com&gt;
Cc: Kevin Hilman &lt;khilman@deeprootsystems.com&gt;
Cc: Ryan Mallon &lt;ryan@bluewatersys.com&gt;
Cc: Timur Tabi &lt;timur@freescale.com&gt;
Cc: Sascha Hauer &lt;s.hauer@pengutronix.de&gt;
Cc: Lars-Peter Clausen &lt;lars@metafoo.de&gt;
Cc: Arnaud Patard (Rtp) &lt;arnaud.patard@rtp-net.org&gt;
Cc: Wan ZongShun &lt;mcuos.com@gmail.com&gt;
Cc: Eric Miao &lt;eric.y.miao@gmail.com&gt;
Cc: Jassi Brar &lt;jassi.brar@samsung.com&gt;
Cc: Daniel Gloeckner &lt;dg@emlix.com&gt;
Cc: Kuninori Morimoto &lt;morimoto.kuninori@renesas.com&gt;
Signed-off-by: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>ASoC: Remove unneeded use of spi_bus_type</title>
<updated>2010-09-30T20:32:07+00:00</updated>
<author>
<name>Dimitris Papastamos</name>
<email>dp@opensource.wolfsonmicro.com</email>
</author>
<published>2010-09-29T10:48:19+00:00</published>
<link rel='alternate' type='text/html' href='https://git.toradex.cn/cgit/linux-toradex.git/commit/?id=6b90b55ccc7c8ad12dd21ae536ab7747313df927'/>
<id>6b90b55ccc7c8ad12dd21ae536ab7747313df927</id>
<content type='text'>
No need to explicitly set the bus type, spi_register_driver does
that for us.

Signed-off-by: Dimitris Papastamos &lt;dp@opensource.wolfsonmicro.com&gt;
Acked-by: Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;
Signed-off-by: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
No need to explicitly set the bus type, spi_register_driver does
that for us.

Signed-off-by: Dimitris Papastamos &lt;dp@opensource.wolfsonmicro.com&gt;
Acked-by: Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;
Signed-off-by: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>ASoC: Fix incorrect register cache size configuration</title>
<updated>2010-09-10T21:21:23+00:00</updated>
<author>
<name>Dimitris Papastamos</name>
<email>dp@opensource.wolfsonmicro.com</email>
</author>
<published>2010-09-10T17:14:56+00:00</published>
<link rel='alternate' type='text/html' href='https://git.toradex.cn/cgit/linux-toradex.git/commit/?id=e5eec34c68eab7af8fe10d070cb0c948f73a8464'/>
<id>e5eec34c68eab7af8fe10d070cb0c948f73a8464</id>
<content type='text'>
The reg_cache_size is the number of elements in the register cache,
not the size of the cache itself. This is not a problem if the size
of each element of the cache is 1 byte but it matters in any other
case.

Signed-off-by: Dimitris Papastamos &lt;dp@opensource.wolfsonmicro.com&gt;
Acked-by: Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;
Signed-off-by: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
The reg_cache_size is the number of elements in the register cache,
not the size of the cache itself. This is not a problem if the size
of each element of the cache is 1 byte but it matters in any other
case.

Signed-off-by: Dimitris Papastamos &lt;dp@opensource.wolfsonmicro.com&gt;
Acked-by: Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;
Signed-off-by: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>ASoC: Remove unneeded control_data management from Wolfson drivers</title>
<updated>2010-08-12T13:00:19+00:00</updated>
<author>
<name>Mark Brown</name>
<email>broonie@opensource.wolfsonmicro.com</email>
</author>
<published>2010-08-12T10:04:14+00:00</published>
<link rel='alternate' type='text/html' href='https://git.toradex.cn/cgit/linux-toradex.git/commit/?id=af3751a0bfe4d461e0567961dc06448f2128e26f'/>
<id>af3751a0bfe4d461e0567961dc06448f2128e26f</id>
<content type='text'>
Now soc-cache.c can figure out the I2C and SPI control data from the
device for the CODEC we don't need to manually assign it in drivers.

Signed-off-by: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;
Signed-off-by: Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Now soc-cache.c can figure out the I2C and SPI control data from the
device for the CODEC we don't need to manually assign it in drivers.

Signed-off-by: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;
Signed-off-by: Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>ASoC: multi-component - ASoC Multi-Component Support</title>
<updated>2010-08-12T13:00:00+00:00</updated>
<author>
<name>Liam Girdwood</name>
<email>lrg@slimlogic.co.uk</email>
</author>
<published>2010-03-17T20:15:21+00:00</published>
<link rel='alternate' type='text/html' href='https://git.toradex.cn/cgit/linux-toradex.git/commit/?id=f0fba2ad1b6b53d5360125c41953b7afcd6deff0'/>
<id>f0fba2ad1b6b53d5360125c41953b7afcd6deff0</id>
<content type='text'>
This patch extends the ASoC API to allow sound cards to have more than one
CODEC and more than one platform DMA controller. This is achieved by dividing
some current ASoC structures that contain both driver data and device data into
structures that only either contain device data or driver data. i.e.

 struct snd_soc_codec    ---&gt;  struct snd_soc_codec (device data)
                          +-&gt;  struct snd_soc_codec_driver (driver data)

 struct snd_soc_platform ---&gt;  struct snd_soc_platform (device data)
                          +-&gt;  struct snd_soc_platform_driver (driver data)

 struct snd_soc_dai      ---&gt;  struct snd_soc_dai (device data)
                          +-&gt;  struct snd_soc_dai_driver (driver data)

 struct snd_soc_device   ---&gt;  deleted

This now allows ASoC to be more tightly aligned with the Linux driver model and
also means that every ASoC codec, platform and (platform) DAI is a kernel
device. ASoC component private data is now stored as device private data.

The ASoC sound card struct snd_soc_card has also been updated to store lists
of it's components rather than a pointer to a codec and platform. The PCM
runtime struct soc_pcm_runtime now has pointers to all its components.

This patch adds DAPM support for ASoC multi-component and removes struct
snd_soc_socdev from DAPM core. All DAPM calls are now made on a card, codec
or runtime PCM level basis rather than using snd_soc_socdev.

Other notable multi-component changes:-

 * Stream operations now de-reference less structures.
 * close_delayed work() now runs on a DAI basis rather than looping all DAIs
   in a card.
 * PM suspend()/resume() operations can now handle N CODECs and Platforms
   per sound card.
 * Added soc_bind_dai_link() to bind the component devices to the sound card.
 * Added soc_dai_link_probe() and soc_dai_link_remove() to probe and remove
   DAI link components.
 * sysfs entries can now be registered per component per card.
 * snd_soc_new_pcms() functionailty rolled into dai_link_probe().
 * snd_soc_register_codec() now does all the codec list and mutex init.

This patch changes the probe() and remove() of the CODEC drivers as follows:-

 o Make CODEC driver a platform driver
 o Moved all struct snd_soc_codec list, mutex, etc initialiasation to core.
 o Removed all static codec pointers (drivers now support &gt; 1 codec dev)
 o snd_soc_register_pcms() now done by core.
 o snd_soc_register_dai() folded into snd_soc_register_codec().

CS4270 portions:
Acked-by: Timur Tabi &lt;timur@freescale.com&gt;

Some TLV320aic23 and Cirrus platform fixes.
Signed-off-by: Ryan Mallon &lt;ryan@bluewatersys.com&gt;

TI CODEC and OMAP fixes
Signed-off-by: Peter Ujfalusi &lt;peter.ujfalusi@nokia.com&gt;
Signed-off-by: Janusz Krzysztofik &lt;jkrzyszt@tis.icnet.pl&gt;
Signed-off-by: Jarkko Nikula &lt;jhnikula@gmail.com&gt;

Samsung platform and misc fixes :-
Signed-off-by: Chanwoo Choi &lt;cw00.choi@samsung.com&gt;
Signed-off-by: Joonyoung Shim &lt;jy0922.shim@samsung.com&gt;
Signed-off-by: Kyungmin Park &lt;kyungmin.park@samsung.com&gt;
Reviewed-by: Jassi Brar &lt;jassi.brar@samsung.com&gt;
Signed-off-by: Seungwhan Youn &lt;sw.youn@samsung.com&gt;

MPC8610 and PPC fixes.
Signed-off-by: Timur Tabi &lt;timur@freescale.com&gt;

i.MX fixes and some core fixes.
Signed-off-by: Sascha Hauer &lt;s.hauer@pengutronix.de&gt;

J4740 platform fixes:-
Signed-off-by: Lars-Peter Clausen &lt;lars@metafoo.de&gt;

CC: Tony Lindgren &lt;tony@atomide.com&gt;
CC: Nicolas Ferre &lt;nicolas.ferre@atmel.com&gt;
CC: Kevin Hilman &lt;khilman@deeprootsystems.com&gt;
CC: Sascha Hauer &lt;s.hauer@pengutronix.de&gt;
CC: Atsushi Nemoto &lt;anemo@mba.ocn.ne.jp&gt;
CC: Kuninori Morimoto &lt;morimoto.kuninori@renesas.com&gt;
CC: Daniel Gloeckner &lt;dg@emlix.com&gt;
CC: Manuel Lauss &lt;mano@roarinelk.homelinux.net&gt;
CC: Mike Frysinger &lt;vapier.adi@gmail.com&gt;
CC: Arnaud Patard &lt;apatard@mandriva.com&gt;
CC: Wan ZongShun &lt;mcuos.com@gmail.com&gt;

Acked-by: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;
Signed-off-by: Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This patch extends the ASoC API to allow sound cards to have more than one
CODEC and more than one platform DMA controller. This is achieved by dividing
some current ASoC structures that contain both driver data and device data into
structures that only either contain device data or driver data. i.e.

 struct snd_soc_codec    ---&gt;  struct snd_soc_codec (device data)
                          +-&gt;  struct snd_soc_codec_driver (driver data)

 struct snd_soc_platform ---&gt;  struct snd_soc_platform (device data)
                          +-&gt;  struct snd_soc_platform_driver (driver data)

 struct snd_soc_dai      ---&gt;  struct snd_soc_dai (device data)
                          +-&gt;  struct snd_soc_dai_driver (driver data)

 struct snd_soc_device   ---&gt;  deleted

This now allows ASoC to be more tightly aligned with the Linux driver model and
also means that every ASoC codec, platform and (platform) DAI is a kernel
device. ASoC component private data is now stored as device private data.

The ASoC sound card struct snd_soc_card has also been updated to store lists
of it's components rather than a pointer to a codec and platform. The PCM
runtime struct soc_pcm_runtime now has pointers to all its components.

This patch adds DAPM support for ASoC multi-component and removes struct
snd_soc_socdev from DAPM core. All DAPM calls are now made on a card, codec
or runtime PCM level basis rather than using snd_soc_socdev.

Other notable multi-component changes:-

 * Stream operations now de-reference less structures.
 * close_delayed work() now runs on a DAI basis rather than looping all DAIs
   in a card.
 * PM suspend()/resume() operations can now handle N CODECs and Platforms
   per sound card.
 * Added soc_bind_dai_link() to bind the component devices to the sound card.
 * Added soc_dai_link_probe() and soc_dai_link_remove() to probe and remove
   DAI link components.
 * sysfs entries can now be registered per component per card.
 * snd_soc_new_pcms() functionailty rolled into dai_link_probe().
 * snd_soc_register_codec() now does all the codec list and mutex init.

This patch changes the probe() and remove() of the CODEC drivers as follows:-

 o Make CODEC driver a platform driver
 o Moved all struct snd_soc_codec list, mutex, etc initialiasation to core.
 o Removed all static codec pointers (drivers now support &gt; 1 codec dev)
 o snd_soc_register_pcms() now done by core.
 o snd_soc_register_dai() folded into snd_soc_register_codec().

CS4270 portions:
Acked-by: Timur Tabi &lt;timur@freescale.com&gt;

Some TLV320aic23 and Cirrus platform fixes.
Signed-off-by: Ryan Mallon &lt;ryan@bluewatersys.com&gt;

TI CODEC and OMAP fixes
Signed-off-by: Peter Ujfalusi &lt;peter.ujfalusi@nokia.com&gt;
Signed-off-by: Janusz Krzysztofik &lt;jkrzyszt@tis.icnet.pl&gt;
Signed-off-by: Jarkko Nikula &lt;jhnikula@gmail.com&gt;

Samsung platform and misc fixes :-
Signed-off-by: Chanwoo Choi &lt;cw00.choi@samsung.com&gt;
Signed-off-by: Joonyoung Shim &lt;jy0922.shim@samsung.com&gt;
Signed-off-by: Kyungmin Park &lt;kyungmin.park@samsung.com&gt;
Reviewed-by: Jassi Brar &lt;jassi.brar@samsung.com&gt;
Signed-off-by: Seungwhan Youn &lt;sw.youn@samsung.com&gt;

MPC8610 and PPC fixes.
Signed-off-by: Timur Tabi &lt;timur@freescale.com&gt;

i.MX fixes and some core fixes.
Signed-off-by: Sascha Hauer &lt;s.hauer@pengutronix.de&gt;

J4740 platform fixes:-
Signed-off-by: Lars-Peter Clausen &lt;lars@metafoo.de&gt;

CC: Tony Lindgren &lt;tony@atomide.com&gt;
CC: Nicolas Ferre &lt;nicolas.ferre@atmel.com&gt;
CC: Kevin Hilman &lt;khilman@deeprootsystems.com&gt;
CC: Sascha Hauer &lt;s.hauer@pengutronix.de&gt;
CC: Atsushi Nemoto &lt;anemo@mba.ocn.ne.jp&gt;
CC: Kuninori Morimoto &lt;morimoto.kuninori@renesas.com&gt;
CC: Daniel Gloeckner &lt;dg@emlix.com&gt;
CC: Manuel Lauss &lt;mano@roarinelk.homelinux.net&gt;
CC: Mike Frysinger &lt;vapier.adi@gmail.com&gt;
CC: Arnaud Patard &lt;apatard@mandriva.com&gt;
CC: Wan ZongShun &lt;mcuos.com@gmail.com&gt;

Acked-by: Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;
Signed-off-by: Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'topic/asoc' into for-linus</title>
<updated>2010-05-20T10:00:43+00:00</updated>
<author>
<name>Takashi Iwai</name>
<email>tiwai@suse.de</email>
</author>
<published>2010-05-20T10:00:43+00:00</published>
<link rel='alternate' type='text/html' href='https://git.toradex.cn/cgit/linux-toradex.git/commit/?id=d71f4cece4bd97d05592836202fc04ff2e7817e3'/>
<id>d71f4cece4bd97d05592836202fc04ff2e7817e3</id>
<content type='text'>
Conflicts:
	sound/soc/codecs/ad1938.c
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Conflicts:
	sound/soc/codecs/ad1938.c
</pre>
</div>
</content>
</entry>
</feed>
