diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-07 17:43:26 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-07 17:43:26 +0000 |
| commit | d2b6658d4d16855b85c9802f279c6dec52664dea (patch) | |
| tree | 94536b3829513e023c931701a2fedcd50d394e35 | |
| parent | e2c83781d65587d4a3457538d3f1627c5805ab43 (diff) | |
| parent | 6e13edf7a18a3e2a0b30b9e3b9d88f123b898275 (diff) | |
| download | uboot-imx-oreo-mr1-iot-release.tar.gz | |
Merge cherrypicks of [4709054] into oc-mr1-iot-releaseandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-release
Change-Id: If6d9ca7ac9c382ac8aadb3ca71dc24158b11080d
| -rwxr-xr-x | board/freescale/pico-imx7d/pico-imx7d.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/board/freescale/pico-imx7d/pico-imx7d.c b/board/freescale/pico-imx7d/pico-imx7d.c index 803b9da4cf..69e9e058c6 100755 --- a/board/freescale/pico-imx7d/pico-imx7d.c +++ b/board/freescale/pico-imx7d/pico-imx7d.c @@ -532,13 +532,6 @@ int board_phy_config(struct phy_device *phydev) int board_early_init_f(void) { setup_iomux_uart(); - -#ifdef CONFIG_SYS_I2C_MXC - setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1); - setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info2); - setup_i2c(3, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info4); -#endif - return 0; } @@ -554,6 +547,12 @@ int board_init(void) setup_fec(); #endif +#ifdef CONFIG_SYS_I2C_MXC + setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1); + setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info2); + setup_i2c(3, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info4); +#endif + //pico-imx7 custom initialize imx_iomux_v3_setup_multiple_pads(bcm4339_pads, ARRAY_SIZE(bcm4339_pads)); imx_iomux_v3_setup_multiple_pads(ccm_clko_pads, ARRAY_SIZE(ccm_clko_pads)); |