diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-01 12:48:23 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-01 12:48:23 +1000 |
| commit | 8e49fbd70c5888996be433512ab44666af708a23 (patch) | |
| tree | f7ee567bd8e35a785992c18c80883b5b6570b3d4 /arch/arm/mach-pxa/zylonite.c | |
| parent | a07527daf4b80514fb8b898f073c843187e47f80 (diff) | |
| parent | 135e44aaa47c22b66c8d2acb54da1106a6c17598 (diff) | |
Merge remote branch 'sound-asoc/for-next'
Conflicts:
drivers/video/sh_mobile_hdmi.c
Diffstat (limited to 'arch/arm/mach-pxa/zylonite.c')
| -rw-r--r-- | arch/arm/mach-pxa/zylonite.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c index c479cbecf784..5ba9d99a1bf6 100644 --- a/arch/arm/mach-pxa/zylonite.c +++ b/arch/arm/mach-pxa/zylonite.c @@ -45,6 +45,16 @@ int wm9713_irq; int lcd_id; int lcd_orientation; +struct platform_device pxa_device_wm9713_audio = { + .name = "wm9713-codec", + .id = -1, +}; + +static void __init zylonite_init_wm9713_audio(void) +{ + platform_device_register(&pxa_device_wm9713_audio); +} + static struct resource smc91x_resources[] = { [0] = { .start = ZYLONITE_ETH_PHYS + 0x300, @@ -408,6 +418,7 @@ static void __init zylonite_init(void) zylonite_init_nand(); zylonite_init_leds(); zylonite_init_ohci(); + zylonite_init_wm9713_audio(); } MACHINE_START(ZYLONITE, "PXA3xx Platform Development Kit (aka Zylonite)") |