---

yaml
---
r: 342690
b: refs/heads/master
c: bac9146
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 242b9bb83e458ddc6205265eafb8770c3dedd009
+refs/heads/master: bac91462e8a8609d7be02a2cbf5c2b406b04ed9f

trunk/arch/arm/mach-at91/at91sam9260_devices.c

@@ -768,6 +768,14 @@ static inline void configure_ssc_pins(unsigned pins)
 		at91_set_A_periph(AT91_PIN_PB21, 1);
 }
 
+static struct platform_device at91sam9260_ssc_dai_device = {
+	.name	= "atmel-ssc-dai",
+	.id	= 0,
+	.dev	= {
+		.parent	= &(at91sam9260_ssc_device.dev),
+	},
+};
+
 /*
  * SSC controllers are accessed through library code, instead of any
  * kind of all-singing/all-dancing driver.  For example one could be
@@ -792,6 +800,7 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins)
 	}
 
 	platform_device_register(pdev);
+	platform_device_register(&at91sam9260_ssc_dai_device);
 }
 
 #else

trunk/arch/arm/mach-at91/board-sam9g20ek.c

@@ -353,6 +353,22 @@ static struct i2c_board_info __initdata ek_i2c_devices[] = {
         },
 };
 
+static struct platform_device sam9g20ek_pcm_device = {
+	.name	= "atmel-pcm-audio",
+	.id = -1,
+};
+
+static struct platform_device sam9g20ek_audio_device = {
+	.name   = "at91sam9g20ek-audio",
+	.id     = -1,
+};
+
+static void __init ek_add_device_audio(void)
+{
+	platform_device_register(&sam9g20ek_pcm_device);
+	platform_device_register(&sam9g20ek_audio_device);
+}
+
 
 static void __init ek_board_init(void)
 {
@@ -394,6 +410,7 @@ static void __init ek_board_init(void)
 	at91_set_B_periph(AT91_PIN_PC1, 0);
 	/* SSC (for WM8731) */
 	at91_add_device_ssc(AT91SAM9260_ID_SSC, ATMEL_SSC_TX);
+	ek_add_device_audio();
 }
 
 MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK")