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

Commit 3636a145 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

arm/mx2: use per-SOC nand device 



The previous commit introduced one nand device per SoC.  Use this
directly instead of the compatibility macro that will break for
multi-SoC kernels.  And while at it remove the compatibility macro now
that all in-tree users are fixed.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent f0d3ab49

arch/arm/mach-mx2/devices.h

+0 −4
Original line number Diff line number Diff line
@@ -15,13 +15,9 @@ extern struct platform_device mxc_uart_device5; 
extern struct platform_device mxc_w1_master_device;

#ifdef CONFIG_MACH_MX21

extern struct platform_device imx21_nand_device;

#define mxc_nand_device imx21_nand_device

#endif

#ifdef CONFIG_MACH_MX27

extern struct platform_device imx27_nand_device;

#ifndef CONFIG_MACH_MX21

#define mxc_nand_device imx27_nand_device

#endif

#endif

extern struct platform_device mxc_fb_device;

extern struct platform_device mxc_fec_device;

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

+2 −1
Original line number Diff line number Diff line
@@ -189,7 +189,8 @@ static void __init eukrea_cpuimx27_init(void) 


	mxc_register_device(&mxc_uart_device0, &uart_pdata[0]);



	mxc_register_device(&mxc_nand_device, &eukrea_cpuimx27_nand_board_info);

	mxc_register_device(&imx27_nand_device,

			&eukrea_cpuimx27_nand_board_info);



	i2c_register_board_info(0, eukrea_cpuimx27_i2c_devices,

				ARRAY_SIZE(eukrea_cpuimx27_i2c_devices));

arch/arm/mach-mx2/mach-mx21ads.c

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static void __init mx21ads_board_init(void) 
	mxc_register_device(&mxc_uart_device3, &uart_pdata);

	mxc_register_device(&mxc_fb_device, &mx21ads_fb_data);

	mxc_register_device(&mxc_sdhc_device0, &mx21ads_sdhc_pdata);

	mxc_register_device(&mxc_nand_device, &mx21ads_nand_board_info);

	mxc_register_device(&imx21_nand_device, &mx21ads_nand_board_info);



	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));

}

arch/arm/mach-mx2/mach-mx27ads.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static void __init mx27ads_board_init(void) 
	mxc_register_device(&mxc_uart_device3, &uart_pdata[3]);

	mxc_register_device(&mxc_uart_device4, &uart_pdata[4]);

	mxc_register_device(&mxc_uart_device5, &uart_pdata[5]);

	mxc_register_device(&mxc_nand_device, &mx27ads_nand_board_info);

	mxc_register_device(&imx27_nand_device, &mx27ads_nand_board_info);



	/* only the i2c master 1 is used on this CPU card */

	i2c_register_board_info(1, mx27ads_i2c_devices,

arch/arm/mach-mx2/mach-mxt_td60.c

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static void __init mxt_td60_board_init(void) 
	mxc_register_device(&mxc_uart_device0, &uart_pdata[0]);

	mxc_register_device(&mxc_uart_device1, &uart_pdata[1]);

	mxc_register_device(&mxc_uart_device2, &uart_pdata[2]);

	mxc_register_device(&mxc_nand_device, &mxt_td60_nand_board_info);

	mxc_register_device(&imx27_nand_device, &mxt_td60_nand_board_info);



	i2c_register_board_info(0, mxt_td60_i2c_devices,

				ARRAY_SIZE(mxt_td60_i2c_devices));