diff options
author | Steven King <sfking@fdwdc.com> | 2010-01-22 15:43:03 -0500 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2010-05-16 21:04:19 -0400 |
commit | 91d60417212fa6b100107384c5e4f5663ab69c8f (patch) | |
tree | 2e751a2df6a8e873b46d800d430d9cf617b9d399 | |
parent | e40152ee1e1c7a63f4777791863215e3faa37a86 (diff) |
m68knommu: Coldfire QSPI platform support
Since Grant has added the coldfire-qspi driver to next-spi, here is the
platform support for the parts that have qspi hardware. This sets up
gpio to do the spi chip select using the default chip select pins; it should
be trivial for boards that require different or additional spi chip selects to
use other gpios as needed.
Signed-off-by: Steven King <sfking@fdwdc.com>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
-rw-r--r-- | arch/m68k/include/asm/m520xsim.h | 1 | ||||
-rw-r--r-- | arch/m68k/include/asm/m523xsim.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/m5249sim.h | 2 | ||||
-rw-r--r-- | arch/m68k/include/asm/m527xsim.h | 7 | ||||
-rw-r--r-- | arch/m68k/include/asm/m528xsim.h | 67 | ||||
-rw-r--r-- | arch/m68k/include/asm/m532xsim.h | 1 | ||||
-rw-r--r-- | arch/m68k/include/asm/mcfqspi.h | 64 | ||||
-rw-r--r-- | arch/m68knommu/platform/520x/config.c | 149 | ||||
-rw-r--r-- | arch/m68knommu/platform/523x/config.c | 170 | ||||
-rw-r--r-- | arch/m68knommu/platform/5249/config.c | 167 | ||||
-rw-r--r-- | arch/m68knommu/platform/527x/config.c | 182 | ||||
-rw-r--r-- | arch/m68knommu/platform/528x/config.c | 137 | ||||
-rw-r--r-- | arch/m68knommu/platform/532x/config.c | 124 |
13 files changed, 1010 insertions, 66 deletions
diff --git a/arch/m68k/include/asm/m520xsim.h b/arch/m68k/include/asm/m520xsim.h index ed2b69b96805..db824a4b136e 100644 --- a/arch/m68k/include/asm/m520xsim.h +++ b/arch/m68k/include/asm/m520xsim.h | |||
@@ -113,6 +113,7 @@ | |||
113 | 113 | ||
114 | #define MCF_GPIO_PAR_UART (0xA4036) | 114 | #define MCF_GPIO_PAR_UART (0xA4036) |
115 | #define MCF_GPIO_PAR_FECI2C (0xA4033) | 115 | #define MCF_GPIO_PAR_FECI2C (0xA4033) |
116 | #define MCF_GPIO_PAR_QSPI (0xA4034) | ||
116 | #define MCF_GPIO_PAR_FEC (0xA4038) | 117 | #define MCF_GPIO_PAR_FEC (0xA4038) |
117 | 118 | ||
118 | #define MCF_GPIO_PAR_UART_PAR_URXD0 (0x0001) | 119 | #define MCF_GPIO_PAR_UART_PAR_URXD0 (0x0001) |
diff --git a/arch/m68k/include/asm/m523xsim.h b/arch/m68k/include/asm/m523xsim.h index a34894cf8e6f..e8d06b24a48e 100644 --- a/arch/m68k/include/asm/m523xsim.h +++ b/arch/m68k/include/asm/m523xsim.h | |||
@@ -127,5 +127,10 @@ | |||
127 | #define MCFGPIO_IRQ_MAX 8 | 127 | #define MCFGPIO_IRQ_MAX 8 |
128 | #define MCFGPIO_IRQ_VECBASE MCFINT_VECBASE | 128 | #define MCFGPIO_IRQ_VECBASE MCFINT_VECBASE |
129 | 129 | ||
130 | /* | ||
131 | * Pin Assignment | ||
132 | */ | ||
133 | #define MCFGPIO_PAR_QSPI (MCF_IPSBAR + 0x10004A) | ||
134 | #define MCFGPIO_PAR_TIMER (MCF_IPSBAR + 0x10004C) | ||
130 | /****************************************************************************/ | 135 | /****************************************************************************/ |
131 | #endif /* m523xsim_h */ | 136 | #endif /* m523xsim_h */ |
diff --git a/arch/m68k/include/asm/m5249sim.h b/arch/m68k/include/asm/m5249sim.h index 14bce877ed88..79b7b402f3c9 100644 --- a/arch/m68k/include/asm/m5249sim.h +++ b/arch/m68k/include/asm/m5249sim.h | |||
@@ -69,10 +69,12 @@ | |||
69 | #define MCFSIM_DMA1ICR MCFSIM_ICR7 /* DMA 1 ICR */ | 69 | #define MCFSIM_DMA1ICR MCFSIM_ICR7 /* DMA 1 ICR */ |
70 | #define MCFSIM_DMA2ICR MCFSIM_ICR8 /* DMA 2 ICR */ | 70 | #define MCFSIM_DMA2ICR MCFSIM_ICR8 /* DMA 2 ICR */ |
71 | #define MCFSIM_DMA3ICR MCFSIM_ICR9 /* DMA 3 ICR */ | 71 | #define MCFSIM_DMA3ICR MCFSIM_ICR9 /* DMA 3 ICR */ |
72 | #define MCFSIM_QSPIICR MCFSIM_ICR10 /* QSPI ICR */ | ||
72 | 73 | ||
73 | /* | 74 | /* |
74 | * Define system peripheral IRQ usage. | 75 | * Define system peripheral IRQ usage. |
75 | */ | 76 | */ |
77 | #define MCF_IRQ_QSPI 28 /* QSPI, Level 4 */ | ||
76 | #define MCF_IRQ_TIMER 30 /* Timer0, Level 6 */ | 78 | #define MCF_IRQ_TIMER 30 /* Timer0, Level 6 */ |
77 | #define MCF_IRQ_PROFILER 31 /* Timer1, Level 7 */ | 79 | #define MCF_IRQ_PROFILER 31 /* Timer1, Level 7 */ |
78 | 80 | ||
diff --git a/arch/m68k/include/asm/m527xsim.h b/arch/m68k/include/asm/m527xsim.h index 453356d72d80..1feb46f108ce 100644 --- a/arch/m68k/include/asm/m527xsim.h +++ b/arch/m68k/include/asm/m527xsim.h | |||
@@ -31,6 +31,7 @@ | |||
31 | #define MCFINT_UART0 13 /* Interrupt number for UART0 */ | 31 | #define MCFINT_UART0 13 /* Interrupt number for UART0 */ |
32 | #define MCFINT_UART1 14 /* Interrupt number for UART1 */ | 32 | #define MCFINT_UART1 14 /* Interrupt number for UART1 */ |
33 | #define MCFINT_UART2 15 /* Interrupt number for UART2 */ | 33 | #define MCFINT_UART2 15 /* Interrupt number for UART2 */ |
34 | #define MCFINT_QSPI 18 /* Interrupt number for QSPI */ | ||
34 | #define MCFINT_PIT1 36 /* Interrupt number for PIT1 */ | 35 | #define MCFINT_PIT1 36 /* Interrupt number for PIT1 */ |
35 | 36 | ||
36 | /* | 37 | /* |
@@ -120,6 +121,9 @@ | |||
120 | #define MCFGPIO_PIN_MAX 100 | 121 | #define MCFGPIO_PIN_MAX 100 |
121 | #define MCFGPIO_IRQ_MAX 8 | 122 | #define MCFGPIO_IRQ_MAX 8 |
122 | #define MCFGPIO_IRQ_VECBASE MCFINT_VECBASE | 123 | #define MCFGPIO_IRQ_VECBASE MCFINT_VECBASE |
124 | |||
125 | #define MCFGPIO_PAR_QSPI (MCF_IPSBAR + 0x10004A) | ||
126 | #define MCFGPIO_PAR_TIMER (MCF_IPSBAR + 0x10004C) | ||
123 | #endif | 127 | #endif |
124 | 128 | ||
125 | #ifdef CONFIG_M5275 | 129 | #ifdef CONFIG_M5275 |
@@ -212,6 +216,8 @@ | |||
212 | #define MCFGPIO_PIN_MAX 148 | 216 | #define MCFGPIO_PIN_MAX 148 |
213 | #define MCFGPIO_IRQ_MAX 8 | 217 | #define MCFGPIO_IRQ_MAX 8 |
214 | #define MCFGPIO_IRQ_VECBASE MCFINT_VECBASE | 218 | #define MCFGPIO_IRQ_VECBASE MCFINT_VECBASE |
219 | |||
220 | #define MCFGPIO_PAR_QSPI (MCF_IPSBAR + 0x10007E) | ||
215 | #endif | 221 | #endif |
216 | 222 | ||
217 | /* | 223 | /* |
@@ -223,6 +229,7 @@ | |||
223 | #define MCFEPORT_EPPDR (MCF_IPSBAR + 0x130005) | 229 | #define MCFEPORT_EPPDR (MCF_IPSBAR + 0x130005) |
224 | 230 | ||
225 | 231 | ||
232 | |||
226 | /* | 233 | /* |
227 | * GPIO pins setups to enable the UARTs. | 234 | * GPIO pins setups to enable the UARTs. |
228 | */ | 235 | */ |
diff --git a/arch/m68k/include/asm/m528xsim.h b/arch/m68k/include/asm/m528xsim.h index e2ad1f42b657..891cbedad972 100644 --- a/arch/m68k/include/asm/m528xsim.h +++ b/arch/m68k/include/asm/m528xsim.h | |||
@@ -29,6 +29,7 @@ | |||
29 | 29 | ||
30 | #define MCFINT_VECBASE 64 /* Vector base number */ | 30 | #define MCFINT_VECBASE 64 /* Vector base number */ |
31 | #define MCFINT_UART0 13 /* Interrupt number for UART0 */ | 31 | #define MCFINT_UART0 13 /* Interrupt number for UART0 */ |
32 | #define MCFINT_QSPI 18 /* Interrupt number for QSPI */ | ||
32 | #define MCFINT_PIT1 55 /* Interrupt number for PIT1 */ | 33 | #define MCFINT_PIT1 55 /* Interrupt number for PIT1 */ |
33 | 34 | ||
34 | /* | 35 | /* |
@@ -249,70 +250,4 @@ | |||
249 | #define MCF5282_I2C_I2SR_RXAK (0x01) // received acknowledge | 250 | #define MCF5282_I2C_I2SR_RXAK (0x01) // received acknowledge |
250 | 251 | ||
251 | 252 | ||
252 | |||
253 | /********************************************************************* | ||
254 | * | ||
255 | * Queued Serial Peripheral Interface (QSPI) Module | ||
256 | * | ||
257 | *********************************************************************/ | ||
258 | /* Derek - 21 Feb 2005 */ | ||
259 | /* change to the format used in I2C */ | ||
260 | /* Read/Write access macros for general use */ | ||
261 | #define MCF5282_QSPI_QMR MCF_IPSBAR + 0x0340 | ||
262 | #define MCF5282_QSPI_QDLYR MCF_IPSBAR + 0x0344 | ||
263 | #define MCF5282_QSPI_QWR MCF_IPSBAR + 0x0348 | ||
264 | #define MCF5282_QSPI_QIR MCF_IPSBAR + 0x034C | ||
265 | #define MCF5282_QSPI_QAR MCF_IPSBAR + 0x0350 | ||
266 | #define MCF5282_QSPI_QDR MCF_IPSBAR + 0x0354 | ||
267 | #define MCF5282_QSPI_QCR MCF_IPSBAR + 0x0354 | ||
268 | |||
269 | /* Bit level definitions and macros */ | ||
270 | #define MCF5282_QSPI_QMR_MSTR (0x8000) | ||
271 | #define MCF5282_QSPI_QMR_DOHIE (0x4000) | ||
272 | #define MCF5282_QSPI_QMR_BITS_16 (0x0000) | ||
273 | #define MCF5282_QSPI_QMR_BITS_8 (0x2000) | ||
274 | #define MCF5282_QSPI_QMR_BITS_9 (0x2400) | ||
275 | #define MCF5282_QSPI_QMR_BITS_10 (0x2800) | ||
276 | #define MCF5282_QSPI_QMR_BITS_11 (0x2C00) | ||
277 | #define MCF5282_QSPI_QMR_BITS_12 (0x3000) | ||
278 | #define MCF5282_QSPI_QMR_BITS_13 (0x3400) | ||
279 | #define MCF5282_QSPI_QMR_BITS_14 (0x3800) | ||
280 | #define MCF5282_QSPI_QMR_BITS_15 (0x3C00) | ||
281 | #define MCF5282_QSPI_QMR_CPOL (0x0200) | ||
282 | #define MCF5282_QSPI_QMR_CPHA (0x0100) | ||
283 | #define MCF5282_QSPI_QMR_BAUD(x) (((x)&0x00FF)) | ||
284 | |||
285 | #define MCF5282_QSPI_QDLYR_SPE (0x80) | ||
286 | #define MCF5282_QSPI_QDLYR_QCD(x) (((x)&0x007F)<<8) | ||
287 | #define MCF5282_QSPI_QDLYR_DTL(x) (((x)&0x00FF)) | ||
288 | |||
289 | #define MCF5282_QSPI_QWR_HALT (0x8000) | ||
290 | #define MCF5282_QSPI_QWR_WREN (0x4000) | ||
291 | #define MCF5282_QSPI_QWR_WRTO (0x2000) | ||
292 | #define MCF5282_QSPI_QWR_CSIV (0x1000) | ||
293 | #define MCF5282_QSPI_QWR_ENDQP(x) (((x)&0x000F)<<8) | ||
294 | #define MCF5282_QSPI_QWR_CPTQP(x) (((x)&0x000F)<<4) | ||
295 | #define MCF5282_QSPI_QWR_NEWQP(x) (((x)&0x000F)) | ||
296 | |||
297 | #define MCF5282_QSPI_QIR_WCEFB (0x8000) | ||
298 | #define MCF5282_QSPI_QIR_ABRTB (0x4000) | ||
299 | #define MCF5282_QSPI_QIR_ABRTL (0x1000) | ||
300 | #define MCF5282_QSPI_QIR_WCEFE (0x0800) | ||
301 | #define MCF5282_QSPI_QIR_ABRTE (0x0400) | ||
302 | #define MCF5282_QSPI_QIR_SPIFE (0x0100) | ||
303 | #define MCF5282_QSPI_QIR_WCEF (0x0008) | ||
304 | #define MCF5282_QSPI_QIR_ABRT (0x0004) | ||
305 | #define MCF5282_QSPI_QIR_SPIF (0x0001) | ||
306 | |||
307 | #define MCF5282_QSPI_QAR_ADDR(x) (((x)&0x003F)) | ||
308 | |||
309 | #define MCF5282_QSPI_QDR_COMMAND(x) (((x)&0xFF00)) | ||
310 | #define MCF5282_QSPI_QCR_DATA(x) (((x)&0x00FF)<<8) | ||
311 | #define MCF5282_QSPI_QCR_CONT (0x8000) | ||
312 | #define MCF5282_QSPI_QCR_BITSE (0x4000) | ||
313 | #define MCF5282_QSPI_QCR_DT (0x2000) | ||
314 | #define MCF5282_QSPI_QCR_DSCK (0x1000) | ||
315 | #define MCF5282_QSPI_QCR_CS (((x)&0x000F)<<8) | ||
316 | |||
317 | /****************************************************************************/ | ||
318 | #endif /* m528xsim_h */ | 253 | #endif /* m528xsim_h */ |
diff --git a/arch/m68k/include/asm/m532xsim.h b/arch/m68k/include/asm/m532xsim.h index 36bf15aec9ae..c4bf1c81e3cf 100644 --- a/arch/m68k/include/asm/m532xsim.h +++ b/arch/m68k/include/asm/m532xsim.h | |||
@@ -17,6 +17,7 @@ | |||
17 | #define MCFINT_UART0 26 /* Interrupt number for UART0 */ | 17 | #define MCFINT_UART0 26 /* Interrupt number for UART0 */ |
18 | #define MCFINT_UART1 27 /* Interrupt number for UART1 */ | 18 | #define MCFINT_UART1 27 /* Interrupt number for UART1 */ |
19 | #define MCFINT_UART2 28 /* Interrupt number for UART2 */ | 19 | #define MCFINT_UART2 28 /* Interrupt number for UART2 */ |
20 | #define MCFINT_QSPI 31 /* Interrupt number for QSPI */ | ||
20 | 21 | ||
21 | #define MCF_WTM_WCR MCF_REG16(0xFC098000) | 22 | #define MCF_WTM_WCR MCF_REG16(0xFC098000) |
22 | 23 | ||
diff --git a/arch/m68k/include/asm/mcfqspi.h b/arch/m68k/include/asm/mcfqspi.h new file mode 100644 index 000000000000..39d90d51111d --- /dev/null +++ b/arch/m68k/include/asm/mcfqspi.h | |||
@@ -0,0 +1,64 @@ | |||
1 | /* | ||
2 | * Definitions for Freescale Coldfire QSPI module | ||
3 | * | ||
4 | * Copyright 2010 Steven King <sfking@fdwdc.com> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 | ||
8 | * as published by the Free Software Foundation. | ||
9 | * | ||
10 | * This program is distributed in the hope that it will be useful, | ||
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | * GNU General Public License for more details. | ||
14 | * | ||
15 | * You should have received a copy of the GNU General Public License along | ||
16 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
17 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
18 | * | ||
19 | */ | ||
20 | |||
21 | #ifndef mcfqspi_h | ||
22 | #define mcfqspi_h | ||
23 | |||
24 | #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) | ||
25 | #define MCFQSPI_IOBASE (MCF_IPSBAR + 0x340) | ||
26 | #elif defined(CONFIG_M5249) | ||
27 | #define MCFQSPI_IOBASE (MCF_MBAR + 0x300) | ||
28 | #elif defined(CONFIG_M520x) || defined(CONFIG_M532x) | ||
29 | #define MCFQSPI_IOBASE 0xFC058000 | ||
30 | #endif | ||
31 | #define MCFQSPI_IOSIZE 0x40 | ||
32 | |||
33 | /** | ||
34 | * struct mcfqspi_cs_control - chip select control for the coldfire qspi driver | ||
35 | * @setup: setup the control; allocate gpio's, etc. May be NULL. | ||
36 | * @teardown: finish with the control; free gpio's, etc. May be NULL. | ||
37 | * @select: output the signals to select the device. Can not be NULL. | ||
38 | * @deselect: output the signals to deselect the device. Can not be NULL. | ||
39 | * | ||
40 | * The QSPI module has 4 hardware chip selects. We don't use them. Instead | ||
41 | * platforms are required to supply a mcfqspi_cs_control as a part of the | ||
42 | * platform data for each QSPI master controller. Only the select and | ||
43 | * deselect functions are required. | ||
44 | */ | ||
45 | struct mcfqspi_cs_control { | ||
46 | int (*setup)(struct mcfqspi_cs_control *); | ||
47 | void (*teardown)(struct mcfqspi_cs_control *); | ||
48 | void (*select)(struct mcfqspi_cs_control *, u8, bool); | ||
49 | void (*deselect)(struct mcfqspi_cs_control *, u8, bool); | ||
50 | }; | ||
51 | |||
52 | /** | ||
53 | * struct mcfqspi_platform_data - platform data for the coldfire qspi driver | ||
54 | * @bus_num: board specific identifier for this qspi driver. | ||
55 | * @num_chipselects: number of chip selects supported by this qspi driver. | ||
56 | * @cs_control: platform dependent chip select control. | ||
57 | */ | ||
58 | struct mcfqspi_platform_data { | ||
59 | s16 bus_num; | ||
60 | u16 num_chipselect; | ||
61 | struct mcfqspi_cs_control *cs_control; | ||
62 | }; | ||
63 | |||
64 | #endif /* mcfqspi_h */ | ||
diff --git a/arch/m68knommu/platform/520x/config.c b/arch/m68knommu/platform/520x/config.c index 92614de42cd3..71d2ba474c63 100644 --- a/arch/m68knommu/platform/520x/config.c +++ b/arch/m68knommu/platform/520x/config.c | |||
@@ -15,10 +15,13 @@ | |||
15 | #include <linux/param.h> | 15 | #include <linux/param.h> |
16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
18 | #include <linux/spi/spi.h> | ||
19 | #include <linux/gpio.h> | ||
18 | #include <asm/machdep.h> | 20 | #include <asm/machdep.h> |
19 | #include <asm/coldfire.h> | 21 | #include <asm/coldfire.h> |
20 | #include <asm/mcfsim.h> | 22 | #include <asm/mcfsim.h> |
21 | #include <asm/mcfuart.h> | 23 | #include <asm/mcfuart.h> |
24 | #include <asm/mcfqspi.h> | ||
22 | 25 | ||
23 | /***************************************************************************/ | 26 | /***************************************************************************/ |
24 | 27 | ||
@@ -74,9 +77,152 @@ static struct platform_device m520x_fec = { | |||
74 | .resource = m520x_fec_resources, | 77 | .resource = m520x_fec_resources, |
75 | }; | 78 | }; |
76 | 79 | ||
80 | #if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) | ||
81 | static struct resource m520x_qspi_resources[] = { | ||
82 | { | ||
83 | .start = MCFQSPI_IOBASE, | ||
84 | .end = MCFQSPI_IOBASE + MCFQSPI_IOSIZE - 1, | ||
85 | .flags = IORESOURCE_MEM, | ||
86 | }, | ||
87 | { | ||
88 | .start = MCFINT_VECBASE + MCFINT_QSPI, | ||
89 | .end = MCFINT_VECBASE + MCFINT_QSPI, | ||
90 | .flags = IORESOURCE_IRQ, | ||
91 | }, | ||
92 | }; | ||
93 | |||
94 | #define MCFQSPI_CS0 62 | ||
95 | #define MCFQSPI_CS1 63 | ||
96 | #define MCFQSPI_CS2 44 | ||
97 | |||
98 | static int m520x_cs_setup(struct mcfqspi_cs_control *cs_control) | ||
99 | { | ||
100 | int status; | ||
101 | |||
102 | status = gpio_request(MCFQSPI_CS0, "MCFQSPI_CS0"); | ||
103 | if (status) { | ||
104 | pr_debug("gpio_request for MCFQSPI_CS0 failed\n"); | ||
105 | goto fail0; | ||
106 | } | ||
107 | status = gpio_direction_output(MCFQSPI_CS0, 1); | ||
108 | if (status) { | ||
109 | pr_debug("gpio_direction_output for MCFQSPI_CS0 failed\n"); | ||
110 | goto fail1; | ||
111 | } | ||
112 | |||
113 | status = gpio_request(MCFQSPI_CS1, "MCFQSPI_CS1"); | ||
114 | if (status) { | ||
115 | pr_debug("gpio_request for MCFQSPI_CS1 failed\n"); | ||
116 | goto fail1; | ||
117 | } | ||
118 | status = gpio_direction_output(MCFQSPI_CS1, 1); | ||
119 | if (status) { | ||
120 | pr_debug("gpio_direction_output for MCFQSPI_CS1 failed\n"); | ||
121 | goto fail2; | ||
122 | } | ||
123 | |||
124 | status = gpio_request(MCFQSPI_CS2, "MCFQSPI_CS2"); | ||
125 | if (status) { | ||
126 | pr_debug("gpio_request for MCFQSPI_CS2 failed\n"); | ||
127 | goto fail2; | ||
128 | } | ||
129 | status = gpio_direction_output(MCFQSPI_CS2, 1); | ||
130 | if (status) { | ||
131 | pr_debug("gpio_direction_output for MCFQSPI_CS2 failed\n"); | ||
132 | goto fail3; | ||
133 | } | ||
134 | |||
135 | return 0; | ||
136 | |||
137 | fail3: | ||
138 | gpio_free(MCFQSPI_CS2); | ||
139 | fail2: | ||
140 | gpio_free(MCFQSPI_CS1); | ||
141 | fail1: | ||
142 | gpio_free(MCFQSPI_CS0); | ||
143 | fail0: | ||
144 | return status; | ||
145 | } | ||
146 | |||
147 | static void m520x_cs_teardown(struct mcfqspi_cs_control *cs_control) | ||
148 | { | ||
149 | gpio_free(MCFQSPI_CS2); | ||
150 | gpio_free(MCFQSPI_CS1); | ||
151 | gpio_free(MCFQSPI_CS0); | ||
152 | } | ||
153 | |||
154 | static void m520x_cs_select(struct mcfqspi_cs_control *cs_control, | ||
155 | u8 chip_select, bool cs_high) | ||
156 | { | ||
157 | switch (chip_select) { | ||
158 | case 0: | ||
159 | gpio_set_value(MCFQSPI_CS0, cs_high); | ||
160 | break; | ||
161 | case 1: | ||
162 | gpio_set_value(MCFQSPI_CS1, cs_high); | ||
163 | break; | ||
164 | case 2: | ||
165 | gpio_set_value(MCFQSPI_CS2, cs_high); | ||
166 | break; | ||
167 | } | ||
168 | } | ||
169 | |||
170 | static void m520x_cs_deselect(struct mcfqspi_cs_control *cs_control, | ||
171 | u8 chip_select, bool cs_high) | ||
172 | { | ||
173 | switch (chip_select) { | ||
174 | case 0: | ||
175 | gpio_set_value(MCFQSPI_CS0, !cs_high); | ||
176 | break; | ||
177 | case 1: | ||
178 | gpio_set_value(MCFQSPI_CS1, !cs_high); | ||
179 | break; | ||
180 | case 2: | ||
181 | gpio_set_value(MCFQSPI_CS2, !cs_high); | ||
182 | break; | ||
183 | } | ||
184 | } | ||
185 | |||
186 | static struct mcfqspi_cs_control m520x_cs_control = { | ||
187 | .setup = m520x_cs_setup, | ||
188 | .teardown = m520x_cs_teardown, | ||
189 | .select = m520x_cs_select, | ||
190 | .deselect = m520x_cs_deselect, | ||
191 | }; | ||
192 | |||
193 | static struct mcfqspi_platform_data m520x_qspi_data = { | ||
194 | .bus_num = 0, | ||
195 | .num_chipselect = 3, | ||
196 | .cs_control = &m520x_cs_control, | ||
197 | }; | ||
198 | |||
199 | static struct platform_device m520x_qspi = { | ||
200 | .name = "mcfqspi", | ||
201 | .id = 0, | ||
202 | .num_resources = ARRAY_SIZE(m520x_qspi_resources), | ||
203 | .resource = m520x_qspi_resources, | ||
204 | .dev.platform_data = &m520x_qspi_data, | ||
205 | }; | ||
206 | |||
207 | static void __init m520x_qspi_init(void) | ||
208 | { | ||
209 | u16 par; | ||
210 | /* setup Port QS for QSPI with gpio CS control */ | ||
211 | writeb(0x3f, MCF_IPSBAR + MCF_GPIO_PAR_QSPI); | ||
212 | /* make U1CTS and U2RTS gpio for cs_control */ | ||
213 | par = readw(MCF_IPSBAR + MCF_GPIO_PAR_UART); | ||
214 | par &= 0x00ff; | ||
215 | writew(par, MCF_IPSBAR + MCF_GPIO_PAR_UART); | ||
216 | } | ||
217 | #endif /* defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) */ | ||
218 | |||
219 | |||
77 | static struct platform_device *m520x_devices[] __initdata = { | 220 | static struct platform_device *m520x_devices[] __initdata = { |
78 | &m520x_uart, | 221 | &m520x_uart, |
79 | &m520x_fec, | 222 | &m520x_fec, |
223 | #if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) | ||
224 | &m520x_qspi, | ||
225 | #endif | ||
80 | }; | 226 | }; |
81 | 227 | ||
82 | /***************************************************************************/ | 228 | /***************************************************************************/ |
@@ -147,6 +293,9 @@ void __init config_BSP(char *commandp, int size) | |||
147 | mach_reset = m520x_cpu_reset; | 293 | mach_reset = m520x_cpu_reset; |
148 | m520x_uarts_init(); | 294 | m520x_uarts_init(); |
149 | m520x_fec_init(); | 295 | m520x_fec_init(); |
296 | #if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) | ||
297 | m520x_qspi_init(); | ||
298 | #endif | ||
150 | } | 299 | } |
151 | 300 | ||
152 | /***************************************************************************/ | 301 | /***************************************************************************/ |
diff --git a/arch/m68knommu/platform/523x/config.c b/arch/m68knommu/platform/523x/config.c index 6ba84f2aa397..8980f6d7715a 100644 --- a/arch/m68knommu/platform/523x/config.c +++ b/arch/m68knommu/platform/523x/config.c | |||
@@ -16,10 +16,13 @@ | |||
16 | #include <linux/param.h> | 16 | #include <linux/param.h> |
17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | #include <linux/io.h> | 18 | #include <linux/io.h> |
19 | #include <linux/spi/spi.h> | ||
20 | #include <linux/gpio.h> | ||
19 | #include <asm/machdep.h> | 21 | #include <asm/machdep.h> |
20 | #include <asm/coldfire.h> | 22 | #include <asm/coldfire.h> |
21 | #include <asm/mcfsim.h> | 23 | #include <asm/mcfsim.h> |
22 | #include <asm/mcfuart.h> | 24 | #include <asm/mcfuart.h> |
25 | #include <asm/mcfqspi.h> | ||
23 | 26 | ||
24 | /***************************************************************************/ | 27 | /***************************************************************************/ |
25 | 28 | ||
@@ -75,9 +78,173 @@ static struct platform_device m523x_fec = { | |||
75 | .resource = m523x_fec_resources, | 78 | .resource = m523x_fec_resources, |
76 | }; | 79 | }; |
77 | 80 | ||
81 | #if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) | ||
82 | static struct resource m523x_qspi_resources[] = { | ||
83 | { | ||
84 | .start = MCFQSPI_IOBASE, | ||
85 | .end = MCFQSPI_IOBASE + MCFQSPI_IOSIZE - 1, | ||
86 | .flags = IORESOURCE_MEM, | ||
87 | }, | ||
88 | { | ||
89 | .start = MCFINT_VECBASE + MCFINT_QSPI, | ||
90 | .end = MCFINT_VECBASE + MCFINT_QSPI, | ||
91 | .flags = IORESOURCE_IRQ, | ||
92 | }, | ||
93 | }; | ||
94 | |||
95 | #define MCFQSPI_CS0 91 | ||
96 | #define MCFQSPI_CS1 92 | ||
97 | #define MCFQSPI_CS2 103 | ||
98 | #define MCFQSPI_CS3 99 | ||
99 | |||
100 | static int m523x_cs_setup(struct mcfqspi_cs_control *cs_control) | ||
101 | { | ||
102 | int status; | ||
103 | |||
104 | status = gpio_request(MCFQSPI_CS0, "MCFQSPI_CS0"); | ||
105 | if (status) { | ||
106 | pr_debug("gpio_request for MCFQSPI_CS0 failed\n"); | ||
107 | goto fail0; | ||
108 | } | ||
109 | status = gpio_direction_output(MCFQSPI_CS0, 1); | ||
110 | if (status) { | ||
111 | pr_debug("gpio_direction_output for MCFQSPI_CS0 failed\n"); | ||
112 | goto fail1; | ||
113 | } | ||
114 | |||
115 | status = gpio_request(MCFQSPI_CS1, "MCFQSPI_CS1"); | ||
116 | if (status) { | ||
117 | pr_debug("gpio_request for MCFQSPI_CS1 failed\n"); | ||
118 | goto fail1; | ||
119 | } | ||
120 | status = gpio_direction_output(MCFQSPI_CS1, 1); | ||
121 | if (status) { | ||
122 | pr_debug("gpio_direction_output for MCFQSPI_CS1 failed\n"); | ||
123 | goto fail2; | ||
124 | } | ||
125 | |||
126 | status = gpio_request(MCFQSPI_CS2, "MCFQSPI_CS2"); | ||
127 | if (status) { | ||
128 | pr_debug("gpio_request for MCFQSPI_CS2 failed\n"); | ||
129 | goto fail2; | ||
130 | } | ||
131 | status = gpio_direction_output(MCFQSPI_CS2, 1); | ||
132 | if (status) { | ||
133 | pr_debug("gpio_direction_output for MCFQSPI_CS2 failed\n"); | ||
134 | goto fail3; | ||
135 | } | ||
136 | |||
137 | status = gpio_request(MCFQSPI_CS3, "MCFQSPI_CS3"); | ||
138 | if (status) { | ||
139 | pr_debug("gpio_request for MCFQSPI_CS3 failed\n"); | ||
140 | goto fail3; | ||
141 | } | ||
142 | status = gpio_direction_output(MCFQSPI_CS3, 1); | ||
143 | if (status) { | ||
144 | pr_debug("gpio_direction_output for MCFQSPI_CS3 failed\n"); | ||
145 | goto fail4; | ||
146 | } | ||
147 | |||
148 | return 0; | ||
149 | |||
150 | fail4: | ||
151 | gpio_free(MCFQSPI_CS3); | ||
152 | fail3: | ||
153 | gpio_free(MCFQSPI_CS2); | ||
154 | fail2: | ||
155 | gpio_free(MCFQSPI_CS1); | ||
156 | fail1: | ||
157 | gpio_free(MCFQSPI_CS0); | ||
158 | fail0: | ||
159 | return status; | ||
160 | } | ||
161 | |||
162 | static void m523x_cs_teardown(struct mcfqspi_cs_control *cs_control) | ||
163 | { | ||
164 | gpio_free(MCFQSPI_CS3); | ||
165 | gpio_free(MCFQSPI_CS2); | ||
166 | gpio_free(MCFQSPI_CS1); | ||
167 | gpio_free(MCFQSPI_CS0); | ||
168 | } | ||
169 | |||
170 | static void m523x_cs_select(struct mcfqspi_cs_control *cs_control, | ||
171 | u8 chip_select, bool cs_high) | ||
172 | { | ||
173 | switch (chip_select) { | ||
174 | case 0: | ||
175 | gpio_set_value(MCFQSPI_CS0, cs_high); | ||
176 | break; | ||
177 | case 1: | ||
178 | gpio_set_value(MCFQSPI_CS1, cs_high); | ||
179 | break; | ||
180 | case 2: | ||
181 | gpio_set_value(MCFQSPI_CS2, cs_high); | ||
182 | break; | ||
183 | case 3: | ||
184 | gpio_set_value(MCFQSPI_CS3, cs_high); | ||
185 | break; | ||
186 | } | ||
187 | } | ||
188 | |||
189 | static void m523x_cs_deselect(struct mcfqspi_cs_control *cs_control, | ||
190 | u8 chip_select, bool cs_high) | ||
191 | { | ||
192 | switch (chip_select) { | ||
193 | case 0: | ||
194 | gpio_set_value(MCFQSPI_CS0, !cs_high); | ||
195 | break; | ||
196 | case 1: | ||
197 | gpio_set_value(MCFQSPI_CS1, !cs_high); | ||
198 | break; | ||
199 | case 2: | ||
200 | gpio_set_value(MCFQSPI_CS2, !cs_high); | ||
201 | break; | ||
202 | case 3: | ||
203 | gpio_set_value(MCFQSPI_CS3, !cs_high); | ||
204 | break; | ||
205 | } | ||
206 | } | ||
207 | |||
208 | static struct mcfqspi_cs_control m523x_cs_control = { | ||
209 | .setup = m523x_cs_setup, | ||
210 | .teardown = m523x_cs_teardown, | ||
211 | .select = m523x_cs_select, | ||
212 | .deselect = m523x_cs_deselect, | ||
213 | }; | ||
214 | |||
215 | static struct mcfqspi_platform_data m523x_qspi_data = { | ||
216 | .bus_num = 0, | ||
217 | .num_chipselect = 4, | ||
218 | .cs_control = &m523x_cs_control, | ||
219 | }; | ||
220 | |||
221 | static struct platform_device m523x_qspi = { | ||
222 | .name = "mcfqspi", | ||
223 | .id = 0, | ||
224 | .num_resources = ARRAY_SIZE(m523x_qspi_resources), | ||
225 | .resource = m523x_qspi_resources, | ||
226 | .dev.platform_data = &m523x_qspi_data, | ||
227 | }; | ||
228 | |||
229 | static void __init m523x_qspi_init(void) | ||
230 | { | ||
231 | u16 par; | ||
232 | |||
233 | /* setup QSPS pins for QSPI with gpio CS control */ | ||
234 | writeb(0x1f, MCFGPIO_PAR_QSPI); | ||
235 | /* and CS2 & CS3 as gpio */ | ||
236 | par = readw(MCFGPIO_PAR_TIMER); | ||
237 | par &= 0x3f3f; | ||
238 | writew(par, MCFGPIO_PAR_TIMER); | ||
239 | } | ||
240 | #endif /* defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) */ | ||
241 | |||
78 | static struct platform_device *m523x_devices[] __initdata = { | 242 | static struct platform_device *m523x_devices[] __initdata = { |
79 | &m523x_uart, | 243 | &m523x_uart, |
80 | &m523x_fec, | 244 | &m523x_fec, |
245 | #if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) | ||
246 | &m523x_qspi, | ||
247 | #endif | ||
81 | }; | 248 | }; |
82 | 249 | ||
83 | /***************************************************************************/ | 250 | /***************************************************************************/ |
@@ -114,6 +281,9 @@ void __init config_BSP(char *commandp, int size) | |||
114 | static int __init init_BSP(void) | 281 | static int __init init_BSP(void) |
115 | { | 282 | { |
116 | m523x_fec_init(); | 283 | m523x_fec_init(); |
284 | #if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) | ||
285 | m523x_qspi_init(); | ||
286 | #endif | ||
117 | platform_add_devices(m523x_devices, ARRAY_SIZE(m523x_devices)); | 287 | platform_add_devices(m523x_devices, ARRAY_SIZE(m523x_devices)); |
118 | return 0; | 288 | return 0; |
119 | } | 289 | } |
diff --git a/arch/m68knommu/platform/5249/config.c b/arch/m68knommu/platform/5249/config.c index 646f5ba462fc..72fc4ae0e663 100644 --- a/arch/m68knommu/platform/5249/config.c +++ b/arch/m68knommu/platform/5249/config.c | |||
@@ -12,10 +12,13 @@ | |||
12 | #include <linux/param.h> | 12 | #include <linux/param.h> |
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
15 | #include <linux/spi/spi.h> | ||
16 | #include <linux/gpio.h> | ||
15 | #include <asm/machdep.h> | 17 | #include <asm/machdep.h> |
16 | #include <asm/coldfire.h> | 18 | #include <asm/coldfire.h> |
17 | #include <asm/mcfsim.h> | 19 | #include <asm/mcfsim.h> |
18 | #include <asm/mcfuart.h> | 20 | #include <asm/mcfuart.h> |
21 | #include <asm/mcfqspi.h> | ||
19 | 22 | ||
20 | /***************************************************************************/ | 23 | /***************************************************************************/ |
21 | 24 | ||
@@ -37,8 +40,169 @@ static struct platform_device m5249_uart = { | |||
37 | .dev.platform_data = m5249_uart_platform, | 40 | .dev.platform_data = m5249_uart_platform, |
38 | }; | 41 | }; |
39 | 42 | ||
43 | #if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) | ||
44 | static struct resource m5249_qspi_resources[] = { | ||
45 | { | ||
46 | .start = MCFQSPI_IOBASE, | ||
47 | .end = MCFQSPI_IOBASE + MCFQSPI_IOSIZE - 1, | ||
48 | .flags = IORESOURCE_MEM, | ||
49 | }, | ||
50 | { | ||
51 | .start = MCF_IRQ_QSPI, | ||
52 | .end = MCF_IRQ_QSPI, | ||
53 | .flags = IORESOURCE_IRQ, | ||
54 | }, | ||
55 | }; | ||
56 | |||
57 | #define MCFQSPI_CS0 29 | ||
58 | #define MCFQSPI_CS1 24 | ||
59 | #define MCFQSPI_CS2 21 | ||
60 | #define MCFQSPI_CS3 22 | ||
61 | |||
62 | static int m5249_cs_setup(struct mcfqspi_cs_control *cs_control) | ||
63 | { | ||
64 | int status; | ||
65 | |||
66 | status = gpio_request(MCFQSPI_CS0, "MCFQSPI_CS0"); | ||
67 | if (status) { | ||
68 | pr_debug("gpio_request for MCFQSPI_CS0 failed\n"); | ||
69 | goto fail0; | ||
70 | } | ||
71 | status = gpio_direction_output(MCFQSPI_CS0, 1); | ||
72 | if (status) { | ||
73 | pr_debug("gpio_direction_output for MCFQSPI_CS0 failed\n"); | ||
74 | goto fail1; | ||
75 | } | ||
76 | |||
77 | status = gpio_request(MCFQSPI_CS1, "MCFQSPI_CS1"); | ||
78 | if (status) { | ||
79 | pr_debug("gpio_request for MCFQSPI_CS1 failed\n"); | ||
80 | goto fail1; | ||
81 | } | ||
82 | status = gpio_direction_output(MCFQSPI_CS1, 1); | ||
83 | if (status) { | ||
84 | pr_debug("gpio_direction_output for MCFQSPI_CS1 failed\n"); | ||
85 | goto fail2; | ||
86 | } | ||
87 | |||
88 | status = gpio_request(MCFQSPI_CS2, "MCFQSPI_CS2"); | ||
89 | if (status) { | ||
90 | pr_debug("gpio_request for MCFQSPI_CS2 failed\n"); | ||
91 | goto fail2; | ||
92 | } | ||
93 | status = gpio_direction_output(MCFQSPI_CS2, 1); | ||
94 | if (status) { | ||
95 | pr_debug("gpio_direction_output for MCFQSPI_CS2 failed\n"); | ||
96 | goto fail3; | ||
97 | } | ||
98 | |||
99 | status = gpio_request(MCFQSPI_CS3, "MCFQSPI_CS3"); | ||
100 | if (status) { | ||
101 | pr_debug("gpio_request for MCFQSPI_CS3 failed\n"); | ||
102 | goto fail3; | ||
103 | } | ||
104 | status = gpio_direction_output(MCFQSPI_CS3, 1); | ||
105 | if (status) { | ||
106 | pr_debug("gpio_direction_output for MCFQSPI_CS3 failed\n"); | ||
107 | goto fail4; | ||
108 | } | ||
109 | |||
110 | return 0; | ||
111 | |||
112 | fail4: | ||
113 | gpio_free(MCFQSPI_CS3); | ||
114 | fail3: | ||
115 | gpio_free(MCFQSPI_CS2); | ||
116 | fail2: | ||
117 | gpio_free(MCFQSPI_CS1); | ||
118 | fail1: | ||
119 | gpio_free(MCFQSPI_CS0); | ||
120 | fail0: | ||
121 | return status; | ||
122 | } | ||
123 | |||
124 | static void m5249_cs_teardown(struct mcfqspi_cs_control *cs_control) | ||
125 | { | ||
126 | gpio_free(MCFQSPI_CS3); | ||
127 | gpio_free(MCFQSPI_CS2); | ||
128 | gpio_free(MCFQSPI_CS1); | ||
129 | gpio_free(MCFQSPI_CS0); | ||
130 | } | ||
131 | |||
132 | static void m5249_cs_select(struct mcfqspi_cs_control *cs_control, | ||
133 | u8 chip_select, bool cs_high) | ||
134 | { | ||
135 | switch (chip_select) { | ||
136 | case 0: | ||
137 | gpio_set_value(MCFQSPI_CS0, cs_high); | ||
138 | break; | ||
139 | case 1: | ||
140 | gpio_set_value(MCFQSPI_CS1, cs_high); | ||
141 | break; | ||
142 | case 2: | ||
143 | gpio_set_value(MCFQSPI_CS2, cs_high); | ||
144 | break; | ||
145 | case 3: | ||
146 | gpio_set_value(MCFQSPI_CS3, cs_high); | ||
147 | break; | ||
148 | } | ||
149 | } | ||
150 | |||
151 | static void m5249_cs_deselect(struct mcfqspi_cs_control *cs_control, | ||
152 | u8 chip_select, bool cs_high) | ||
153 | { | ||
154 | switch (chip_select) { | ||
155 | case 0: | ||
156 | gpio_set_value(MCFQSPI_CS0, !cs_high); | ||
157 | break; | ||
158 | case 1: | ||
159 | gpio_set_value(MCFQSPI_CS1, !cs_high); | ||
160 | break; | ||
161 | case 2: | ||
162 | gpio_set_value(MCFQSPI_CS2, !cs_high); | ||
163 | break; | ||
164 | case 3: | ||
165 | gpio_set_value(MCFQSPI_CS3, !cs_high); | ||
166 | break; | ||
167 | } | ||
168 | } | ||
169 | |||
170 | static struct mcfqspi_cs_control m5249_cs_control = { | ||
171 | .setup = m5249_cs_setup, | ||
172 | .teardown = m5249_cs_teardown, | ||
173 | .select = m5249_cs_select, | ||
174 | .deselect = m5249_cs_deselect, | ||
175 | }; | ||
176 | |||
177 | static struct mcfqspi_platform_data m5249_qspi_data = { | ||
178 | .bus_num = 0, | ||
179 | .num_chipselect = 4, | ||
180 | .cs_control = &m5249_cs_control, | ||
181 | }; | ||
182 | |||
183 | static struct platform_device m5249_qspi = { | ||
184 | .name = "mcfqspi", | ||
185 | .id = 0, | ||
186 | .num_resources = ARRAY_SIZE(m5249_qspi_resources), | ||
187 | .resource = m5249_qspi_resources, | ||
188 | .dev.platform_data = &m5249_qspi_data, | ||
189 | }; | ||
190 | |||
191 | static void __init m5249_qspi_init(void) | ||
192 | { | ||
193 | /* QSPI irq setup */ | ||
194 | writeb(MCFSIM_ICR_AUTOVEC | MCFSIM_ICR_LEVEL4 | MCFSIM_ICR_PRI0, | ||
195 | MCF_MBAR + MCFSIM_QSPIICR); | ||
196 | mcf_mapirq2imr(MCF_IRQ_QSPI, MCFINTC_QSPI); | ||
197 | } | ||
198 | #endif /* defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) */ | ||
199 | |||
200 | |||
40 | static struct platform_device *m5249_devices[] __initdata = { | 201 | static struct platform_device *m5249_devices[] __initdata = { |
41 | &m5249_uart, | 202 | &m5249_uart, |
203 | #if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) | ||
204 | &m5249_qspi, | ||
205 | #endif | ||
42 | }; | 206 | }; |
43 | 207 | ||
44 | /***************************************************************************/ | 208 | /***************************************************************************/ |
@@ -100,6 +264,9 @@ void __init config_BSP(char *commandp, int size) | |||
100 | mach_reset = m5249_cpu_reset; | 264 | mach_reset = m5249_cpu_reset; |
101 | m5249_timers_init(); | 265 | m5249_timers_init(); |
102 | m5249_uarts_init(); | 266 | m5249_uarts_init(); |
267 | #if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) | ||
268 | m5249_qspi_init(); | ||
269 | #endif | ||
103 | } | 270 | } |
104 | 271 | ||
105 | /***************************************************************************/ | 272 | /***************************************************************************/ |
diff --git a/arch/m68knommu/platform/527x/config.c b/arch/m68knommu/platform/527x/config.c index fa51be172830..3d9c35c98b98 100644 --- a/arch/m68knommu/platform/527x/config.c +++ b/arch/m68knommu/platform/527x/config.c | |||
@@ -16,10 +16,13 @@ | |||
16 | #include <linux/param.h> | 16 | #include <linux/param.h> |
17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | #include <linux/io.h> | 18 | #include <linux/io.h> |
19 | #include <linux/spi/spi.h> | ||
20 | #include <linux/gpio.h> | ||
19 | #include <asm/machdep.h> | 21 | #include <asm/machdep.h> |
20 | #include <asm/coldfire.h> | 22 | #include <asm/coldfire.h> |
21 | #include <asm/mcfsim.h> | 23 | #include <asm/mcfsim.h> |
22 | #include <asm/mcfuart.h> | 24 | #include <asm/mcfuart.h> |
25 | #include <asm/mcfqspi.h> | ||
23 | 26 | ||
24 | /***************************************************************************/ | 27 | /***************************************************************************/ |
25 | 28 | ||
@@ -106,12 +109,188 @@ static struct platform_device m527x_fec[] = { | |||
106 | }, | 109 | }, |
107 | }; | 110 | }; |
108 | 111 | ||
112 | #if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) | ||
113 | static struct resource m527x_qspi_resources[] = { | ||
114 | { | ||
115 | .start = MCFQSPI_IOBASE, | ||
116 | .end = MCFQSPI_IOBASE + MCFQSPI_IOSIZE - 1, | ||
117 | .flags = IORESOURCE_MEM, | ||
118 | }, | ||
119 | { | ||
120 | .start = MCFINT_VECBASE + MCFINT_QSPI, | ||
121 | .end = MCFINT_VECBASE + MCFINT_QSPI, | ||
122 | .flags = IORESOURCE_IRQ, | ||
123 | }, | ||
124 | }; | ||
125 | |||
126 | #if defined(CONFIG_M5271) | ||
127 | #define MCFQSPI_CS0 91 | ||
128 | #define MCFQSPI_CS1 92 | ||
129 | #define MCFQSPI_CS2 99 | ||
130 | #define MCFQSPI_CS3 103 | ||
131 | #elif defined(CONFIG_M5275) | ||
132 | #define MCFQSPI_CS0 59 | ||
133 | #define MCFQSPI_CS1 60 | ||
134 | #define MCFQSPI_CS2 61 | ||
135 | #define MCFQSPI_CS3 62 | ||
136 | #endif | ||
137 | |||
138 | static int m527x_cs_setup(struct mcfqspi_cs_control *cs_control) | ||
139 | { | ||
140 | int status; | ||
141 | |||
142 | status = gpio_request(MCFQSPI_CS0, "MCFQSPI_CS0"); | ||
143 | if (status) { | ||
144 | pr_debug("gpio_request for MCFQSPI_CS0 failed\n"); | ||
145 | goto fail0; | ||
146 | } | ||
147 | status = gpio_direction_output(MCFQSPI_CS0, 1); | ||
148 | if (status) { | ||
149 | pr_debug("gpio_direction_output for MCFQSPI_CS0 failed\n"); | ||
150 | goto fail1; | ||
151 | } | ||
152 | |||
153 | status = gpio_request(MCFQSPI_CS1, "MCFQSPI_CS1"); | ||
154 | if (status) { | ||
155 | pr_debug("gpio_request for MCFQSPI_CS1 failed\n"); | ||
156 | goto fail1; | ||
157 | } | ||
158 | status = gpio_direction_output(MCFQSPI_CS1, 1); | ||
159 | if (status) { | ||
160 | pr_debug("gpio_direction_output for MCFQSPI_CS1 failed\n"); | ||
161 | goto fail2; | ||
162 | } | ||
163 | |||
164 | status = gpio_request(MCFQSPI_CS2, "MCFQSPI_CS2"); | ||
165 | if (status) { | ||
166 | pr_debug("gpio_request for MCFQSPI_CS2 failed\n"); | ||
167 | goto fail2; | ||
168 | } | ||
169 | status = gpio_direction_output(MCFQSPI_CS2, 1); | ||
170 | if (status) { | ||
171 | pr_debug("gpio_direction_output for MCFQSPI_CS2 failed\n"); | ||
172 | goto fail3; | ||
173 | } | ||
174 | |||
175 | status = gpio_request(MCFQSPI_CS3, "MCFQSPI_CS3"); | ||
176 | if (status) { | ||
177 | pr_debug("gpio_request for MCFQSPI_CS3 failed\n"); | ||
178 | goto fail3; | ||
179 | } | ||
180 | status = gpio_direction_output(MCFQSPI_CS3, 1); | ||
181 | if (status) { | ||
182 | pr_debug("gpio_direction_output for MCFQSPI_CS3 failed\n"); | ||
183 | goto fail4; | ||
184 | } | ||
185 | |||
186 | return 0; | ||
187 | |||
188 | fail4: | ||
189 | gpio_free(MCFQSPI_CS3); | ||
190 | fail3: | ||
191 | gpio_free(MCFQSPI_CS2); | ||
192 | fail2: | ||
193 | gpio_free(MCFQSPI_CS1); | ||
194 | fail1: | ||
195 | gpio_free(MCFQSPI_CS0); | ||
196 | fail0: | ||
197 | return status; | ||
198 | } | ||
199 | |||
200 | static void m527x_cs_teardown(struct mcfqspi_cs_control *cs_control) | ||
201 | { | ||
202 | gpio_free(MCFQSPI_CS3); | ||
203 | gpio_free(MCFQSPI_CS2); | ||
204 | gpio_free(MCFQSPI_CS1); | ||
205 | gpio_free(MCFQSPI_CS0); | ||
206 | } | ||
207 | |||
208 | static void m527x_cs_select(struct mcfqspi_cs_control *cs_control, | ||
209 | u8 chip_select, bool cs_high) | ||
210 | { | ||
211 | switch (chip_select) { | ||
212 | case 0: | ||
213 | gpio_set_value(MCFQSPI_CS0, cs_high); | ||
214 | break; | ||
215 | case 1: | ||
216 | gpio_set_value(MCFQSPI_CS1, cs_high); | ||
217 | break; | ||
218 | case 2: | ||
219 | gpio_set_value(MCFQSPI_CS2, cs_high); | ||
220 | break; | ||
221 | case 3: | ||
222 | gpio_set_value(MCFQSPI_CS3, cs_high); | ||
223 | break; | ||
224 | } | ||
225 | } | ||
226 | |||
227 | static void m527x_cs_deselect(struct mcfqspi_cs_control *cs_control, | ||
228 | u8 chip_select, bool cs_high) | ||
229 | { | ||
230 | switch (chip_select) { | ||
231 | case 0: | ||
232 | gpio_set_value(MCFQSPI_CS0, !cs_high); | ||
233 | break; | ||
234 | case 1: | ||
235 | gpio_set_value(MCFQSPI_CS1, !cs_high); | ||
236 | break; | ||
237 | case 2: | ||
238 | gpio_set_value(MCFQSPI_CS2, !cs_high); | ||
239 | break; | ||
240 | case 3: | ||
241 | gpio_set_value(MCFQSPI_CS3, !cs_high); | ||
242 | break; | ||
243 | } | ||
244 | } | ||
245 | |||
246 | static struct mcfqspi_cs_control m527x_cs_control = { | ||
247 | .setup = m527x_cs_setup, | ||
248 | .teardown = m527x_cs_teardown, | ||
249 | .select = m527x_cs_select, | ||
250 | .deselect = m527x_cs_deselect, | ||
251 | }; | ||
252 | |||
253 | static struct mcfqspi_platform_data m527x_qspi_data = { | ||
254 | .bus_num = 0, | ||
255 | .num_chipselect = 4, | ||
256 | .cs_control = &m527x_cs_control, | ||
257 | }; | ||
258 | |||
259 | static struct platform_device m527x_qspi = { | ||
260 | .name = "mcfqspi", | ||
261 | .id = 0, | ||
262 | .num_resources = ARRAY_SIZE(m527x_qspi_resources), | ||
263 | .resource = m527x_qspi_resources, | ||
264 | .dev.platform_data = &m527x_qspi_data, | ||
265 | }; | ||
266 | |||
267 | static void __init m527x_qspi_init(void) | ||
268 | { | ||
269 | #if defined(CONFIG_M5271) | ||
270 | u16 par; | ||
271 | |||
272 | /* setup QSPS pins for QSPI with gpio CS control */ | ||
273 | writeb(0x1f, MCFGPIO_PAR_QSPI); | ||
274 | /* and CS2 & CS3 as gpio */ | ||
275 | par = readw(MCFGPIO_PAR_TIMER); | ||
276 | par &= 0x3f3f; | ||
277 | writew(par, MCFGPIO_PAR_TIMER); | ||
278 | #elif defined(CONFIG_M5275) | ||
279 | /* setup QSPS pins for QSPI with gpio CS control */ | ||
280 | writew(0x003e, MCFGPIO_PAR_QSPI); | ||
281 | #endif | ||
282 | } | ||
283 | #endif /* defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) */ | ||
284 | |||
109 | static struct platform_device *m527x_devices[] __initdata = { | 285 | static struct platform_device *m527x_devices[] __initdata = { |
110 | &m527x_uart, | 286 | &m527x_uart, |
111 | &m527x_fec[0], | 287 | &m527x_fec[0], |
112 | #ifdef CONFIG_FEC2 | 288 | #ifdef CONFIG_FEC2 |
113 | &m527x_fec[1], | 289 | &m527x_fec[1], |
114 | #endif | 290 | #endif |
291 | #if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) | ||
292 | &m527x_qspi, | ||
293 | #endif | ||
115 | }; | 294 | }; |
116 | 295 | ||
117 | /***************************************************************************/ | 296 | /***************************************************************************/ |
@@ -187,6 +366,9 @@ void __init config_BSP(char *commandp, int size) | |||
187 | mach_reset = m527x_cpu_reset; | 366 | mach_reset = m527x_cpu_reset; |
188 | m527x_uarts_init(); | 367 | m527x_uarts_init(); |
189 | m527x_fec_init(); | 368 | m527x_fec_init(); |
369 | #if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) | ||
370 | m527x_qspi_init(); | ||
371 | #endif | ||
190 | } | 372 | } |
191 | 373 | ||
192 | /***************************************************************************/ | 374 | /***************************************************************************/ |
diff --git a/arch/m68knommu/platform/528x/config.c b/arch/m68knommu/platform/528x/config.c index 6e608d1836f1..76b743343bfa 100644 --- a/arch/m68knommu/platform/528x/config.c +++ b/arch/m68knommu/platform/528x/config.c | |||
@@ -17,10 +17,13 @@ | |||
17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
20 | #include <linux/spi/spi.h> | ||
21 | #include <linux/gpio.h> | ||
20 | #include <asm/machdep.h> | 22 | #include <asm/machdep.h> |
21 | #include <asm/coldfire.h> | 23 | #include <asm/coldfire.h> |
22 | #include <asm/mcfsim.h> | 24 | #include <asm/mcfsim.h> |
23 | #include <asm/mcfuart.h> | 25 | #include <asm/mcfuart.h> |
26 | #include <asm/mcfqspi.h> | ||
24 | 27 | ||
25 | /***************************************************************************/ | 28 | /***************************************************************************/ |
26 | 29 | ||
@@ -76,10 +79,141 @@ static struct platform_device m528x_fec = { | |||
76 | .resource = m528x_fec_resources, | 79 | .resource = m528x_fec_resources, |
77 | }; | 80 | }; |
78 | 81 | ||
82 | #if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) | ||
83 | static struct resource m528x_qspi_resources[] = { | ||
84 | { | ||
85 | .start = MCFQSPI_IOBASE, | ||
86 | .end = MCFQSPI_IOBASE + MCFQSPI_IOSIZE - 1, | ||
87 | .flags = IORESOURCE_MEM, | ||
88 | }, | ||
89 | { | ||
90 | .start = MCFINT_VECBASE + MCFINT_QSPI, | ||
91 | .end = MCFINT_VECBASE + MCFINT_QSPI, | ||
92 | .flags = IORESOURCE_IRQ, | ||
93 | }, | ||
94 | }; | ||
95 | |||
96 | #define MCFQSPI_CS0 147 | ||
97 | #define MCFQSPI_CS1 148 | ||
98 | #define MCFQSPI_CS2 149 | ||
99 | #define MCFQSPI_CS3 150 | ||
100 | |||
101 | static int m528x_cs_setup(struct mcfqspi_cs_control *cs_control) | ||
102 | { | ||
103 | int status; | ||
104 | |||
105 | status = gpio_request(MCFQSPI_CS0, "MCFQSPI_CS0"); | ||
106 | if (status) { | ||
107 | pr_debug("gpio_request for MCFQSPI_CS0 failed\n"); | ||
108 | goto fail0; | ||
109 | } | ||
110 | status = gpio_direction_output(MCFQSPI_CS0, 1); | ||
111 | if (status) { | ||
112 | pr_debug("gpio_direction_output for MCFQSPI_CS0 failed\n"); | ||
113 | goto fail1; | ||
114 | } | ||
115 | |||
116 | status = gpio_request(MCFQSPI_CS1, "MCFQSPI_CS1"); | ||
117 | if (status) { | ||
118 | pr_debug("gpio_request for MCFQSPI_CS1 failed\n"); | ||
119 | goto fail1; | ||
120 | } | ||
121 | status = gpio_direction_output(MCFQSPI_CS1, 1); | ||
122 | if (status) { | ||
123 | pr_debug("gpio_direction_output for MCFQSPI_CS1 failed\n"); | ||
124 | goto fail2; | ||
125 | } | ||
126 | |||
127 | status = gpio_request(MCFQSPI_CS2, "MCFQSPI_CS2"); | ||
128 | if (status) { | ||
129 | pr_debug("gpio_request for MCFQSPI_CS2 failed\n"); | ||
130 | goto fail2; | ||
131 | } | ||
132 | status = gpio_direction_output(MCFQSPI_CS2, 1); | ||
133 | if (status) { | ||
134 | pr_debug("gpio_direction_output for MCFQSPI_CS2 failed\n"); | ||
135 | goto fail3; | ||
136 | } | ||
137 | |||
138 | status = gpio_request(MCFQSPI_CS3, "MCFQSPI_CS3"); | ||
139 | if (status) { | ||
140 | pr_debug("gpio_request for MCFQSPI_CS3 failed\n"); | ||
141 | goto fail3; | ||
142 | } | ||
143 | status = gpio_direction_output(MCFQSPI_CS3, 1); | ||
144 | if (status) { | ||
145 | pr_debug("gpio_direction_output for MCFQSPI_CS3 failed\n"); | ||
146 | goto fail4; | ||
147 | } | ||
148 | |||
149 | return 0; | ||
150 | |||
151 | fail4: | ||
152 | gpio_free(MCFQSPI_CS3); | ||
153 | fail3: | ||
154 | gpio_free(MCFQSPI_CS2); | ||
155 | fail2: | ||
156 | gpio_free(MCFQSPI_CS1); | ||
157 | fail1: | ||
158 | gpio_free(MCFQSPI_CS0); | ||
159 | fail0: | ||
160 | return status; | ||
161 | } | ||
162 | |||
163 | static void m528x_cs_teardown(struct mcfqspi_cs_control *cs_control) | ||
164 | { | ||
165 | gpio_free(MCFQSPI_CS3); | ||
166 | gpio_free(MCFQSPI_CS2); | ||
167 | gpio_free(MCFQSPI_CS1); | ||
168 | gpio_free(MCFQSPI_CS0); | ||
169 | } | ||
170 | |||
171 | static void m528x_cs_select(struct mcfqspi_cs_control *cs_control, | ||
172 | u8 chip_select, bool cs_high) | ||
173 | { | ||
174 | gpio_set_value(MCFQSPI_CS0 + chip_select, cs_high); | ||
175 | } | ||
176 | |||
177 | static void m528x_cs_deselect(struct mcfqspi_cs_control *cs_control, | ||
178 | u8 chip_select, bool cs_high) | ||
179 | { | ||
180 | gpio_set_value(MCFQSPI_CS0 + chip_select, !cs_high); | ||
181 | } | ||
182 | |||
183 | static struct mcfqspi_cs_control m528x_cs_control = { | ||
184 | .setup = m528x_cs_setup, | ||
185 | .teardown = m528x_cs_teardown, | ||
186 | .select = m528x_cs_select, | ||
187 | .deselect = m528x_cs_deselect, | ||
188 | }; | ||
189 | |||
190 | static struct mcfqspi_platform_data m528x_qspi_data = { | ||
191 | .bus_num = 0, | ||
192 | .num_chipselect = 4, | ||
193 | .cs_control = &m528x_cs_control, | ||
194 | }; | ||
195 | |||
196 | static struct platform_device m528x_qspi = { | ||
197 | .name = "mcfqspi", | ||
198 | .id = 0, | ||
199 | .num_resources = ARRAY_SIZE(m528x_qspi_resources), | ||
200 | .resource = m528x_qspi_resources, | ||
201 | .dev.platform_data = &m528x_qspi_data, | ||
202 | }; | ||
203 | |||
204 | static void __init m528x_qspi_init(void) | ||
205 | { | ||
206 | /* setup Port QS for QSPI with gpio CS control */ | ||
207 | __raw_writeb(0x07, MCFGPIO_PQSPAR); | ||
208 | } | ||
209 | #endif /* defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) */ | ||
79 | 210 | ||
80 | static struct platform_device *m528x_devices[] __initdata = { | 211 | static struct platform_device *m528x_devices[] __initdata = { |
81 | &m528x_uart, | 212 | &m528x_uart, |
82 | &m528x_fec, | 213 | &m528x_fec, |
214 | #if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) | ||
215 | &m528x_qspi, | ||
216 | #endif | ||
83 | }; | 217 | }; |
84 | 218 | ||
85 | /***************************************************************************/ | 219 | /***************************************************************************/ |
@@ -174,6 +308,9 @@ static int __init init_BSP(void) | |||
174 | mach_reset = m528x_cpu_reset; | 308 | mach_reset = m528x_cpu_reset; |
175 | m528x_uarts_init(); | 309 | m528x_uarts_init(); |
176 | m528x_fec_init(); | 310 | m528x_fec_init(); |
311 | #if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) | ||
312 | m528x_qspi_init(); | ||
313 | #endif | ||
177 | platform_add_devices(m528x_devices, ARRAY_SIZE(m528x_devices)); | 314 | platform_add_devices(m528x_devices, ARRAY_SIZE(m528x_devices)); |
178 | return 0; | 315 | return 0; |
179 | } | 316 | } |
diff --git a/arch/m68knommu/platform/532x/config.c b/arch/m68knommu/platform/532x/config.c index d632948e64e5..ca51323f957b 100644 --- a/arch/m68knommu/platform/532x/config.c +++ b/arch/m68knommu/platform/532x/config.c | |||
@@ -21,12 +21,15 @@ | |||
21 | #include <linux/param.h> | 21 | #include <linux/param.h> |
22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
23 | #include <linux/io.h> | 23 | #include <linux/io.h> |
24 | #include <linux/spi/spi.h> | ||
25 | #include <linux/gpio.h> | ||
24 | #include <asm/machdep.h> | 26 | #include <asm/machdep.h> |
25 | #include <asm/coldfire.h> | 27 | #include <asm/coldfire.h> |
26 | #include <asm/mcfsim.h> | 28 | #include <asm/mcfsim.h> |
27 | #include <asm/mcfuart.h> | 29 | #include <asm/mcfuart.h> |
28 | #include <asm/mcfdma.h> | 30 | #include <asm/mcfdma.h> |
29 | #include <asm/mcfwdebug.h> | 31 | #include <asm/mcfwdebug.h> |
32 | #include <asm/mcfqspi.h> | ||
30 | 33 | ||
31 | /***************************************************************************/ | 34 | /***************************************************************************/ |
32 | 35 | ||
@@ -82,9 +85,127 @@ static struct platform_device m532x_fec = { | |||
82 | .resource = m532x_fec_resources, | 85 | .resource = m532x_fec_resources, |
83 | }; | 86 | }; |
84 | 87 | ||
88 | #if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) | ||
89 | static struct resource m532x_qspi_resources[] = { | ||
90 | { | ||
91 | .start = MCFQSPI_IOBASE, | ||
92 | .end = MCFQSPI_IOBASE + MCFQSPI_IOSIZE - 1, | ||
93 | .flags = IORESOURCE_MEM, | ||
94 | }, | ||
95 | { | ||
96 | .start = MCFINT_VECBASE + MCFINT_QSPI, | ||
97 | .end = MCFINT_VECBASE + MCFINT_QSPI, | ||
98 | .flags = IORESOURCE_IRQ, | ||
99 | }, | ||
100 | }; | ||
101 | |||
102 | #define MCFQSPI_CS0 84 | ||
103 | #define MCFQSPI_CS1 85 | ||
104 | #define MCFQSPI_CS2 86 | ||
105 | |||
106 | static int m532x_cs_setup(struct mcfqspi_cs_control *cs_control) | ||
107 | { | ||
108 | int status; | ||
109 | |||
110 | status = gpio_request(MCFQSPI_CS0, "MCFQSPI_CS0"); | ||
111 | if (status) { | ||
112 | pr_debug("gpio_request for MCFQSPI_CS0 failed\n"); | ||
113 | goto fail0; | ||
114 | } | ||
115 | status = gpio_direction_output(MCFQSPI_CS0, 1); | ||
116 | if (status) { | ||
117 | pr_debug("gpio_direction_output for MCFQSPI_CS0 failed\n"); | ||
118 | goto fail1; | ||
119 | } | ||
120 | |||
121 | status = gpio_request(MCFQSPI_CS1, "MCFQSPI_CS1"); | ||
122 | if (status) { | ||
123 | pr_debug("gpio_request for MCFQSPI_CS1 failed\n"); | ||
124 | goto fail1; | ||
125 | } | ||
126 | status = gpio_direction_output(MCFQSPI_CS1, 1); | ||
127 | if (status) { | ||
128 | pr_debug("gpio_direction_output for MCFQSPI_CS1 failed\n"); | ||
129 | goto fail2; | ||
130 | } | ||
131 | |||
132 | status = gpio_request(MCFQSPI_CS2, "MCFQSPI_CS2"); | ||
133 | if (status) { | ||
134 | pr_debug("gpio_request for MCFQSPI_CS2 failed\n"); | ||
135 | goto fail2; | ||
136 | } | ||
137 | status = gpio_direction_output(MCFQSPI_CS2, 1); | ||
138 | if (status) { | ||
139 | pr_debug("gpio_direction_output for MCFQSPI_CS2 failed\n"); | ||
140 | goto fail3; | ||
141 | } | ||
142 | |||
143 | return 0; | ||
144 | |||
145 | fail3: | ||
146 | gpio_free(MCFQSPI_CS2); | ||
147 | fail2: | ||
148 | gpio_free(MCFQSPI_CS1); | ||
149 | fail1: | ||
150 | gpio_free(MCFQSPI_CS0); | ||
151 | fail0: | ||
152 | return status; | ||
153 | } | ||
154 | |||
155 | static void m532x_cs_teardown(struct mcfqspi_cs_control *cs_control) | ||
156 | { | ||
157 | gpio_free(MCFQSPI_CS2); | ||
158 | gpio_free(MCFQSPI_CS1); | ||
159 | gpio_free(MCFQSPI_CS0); | ||
160 | } | ||
161 | |||
162 | static void m532x_cs_select(struct mcfqspi_cs_control *cs_control, | ||
163 | u8 chip_select, bool cs_high) | ||
164 | { | ||
165 | gpio_set_value(MCFQSPI_CS0 + chip_select, cs_high); | ||
166 | } | ||
167 | |||
168 | static void m532x_cs_deselect(struct mcfqspi_cs_control *cs_control, | ||
169 | u8 chip_select, bool cs_high) | ||
170 | { | ||
171 | gpio_set_value(MCFQSPI_CS0 + chip_select, !cs_high); | ||
172 | } | ||
173 | |||
174 | static struct mcfqspi_cs_control m532x_cs_control = { | ||
175 | .setup = m532x_cs_setup, | ||
176 | .teardown = m532x_cs_teardown, | ||
177 | .select = m532x_cs_select, | ||
178 | .deselect = m532x_cs_deselect, | ||
179 | }; | ||
180 | |||
181 | static struct mcfqspi_platform_data m532x_qspi_data = { | ||
182 | .bus_num = 0, | ||
183 | .num_chipselect = 3, | ||
184 | .cs_control = &m532x_cs_control, | ||
185 | }; | ||
186 | |||
187 | static struct platform_device m532x_qspi = { | ||
188 | .name = "mcfqspi", | ||
189 | .id = 0, | ||
190 | .num_resources = ARRAY_SIZE(m532x_qspi_resources), | ||
191 | .resource = m532x_qspi_resources, | ||
192 | .dev.platform_data = &m532x_qspi_data, | ||
193 | }; | ||
194 | |||
195 | static void __init m532x_qspi_init(void) | ||
196 | { | ||
197 | /* setup QSPS pins for QSPI with gpio CS control */ | ||
198 | writew(0x01f0, MCF_GPIO_PAR_QSPI); | ||
199 | } | ||
200 | #endif /* defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) */ | ||
201 | |||
202 | |||
85 | static struct platform_device *m532x_devices[] __initdata = { | 203 | static struct platform_device *m532x_devices[] __initdata = { |
86 | &m532x_uart, | 204 | &m532x_uart, |
87 | &m532x_fec, | 205 | &m532x_fec, |
206 | #if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) | ||
207 | &m532x_qspi, | ||
208 | #endif | ||
88 | }; | 209 | }; |
89 | 210 | ||
90 | /***************************************************************************/ | 211 | /***************************************************************************/ |
@@ -158,6 +279,9 @@ static int __init init_BSP(void) | |||
158 | { | 279 | { |
159 | m532x_uarts_init(); | 280 | m532x_uarts_init(); |
160 | m532x_fec_init(); | 281 | m532x_fec_init(); |
282 | #if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) | ||
283 | m532x_qspi_init(); | ||
284 | #endif | ||
161 | platform_add_devices(m532x_devices, ARRAY_SIZE(m532x_devices)); | 285 | platform_add_devices(m532x_devices, ARRAY_SIZE(m532x_devices)); |
162 | return 0; | 286 | return 0; |
163 | } | 287 | } |