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/plat-mxc | |
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/plat-mxc')
-rw-r--r-- | arch/arm/plat-mxc/devices/Kconfig | 3 | ||||
-rw-r--r-- | arch/arm/plat-mxc/devices/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/plat-mxc/devices/platform-imx-ssi.c | 98 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/devices-common.h | 15 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mx25.h | 9 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mx31.h | 9 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mx35.h | 9 |
7 files changed, 144 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/devices/Kconfig b/arch/arm/plat-mxc/devices/Kconfig index 9ab784b776f9..d736c3d4e292 100644 --- a/arch/arm/plat-mxc/devices/Kconfig +++ b/arch/arm/plat-mxc/devices/Kconfig | |||
@@ -5,6 +5,9 @@ config IMX_HAVE_PLATFORM_FLEXCAN | |||
5 | config IMX_HAVE_PLATFORM_IMX_I2C | 5 | config IMX_HAVE_PLATFORM_IMX_I2C |
6 | bool | 6 | bool |
7 | 7 | ||
8 | config IMX_HAVE_PLATFORM_IMX_SSI | ||
9 | bool | ||
10 | |||
8 | config IMX_HAVE_PLATFORM_IMX_UART | 11 | config IMX_HAVE_PLATFORM_IMX_UART |
9 | bool | 12 | bool |
10 | 13 | ||
diff --git a/arch/arm/plat-mxc/devices/Makefile b/arch/arm/plat-mxc/devices/Makefile index 2062ab4d094d..ac7738379374 100644 --- a/arch/arm/plat-mxc/devices/Makefile +++ b/arch/arm/plat-mxc/devices/Makefile | |||
@@ -1,5 +1,6 @@ | |||
1 | obj-$(CONFIG_IMX_HAVE_PLATFORM_FLEXCAN) += platform-flexcan.o | 1 | obj-$(CONFIG_IMX_HAVE_PLATFORM_FLEXCAN) += platform-flexcan.o |
2 | obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_I2C) += platform-imx-i2c.o | 2 | obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_I2C) += platform-imx-i2c.o |
3 | obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_SSI) += platform-imx-ssi.o | ||
3 | obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UART) += platform-imx-uart.o | 4 | obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UART) += platform-imx-uart.o |
4 | obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_NAND) += platform-mxc_nand.o | 5 | obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_NAND) += platform-mxc_nand.o |
5 | obj-$(CONFIG_IMX_HAVE_PLATFORM_SPI_IMX) += platform-spi_imx.o | 6 | obj-$(CONFIG_IMX_HAVE_PLATFORM_SPI_IMX) += platform-spi_imx.o |
diff --git a/arch/arm/plat-mxc/devices/platform-imx-ssi.c b/arch/arm/plat-mxc/devices/platform-imx-ssi.c new file mode 100644 index 000000000000..1535bc9f0601 --- /dev/null +++ b/arch/arm/plat-mxc/devices/platform-imx-ssi.c | |||
@@ -0,0 +1,98 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2010 Pengutronix | ||
3 | * Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de> | ||
4 | * | ||
5 | * This program is free software; you can redistribute it and/or modify it under | ||
6 | * the terms of the GNU General Public License version 2 as published by the | ||
7 | * Free Software Foundation. | ||
8 | */ | ||
9 | #include <mach/hardware.h> | ||
10 | #include <mach/devices-common.h> | ||
11 | |||
12 | #define imx_imx_ssi_data_entry(soc, _id, _hwid, _size) \ | ||
13 | [_id] = { \ | ||
14 | .id = _id, \ | ||
15 | .iobase = soc ## _SSI ## _hwid ## _BASE_ADDR, \ | ||
16 | .iosize = _size, \ | ||
17 | .irq = soc ## _INT_SSI ## _hwid, \ | ||
18 | .dmatx0 = soc ## _DMA_REQ_SSI ## _hwid ## _TX0, \ | ||
19 | .dmarx0 = soc ## _DMA_REQ_SSI ## _hwid ## _RX0, \ | ||
20 | .dmatx1 = soc ## _DMA_REQ_SSI ## _hwid ## _TX1, \ | ||
21 | .dmarx1 = soc ## _DMA_REQ_SSI ## _hwid ## _RX1, \ | ||
22 | } | ||
23 | |||
24 | #ifdef CONFIG_SOC_IMX21 | ||
25 | const struct imx_imx_ssi_data imx21_imx_ssi_data[] __initconst = { | ||
26 | #define imx21_imx_ssi_data_entry(_id, _hwid) \ | ||
27 | imx_imx_ssi_data_entry(MX21, _id, _hwid, SZ_4K) | ||
28 | imx21_imx_ssi_data_entry(0, 1), | ||
29 | imx21_imx_ssi_data_entry(1, 2), | ||
30 | }; | ||
31 | #endif /* ifdef CONFIG_SOC_IMX21 */ | ||
32 | |||
33 | #ifdef CONFIG_ARCH_MX25 | ||
34 | const struct imx_imx_ssi_data imx25_imx_ssi_data[] __initconst = { | ||
35 | #define imx25_imx_ssi_data_entry(_id, _hwid) \ | ||
36 | imx_imx_ssi_data_entry(MX25, _id, _hwid, SZ_4K) | ||
37 | imx25_imx_ssi_data_entry(0, 1), | ||
38 | imx25_imx_ssi_data_entry(1, 2), | ||
39 | }; | ||
40 | #endif /* ifdef CONFIG_ARCH_MX25 */ | ||
41 | |||
42 | #ifdef CONFIG_SOC_IMX27 | ||
43 | const struct imx_imx_ssi_data imx27_imx_ssi_data[] __initconst = { | ||
44 | #define imx27_imx_ssi_data_entry(_id, _hwid) \ | ||
45 | imx_imx_ssi_data_entry(MX27, _id, _hwid, SZ_4K) | ||
46 | imx27_imx_ssi_data_entry(0, 1), | ||
47 | imx27_imx_ssi_data_entry(1, 2), | ||
48 | }; | ||
49 | #endif /* ifdef CONFIG_SOC_IMX27 */ | ||
50 | |||
51 | #ifdef CONFIG_ARCH_MX31 | ||
52 | const struct imx_imx_ssi_data imx31_imx_ssi_data[] __initconst = { | ||
53 | #define imx31_imx_ssi_data_entry(_id, _hwid) \ | ||
54 | imx_imx_ssi_data_entry(MX31, _id, _hwid, SZ_4K) | ||
55 | imx31_imx_ssi_data_entry(0, 1), | ||
56 | imx31_imx_ssi_data_entry(1, 2), | ||
57 | }; | ||
58 | #endif /* ifdef CONFIG_ARCH_MX31 */ | ||
59 | |||
60 | #ifdef CONFIG_ARCH_MX35 | ||
61 | const struct imx_imx_ssi_data imx35_imx_ssi_data[] __initconst = { | ||
62 | #define imx35_imx_ssi_data_entry(_id, _hwid) \ | ||
63 | imx_imx_ssi_data_entry(MX35, _id, _hwid, SZ_4K) | ||
64 | imx35_imx_ssi_data_entry(0, 1), | ||
65 | imx35_imx_ssi_data_entry(1, 2), | ||
66 | }; | ||
67 | #endif /* ifdef CONFIG_ARCH_MX35 */ | ||
68 | |||
69 | struct platform_device *__init imx_add_imx_ssi( | ||
70 | const struct imx_imx_ssi_data *data, | ||
71 | const struct imx_ssi_platform_data *pdata) | ||
72 | { | ||
73 | struct resource res[] = { | ||
74 | { | ||
75 | .start = data->iobase, | ||
76 | .end = data->iobase + data->iosize - 1, | ||
77 | .flags = IORESOURCE_MEM, | ||
78 | }, { | ||
79 | .start = data->irq, | ||
80 | .end = data->irq, | ||
81 | .flags = IORESOURCE_IRQ, | ||
82 | }, | ||
83 | #define DMARES(_name) { \ | ||
84 | .name = #_name, \ | ||
85 | .start = data->dma ## _name, \ | ||
86 | .end = data->dma ## _name, \ | ||
87 | .flags = IORESOURCE_DMA, \ | ||
88 | } | ||
89 | DMARES(tx0), | ||
90 | DMARES(rx0), | ||
91 | DMARES(tx1), | ||
92 | DMARES(rx1), | ||
93 | }; | ||
94 | |||
95 | return imx_add_platform_device("imx-ssi", data->id, | ||
96 | res, ARRAY_SIZE(res), | ||
97 | pdata, sizeof(*pdata)); | ||
98 | } | ||
diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h index 12bdc7d027c7..84bfe44ec2cd 100644 --- a/arch/arm/plat-mxc/include/mach/devices-common.h +++ b/arch/arm/plat-mxc/include/mach/devices-common.h | |||
@@ -25,6 +25,21 @@ struct platform_device *__init imx_add_imx_i2c(int id, | |||
25 | resource_size_t iobase, resource_size_t iosize, int irq, | 25 | resource_size_t iobase, resource_size_t iosize, int irq, |
26 | const struct imxi2c_platform_data *pdata); | 26 | const struct imxi2c_platform_data *pdata); |
27 | 27 | ||
28 | #include <mach/ssi.h> | ||
29 | struct imx_imx_ssi_data { | ||
30 | int id; | ||
31 | resource_size_t iobase; | ||
32 | resource_size_t iosize; | ||
33 | resource_size_t irq; | ||
34 | resource_size_t dmatx0; | ||
35 | resource_size_t dmarx0; | ||
36 | resource_size_t dmatx1; | ||
37 | resource_size_t dmarx1; | ||
38 | }; | ||
39 | struct platform_device *__init imx_add_imx_ssi( | ||
40 | const struct imx_imx_ssi_data *data, | ||
41 | const struct imx_ssi_platform_data *pdata); | ||
42 | |||
28 | #include <mach/imx-uart.h> | 43 | #include <mach/imx-uart.h> |
29 | struct imx_imx_uart_3irq_data { | 44 | struct imx_imx_uart_3irq_data { |
30 | int id; | 45 | int id; |
diff --git a/arch/arm/plat-mxc/include/mach/mx25.h b/arch/arm/plat-mxc/include/mach/mx25.h index 4a6f800990f8..8f809eb084df 100644 --- a/arch/arm/plat-mxc/include/mach/mx25.h +++ b/arch/arm/plat-mxc/include/mach/mx25.h | |||
@@ -77,4 +77,13 @@ | |||
77 | #define MX25_INT_UART1 45 | 77 | #define MX25_INT_UART1 45 |
78 | #define MX25_INT_FEC 57 | 78 | #define MX25_INT_FEC 57 |
79 | 79 | ||
80 | #define MX25_DMA_REQ_SSI2_RX1 22 | ||
81 | #define MX25_DMA_REQ_SSI2_TX1 23 | ||
82 | #define MX25_DMA_REQ_SSI2_RX0 24 | ||
83 | #define MX25_DMA_REQ_SSI2_TX0 25 | ||
84 | #define MX25_DMA_REQ_SSI1_RX1 26 | ||
85 | #define MX25_DMA_REQ_SSI1_TX1 27 | ||
86 | #define MX25_DMA_REQ_SSI1_RX0 28 | ||
87 | #define MX25_DMA_REQ_SSI1_TX0 29 | ||
88 | |||
80 | #endif /* ifndef __MACH_MX25_H__ */ | 89 | #endif /* ifndef __MACH_MX25_H__ */ |
diff --git a/arch/arm/plat-mxc/include/mach/mx31.h b/arch/arm/plat-mxc/include/mach/mx31.h index afee3ab9d62e..eb8bbc7eedfa 100644 --- a/arch/arm/plat-mxc/include/mach/mx31.h +++ b/arch/arm/plat-mxc/include/mach/mx31.h | |||
@@ -197,6 +197,15 @@ static inline void mx31_setup_weimcs(size_t cs, | |||
197 | #define MX31_INT_EXT_WDOG 62 | 197 | #define MX31_INT_EXT_WDOG 62 |
198 | #define MX31_INT_EXT_TV 63 | 198 | #define MX31_INT_EXT_TV 63 |
199 | 199 | ||
200 | #define MX31_DMA_REQ_SSI2_RX1 22 | ||
201 | #define MX31_DMA_REQ_SSI2_TX1 23 | ||
202 | #define MX31_DMA_REQ_SSI2_RX0 24 | ||
203 | #define MX31_DMA_REQ_SSI2_TX0 25 | ||
204 | #define MX31_DMA_REQ_SSI1_RX1 26 | ||
205 | #define MX31_DMA_REQ_SSI1_TX1 27 | ||
206 | #define MX31_DMA_REQ_SSI1_RX0 28 | ||
207 | #define MX31_DMA_REQ_SSI1_TX0 29 | ||
208 | |||
200 | #define MX31_PROD_SIGNATURE 0x1 /* For MX31 */ | 209 | #define MX31_PROD_SIGNATURE 0x1 /* For MX31 */ |
201 | 210 | ||
202 | /* silicon revisions specific to i.MX31 */ | 211 | /* silicon revisions specific to i.MX31 */ |
diff --git a/arch/arm/plat-mxc/include/mach/mx35.h b/arch/arm/plat-mxc/include/mach/mx35.h index af3038c12e39..867b8c0ca105 100644 --- a/arch/arm/plat-mxc/include/mach/mx35.h +++ b/arch/arm/plat-mxc/include/mach/mx35.h | |||
@@ -173,6 +173,15 @@ | |||
173 | #define MX35_INT_EXT_WDOG 62 | 173 | #define MX35_INT_EXT_WDOG 62 |
174 | #define MX35_INT_EXT_TV 63 | 174 | #define MX35_INT_EXT_TV 63 |
175 | 175 | ||
176 | #define MX35_DMA_REQ_SSI2_RX1 22 | ||
177 | #define MX35_DMA_REQ_SSI2_TX1 23 | ||
178 | #define MX35_DMA_REQ_SSI2_RX0 24 | ||
179 | #define MX35_DMA_REQ_SSI2_TX0 25 | ||
180 | #define MX35_DMA_REQ_SSI1_RX1 26 | ||
181 | #define MX35_DMA_REQ_SSI1_TX1 27 | ||
182 | #define MX35_DMA_REQ_SSI1_RX0 28 | ||
183 | #define MX35_DMA_REQ_SSI1_TX0 29 | ||
184 | |||
176 | #define MX35_PROD_SIGNATURE 0x1 /* For MX31 */ | 185 | #define MX35_PROD_SIGNATURE 0x1 /* For MX31 */ |
177 | 186 | ||
178 | /* silicon revisions specific to i.MX31 */ | 187 | /* silicon revisions specific to i.MX31 */ |