- 10 Sep, 2010 10 commits
-
-
Kuninori Morimoto authored
This patch solve compile error when .config doesn't have CONFIG_SND_SOC which is needed for HDMI sound. It was reported by Guennadi as follows Besides, I think, this will not link without CONFIG_SND_SOC. Reported-by:
Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by:
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Reviewed-by:
Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by:
Mark Brown <broonie@opensource.wolfsonmicro.com>
-
Kuninori Morimoto authored
This patch solve below report from Guennadi. But I didn't remove #include <sound/sh_fsi.h>. Because it have FSI_PORT_B define which is used on this file. > +#include <linux/platform_device.h> > +#include <sound/sh_fsi.h> > +#include <video/sh_mobile_hdmi.h> Now that everything is done with strings - do you still need these headers? Reported-by:
-
Kuninori Morimoto authored
This patch solve below report from Guennadi > /* External video parameter settings */ > static void hdmi_external_video_param(struct sh_hdmi *hdmi) > { > @@ -804,6 +862,11 @@ static int __init sh_hdmi_probe(struct platform_device *pdev) > return -ENOMEM; > } > > + ret = snd_soc_register_codec(&pdev->dev, > + &soc_codec_dev_sh_hdmi, &sh_hdmi_dai, 1); > + if (ret < 0) > + goto egetclk; > + > hdmi->dev = &pdev->dev; > > hdmi->hdmi_clk = clk_get(&pdev->dev, "ick"); NAK. This breaks the error path and has to be fixed. Firstly, please, use a new label like "esndreg," secondly, you have to add clk_disable(hdmi->hdmi_clk); erate: clk_put(hdmi->hdmi_clk); egetclk: + snd_soc_unregister_codec(&pdev->dev); +esndreg: mutex_destroy(&hdmi->mutex); kfree(hdmi); Reported-by: -
Kuninori Morimoto authored
This patch solve below report from Guennadi > +static struct snd_soc_dai_driver sh_hdmi_dai = { > + .name = "sh_mobile_hdmi-hifi", > + .playback = { > + .stream_name = "Playback", > + .channels_min = 1, Can it actually do mono? Maybe at probe time you could look at audio flags from your previous patch and, e.g., for SPDIF set channels_min to 2? > + .channels_max = 2, That's the "smallest max," yes. With some other interfaces (I2S, DSD) it can support up to 8 channels... > + .rates = SNDRV_PCM_RATE_8000_48000, Hm, in the datasheet I see supported frequencies 32kHz to 192kHz. And if you promise support for multiple frequencies, don't you want to implement .hw_params? Besides, not all of these frequencies will be available, depending on your supplied clock and your willingness to implement downsampling. Reported-by: -
Kuninori Morimoto authored
This patch solve below report from Guennadi 1) > +/* Audio source select */ > +#define HDMI_SRC_MASK (0xF << 0) > +#define HDMI_SRC_I2S (0 << 0) /* default */ > +#define HDMI_SRC_SPDIF (1 << 0) > +#define HDMI_SRC_DSD (2 << 0) > +#define HDMI_SRC_HBR (3 << 0) I would be more specific with these macro names, i.e., include "AUDIO" or "SND" or something similar in them, e.g., HDMI_AUDIO_SRC_I2S. 2) > + case HDMI_SRC_I2S: > + data = (0x0 << 3); > + break; > + case HDMI_SRC_SPDIF: > + data = (0x1 << 3); > + break; > + case HDMI_SRC_DSD: > + data = (0x2 << 3); > + break; > + case HDMI_SRC_HBR: > + data = (0x3 << 3); In all above cases parenthesis are superfluous. Reported-by:
-
Kuninori Morimoto authored
This patch solve below report from Guennadi 1) > - hdmi_write(hdmi, 0x00, HDMI_AUDIO_SETTING_1); > + switch (pdata->flags & HDMI_SRC_MASK) { > + default: > + /* FALL THROUGH */ I'm not sure I like the capitalisation here - no reason to shout;) 2) > +/************************************************************************ > + > + > + HDMI sound > + > + > +************************************************************************/ I don't think this comment deserves 7 lines of text, besides breaking the multiline comment style. If you think, one line like /* HDMI sound */ is not enough how about just /* * HDMI sound */ 3) > +/************************************************************************ > + > + > + HDMI video > + > + > +************************************************************************/ See above - 7 lines seem to be an overkill to me. Reported-by: -
Jassi Brar authored
The PCM controller platform devices are registered by the name 'samsung-pcm', so use the same in the CPU driver. Signed-off-by:
Jassi Brar <jassi.brar@samsung.com> Acked-by:
-
Jassi Brar authored
Drop the invalid -dai suffix appended to the Samsung AC97 CPU DAI. Signed-off-by:
-
Kuninori Morimoto authored
Current SND_FSI_xxx menu attributes were bool, but it should be tristate. This patch solve below report from Guennadi "bool" means, if someone is linking the whole ASoC into the kernel, they will not be able to build this as a module. Not a big deal, but you're stealing some freedom from the user. Reported-by:
-
Kuninori Morimoto authored
Signed-off-by:
-
- 08 Sep, 2010 4 commits
-
-
Vasily Khoruzhick authored
Usage of 256 as clkdiv gives better rounding error (<1%) for 16khz and 48khz Signed-off-by:
Vasily Khoruzhick <anarsoul@gmail.com> Acked-by:
-
Vasily Khoruzhick authored
Signed-off-by:
-
Vasily Khoruzhick authored
Signed-off-by:
-
Vasily Khoruzhick authored
Signed-off-by:
-
- 07 Sep, 2010 1 commit
-
-
Mark Brown authored
Not needed with multi-component. Signed-off-by:
Timur Tabi <timur@freescale.com> Acked-by:
-
- 06 Sep, 2010 6 commits
-
-
Mark Brown authored
Signed-off-by:
-
Mark Brown authored
Signed-off-by:
-
Mark Brown authored
Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into for-2.6.37
-
Jiri Slaby authored
There is adangling code in wm8753_probe which is never executed. Remove it. Signed-off-by:
Jiri Slaby <jslaby@suse.cz> Acked-by:
Liam Girdwood <lg@opensource.wolfsonmicro.com> Signed-off-by:
-
Jarkko Nikula authored
Null pointer dereference will occur from *setup = pdata->setup if pdata is not set. Fix this by moving assignments from pdata inside non-null case. Thanks to Jiri Slaby <jirislaby@gmail.com> for noticing. Signed-off-by:
Jarkko Nikula <jhnikula@gmail.com> Cc: Jiri Slaby <jirislaby@gmail.com> Acked-by:
-
Mark Brown authored
Signed-off-by:
-
- 03 Sep, 2010 1 commit
-
-
Kuninori Morimoto authored
This patch revive ak4642_snd_controls which was removed on f0fba2adSigned-off-by:
-
- 02 Sep, 2010 2 commits
-
-
Julia Lawall authored
Add a call to of_node_put in the error handling code following a call to of_parse_phandle. This patch also moves the existing call to of_node_put tothe end of the error handling code, to make it possible to jump to of_node_put without doing the other cleanup operations. These appear to be disjoint operations, so the ordering doesn't matter. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r exists@ local idexpression x; expression E,E1,E2; statement S; @@ *x = (of_find_node_by_path |of_find_node_by_name |of_find_node_by_phandle |of_get_parent |of_get_next_parent |of_get_next_child |of_find_compatible_node |of_match_node |of_find_node_by_type |of_find_node_with_property |of_find_matching_node |of_parse_phandle )(...); ... if (x == NULL) S <... when != x = E *if (...) { ... when != of_node_put(x) when != if (...) { ... of_node_put(x); ... } ( return <+...x...+>; | * return ...; ) } ...> ( E2 = x; | of_node_put(x); ) // </smpl> Signed-off-by:
Julia Lawall <julia@diku.dk> Acked-by:
Liam Girdwood <lrg@slimlogic.uo.uk> Signed-off-by:
-
Arnaud Patard (Rtp) authored
Allow snd-soc-kirkwood autoloading by adding an alias. Signed-off-by:
Arnaud Patard <arnaud.patard@rtp-net.org> Acked-by:
-
- 01 Sep, 2010 5 commits
-
-
Ian Lartey authored
Signed-off-by:
Ian Lartey <ian@opensource.wolfsonmicro.com> Acked-by:
-
Mark Brown authored
Allow selection of the channel used for input to the AIFnDAC signals. This isn't integrated into DAPM since we treat the data as a single mono channel until just beyond this selection so it ends up having no visible effect on the routing. Signed-off-by:
-
Kuninori Morimoto authored
Signed-off-by:
-
Kuninori Morimoto authored
Signed-off-by:
-
Kuninori Morimoto authored
Signed-off-by:
-
- 31 Aug, 2010 8 commits
-
-
Arnaud Patard (Rtp) authored
multicomponent support added/changed some device name but added some typos, breaking existing OpenRD Client support. Signed-off-by:
-
Kuninori Morimoto authored
This patch modify dai link - platform_name: sh_fsi/sh_fsi2 are used for FSI driver - codec_name: ak4642/ak4643 are used for ak4642 driver This is quick hack. I should modify it more wisely in future Signed-off-by:
-
Kuninori Morimoto authored
Signed-off-by:
-
Vasily Khoruzhick authored
Export s3c_device_pcm for all S3C24xx-devices, not only for S3C2440; Fix device name for s3c_device_iis; Signed-off-by:
-
Vasily Khoruzhick authored
Signed-off-by:
-
Vasily Khoruzhick authored
Disable some codec modules in standby mode, completely disable codec in off mode to save some power. Fix suspend/resume: mark mixer regs as dirty on resume to restore mixer values, otherwise driver produces no sound (master is muted by default). Signed-off-by:
Marek Vasut <marek.vasut@gmail.com> Acked-by:
-
Jarkko Nikula authored
Swapping the bias level enumeration is only meant to help debugging. It is easier if number 0 means bias off and bigger number means bigger bias level. Signed-off-by:
-
Manuel Lauss authored
This patch fixes up the au1x audio platform after the multi-component merge: - compile fixes and updates to get DB1200 platform audio working again, - removal of global variables in AC97/I2S/DMA(PCM) modules. The AC97 part is limited to one instance only for now due to issues with getting at driver data in the soc_ac97_ops. Signed-off-by:
Manuel Lauss <manuel.lauss@googlemail.com> Acked-by:
-
- 28 Aug, 2010 3 commits
-
-
Jarkko Nikula authored
Currently output controls are not uniform. Some routes are adjusted by mono controls that don't match to associated mixer switch, many routes are not covered at all and stereo controls have following variants: - L-to-L & R-to-R - R-to-L & R-to-R - L-to-L & R-to-L This patch attempts to fix these issues. First, for the convenience, only direct L-to-L, R-to-R and [L | R]-to-Mono routes are controlled by the stereo controls. This logic is also used with the output pin mute controls so all of them except mono output are controlled by stereo switches. Then rest of the swapped L-to-R and R-to-L routes are controlled by the mono controls that map to mixer switches with a same name. Mixers can then associate these switches and volumes together. Signed-off-by:
-
Jarkko Nikula authored
It turned out that the output mixers and their routes were misdefined: They are not mixing output pins to internal signals but opposite. This has worked for direct left-to-left and right-to-right routes since for those there are complete routes. For swapped left-to-right and right-to-left routes this is not working since there are no routes defined between them. Another consequence is that those misdefined mixers are incorrectly routed to several output pins leading unnecessary pin powerings even if there is no route active to them. Fix these by reimplementing the output mixers and routes as they are in hardware. For completeness add also a few missing links between internal signals and outputs. Signed-off-by:
-
Jarkko Nikula authored
Each output pin has 7 consecutive control registers in tlv320aic3x register map. First 6 of them control the signal mixing and one is for output level and power control. Sort these registers as they are sorted clearly in hardware, it makes also definitions more readable and easier to pinpoint missing register definitions. Signed-off-by:
-
