diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-09-10 10:57:07 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-01 03:32:15 -0400 |
commit | 9f0c11ee67d9a5ab76c27d2f9dbdd9ee85fbce10 (patch) | |
tree | aabb8a4851d52e06ba7fb40e8032e110dd37988b | |
parent | ab5605037c119f1bde0f01786ede16d0ea5dcd8a (diff) |
ARM: mx5: add spi_imx device registration
Acked-by: Jason Wang <jason77.wang@gmail.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | arch/arm/mach-mx5/devices-imx51.h | 8 | ||||
-rw-r--r-- | arch/arm/plat-mxc/devices/platform-spi_imx.c | 12 |
2 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/mach-mx5/devices-imx51.h b/arch/arm/mach-mx5/devices-imx51.h index a3cc3834c9fe..09d2b5c8b4f5 100644 --- a/arch/arm/mach-mx5/devices-imx51.h +++ b/arch/arm/mach-mx5/devices-imx51.h | |||
@@ -12,3 +12,11 @@ | |||
12 | extern const struct imx_imx_i2c_data imx51_imx_i2c_data[] __initconst; | 12 | extern const struct imx_imx_i2c_data imx51_imx_i2c_data[] __initconst; |
13 | #define imx51_add_imx_i2c(id, pdata) \ | 13 | #define imx51_add_imx_i2c(id, pdata) \ |
14 | imx_add_imx_i2c(&imx51_imx_i2c_data[id], pdata) | 14 | imx_add_imx_i2c(&imx51_imx_i2c_data[id], pdata) |
15 | |||
16 | extern const struct imx_spi_imx_data imx51_cspi_data __initconst; | ||
17 | #define imx51_add_cspi(pdata) \ | ||
18 | imx_add_spi_imx(&imx51_cspi_data, pdata) | ||
19 | |||
20 | extern const struct imx_spi_imx_data imx51_ecspi_data[] __initconst; | ||
21 | #define imx51_add_ecspi(id, pdata) \ | ||
22 | imx_add_spi_imx(&imx51_ecspi_data[id], pdata) | ||
diff --git a/arch/arm/plat-mxc/devices/platform-spi_imx.c b/arch/arm/plat-mxc/devices/platform-spi_imx.c index bd30d4b2b2f9..e48340ec331e 100644 --- a/arch/arm/plat-mxc/devices/platform-spi_imx.c +++ b/arch/arm/plat-mxc/devices/platform-spi_imx.c | |||
@@ -68,6 +68,18 @@ const struct imx_spi_imx_data imx35_cspi_data[] __initconst = { | |||
68 | }; | 68 | }; |
69 | #endif /* ifdef CONFIG_ARCH_MX35 */ | 69 | #endif /* ifdef CONFIG_ARCH_MX35 */ |
70 | 70 | ||
71 | #ifdef CONFIG_ARCH_MX51 | ||
72 | const struct imx_spi_imx_data imx51_cspi_data __initconst = | ||
73 | imx_spi_imx_data_entry_single(MX51, CSPI, "imx51-cspi", 0, , SZ_4K); | ||
74 | |||
75 | const struct imx_spi_imx_data imx51_ecspi_data[] __initconst = { | ||
76 | #define imx51_ecspi_data_entry(_id, _hwid) \ | ||
77 | imx_spi_imx_data_entry(MX51, ECSPI, "imx51-ecspi", _id, _hwid, SZ_4K) | ||
78 | imx51_ecspi_data_entry(0, 1), | ||
79 | imx51_ecspi_data_entry(1, 2), | ||
80 | }; | ||
81 | #endif /* ifdef CONFIG_ARCH_MX51 */ | ||
82 | |||
71 | struct platform_device *__init imx_add_spi_imx( | 83 | struct platform_device *__init imx_add_spi_imx( |
72 | const struct imx_spi_imx_data *data, | 84 | const struct imx_spi_imx_data *data, |
73 | const struct spi_imx_master *pdata) | 85 | const struct spi_imx_master *pdata) |