diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-08-25 11:37:45 -0400 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-09-27 09:46:38 -0400 |
commit | 4697bb926f43b8012ebd111ef43834f42126a0ef (patch) | |
tree | bd913f4f8ea631e50aff81b18cec211f5b7ddc91 /arch/arm/mach-imx/mach-pca100.c | |
parent | 5162de08d116fe7bbb912b17d84169983bfa16a8 (diff) |
ARM: imx: dynamically allocate imx-ssi devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-pca100.c')
-rw-r--r-- | arch/arm/mach-imx/mach-pca100.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c index 23c9e1f37b9c..93e0d66e37dc 100644 --- a/arch/arm/mach-imx/mach-pca100.c +++ b/arch/arm/mach-imx/mach-pca100.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #include <mach/iomux-mx27.h> | 38 | #include <mach/iomux-mx27.h> |
39 | #include <asm/mach/time.h> | 39 | #include <asm/mach/time.h> |
40 | #include <mach/audmux.h> | 40 | #include <mach/audmux.h> |
41 | #include <mach/ssi.h> | ||
42 | #include <mach/mxc_nand.h> | 41 | #include <mach/mxc_nand.h> |
43 | #include <mach/irqs.h> | 42 | #include <mach/irqs.h> |
44 | #include <mach/mmc.h> | 43 | #include <mach/mmc.h> |
@@ -252,7 +251,7 @@ static void pca100_ac97_cold_reset(struct snd_ac97 *ac97) | |||
252 | msleep(2); | 251 | msleep(2); |
253 | } | 252 | } |
254 | 253 | ||
255 | static struct imx_ssi_platform_data pca100_ssi_pdata = { | 254 | static const struct imx_ssi_platform_data pca100_ssi_pdata __initconst = { |
256 | .ac97_reset = pca100_ac97_cold_reset, | 255 | .ac97_reset = pca100_ac97_cold_reset, |
257 | .ac97_warm_reset = pca100_ac97_warm_reset, | 256 | .ac97_warm_reset = pca100_ac97_warm_reset, |
258 | .flags = IMX_SSI_USE_AC97, | 257 | .flags = IMX_SSI_USE_AC97, |
@@ -389,7 +388,7 @@ static void __init pca100_init(void) | |||
389 | if (ret) | 388 | if (ret) |
390 | printk(KERN_ERR "pca100: Failed to setup pins (%d)\n", ret); | 389 | printk(KERN_ERR "pca100: Failed to setup pins (%d)\n", ret); |
391 | 390 | ||
392 | mxc_register_device(&imx_ssi_device0, &pca100_ssi_pdata); | 391 | imx27_add_imx_ssi(0, &pca100_ssi_pdata); |
393 | 392 | ||
394 | imx27_add_imx_uart0(&uart_pdata); | 393 | imx27_add_imx_uart0(&uart_pdata); |
395 | 394 | ||