Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30caa4b7 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

ARM: imx: prepare for removal of flexcan_platform_data 



As there are no imx in-tree users of flexcan_platform_data, this patch removes
the possibility to register a flexcan device with platform data.

The functionality to swith on/off CAN transceivers is added to DT via
regulators in a later patch.

Compile time tested with imx_v4_v5_defconfig and imx_v6_v7_defconfig.

Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 38ae92dc

arch/arm/mach-imx/devices-imx25.h

+4 −4
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ extern const struct imx_fec_data imx25_fec_data; 
	imx_add_fec(&imx25_fec_data, pdata)



extern const struct imx_flexcan_data imx25_flexcan_data[];

#define imx25_add_flexcan(id, pdata)	\

	imx_add_flexcan(&imx25_flexcan_data[id], pdata)

#define imx25_add_flexcan0(pdata)	imx25_add_flexcan(0, pdata)

#define imx25_add_flexcan1(pdata)	imx25_add_flexcan(1, pdata)

#define imx25_add_flexcan(id)	\

	imx_add_flexcan(&imx25_flexcan_data[id])

#define imx25_add_flexcan0()		imx25_add_flexcan(0)

#define imx25_add_flexcan1()		imx25_add_flexcan(1)



extern const struct imx_fsl_usb2_udc_data imx25_fsl_usb2_udc_data;

#define imx25_add_fsl_usb2_udc(pdata)	\

arch/arm/mach-imx/devices-imx35.h

+4 −4
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ extern const struct imx_fsl_usb2_udc_data imx35_fsl_usb2_udc_data; 
	imx_add_fsl_usb2_udc(&imx35_fsl_usb2_udc_data, pdata)



extern const struct imx_flexcan_data imx35_flexcan_data[];

#define imx35_add_flexcan(id, pdata)	\

	imx_add_flexcan(&imx35_flexcan_data[id], pdata)

#define imx35_add_flexcan0(pdata)	imx35_add_flexcan(0, pdata)

#define imx35_add_flexcan1(pdata)	imx35_add_flexcan(1, pdata)

#define imx35_add_flexcan(id)	\

	imx_add_flexcan(&imx35_flexcan_data[id])

#define imx35_add_flexcan0()		imx35_add_flexcan(0)

#define imx35_add_flexcan1()		imx35_add_flexcan(1)



extern const struct imx_imx2_wdt_data imx35_imx2_wdt_data;

#define imx35_add_imx2_wdt()       \

arch/arm/mach-imx/devices/devices-common.h

+1 −3
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ struct platform_device *__init imx_add_fec( 
		const struct imx_fec_data *data,

		const struct fec_platform_data *pdata);



#include <linux/can/platform/flexcan.h>

struct imx_flexcan_data {

	int id;

	resource_size_t iobase;
@@ -58,8 +57,7 @@ struct imx_flexcan_data { 
	resource_size_t irq;

};

struct platform_device *__init imx_add_flexcan(

		const struct imx_flexcan_data *data,

		const struct flexcan_platform_data *pdata);

		const struct imx_flexcan_data *data);



#include <linux/fsl_devices.h>

struct imx_fsl_usb2_udc_data {

arch/arm/mach-imx/devices/platform-flexcan.c

+2 −3
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ const struct imx_flexcan_data imx35_flexcan_data[] __initconst = { 
#endif /* ifdef CONFIG_SOC_IMX35 */



struct platform_device *__init imx_add_flexcan(

		const struct imx_flexcan_data *data,

		const struct flexcan_platform_data *pdata)

		const struct imx_flexcan_data *data)

{

	struct resource res[] = {

		{
@@ -54,5 +53,5 @@ struct platform_device *__init imx_add_flexcan( 
	};



	return imx_add_platform_device("flexcan", data->id,

			res, ARRAY_SIZE(res), pdata, sizeof(*pdata));

			res, ARRAY_SIZE(res), NULL, 0);

}

arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ void __init eukrea_mbimxsd25_baseboard_init(void) 
	imx25_add_imx_fb(&eukrea_mximxsd_fb_pdata);

	imx25_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata);



	imx25_add_flexcan1(NULL);

	imx25_add_flexcan1();

	imx25_add_sdhci_esdhc_imx(0, &sd1_pdata);



	gpio_request(GPIO_LED1, "LED1");