We should take the MX6DP and MX6QP options in consideration in the I2C_PADS_INFO macro.

Based on a patch by Pierluigi Passaro pierluigi.p@variscite.com

Signed-off-by: Eran Matityahu eran.m@variscite.com --- arch/arm/include/asm/mach-imx/mxc_i2c.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/include/asm/mach-imx/mxc_i2c.h b/arch/arm/include/asm/mach-imx/mxc_i2c.h index 292bf0c..80018e4 100644 --- a/arch/arm/include/asm/mach-imx/mxc_i2c.h +++ b/arch/arm/include/asm/mach-imx/mxc_i2c.h @@ -88,8 +88,7 @@ struct mxc_i2c_bus {

#define I2C_PADS_INFO(name) \ - (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D)) ? \ - &mx6q_##name : &mx6s_##name + (is_mx6dq() || is_mx6dqp()) ? &mx6q_##name : &mx6s_##name #endif

int setup_i2c(unsigned i2c_index, int speed, int slave_addr,