Linux kernel source tree https://git.amat.us/linux/atom/sound/soc?h=v3.8.2 2013-02-28T13:38:37Z 2013-02-28T13:38:37Z Ryo Tsutsui ryo.tsutsui@wolfsonmicro.com 2013-02-03T08:18:00Z urn:sha1:e32ae42530f86a574007fbf57fbc08c2a445e939 commit 01f58153aefc158fd690b337d29ad140e963959d upstream. Previously arizona_calc_fll() was checking if the target frequency is exactly divisible by reference frequency, but should have been product of the ratio and the reference frequency. Also scale down the Lamba and Theta coefficients be under 16-bits in order to match the registers. Signed-off-by: Ryo Tsutsui <ryo.tsutsui@wolfsonmicro.com> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2013-02-28T13:38:37Z Chris Rattray crattray@opensource.wolfsonmicro.com 2013-02-01T15:51:41Z urn:sha1:e4822a5f9cccf33f8e371f5cd58ecae51b2c3e74 commit 0d2b6422529a26ac4dee06196524ba9da70cf735 upstream. Signed-off-by: Chris Rattray <crattray@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2013-02-06T14:49:07Z Takashi Iwai tiwai@suse.de 2013-02-06T14:16:58Z urn:sha1:6baa4afa04a79d3a12558401cee0e39004ffcbcf We need this for fixing build error regressions in soc/fsl. 2013-01-28T06:46:09Z Shawn Guo shawn.guo@linaro.org 2013-01-28T06:25:43Z urn:sha1:1927661b1748480692f1fa2c390fe031c86d862a When building modules with CONFIG_SND_IMX_SOC=m in imx_v6_v7_defconfig, we will see the following link error. LD [M] sound/soc/fsl/snd-soc-fsl-ssi.o LD [M] sound/soc/fsl/snd-soc-fsl-utils.o LD [M] sound/soc/fsl/snd-soc-imx-ssi.o LD [M] sound/soc/fsl/snd-soc-imx-audmux.o LD [M] sound/soc/fsl/snd-soc-imx-pcm.o sound/soc/fsl/imx-pcm-dma.o: In function `init_module': imx-pcm-dma.c:(.init.text+0x0): multiple definition of `init_module' sound/soc/fsl/imx-pcm-fiq.o:imx-pcm-fiq.c:(.init.text+0x0): first defined here sound/soc/fsl/imx-pcm-dma.o: In function `cleanup_module': imx-pcm-dma.c:(.exit.text+0x0): multiple definition of `cleanup_module' sound/soc/fsl/imx-pcm-fiq.o:imx-pcm-fiq.c:(.exit.text+0x0): first defined here make[4]: *** [sound/soc/fsl/snd-soc-imx-pcm.o] Error 1 The module snd-soc-imx-pcm is designed to link imx-pcm.o with imx-pcm-dma.o or imx-pcm-fiq.o depending on if option SND_SOC_IMX_PCM_DMA or SND_SOC_IMX_PCM_FIQ is enabled. Both imx-pcm-dma and imx-pcm-fiq register their own module_platform_driver. However, these two options are not mutually exclusive and can be enabled together. And that's why we see above multiple init_module definition error. Instead of having both imx-pcm-dma and imx-pcm-fiq register their own platform_driver, we should do only once in imx-pcm.c. Using platform_device_id to distinguish between imx-pcm-dma and imx-pcm-fiq, we can run-time call imx-pcm-dma/fiq specific initialization in .probe hook to have module snd-soc-imx-pcm work for both cases. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> 2013-01-28T06:46:09Z Shawn Guo shawn.guo@linaro.org 2013-01-28T06:25:42Z urn:sha1:93d7b7622c199f1be25ca8fe64b3cbf468ea49b9 This reverts commit 25b8d31488a3fb3611651991969526b2ea475764. While the commit fixes multiple init_module definition error with module build, it breaks build when both imx-pcm-fiq and imx-pcm-dma are built in as below. LD sound/soc/fsl/snd-soc-fsl-ssi.o LD sound/soc/fsl/snd-soc-fsl-utils.o LD sound/soc/fsl/snd-soc-imx-ssi.o LD sound/soc/fsl/snd-soc-imx-audmux.o LD sound/soc/fsl/snd-soc-imx-pcm-fiq.o LD sound/soc/fsl/snd-soc-imx-pcm-dma.o LD sound/soc/fsl/snd-soc-eukrea-tlv320.o LD sound/soc/fsl/snd-soc-imx-sgtl5000.o LD sound/soc/fsl/snd-soc-imx-mc13783.o LD sound/soc/fsl/built-in.o sound/soc/fsl/snd-soc-imx-pcm-dma.o: In function `imx_pcm_free': imx-pcm.c:(.text+0x464): multiple definition of `imx_pcm_free' sound/soc/fsl/snd-soc-imx-pcm-fiq.o:imx-pcm-fiq.c:(.text+0x1a8): first defined here sound/soc/fsl/snd-soc-imx-pcm-dma.o: In function `snd_imx_pcm_mmap': imx-pcm.c:(.text+0x35c): multiple definition of `snd_imx_pcm_mmap' sound/soc/fsl/snd-soc-imx-pcm-fiq.o:imx-pcm-fiq.c:(.text+0xa0): first defined here sound/soc/fsl/snd-soc-imx-pcm-dma.o: In function `imx_pcm_new': imx-pcm.c:(.text+0x3dc): multiple definition of `imx_pcm_new' sound/soc/fsl/snd-soc-imx-pcm-fiq.o:imx-pcm-fiq.c:(.text+0x120): first defined here make[4]: *** [sound/soc/fsl/built-in.o] Error 1 Let's revert the commit and find a proper fix for multiple init_module definition error later. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> 2013-01-22T08:26:33Z Mark Brown broonie@opensource.wolfsonmicro.com 2013-01-22T08:26:33Z urn:sha1:a8c136d2eba7b0b0c872e59eb404b1fe36504112 2013-01-22T08:26:21Z Mark Brown broonie@opensource.wolfsonmicro.com 2013-01-22T08:26:21Z urn:sha1:32eca984f6815f25c8ee2f5521758f5625579223 2013-01-22T08:26:15Z Mark Brown broonie@opensource.wolfsonmicro.com 2013-01-22T08:26:15Z urn:sha1:05780d7771ed126aacfa331fa5f81772fe74d32b 2013-01-22T08:26:06Z Mark Brown broonie@opensource.wolfsonmicro.com 2013-01-22T08:26:06Z urn:sha1:bc04c93bbc6ddfce4486d0fcb66e2f49957110ce 2013-01-22T07:40:26Z Charles Keepax ckeepax@opensource.wolfsonmicro.com 2013-01-21T09:02:31Z urn:sha1:a4cdbec758d2491a86ba94263b847768fa004fde This patch correctly releases the firmware if the magic string in the firmware header does not match. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>