Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo...

[linux-drm-fsl-dcu.git] / arch / blackfin / mach-bf537 / boards / stamp.c

diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 5ed654ae66e14930399982a7b1310fa53cf58629..95114ed395ac6939d6a82551c289de52fa943edf 100644 (file)
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -1525,7 +1525,7 @@ static struct platform_device bfin_sport_spi1_device = {
 
 #if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE)
 static struct platform_device bfin_fb_device = {
-       .name = "bf537-lq035",
+       .name = "bf537_lq035",
 };
 #endif
 
@@ -2641,6 +2641,21 @@ static struct platform_device bfin_ac97_pcm = {
 };
 #endif
 
+#if defined(CONFIG_SND_BF5XX_SOC_AD1836) \
+               || defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)
+static const char * const ad1836_link[] = {
+       "bfin-tdm.0",
+       "spi0.4",
+};
+static struct platform_device bfin_ad1836_machine = {
+       .name = "bfin-snd-ad1836",
+       .id = -1,
+       .dev = {
+               .platform_data = (void *)ad1836_link,
+       },
+};
+#endif
+
 #if defined(CONFIG_SND_BF5XX_SOC_AD73311) || \
                                defined(CONFIG_SND_BF5XX_SOC_AD73311_MODULE)
 static const unsigned ad73311_gpio[] = {
@@ -2927,6 +2942,11 @@ static struct platform_device *stamp_devices[] __initdata = {
        &bfin_ac97_pcm,
 #endif
 
+#if defined(CONFIG_SND_BF5XX_SOC_AD1836) || \
+       defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)
+       &bfin_ad1836_machine,
+#endif
+
 #if defined(CONFIG_SND_BF5XX_SOC_AD73311) || \
                defined(CONFIG_SND_BF5XX_SOC_AD73311_MODULE)
        &bfin_ad73311_machine,