diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-03-18 18:22:37 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-03-18 18:22:37 +0100 |
| commit | cb3f2adc03ab055b19c677a6283523861fafebdd (patch) | |
| tree | 59cfb6800f0635a4aec16c8e0da619f27e51ee79 /arch/arm/mach-imx/mm-imx27.c | |
| parent | 44c76a960a62fcc46cbcaa0a22a34e666a729329 (diff) | |
| parent | 828006de1bddf83b6ecf03ec459c15f7c7c22db7 (diff) | |
| download | op-kernel-dev-cb3f2adc03ab055b19c677a6283523861fafebdd.zip op-kernel-dev-cb3f2adc03ab055b19c677a6283523861fafebdd.tar.gz | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'arch/arm/mach-imx/mm-imx27.c')
| -rw-r--r-- | arch/arm/mach-imx/mm-imx27.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mm-imx27.c b/arch/arm/mach-imx/mm-imx27.c index 96dd1f5..8cb3f5e 100644 --- a/arch/arm/mach-imx/mm-imx27.c +++ b/arch/arm/mach-imx/mm-imx27.c @@ -75,6 +75,10 @@ void __init mx27_init_irq(void) mxc_init_irq(MX27_IO_ADDRESS(MX27_AVIC_BASE_ADDR)); } +static const struct resource imx27_audmux_res[] __initconst = { + DEFINE_RES_MEM(MX27_AUDMUX_BASE_ADDR, SZ_4K), +}; + void __init imx27_soc_init(void) { /* i.mx27 has the i.mx21 type gpio */ @@ -86,4 +90,7 @@ void __init imx27_soc_init(void) mxc_register_gpio("imx21-gpio", 5, MX27_GPIO6_BASE_ADDR, SZ_256, MX27_INT_GPIO, 0); imx_add_imx_dma(); + /* imx27 has the imx21 type audmux */ + platform_device_register_simple("imx21-audmux", 0, imx27_audmux_res, + ARRAY_SIZE(imx27_audmux_res)); } |
