diff options
-rw-r--r-- | drivers/spi/spi-fsl-cpm.c | 14 | ||||
-rw-r--r-- | drivers/spi/spi-fsl-dspi.c | 18 | ||||
-rw-r--r-- | drivers/spi/spi-fsl-espi.c | 12 | ||||
-rw-r--r-- | drivers/spi/spi-fsl-lib.c | 6 | ||||
-rw-r--r-- | drivers/spi/spi-fsl-spi.c | 22 |
5 files changed, 36 insertions, 36 deletions
diff --git a/drivers/spi/spi-fsl-cpm.c b/drivers/spi/spi-fsl-cpm.c index 54b06376f03c..c5dd20beee22 100644 --- a/drivers/spi/spi-fsl-cpm.c +++ b/drivers/spi/spi-fsl-cpm.c | |||
@@ -15,17 +15,17 @@ | |||
15 | * Free Software Foundation; either version 2 of the License, or (at your | 15 | * Free Software Foundation; either version 2 of the License, or (at your |
16 | * option) any later version. | 16 | * option) any later version. |
17 | */ | 17 | */ |
18 | #include <linux/types.h> | ||
19 | #include <linux/kernel.h> | ||
20 | #include <linux/spi/spi.h> | ||
21 | #include <linux/fsl_devices.h> | ||
22 | #include <linux/dma-mapping.h> | ||
23 | #include <linux/of_address.h> | ||
24 | #include <asm/cpm.h> | 18 | #include <asm/cpm.h> |
25 | #include <asm/qe.h> | 19 | #include <asm/qe.h> |
20 | #include <linux/dma-mapping.h> | ||
21 | #include <linux/fsl_devices.h> | ||
22 | #include <linux/kernel.h> | ||
23 | #include <linux/of_address.h> | ||
24 | #include <linux/spi/spi.h> | ||
25 | #include <linux/types.h> | ||
26 | 26 | ||
27 | #include "spi-fsl-lib.h" | ||
28 | #include "spi-fsl-cpm.h" | 27 | #include "spi-fsl-cpm.h" |
28 | #include "spi-fsl-lib.h" | ||
29 | #include "spi-fsl-spi.h" | 29 | #include "spi-fsl-spi.h" |
30 | 30 | ||
31 | /* CPM1 and CPM2 are mutually exclusive. */ | 31 | /* CPM1 and CPM2 are mutually exclusive. */ |
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index 5021ddf03f60..63c3859d24cf 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c | |||
@@ -13,22 +13,22 @@ | |||
13 | * | 13 | * |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/clk.h> | ||
17 | #include <linux/delay.h> | ||
18 | #include <linux/err.h> | ||
19 | #include <linux/errno.h> | ||
20 | #include <linux/interrupt.h> | ||
21 | #include <linux/io.h> | ||
16 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
17 | #include <linux/module.h> | 23 | #include <linux/module.h> |
18 | #include <linux/interrupt.h> | 24 | #include <linux/of.h> |
19 | #include <linux/errno.h> | 25 | #include <linux/of_device.h> |
20 | #include <linux/platform_device.h> | 26 | #include <linux/platform_device.h> |
27 | #include <linux/pm_runtime.h> | ||
21 | #include <linux/regmap.h> | 28 | #include <linux/regmap.h> |
22 | #include <linux/sched.h> | 29 | #include <linux/sched.h> |
23 | #include <linux/delay.h> | ||
24 | #include <linux/io.h> | ||
25 | #include <linux/clk.h> | ||
26 | #include <linux/err.h> | ||
27 | #include <linux/spi/spi.h> | 30 | #include <linux/spi/spi.h> |
28 | #include <linux/spi/spi_bitbang.h> | 31 | #include <linux/spi/spi_bitbang.h> |
29 | #include <linux/pm_runtime.h> | ||
30 | #include <linux/of.h> | ||
31 | #include <linux/of_device.h> | ||
32 | 32 | ||
33 | #define DRIVER_NAME "fsl-dspi" | 33 | #define DRIVER_NAME "fsl-dspi" |
34 | 34 | ||
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index 8ebd724e4c59..68b4254069c0 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c | |||
@@ -8,19 +8,19 @@ | |||
8 | * Free Software Foundation; either version 2 of the License, or (at your | 8 | * Free Software Foundation; either version 2 of the License, or (at your |
9 | * option) any later version. | 9 | * option) any later version. |
10 | */ | 10 | */ |
11 | #include <linux/module.h> | ||
12 | #include <linux/delay.h> | 11 | #include <linux/delay.h> |
13 | #include <linux/irq.h> | 12 | #include <linux/err.h> |
14 | #include <linux/spi/spi.h> | ||
15 | #include <linux/platform_device.h> | ||
16 | #include <linux/fsl_devices.h> | 13 | #include <linux/fsl_devices.h> |
14 | #include <linux/interrupt.h> | ||
15 | #include <linux/irq.h> | ||
16 | #include <linux/module.h> | ||
17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
18 | #include <linux/of.h> | 18 | #include <linux/of.h> |
19 | #include <linux/of_address.h> | 19 | #include <linux/of_address.h> |
20 | #include <linux/of_irq.h> | 20 | #include <linux/of_irq.h> |
21 | #include <linux/of_platform.h> | 21 | #include <linux/of_platform.h> |
22 | #include <linux/interrupt.h> | 22 | #include <linux/platform_device.h> |
23 | #include <linux/err.h> | 23 | #include <linux/spi/spi.h> |
24 | #include <sysdev/fsl_soc.h> | 24 | #include <sysdev/fsl_soc.h> |
25 | 25 | ||
26 | #include "spi-fsl-lib.h" | 26 | #include "spi-fsl-lib.h" |
diff --git a/drivers/spi/spi-fsl-lib.c b/drivers/spi/spi-fsl-lib.c index e0b773fc29cb..5ddb5b098e4e 100644 --- a/drivers/spi/spi-fsl-lib.c +++ b/drivers/spi/spi-fsl-lib.c | |||
@@ -16,10 +16,10 @@ | |||
16 | * Free Software Foundation; either version 2 of the License, or (at your | 16 | * Free Software Foundation; either version 2 of the License, or (at your |
17 | * option) any later version. | 17 | * option) any later version. |
18 | */ | 18 | */ |
19 | #include <linux/kernel.h> | ||
20 | #include <linux/interrupt.h> | ||
21 | #include <linux/fsl_devices.h> | ||
22 | #include <linux/dma-mapping.h> | 19 | #include <linux/dma-mapping.h> |
20 | #include <linux/fsl_devices.h> | ||
21 | #include <linux/interrupt.h> | ||
22 | #include <linux/kernel.h> | ||
23 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
24 | #include <linux/of_platform.h> | 24 | #include <linux/of_platform.h> |
25 | #include <linux/spi/spi.h> | 25 | #include <linux/spi/spi.h> |
diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c index 9452f6740997..c15a34ba71f5 100644 --- a/drivers/spi/spi-fsl-spi.c +++ b/drivers/spi/spi-fsl-spi.c | |||
@@ -19,25 +19,25 @@ | |||
19 | * Free Software Foundation; either version 2 of the License, or (at your | 19 | * Free Software Foundation; either version 2 of the License, or (at your |
20 | * option) any later version. | 20 | * option) any later version. |
21 | */ | 21 | */ |
22 | #include <linux/module.h> | ||
23 | #include <linux/types.h> | ||
24 | #include <linux/kernel.h> | ||
25 | #include <linux/interrupt.h> | ||
26 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
27 | #include <linux/irq.h> | ||
28 | #include <linux/spi/spi.h> | ||
29 | #include <linux/spi/spi_bitbang.h> | ||
30 | #include <linux/platform_device.h> | ||
31 | #include <linux/fsl_devices.h> | ||
32 | #include <linux/dma-mapping.h> | 23 | #include <linux/dma-mapping.h> |
24 | #include <linux/fsl_devices.h> | ||
25 | #include <linux/gpio.h> | ||
26 | #include <linux/interrupt.h> | ||
27 | #include <linux/irq.h> | ||
28 | #include <linux/kernel.h> | ||
33 | #include <linux/mm.h> | 29 | #include <linux/mm.h> |
30 | #include <linux/module.h> | ||
34 | #include <linux/mutex.h> | 31 | #include <linux/mutex.h> |
35 | #include <linux/of.h> | 32 | #include <linux/of.h> |
36 | #include <linux/of_platform.h> | ||
37 | #include <linux/of_address.h> | 33 | #include <linux/of_address.h> |
38 | #include <linux/of_irq.h> | 34 | #include <linux/of_irq.h> |
39 | #include <linux/gpio.h> | ||
40 | #include <linux/of_gpio.h> | 35 | #include <linux/of_gpio.h> |
36 | #include <linux/of_platform.h> | ||
37 | #include <linux/platform_device.h> | ||
38 | #include <linux/spi/spi.h> | ||
39 | #include <linux/spi/spi_bitbang.h> | ||
40 | #include <linux/types.h> | ||
41 | 41 | ||
42 | #include "spi-fsl-lib.h" | 42 | #include "spi-fsl-lib.h" |
43 | #include "spi-fsl-cpm.h" | 43 | #include "spi-fsl-cpm.h" |