diff options
Diffstat (limited to 'arch/arm/plat-mxc/devices')
-rw-r--r-- | arch/arm/plat-mxc/devices/platform-fec.c | 1 | ||||
-rw-r--r-- | arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c | 1 | ||||
-rw-r--r-- | arch/arm/plat-mxc/devices/platform-gpio-mxc.c | 4 | ||||
-rw-r--r-- | arch/arm/plat-mxc/devices/platform-imx-fb.c | 1 | ||||
-rw-r--r-- | arch/arm/plat-mxc/devices/platform-ipu-core.c | 1 | ||||
-rw-r--r-- | arch/arm/plat-mxc/devices/platform-mxc-ehci.c | 1 | ||||
-rw-r--r-- | arch/arm/plat-mxc/devices/platform-mxc-mmc.c | 1 | ||||
-rw-r--r-- | arch/arm/plat-mxc/devices/platform-spi_imx.c | 12 |
8 files changed, 16 insertions, 6 deletions
diff --git a/arch/arm/plat-mxc/devices/platform-fec.c b/arch/arm/plat-mxc/devices/platform-fec.c index ccc789e21daa..4fc6ffc2a13e 100644 --- a/arch/arm/plat-mxc/devices/platform-fec.c +++ b/arch/arm/plat-mxc/devices/platform-fec.c | |||
@@ -6,6 +6,7 @@ | |||
6 | * the terms of the GNU General Public License version 2 as published by the | 6 | * the terms of the GNU General Public License version 2 as published by the |
7 | * Free Software Foundation. | 7 | * Free Software Foundation. |
8 | */ | 8 | */ |
9 | #include <linux/dma-mapping.h> | ||
9 | #include <asm/sizes.h> | 10 | #include <asm/sizes.h> |
10 | #include <mach/hardware.h> | 11 | #include <mach/hardware.h> |
11 | #include <mach/devices-common.h> | 12 | #include <mach/devices-common.h> |
diff --git a/arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c b/arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c index 59c33f6e401c..23ce08e6ffd2 100644 --- a/arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c +++ b/arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c | |||
@@ -6,6 +6,7 @@ | |||
6 | * the terms of the GNU General Public License version 2 as published by the | 6 | * the terms of the GNU General Public License version 2 as published by the |
7 | * Free Software Foundation. | 7 | * Free Software Foundation. |
8 | */ | 8 | */ |
9 | #include <linux/dma-mapping.h> | ||
9 | #include <mach/hardware.h> | 10 | #include <mach/hardware.h> |
10 | #include <mach/devices-common.h> | 11 | #include <mach/devices-common.h> |
11 | 12 | ||
diff --git a/arch/arm/plat-mxc/devices/platform-gpio-mxc.c b/arch/arm/plat-mxc/devices/platform-gpio-mxc.c index cf1b7fdfa20d..a7919a241032 100644 --- a/arch/arm/plat-mxc/devices/platform-gpio-mxc.c +++ b/arch/arm/plat-mxc/devices/platform-gpio-mxc.c | |||
@@ -8,7 +8,7 @@ | |||
8 | */ | 8 | */ |
9 | #include <mach/devices-common.h> | 9 | #include <mach/devices-common.h> |
10 | 10 | ||
11 | struct platform_device *__init mxc_register_gpio(int id, | 11 | struct platform_device *__init mxc_register_gpio(char *name, int id, |
12 | resource_size_t iobase, resource_size_t iosize, int irq, int irq_high) | 12 | resource_size_t iobase, resource_size_t iosize, int irq, int irq_high) |
13 | { | 13 | { |
14 | struct resource res[] = { | 14 | struct resource res[] = { |
@@ -28,5 +28,5 @@ struct platform_device *__init mxc_register_gpio(int id, | |||
28 | }; | 28 | }; |
29 | 29 | ||
30 | return platform_device_register_resndata(&mxc_aips_bus, | 30 | return platform_device_register_resndata(&mxc_aips_bus, |
31 | "gpio-mxc", id, res, ARRAY_SIZE(res), NULL, 0); | 31 | name, id, res, ARRAY_SIZE(res), NULL, 0); |
32 | } | 32 | } |
diff --git a/arch/arm/plat-mxc/devices/platform-imx-fb.c b/arch/arm/plat-mxc/devices/platform-imx-fb.c index 79a1cb18a5b0..2b0b5e0aa998 100644 --- a/arch/arm/plat-mxc/devices/platform-imx-fb.c +++ b/arch/arm/plat-mxc/devices/platform-imx-fb.c | |||
@@ -6,6 +6,7 @@ | |||
6 | * the terms of the GNU General Public License version 2 as published by the | 6 | * the terms of the GNU General Public License version 2 as published by the |
7 | * Free Software Foundation. | 7 | * Free Software Foundation. |
8 | */ | 8 | */ |
9 | #include <linux/dma-mapping.h> | ||
9 | #include <mach/hardware.h> | 10 | #include <mach/hardware.h> |
10 | #include <mach/devices-common.h> | 11 | #include <mach/devices-common.h> |
11 | 12 | ||
diff --git a/arch/arm/plat-mxc/devices/platform-ipu-core.c b/arch/arm/plat-mxc/devices/platform-ipu-core.c index edf65034aea5..79d340ae0af1 100644 --- a/arch/arm/plat-mxc/devices/platform-ipu-core.c +++ b/arch/arm/plat-mxc/devices/platform-ipu-core.c | |||
@@ -6,6 +6,7 @@ | |||
6 | * the terms of the GNU General Public License version 2 as published by the | 6 | * the terms of the GNU General Public License version 2 as published by the |
7 | * Free Software Foundation. | 7 | * Free Software Foundation. |
8 | */ | 8 | */ |
9 | #include <linux/dma-mapping.h> | ||
9 | #include <mach/hardware.h> | 10 | #include <mach/hardware.h> |
10 | #include <mach/devices-common.h> | 11 | #include <mach/devices-common.h> |
11 | 12 | ||
diff --git a/arch/arm/plat-mxc/devices/platform-mxc-ehci.c b/arch/arm/plat-mxc/devices/platform-mxc-ehci.c index cc488f4b6204..e1763e03e7cb 100644 --- a/arch/arm/plat-mxc/devices/platform-mxc-ehci.c +++ b/arch/arm/plat-mxc/devices/platform-mxc-ehci.c | |||
@@ -6,6 +6,7 @@ | |||
6 | * the terms of the GNU General Public License version 2 as published by the | 6 | * the terms of the GNU General Public License version 2 as published by the |
7 | * Free Software Foundation. | 7 | * Free Software Foundation. |
8 | */ | 8 | */ |
9 | #include <linux/dma-mapping.h> | ||
9 | #include <mach/hardware.h> | 10 | #include <mach/hardware.h> |
10 | #include <mach/devices-common.h> | 11 | #include <mach/devices-common.h> |
11 | 12 | ||
diff --git a/arch/arm/plat-mxc/devices/platform-mxc-mmc.c b/arch/arm/plat-mxc/devices/platform-mxc-mmc.c index 90d762f6f93b..540d3a7d92df 100644 --- a/arch/arm/plat-mxc/devices/platform-mxc-mmc.c +++ b/arch/arm/plat-mxc/devices/platform-mxc-mmc.c | |||
@@ -6,6 +6,7 @@ | |||
6 | * the terms of the GNU General Public License version 2 as published by the | 6 | * the terms of the GNU General Public License version 2 as published by the |
7 | * Free Software Foundation. | 7 | * Free Software Foundation. |
8 | */ | 8 | */ |
9 | #include <linux/dma-mapping.h> | ||
9 | #include <mach/hardware.h> | 10 | #include <mach/hardware.h> |
10 | #include <mach/devices-common.h> | 11 | #include <mach/devices-common.h> |
11 | 12 | ||
diff --git a/arch/arm/plat-mxc/devices/platform-spi_imx.c b/arch/arm/plat-mxc/devices/platform-spi_imx.c index f97eb3615b2c..9bfae8bd5b8d 100644 --- a/arch/arm/plat-mxc/devices/platform-spi_imx.c +++ b/arch/arm/plat-mxc/devices/platform-spi_imx.c | |||
@@ -40,9 +40,10 @@ const struct imx_spi_imx_data imx21_cspi_data[] __initconst = { | |||
40 | #endif | 40 | #endif |
41 | 41 | ||
42 | #ifdef CONFIG_SOC_IMX25 | 42 | #ifdef CONFIG_SOC_IMX25 |
43 | /* i.mx25 has the i.mx35 type cspi */ | ||
43 | const struct imx_spi_imx_data imx25_cspi_data[] __initconst = { | 44 | const struct imx_spi_imx_data imx25_cspi_data[] __initconst = { |
44 | #define imx25_cspi_data_entry(_id, _hwid) \ | 45 | #define imx25_cspi_data_entry(_id, _hwid) \ |
45 | imx_spi_imx_data_entry(MX25, CSPI, "imx25-cspi", _id, _hwid, SZ_16K) | 46 | imx_spi_imx_data_entry(MX25, CSPI, "imx35-cspi", _id, _hwid, SZ_16K) |
46 | imx25_cspi_data_entry(0, 1), | 47 | imx25_cspi_data_entry(0, 1), |
47 | imx25_cspi_data_entry(1, 2), | 48 | imx25_cspi_data_entry(1, 2), |
48 | imx25_cspi_data_entry(2, 3), | 49 | imx25_cspi_data_entry(2, 3), |
@@ -79,8 +80,9 @@ const struct imx_spi_imx_data imx35_cspi_data[] __initconst = { | |||
79 | #endif /* ifdef CONFIG_SOC_IMX35 */ | 80 | #endif /* ifdef CONFIG_SOC_IMX35 */ |
80 | 81 | ||
81 | #ifdef CONFIG_SOC_IMX51 | 82 | #ifdef CONFIG_SOC_IMX51 |
83 | /* i.mx51 has the i.mx35 type cspi */ | ||
82 | const struct imx_spi_imx_data imx51_cspi_data __initconst = | 84 | const struct imx_spi_imx_data imx51_cspi_data __initconst = |
83 | imx_spi_imx_data_entry_single(MX51, CSPI, "imx51-cspi", 2, , SZ_4K); | 85 | imx_spi_imx_data_entry_single(MX51, CSPI, "imx35-cspi", 2, , SZ_4K); |
84 | 86 | ||
85 | const struct imx_spi_imx_data imx51_ecspi_data[] __initconst = { | 87 | const struct imx_spi_imx_data imx51_ecspi_data[] __initconst = { |
86 | #define imx51_ecspi_data_entry(_id, _hwid) \ | 88 | #define imx51_ecspi_data_entry(_id, _hwid) \ |
@@ -91,12 +93,14 @@ const struct imx_spi_imx_data imx51_ecspi_data[] __initconst = { | |||
91 | #endif /* ifdef CONFIG_SOC_IMX51 */ | 93 | #endif /* ifdef CONFIG_SOC_IMX51 */ |
92 | 94 | ||
93 | #ifdef CONFIG_SOC_IMX53 | 95 | #ifdef CONFIG_SOC_IMX53 |
96 | /* i.mx53 has the i.mx35 type cspi */ | ||
94 | const struct imx_spi_imx_data imx53_cspi_data __initconst = | 97 | const struct imx_spi_imx_data imx53_cspi_data __initconst = |
95 | imx_spi_imx_data_entry_single(MX53, CSPI, "imx53-cspi", 0, , SZ_4K); | 98 | imx_spi_imx_data_entry_single(MX53, CSPI, "imx35-cspi", 0, , SZ_4K); |
96 | 99 | ||
100 | /* i.mx53 has the i.mx51 type ecspi */ | ||
97 | const struct imx_spi_imx_data imx53_ecspi_data[] __initconst = { | 101 | const struct imx_spi_imx_data imx53_ecspi_data[] __initconst = { |
98 | #define imx53_ecspi_data_entry(_id, _hwid) \ | 102 | #define imx53_ecspi_data_entry(_id, _hwid) \ |
99 | imx_spi_imx_data_entry(MX53, ECSPI, "imx53-ecspi", _id, _hwid, SZ_4K) | 103 | imx_spi_imx_data_entry(MX53, ECSPI, "imx51-ecspi", _id, _hwid, SZ_4K) |
100 | imx53_ecspi_data_entry(0, 1), | 104 | imx53_ecspi_data_entry(0, 1), |
101 | imx53_ecspi_data_entry(1, 2), | 105 | imx53_ecspi_data_entry(1, 2), |
102 | }; | 106 | }; |