redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
This is a follow up to

	c698715 (ARM: imx: dynamically register imx-i2c devices (imx27))
	2b92084 (ARM: imx: dynamically register imx-i2c devices (imx21))
	6348e6b (ARM: imx: dynamically register imx-i2c devices (imx1))

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Uwe Kleine-König 2010-08-25 12:19:50 +02:00 committed by Sascha Hauer
parent 44505c0768
commit 77a406da5a
10 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-imx/devices-imx1.h
View file

@ -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;

2
arch/arm/mach-imx/devices-imx21.h
View file

@ -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;

2
arch/arm/mach-imx/devices-imx27.h
View file

@ -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) \

2
arch/arm/mach-imx/mach-cpuimx27.c
View file

@ -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));

4
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
View file

@ -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));

2
arch/arm/mach-imx/mach-mx1ads.c
View file

@ -131,7 +131,7 @@ static void __init mx1ads_init(void)
i2c_register_board_info(0, mx1ads_i2c_devices,
ARRAY_SIZE(mx1ads_i2c_devices));
imx1_add_i2c_imx(&mx1ads_i2c_data);
imx1_add_imx_i2c(&mx1ads_i2c_data);
}
static void __init mx1ads_timer_init(void)

2
arch/arm/mach-imx/mach-mx27ads.c
View file

@ -308,7 +308,7 @@ static void __init mx27ads_board_init(void)
/* only the i2c master 1 is used on this CPU card */
i2c_register_board_info(1, mx27ads_i2c_devices,
ARRAY_SIZE(mx27ads_i2c_devices));
imx27_add_i2c_imx1(&mx27ads_i2c1_data);
imx27_add_imx_i2c(1, &mx27ads_i2c1_data);
mxc_register_device(&mxc_fb_device, &mx27ads_fb_data);
mxc_register_device(&mxc_sdhc_device0, &sdhc1_pdata);
mxc_register_device(&mxc_sdhc_device1, &sdhc2_pdata);

4
arch/arm/mach-imx/mach-mxt_td60.c
View file

@ -255,8 +255,8 @@ static void __init mxt_td60_board_init(void)
i2c_register_board_info(1, mxt_td60_i2c2_devices,
ARRAY_SIZE(mxt_td60_i2c2_devices));
imx27_add_i2c_imx0(&mxt_td60_i2c0_data);
imx27_add_i2c_imx1(&mxt_td60_i2c1_data);
imx27_add_imx_i2c(0, &mxt_td60_i2c0_data);
imx27_add_imx_i2c(1, &mxt_td60_i2c1_data);
mxc_register_device(&mxc_fb_device, &mxt_td60_fb_data);
mxc_register_device(&mxc_sdhc_device0, &sdhc1_pdata);

2
arch/arm/mach-imx/mach-pca100.c
View file

@ -400,7 +400,7 @@ static void __init pca100_init(void)
i2c_register_board_info(1, pca100_i2c_devices,
ARRAY_SIZE(pca100_i2c_devices));
imx27_add_i2c_imx1(&pca100_i2c1_data);
imx27_add_imx_i2c(1, &pca100_i2c1_data);
#if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE)
mxc_gpio_mode(GPIO_PORTD | 28 | GPIO_GPIO | GPIO_IN);

2
arch/arm/mach-imx/mach-pcm038.c
View file

@ -309,7 +309,7 @@ static void __init pcm038_init(void)
i2c_register_board_info(1, pcm038_i2c_devices,
ARRAY_SIZE(pcm038_i2c_devices));
imx27_add_i2c_imx1(&pcm038_i2c1_data);
imx27_add_imx_i2c(1, &pcm038_i2c1_data);
/* PE18 for user-LED D40 */
mxc_gpio_mode(GPIO_PORTE | 18 | GPIO_GPIO | GPIO_OUT);