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

Commit 77a406da authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Sascha Hauer
Browse files

ARM: imx: fix name of macros to add imx-i2c devices 



This is a follow up to

	c6987159 (ARM: imx: dynamically register imx-i2c devices (imx27))
	2b92084f (ARM: imx: dynamically register imx-i2c devices (imx21))
	6348e6b5 (ARM: imx: dynamically register imx-i2c devices (imx1))

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 44505c07

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

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <mach/devices-common.h>



extern const struct imx_imx_i2c_data imx1_imx_i2c_data __initconst;

#define imx1_add_i2c_imx(pdata)		\

#define imx1_add_imx_i2c(pdata)		\

	imx_add_imx_i2c(&imx1_imx_i2c_data, pdata)



extern const struct imx_imx_uart_3irq_data imx1_imx_uart_data[] __initconst;

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

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <mach/devices-common.h>



extern const struct imx_imx_i2c_data imx21_imx_i2c_data __initconst;

#define imx21_add_i2c_imx(pdata)	\

#define imx21_add_imx_i2c(pdata)	\

	imx_add_imx_i2c(&imx21_imx_i2c_data, pdata)



extern const struct imx_imx_ssi_data imx21_imx_ssi_data[] __initconst;

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

+0 −2
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ 
extern const struct imx_imx_i2c_data imx27_imx_i2c_data[] __initconst;

#define imx27_add_imx_i2c(id, pdata)	\

	imx_add_imx_i2c(&imx27_imx_i2c_data[id], pdata)

#define imx27_add_i2c_imx0(pdata)	imx27_add_imx_i2c(0, pdata)

#define imx27_add_i2c_imx1(pdata)	imx27_add_imx_i2c(1, pdata)



extern const struct imx_imx_ssi_data imx27_imx_ssi_data[] __initconst;

#define imx27_add_imx_ssi(id, pdata)    \

arch/arm/mach-imx/mach-cpuimx27.c

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static void __init eukrea_cpuimx27_init(void) 
	i2c_register_board_info(0, eukrea_cpuimx27_i2c_devices,

				ARRAY_SIZE(eukrea_cpuimx27_i2c_devices));



	imx27_add_i2c_imx1(&cpuimx27_i2c1_data);

	imx27_add_imx_i2c(1, &cpuimx27_i2c1_data);



	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));

arch/arm/mach-imx/mach-imx27_visstrim_m10.c

+2 −2
Original line number Diff line number Diff line
@@ -236,8 +236,8 @@ static void __init visstrim_m10_board_init(void) 


	i2c_register_board_info(0, visstrim_m10_i2c_devices,

				ARRAY_SIZE(visstrim_m10_i2c_devices));

	imx27_add_i2c_imx0(&visstrim_m10_i2c_data);

	imx27_add_i2c_imx1(&visstrim_m10_i2c_data);

	imx27_add_imx_i2c(0, &visstrim_m10_i2c_data);

	imx27_add_imx_i2c(1, &visstrim_m10_i2c_data);

	mxc_register_device(&mxc_sdhc_device0, &visstrim_m10_sdhc_pdata);

	mxc_register_device(&mxc_otg_host, &visstrim_m10_usbotg_pdata);

	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));