diff options
| author | Roshni Shah <roshni.shah@timesys.com> | 2014-01-05 16:15:28 -0500 |
|---|---|---|
| committer | Roshni Shah <roshni.shah@timesys.com> | 2014-01-05 16:34:28 -0500 |
| commit | 5e74d2d05b5543eb7952806e80842a4645e7685a (patch) | |
| tree | dd41d3876a0ee7aa035c5a5d4f05a60fab78379c /arch | |
| parent | 81d90159c6aa14b6c713a1280d19a7ba6f8b9e0c (diff) | |
Quartz: Fixed Linux-MQX semaphore conflict in the i2c driver for multiple i2c
registrations in Linux.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mvf/board-quartz.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-mvf/board-quartz.c b/arch/arm/mach-mvf/board-quartz.c index 7a916f6d5992..b94365d6a615 100644 --- a/arch/arm/mach-mvf/board-quartz.c +++ b/arch/arm/mach-mvf/board-quartz.c @@ -420,20 +420,13 @@ static void __init mvf_board_init(void) mvf_add_sdhci_esdhc_imx(1, &mvfa5_sd1_data); -#if 1 - /*FIXME: I2C driver needs a fix for Linux-MQX semaphore - * conflict - */ mvf_add_imx_i2c(2, &mvf600_i2c_data); i2c_register_board_info(2, mxc_i2c2_board_info, ARRAY_SIZE(mxc_i2c2_board_info)); -#endif -#if 0 mvf_add_imx_i2c(3, &mvf600_i2c_data); i2c_register_board_info(3, mxc_i2c3_board_info, ARRAY_SIZE(mxc_i2c3_board_info)); -#endif mvfa5_add_dcu(0, &mvf_dcu_pdata); |