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

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

ARM: imx: dynamically register imx-i2c devices (imx27) 



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

arch/arm/mach-imx/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ comment "MX27 platforms:" 


config MACH_MX27ADS

	bool "MX27ADS platform"

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_MXC_NAND

	help

	  Include support for MX27ADS platform. This includes specific
@@ -89,6 +90,7 @@ config MACH_MX27ADS 


config MACH_PCM038

	bool "Phytec phyCORE-i.MX27 CPU module (pcm038)"

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_MXC_NAND

	select MXC_ULPI if USB_ULPI

	help
@@ -111,6 +113,7 @@ endchoice 


config MACH_CPUIMX27

	bool "Eukrea CPUIMX27 module"

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_MXC_NAND

	help

	  Include support for Eukrea CPUIMX27 platform. This includes
@@ -151,6 +154,7 @@ config MACH_IMX27LITE 


config MACH_PCA100

	bool "Phytec phyCARD-s (pca100)"

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_MXC_NAND

	select MXC_ULPI if USB_ULPI

	help
@@ -159,6 +163,7 @@ config MACH_PCA100 


config MACH_MXT_TD60

	bool "Maxtrack i-MXT TD60"

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_MXC_NAND

	help

	  Include support for i-MXT (aka td60) platform. This

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

+5 −0
Original line number Diff line number Diff line
@@ -9,5 +9,10 @@ 
#include <mach/mx27.h>

#include <mach/devices-common.h>



#define imx27_add_i2c_imx0(pdata)	\

	imx_add_imx_i2c(0, MX27_I2C1_BASE_ADDR, SZ_4K, MX27_INT_I2C1, pdata)

#define imx27_add_i2c_imx1(pdata)	\

	imx_add_imx_i2c(1, MX27_I2C2_BASE_ADDR, SZ_4K, MX27_INT_I2C2, pdata)



#define imx27_add_mxc_nand(pdata)	\

	imx_add_mxc_nand_v1(MX27_NFC_BASE_ADDR, MX27_INT_NANDFC, pdata)

arch/arm/mach-imx/devices.c

+0 −26
Original line number Diff line number Diff line
@@ -368,32 +368,6 @@ struct platform_device mxc_fec_device = { 
};

#endif



#ifdef CONFIG_MACH_MX27

#define DEFINE_IMX_I2C_DEVICE(n, baseaddr, irq)				\

	static struct resource mxc_i2c_resources ## n[] = {		\

		{							\

			.start = baseaddr,				\

			.end = baseaddr + SZ_4K - 1,			\

			.flags = IORESOURCE_MEM,			\

		}, {							\

			.start = irq,					\

			.end = irq,					\

			.flags = IORESOURCE_IRQ,			\

		}							\

	};								\

									\

	struct platform_device mxc_i2c_device ## n = {			\

		.name = "imx-i2c",					\

		.id = n,						\

		.num_resources = ARRAY_SIZE(mxc_i2c_resources ## n),	\

		.resource = mxc_i2c_resources ## n,			\

	}



DEFINE_IMX_I2C_DEVICE(0, MX2x_I2C_BASE_ADDR, MX2x_INT_I2C);



DEFINE_IMX_I2C_DEVICE(1, MX27_I2C2_BASE_ADDR, MX27_INT_I2C2);

#endif



static struct resource mxc_pwm_resources[] = {

	{

		.start = MX2x_PWM_BASE_ADDR,

arch/arm/mach-imx/devices.h

+0 −4
Original line number Diff line number Diff line
@@ -28,10 +28,6 @@ extern struct platform_device mxc_w1_master_device; 
extern struct platform_device mxc_fb_device;

extern struct platform_device mxc_fec_device;

extern struct platform_device mxc_pwm_device;

#ifdef CONFIG_MACH_MX27

extern struct platform_device mxc_i2c_device0;

extern struct platform_device mxc_i2c_device1;

#endif

extern struct platform_device mxc_sdhc_device0;

extern struct platform_device mxc_sdhc_device1;

extern struct platform_device mxc_otg_udc_device;

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

+2 −3
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <mach/board-eukrea_cpuimx27.h>

#include <mach/common.h>

#include <mach/hardware.h>

#include <mach/i2c.h>

#include <mach/iomux-mx27.h>

#include <mach/imx-uart.h>

#include <mach/mxc_nand.h>
@@ -131,7 +130,7 @@ static struct platform_device *platform_devices[] __initdata = { 
	&mxc_fec_device,

};



static struct imxi2c_platform_data eukrea_cpuimx27_i2c_1_data = {

static const struct imxi2c_platform_data cpuimx27_i2c1_data __initconst = {

	.bitrate = 100000,

};
@@ -196,7 +195,7 @@ static void __init eukrea_cpuimx27_init(void) 
	i2c_register_board_info(0, eukrea_cpuimx27_i2c_devices,

				ARRAY_SIZE(eukrea_cpuimx27_i2c_devices));



	mxc_register_device(&mxc_i2c_device0, &eukrea_cpuimx27_i2c_1_data);

	imx27_add_i2c_imx1(&cpuimx27_i2c1_data);



	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));