diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-10 08:53:29 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-10 08:53:29 -0500 |
| commit | 3afdb0f3528991de0833224f2dba60dc061e01fa (patch) | |
| tree | 0d9c7529c6cc2b41f0df778cc396edd74699721a /arch/arm/plat-mxc/devices/platform-spi_imx.c | |
| parent | 71d8c5b11e3b5936ae6c2e0b1dd6f5c78b305b65 (diff) | |
| parent | f7fdaca910e6bc13659ecdffc28c97938b752e01 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/plat-mxc/devices/platform-spi_imx.c')
| -rw-r--r-- | arch/arm/plat-mxc/devices/platform-spi_imx.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/devices/platform-spi_imx.c b/arch/arm/plat-mxc/devices/platform-spi_imx.c index 013c85f20b5..f4a60ab6763 100644 --- a/arch/arm/plat-mxc/devices/platform-spi_imx.c +++ b/arch/arm/plat-mxc/devices/platform-spi_imx.c | |||
| @@ -21,6 +21,15 @@ | |||
| 21 | #define imx_spi_imx_data_entry(soc, type, devid, id, hwid, size) \ | 21 | #define imx_spi_imx_data_entry(soc, type, devid, id, hwid, size) \ |
| 22 | [id] = imx_spi_imx_data_entry_single(soc, type, devid, id, hwid, size) | 22 | [id] = imx_spi_imx_data_entry_single(soc, type, devid, id, hwid, size) |
| 23 | 23 | ||
| 24 | #ifdef CONFIG_SOC_IMX1 | ||
| 25 | const struct imx_spi_imx_data imx1_cspi_data[] __initconst = { | ||
| 26 | #define imx1_cspi_data_entry(_id, _hwid) \ | ||
| 27 | imx_spi_imx_data_entry(MX1, CSPI, "imx1-cspi", _id, _hwid, SZ_4K) | ||
| 28 | imx1_cspi_data_entry(0, 1), | ||
| 29 | imx1_cspi_data_entry(1, 2), | ||
| 30 | }; | ||
| 31 | #endif | ||
| 32 | |||
| 24 | #ifdef CONFIG_SOC_IMX21 | 33 | #ifdef CONFIG_SOC_IMX21 |
| 25 | const struct imx_spi_imx_data imx21_cspi_data[] __initconst = { | 34 | const struct imx_spi_imx_data imx21_cspi_data[] __initconst = { |
| 26 | #define imx21_cspi_data_entry(_id, _hwid) \ | 35 | #define imx21_cspi_data_entry(_id, _hwid) \ |