diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-09-22 09:56:12 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-09-22 09:56:12 +0200 |
commit | af1910a817c5ad52c32dddacc1744cfa1b35889e (patch) | |
tree | 2d6504a2ac5971bb84e0172bbdd309b781048849 /arch/arm/mach-ep93xx/simone.c | |
parent | 5495ffbd7b56d8bffebc5e30f03ea374590f1bb4 (diff) | |
parent | f648de832dbf6d1947ce5a7c0ed24a3a71d8545b (diff) |
Merge branch 'topic/asoc' into topic/remove-irqf_disable
Diffstat (limited to 'arch/arm/mach-ep93xx/simone.c')
-rw-r--r-- | arch/arm/mach-ep93xx/simone.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c index 8392e95d7ce..1445ce568ca 100644 --- a/arch/arm/mach-ep93xx/simone.c +++ b/arch/arm/mach-ep93xx/simone.c @@ -53,6 +53,17 @@ static struct i2c_board_info __initdata simone_i2c_board_info[] = { }, }; +static struct platform_device simone_audio_device = { + .name = "simone-audio", + .id = -1, +}; + +static void __init simone_register_audio(void) +{ + ep93xx_register_ac97(); + platform_device_register(&simone_audio_device); +} + static void __init simone_init_machine(void) { ep93xx_init_devices(); @@ -61,7 +72,7 @@ static void __init simone_init_machine(void) ep93xx_register_fb(&simone_fb_info); ep93xx_register_i2c(&simone_i2c_gpio_data, simone_i2c_board_info, ARRAY_SIZE(simone_i2c_board_info)); - ep93xx_register_ac97(); + simone_register_audio(); } MACHINE_START(SIM_ONE, "Simplemachines Sim.One Board") |