diff options
| author | Ye.Li <B37916@freescale.com> | 2014-06-04 17:20:41 +0800 |
|---|---|---|
| committer | Ye.Li <B37916@freescale.com> | 2014-06-17 11:13:41 +0800 |
| commit | 42b574439e5173bfc0f6e91843de770832a6a4d8 (patch) | |
| tree | b78f9e5cfd8f09cda7d6e1fc9ae24fabc86e5269 /board | |
| parent | 192c10e56fce9cb6e2b7a0ad87cce323a1f31b98 (diff) | |
| download | u-boot-imx-42b574439e5173bfc0f6e91843de770832a6a4d8.zip u-boot-imx-42b574439e5173bfc0f6e91843de770832a6a4d8.tar.gz u-boot-imx-42b574439e5173bfc0f6e91843de770832a6a4d8.tar.bz2 | |
ENGR00315894-15 i.mx6:sabreauto: Remove duplicated I2C settings
1. The i2c2 bus is setup twice, remove the duplication.
2. The i2c settings are duplicated in mx6qsabreauto.h and mx6sabre_common.h,
remove it from mx6qsabreauto.h
Signed-off-by: Ye.Li <B37916@freescale.com>
Diffstat (limited to 'board')
| -rw-r--r-- | board/freescale/mx6qsabreauto/mx6qsabreauto.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/board/freescale/mx6qsabreauto/mx6qsabreauto.c b/board/freescale/mx6qsabreauto/mx6qsabreauto.c index 1091328..0625a17 100644 --- a/board/freescale/mx6qsabreauto/mx6qsabreauto.c +++ b/board/freescale/mx6qsabreauto/mx6qsabreauto.c @@ -617,8 +617,8 @@ int board_init(void) /* address of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; - /* I2C 2 and 3 setup - I2C 3 hw mux with EIM */ - setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1); +#ifdef CONFIG_SYS_I2C_MXC + /* I2C 3 setup - I2C 3 hw mux with EIM */ /* I2C 3 Steer */ gpio_direction_output(IMX_GPIO_NR(5, 4), 1); imx_iomux_v3_setup_multiple_pads(i2c3_pads, ARRAY_SIZE(i2c3_pads)); @@ -626,6 +626,7 @@ int board_init(void) gpio_direction_output(IMX_GPIO_NR(1, 15), 1); imx_iomux_v3_setup_multiple_pads(port_exp, ARRAY_SIZE(port_exp)); +#endif return 0; } |