On Thu, Apr 25, 2013 at 11:50:30AM +0800, Shawn Guo wrote:
On Wed, Apr 24, 2013 at 04:36:36PM +0200, Markus Pargmann wrote:
+/*
- Pointer to AC97 reset functions for specific boards
- */
+#if IS_ENABLED(CONFIG_MACH_PCA100) +extern void pca100_ac97_cold_reset(struct snd_ac97 *ac97); +extern void pca100_ac97_warm_reset(struct snd_ac97 *ac97); +#else +void pca100_ac97_cold_reset(struct snd_ac97 *ac97) { } +void pca100_ac97_warm_reset(struct snd_ac97 *ac97) { } +#endif
+#if IS_ENABLED(CONFIG_MACH_PCM043) +extern void pcm043_ac97_cold_reset(struct snd_ac97 *ac97); +extern void pcm043_ac97_warm_reset(struct snd_ac97 *ac97); +#else +void pcm043_ac97_cold_reset(struct snd_ac97 *ac97) { } +void pcm043_ac97_warm_reset(struct snd_ac97 *ac97) { } +#endif
...
@@ -717,13 +956,39 @@ static int fsl_ssi_probe(struct platform_device *pdev)
strcpy(ssi_private->name, p);
- /* Initialize this copy of the CPU DAI driver structure */
- memcpy(&ssi_private->cpu_dai_drv, &fsl_ssi_dai_template,
sizeof(fsl_ssi_dai_template));- ssi_private->cpu_dai_drv.name = ssi_private->name;
- ssi_private->use_dma = !of_property_read_bool(np, "fsl,imx-fiq");
- if (ac97) {
sprop = of_get_property(of_find_node_by_path("/"), "compatible",NULL);p = strrchr(sprop, ',');if (p)sprop = p + 1;if (!strcmp(sprop, "imx27-pca100")) {ssi_private->ac97_reset = pca100_ac97_cold_reset;ssi_private->ac97_warm_reset = pca100_ac97_warm_reset;} else if (!strcmp(sprop, "imx27-pcm043")) {ssi_private->ac97_reset = pcm043_ac97_cold_reset;ssi_private->ac97_warm_reset = pcm043_ac97_warm_reset;} else {dev_err(&pdev->dev, "Failed to enable ssi AC97 mode, unknown board.\n");ret = -EINVAL;goto error_kmalloc;}I do not like these board specific hooks show up in an IP driver in such way. Can we work it out in other ways, notification or even platform_data with auxdata?
soc_ac97_ops is a global symbol, so we could setup soc_ac97_ops.reset and warm_reset in board specific ac97 drivers. For this patch I would move the assignment of reset functions to phycore-ac97.c which already is specifically for this codec-ssi combination on the two boards.
Regards,
Markus