On Fri, Nov 01, 2013 at 03:04:53PM +0800, Xiubo Li wrote: > Conflicts: > sound/soc/fsl/Makefile Ahem. > + /* TODO: The SAI driver should figure this out for us */ > + switch (channels) { > + case 2: > + snd_soc_dai_set_tdm_slot(cpu_dai, 0xfffffffc, 0xfffffffc, 2, 0); > + break; > + case 1: > + snd_soc_dai_set_tdm_slot(cpu_dai, 0xfffffffe, 0xfffffffe, 1, 0); > + break; > + default: > + return -EINVAL; > + } Yes, it should - this code should probably just be copied straight into the SAI driver. If we need to support other configurations we can do that later. > +static int fsl_sgtl5000_remove(struct platform_device *pdev) > +{ > + snd_soc_unregister_card(&fsl_sgt1500_card); > + > + return 0; > +} You're using snd_soc_unregister_card() so you don't need to do this.
Attachment:
signature.asc
Description: Digital signature