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

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

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



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

arch/arm/mach-mx3/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ config MACH_QONG 
config MACH_PCM043

	bool "Support Phytec pcm043 (i.MX35) platforms"

	select ARCH_MX35

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_MXC_NAND

	select MXC_ULPI if USB_ULPI

	help

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

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

#include <mach/devices-common.h>



#define imx35_add_imx_i2c0(pdata)	\

	imx_add_imx_i2c(0, MX35_I2C1_BASE_ADDR, SZ_4K, MX35_INT_I2C1, pdata)

#define imx35_add_imx_i2c1(pdata)	\

	imx_add_imx_i2c(1, MX35_I2C2_BASE_ADDR, SZ_4K, MX35_INT_I2C2, pdata)

#define imx35_add_imx_i2c2(pdata)	\

	imx_add_imx_i2c(2, MX35_I2C3_BASE_ADDR, SZ_4K, MX35_INT_I2C3, pdata)



#define imx35_add_mxc_nand(pdata)	\

	imx_add_mxc_nand_v21(MX35_NFC_BASE_ADDR, MX35_INT_NANDFC, pdata)

arch/arm/mach-mx3/devices.c

+0 −59
Original line number Diff line number Diff line
@@ -167,65 +167,6 @@ struct platform_device mxc_w1_master_device = { 
	.resource = mxc_w1_master_resources,

};



#if defined(CONFIG_ARCH_MX35)

static struct resource mxc_i2c0_resources[] = {

	{

		.start = I2C_BASE_ADDR,

		.end = I2C_BASE_ADDR + SZ_4K - 1,

		.flags = IORESOURCE_MEM,

	}, {

		.start = MXC_INT_I2C,

		.end = MXC_INT_I2C,

		.flags = IORESOURCE_IRQ,

	},

};



struct platform_device mxc_i2c_device0 = {

	.name = "imx-i2c",

	.id = 0,

	.num_resources = ARRAY_SIZE(mxc_i2c0_resources),

	.resource = mxc_i2c0_resources,

};



static struct resource mxc_i2c1_resources[] = {

	{

		.start = I2C2_BASE_ADDR,

		.end = I2C2_BASE_ADDR + SZ_4K - 1,

		.flags = IORESOURCE_MEM,

	}, {

		.start = MXC_INT_I2C2,

		.end = MXC_INT_I2C2,

		.flags = IORESOURCE_IRQ,

	},

};



struct platform_device mxc_i2c_device1 = {

	.name = "imx-i2c",

	.id = 1,

	.num_resources = ARRAY_SIZE(mxc_i2c1_resources),

	.resource = mxc_i2c1_resources,

};



static struct resource mxc_i2c2_resources[] = {

	{

		.start = I2C3_BASE_ADDR,

		.end = I2C3_BASE_ADDR + SZ_4K - 1,

		.flags = IORESOURCE_MEM,

	}, {

		.start = MXC_INT_I2C3,

		.end = MXC_INT_I2C3,

		.flags = IORESOURCE_IRQ,

	},

};



struct platform_device mxc_i2c_device2 = {

	.name = "imx-i2c",

	.id = 2,

	.num_resources = ARRAY_SIZE(mxc_i2c2_resources),

	.resource = mxc_i2c2_resources,

};

#endif



#ifdef CONFIG_ARCH_MX31

static struct resource mxcsdhc0_resources[] = {

	{

arch/arm/mach-mx3/devices.h

+0 −5
Original line number Diff line number Diff line
@@ -5,11 +5,6 @@ extern struct platform_device mxc_uart_device2; 
extern struct platform_device mxc_uart_device3;

extern struct platform_device mxc_uart_device4;

extern struct platform_device mxc_w1_master_device;

#if defined(CONFIG_ARCH_MX35)

extern struct platform_device mxc_i2c_device0;

extern struct platform_device mxc_i2c_device1;

extern struct platform_device mxc_i2c_device2;

#endif

extern struct platform_device mx3_ipu;

extern struct platform_device mx3_fb;

extern struct platform_device mx3_camera;

arch/arm/mach-mx3/mach-pcm043.c

+2 −5
Original line number Diff line number Diff line
@@ -37,9 +37,6 @@ 
#include <mach/hardware.h>

#include <mach/common.h>

#include <mach/imx-uart.h>

#if defined CONFIG_I2C_IMX || defined CONFIG_I2C_IMX_MODULE

#include <mach/i2c.h>

#endif

#include <mach/iomux-mx35.h>

#include <mach/ipu.h>

#include <mach/mx3fb.h>
@@ -123,7 +120,7 @@ static struct imxuart_platform_data uart_pdata = { 
};



#if defined CONFIG_I2C_IMX || defined CONFIG_I2C_IMX_MODULE

static struct imxi2c_platform_data pcm043_i2c_1_data = {

static const struct imxi2c_platform_data pcm043_i2c0_data __initconst = {

	.bitrate = 50000,

};
@@ -368,7 +365,7 @@ static void __init mxc_board_init(void) 
	i2c_register_board_info(0, pcm043_i2c_devices,

			ARRAY_SIZE(pcm043_i2c_devices));



	mxc_register_device(&mxc_i2c_device0, &pcm043_i2c_1_data);

	imx35_add_imx_i2c0(&pcm043_i2c0_data);

#endif



	mxc_register_device(&mx3_ipu, &mx3_ipu_data);