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-mx31_3ds.c | |
parent | ARM: imx: dynamically register spi_imx devices (imx27) (diff) | |
download | linux-dev-06606ff1300ecb05a2a2953c9f735730950365f5.tar.xz linux-dev-06606ff1300ecb05a2a2953c9f735730950365f5.zip |
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-mx31_3ds.c')
-rw-r--r-- | arch/arm/mach-mx3/mach-mx31_3ds.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-mx3/mach-mx31_3ds.c b/arch/arm/mach-mx3/mach-mx31_3ds.c index c730c090208a..2aa3e581e840 100644 --- a/arch/arm/mach-mx3/mach-mx31_3ds.c +++ b/arch/arm/mach-mx3/mach-mx31_3ds.c @@ -35,7 +35,6 @@ #include <mach/common.h> #include <mach/imx-uart.h> #include <mach/iomux-mx3.h> -#include <mach/spi.h> #include "devices-imx31.h" #include "devices.h" @@ -170,7 +169,7 @@ static int spi1_internal_chipselect[] = { MXC_SPI_CS(2), }; -static struct spi_imx_master spi1_pdata = { +static const struct spi_imx_master spi1_pdata __initconst = { .chipselect = spi1_internal_chipselect, .num_chipselect = ARRAY_SIZE(spi1_internal_chipselect), }; @@ -419,7 +418,7 @@ static void __init mxc_board_init(void) mxc_register_device(&mxc_uart_device0, &uart_pdata); imx31_add_mxc_nand(&mx31_3ds_nand_board_info); - mxc_register_device(&mxc_spi_device1, &spi1_pdata); + imx31_add_spi_imx0(&spi1_pdata); spi_register_board_info(mx31_3ds_spi_devs, ARRAY_SIZE(mx31_3ds_spi_devs)); |