diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-imx/devices-imx25.h | 8 | ||||
-rw-r--r-- | arch/arm/mach-imx/devices-imx35.h | 8 | ||||
-rw-r--r-- | arch/arm/mach-imx/devices/devices-common.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-imx/devices/platform-flexcan.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx25_3ds.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-pcm043.c | 2 |
8 files changed, 15 insertions, 18 deletions
diff --git a/arch/arm/mach-imx/devices-imx25.h b/arch/arm/mach-imx/devices-imx25.h index 0d2922bc575c..769563fdeaa0 100644 --- a/arch/arm/mach-imx/devices-imx25.h +++ b/arch/arm/mach-imx/devices-imx25.h | |||
@@ -13,10 +13,10 @@ extern const struct imx_fec_data imx25_fec_data; | |||
13 | imx_add_fec(&imx25_fec_data, pdata) | 13 | imx_add_fec(&imx25_fec_data, pdata) |
14 | 14 | ||
15 | extern const struct imx_flexcan_data imx25_flexcan_data[]; | 15 | extern const struct imx_flexcan_data imx25_flexcan_data[]; |
16 | #define imx25_add_flexcan(id, pdata) \ | 16 | #define imx25_add_flexcan(id) \ |
17 | imx_add_flexcan(&imx25_flexcan_data[id], pdata) | 17 | imx_add_flexcan(&imx25_flexcan_data[id]) |
18 | #define imx25_add_flexcan0(pdata) imx25_add_flexcan(0, pdata) | 18 | #define imx25_add_flexcan0() imx25_add_flexcan(0) |
19 | #define imx25_add_flexcan1(pdata) imx25_add_flexcan(1, pdata) | 19 | #define imx25_add_flexcan1() imx25_add_flexcan(1) |
20 | 20 | ||
21 | extern const struct imx_fsl_usb2_udc_data imx25_fsl_usb2_udc_data; | 21 | extern const struct imx_fsl_usb2_udc_data imx25_fsl_usb2_udc_data; |
22 | #define imx25_add_fsl_usb2_udc(pdata) \ | 22 | #define imx25_add_fsl_usb2_udc(pdata) \ |
diff --git a/arch/arm/mach-imx/devices-imx35.h b/arch/arm/mach-imx/devices-imx35.h index e2675f1b141c..780d8240281b 100644 --- a/arch/arm/mach-imx/devices-imx35.h +++ b/arch/arm/mach-imx/devices-imx35.h | |||
@@ -17,10 +17,10 @@ extern const struct imx_fsl_usb2_udc_data imx35_fsl_usb2_udc_data; | |||
17 | imx_add_fsl_usb2_udc(&imx35_fsl_usb2_udc_data, pdata) | 17 | imx_add_fsl_usb2_udc(&imx35_fsl_usb2_udc_data, pdata) |
18 | 18 | ||
19 | extern const struct imx_flexcan_data imx35_flexcan_data[]; | 19 | extern const struct imx_flexcan_data imx35_flexcan_data[]; |
20 | #define imx35_add_flexcan(id, pdata) \ | 20 | #define imx35_add_flexcan(id) \ |
21 | imx_add_flexcan(&imx35_flexcan_data[id], pdata) | 21 | imx_add_flexcan(&imx35_flexcan_data[id]) |
22 | #define imx35_add_flexcan0(pdata) imx35_add_flexcan(0, pdata) | 22 | #define imx35_add_flexcan0() imx35_add_flexcan(0) |
23 | #define imx35_add_flexcan1(pdata) imx35_add_flexcan(1, pdata) | 23 | #define imx35_add_flexcan1() imx35_add_flexcan(1) |
24 | 24 | ||
25 | extern const struct imx_imx2_wdt_data imx35_imx2_wdt_data; | 25 | extern const struct imx_imx2_wdt_data imx35_imx2_wdt_data; |
26 | #define imx35_add_imx2_wdt() \ | 26 | #define imx35_add_imx2_wdt() \ |
diff --git a/arch/arm/mach-imx/devices/devices-common.h b/arch/arm/mach-imx/devices/devices-common.h index 453e20bc2657..c13b76b9f6b3 100644 --- a/arch/arm/mach-imx/devices/devices-common.h +++ b/arch/arm/mach-imx/devices/devices-common.h | |||
@@ -50,7 +50,6 @@ struct platform_device *__init imx_add_fec( | |||
50 | const struct imx_fec_data *data, | 50 | const struct imx_fec_data *data, |
51 | const struct fec_platform_data *pdata); | 51 | const struct fec_platform_data *pdata); |
52 | 52 | ||
53 | #include <linux/can/platform/flexcan.h> | ||
54 | struct imx_flexcan_data { | 53 | struct imx_flexcan_data { |
55 | int id; | 54 | int id; |
56 | resource_size_t iobase; | 55 | resource_size_t iobase; |
@@ -58,8 +57,7 @@ struct imx_flexcan_data { | |||
58 | resource_size_t irq; | 57 | resource_size_t irq; |
59 | }; | 58 | }; |
60 | struct platform_device *__init imx_add_flexcan( | 59 | struct platform_device *__init imx_add_flexcan( |
61 | const struct imx_flexcan_data *data, | 60 | const struct imx_flexcan_data *data); |
62 | const struct flexcan_platform_data *pdata); | ||
63 | 61 | ||
64 | #include <linux/fsl_devices.h> | 62 | #include <linux/fsl_devices.h> |
65 | struct imx_fsl_usb2_udc_data { | 63 | struct imx_fsl_usb2_udc_data { |
diff --git a/arch/arm/mach-imx/devices/platform-flexcan.c b/arch/arm/mach-imx/devices/platform-flexcan.c index 1078bf0a94ef..55d61eaf63c6 100644 --- a/arch/arm/mach-imx/devices/platform-flexcan.c +++ b/arch/arm/mach-imx/devices/platform-flexcan.c | |||
@@ -38,8 +38,7 @@ const struct imx_flexcan_data imx35_flexcan_data[] __initconst = { | |||
38 | #endif /* ifdef CONFIG_SOC_IMX35 */ | 38 | #endif /* ifdef CONFIG_SOC_IMX35 */ |
39 | 39 | ||
40 | struct platform_device *__init imx_add_flexcan( | 40 | struct platform_device *__init imx_add_flexcan( |
41 | const struct imx_flexcan_data *data, | 41 | const struct imx_flexcan_data *data) |
42 | const struct flexcan_platform_data *pdata) | ||
43 | { | 42 | { |
44 | struct resource res[] = { | 43 | struct resource res[] = { |
45 | { | 44 | { |
@@ -54,5 +53,5 @@ struct platform_device *__init imx_add_flexcan( | |||
54 | }; | 53 | }; |
55 | 54 | ||
56 | return imx_add_platform_device("flexcan", data->id, | 55 | return imx_add_platform_device("flexcan", data->id, |
57 | res, ARRAY_SIZE(res), pdata, sizeof(*pdata)); | 56 | res, ARRAY_SIZE(res), NULL, 0); |
58 | } | 57 | } |
diff --git a/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c b/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c index e2b70f4c1a2c..e77cc3af6db2 100644 --- a/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c +++ b/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | |||
@@ -279,7 +279,7 @@ void __init eukrea_mbimxsd25_baseboard_init(void) | |||
279 | imx25_add_imx_fb(&eukrea_mximxsd_fb_pdata); | 279 | imx25_add_imx_fb(&eukrea_mximxsd_fb_pdata); |
280 | imx25_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata); | 280 | imx25_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata); |
281 | 281 | ||
282 | imx25_add_flexcan1(NULL); | 282 | imx25_add_flexcan1(); |
283 | imx25_add_sdhci_esdhc_imx(0, &sd1_pdata); | 283 | imx25_add_sdhci_esdhc_imx(0, &sd1_pdata); |
284 | 284 | ||
285 | gpio_request(GPIO_LED1, "LED1"); | 285 | gpio_request(GPIO_LED1, "LED1"); |
diff --git a/arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c b/arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c index 5a2d5ef12dd5..14d6c8249b76 100644 --- a/arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c +++ b/arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | |||
@@ -287,7 +287,7 @@ void __init eukrea_mbimxsd35_baseboard_init(void) | |||
287 | 287 | ||
288 | imx35_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata); | 288 | imx35_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata); |
289 | 289 | ||
290 | imx35_add_flexcan1(NULL); | 290 | imx35_add_flexcan1(); |
291 | imx35_add_sdhci_esdhc_imx(0, &sd1_pdata); | 291 | imx35_add_sdhci_esdhc_imx(0, &sd1_pdata); |
292 | 292 | ||
293 | gpio_request(GPIO_LED1, "LED1"); | 293 | gpio_request(GPIO_LED1, "LED1"); |
diff --git a/arch/arm/mach-imx/mach-mx25_3ds.c b/arch/arm/mach-imx/mach-mx25_3ds.c index 8bcda688a006..13490c203050 100644 --- a/arch/arm/mach-imx/mach-mx25_3ds.c +++ b/arch/arm/mach-imx/mach-mx25_3ds.c | |||
@@ -249,7 +249,7 @@ static void __init mx25pdk_init(void) | |||
249 | imx25_add_imx_i2c0(&mx25_3ds_i2c0_data); | 249 | imx25_add_imx_i2c0(&mx25_3ds_i2c0_data); |
250 | 250 | ||
251 | gpio_request_one(MX25PDK_CAN_PWDN, GPIOF_OUT_INIT_LOW, "can-pwdn"); | 251 | gpio_request_one(MX25PDK_CAN_PWDN, GPIOF_OUT_INIT_LOW, "can-pwdn"); |
252 | imx25_add_flexcan0(NULL); | 252 | imx25_add_flexcan0(); |
253 | } | 253 | } |
254 | 254 | ||
255 | static void __init mx25pdk_timer_init(void) | 255 | static void __init mx25pdk_timer_init(void) |
diff --git a/arch/arm/mach-imx/mach-pcm043.c b/arch/arm/mach-imx/mach-pcm043.c index 8ed533f0f8ca..b726cb1c5fdd 100644 --- a/arch/arm/mach-imx/mach-pcm043.c +++ b/arch/arm/mach-imx/mach-pcm043.c | |||
@@ -385,7 +385,7 @@ static void __init pcm043_init(void) | |||
385 | if (!otg_mode_host) | 385 | if (!otg_mode_host) |
386 | imx35_add_fsl_usb2_udc(&otg_device_pdata); | 386 | imx35_add_fsl_usb2_udc(&otg_device_pdata); |
387 | 387 | ||
388 | imx35_add_flexcan1(NULL); | 388 | imx35_add_flexcan1(); |
389 | imx35_add_sdhci_esdhc_imx(0, &sd1_pdata); | 389 | imx35_add_sdhci_esdhc_imx(0, &sd1_pdata); |
390 | } | 390 | } |
391 | 391 | ||