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

ARM: imx: reorganize imx-i2c device registration to use a struct per SoC 



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

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

+2 −1
Original line number Diff line number Diff line
@@ -9,8 +9,9 @@ 
#include <mach/mx1.h>

#include <mach/devices-common.h>



extern const struct imx_imx_i2c_data imx1_imx_i2c_data __initconst;

#define imx1_add_i2c_imx(pdata)		\

	imx_add_imx_i2c(0, MX1_I2C_BASE_ADDR, SZ_4K, MX1_INT_I2C, pdata)

	imx_add_imx_i2c(&imx1_imx_i2c_data, pdata)



extern const struct imx_imx_uart_3irq_data imx1_imx_uart_data[] __initconst;

#define imx1_add_imx_uart(id, pdata)	\

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

+2 −1
Original line number Diff line number Diff line
@@ -9,8 +9,9 @@ 
#include <mach/mx21.h>

#include <mach/devices-common.h>



extern const struct imx_imx_i2c_data imx21_imx_i2c_data __initconst;

#define imx21_add_i2c_imx(pdata)	\

	imx_add_imx_i2c(0, MX2x_I2C_BASE_ADDR, SZ_4K, MX2x_INT_I2C, pdata)

	imx_add_imx_i2c(&imx21_imx_i2c_data, pdata)



extern const struct imx_imx_ssi_data imx21_imx_ssi_data[] __initconst;

#define imx21_add_imx_ssi(id, pdata)	\

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

+5 −4
Original line number Diff line number Diff line
@@ -9,10 +9,11 @@ 
#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)

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-mx25/devices-imx25.h

+6 −6
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ 
#define imx25_add_flexcan1(pdata)	\

	imx_add_flexcan(1, MX25_CAN2_BASE_ADDR, SZ_16K, MX25_INT_CAN2, pdata)



#define imx25_add_imx_i2c0(pdata)	\

	imx_add_imx_i2c(0, MX25_I2C1_BASE_ADDR, SZ_16K, MX25_INT_I2C1, pdata)

#define imx25_add_imx_i2c1(pdata)	\

	imx_add_imx_i2c(1, MX25_I2C2_BASE_ADDR, SZ_16K, MX25_INT_I2C2, pdata)

#define imx25_add_imx_i2c2(pdata)	\

	imx_add_imx_i2c(2, MX25_I2C3_BASE_ADDR, SZ_16K, MX25_INT_I2C3, pdata)

extern const struct imx_imx_i2c_data imx25_imx_i2c_data[] __initconst;

#define imx25_add_imx_i2c(id, pdata)	\

	imx_add_imx_i2c(&imx25_imx_i2c_data[id], pdata)

#define imx25_add_imx_i2c0(pdata)	imx25_add_imx_i2c(0, pdata)

#define imx25_add_imx_i2c1(pdata)	imx25_add_imx_i2c(1, pdata)

#define imx25_add_imx_i2c2(pdata)	imx25_add_imx_i2c(2, pdata)



extern const struct imx_imx_ssi_data imx25_imx_ssi_data[] __initconst;

#define imx25_add_imx_ssi(id, pdata)	\

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

+6 −6
Original line number Diff line number Diff line
@@ -9,12 +9,12 @@ 
#include <mach/mx31.h>

#include <mach/devices-common.h>



#define imx31_add_imx_i2c0(pdata)	\

	imx_add_imx_i2c(0, MX31_I2C1_BASE_ADDR, SZ_4K, MX31_INT_I2C1, pdata)

#define imx31_add_imx_i2c1(pdata)	\

	imx_add_imx_i2c(1, MX31_I2C2_BASE_ADDR, SZ_4K, MX31_INT_I2C2, pdata)

#define imx31_add_imx_i2c2(pdata)	\

	imx_add_imx_i2c(2, MX31_I2C3_BASE_ADDR, SZ_4K, MX31_INT_I2C3, pdata)

extern const struct imx_imx_i2c_data imx31_imx_i2c_data[] __initconst;

#define imx31_add_imx_i2c(id, pdata)	\

	imx_add_imx_i2c(&imx31_imx_i2c_data[id], pdata)

#define imx31_add_imx_i2c0(pdata)	imx31_add_imx_i2c(0, pdata)

#define imx31_add_imx_i2c1(pdata)	imx31_add_imx_i2c(1, pdata)

#define imx31_add_imx_i2c2(pdata)	imx31_add_imx_i2c(2, pdata)



extern const struct imx_imx_ssi_data imx31_imx_ssi_data[] __initconst;

#define imx31_add_imx_ssi(id, pdata)    \