diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-22 10:09:14 +0200 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-30 09:00:50 +0200 |
| commit | 06606ff1300ecb05a2a2953c9f735730950365f5 (patch) | |
| tree | c34e823648d219d5f6288f68a50804cafe0f13f8 /arch/arm/mach-mx3/mach-mx31lite.c | |
| parent | 7536cf992f395cb431f723041183d14a91d89c84 (diff) | |
ARM: imx: dynamically register spi_imx devices (imx31)
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/mach-mx31lite.c')
| -rw-r--r-- | arch/arm/mach-mx3/mach-mx31lite.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-mx3/mach-mx31lite.c b/arch/arm/mach-mx3/mach-mx31lite.c index f0a68e64e00..634b8559c81 100644 --- a/arch/arm/mach-mx3/mach-mx31lite.c +++ b/arch/arm/mach-mx3/mach-mx31lite.c @@ -41,7 +41,6 @@ #include <mach/imx-uart.h> #include <mach/iomux-mx3.h> #include <mach/irqs.h> -#include <mach/spi.h> #include <mach/mxc_ehci.h> #include <mach/ulpi.h> @@ -109,7 +108,7 @@ static int spi_internal_chipselect[] = { MXC_SPI_CS(0), }; -static struct spi_imx_master spi1_pdata = { +static const struct spi_imx_master spi1_pdata __initconst = { .chipselect = spi_internal_chipselect, .num_chipselect = ARRAY_SIZE(spi_internal_chipselect), }; @@ -252,7 +251,7 @@ static void __init mxc_board_init(void) platform_device_register(&physmap_flash_device); imx31_add_mxc_nand(&mx31lite_nand_board_info); - mxc_register_device(&mxc_spi_device1, &spi1_pdata); + imx31_add_spi_imx1(&spi1_pdata); spi_register_board_info(&mc13783_spi_dev, 1); #if defined(CONFIG_USB_ULPI) |