diff options
| author | Tom Rini <trini@konsulko.com> | 2016-12-05 11:02:01 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-12-05 11:02:01 -0500 |
| commit | ea43683b1381c9bfa7ad1c3238c4f1f3328882db (patch) | |
| tree | 762f70c73defa235ad545ba662999b72140db03b /board/samsung/goni | |
| parent | 5102af4d2f53ec8d76ce60d103c65ae062b9c8fe (diff) | |
| parent | 6ccb410124aef766f5c8ccf8a53a0adbe30d07b0 (diff) | |
| download | u-boot-imx-ea43683b1381c9bfa7ad1c3238c4f1f3328882db.zip u-boot-imx-ea43683b1381c9bfa7ad1c3238c4f1f3328882db.tar.gz u-boot-imx-ea43683b1381c9bfa7ad1c3238c4f1f3328882db.tar.bz2 | |
Merge git://www.denx.de/git/u-boot-i2c
Diffstat (limited to 'board/samsung/goni')
| -rw-r--r-- | board/samsung/goni/goni.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index e8329bb..b066832 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -45,11 +45,15 @@ void i2c_init_board(void) int power_init_board(void) { +#ifndef CONFIG_DM_I2C /* TODO(maintainer): Convert to driver model */ /* * For PMIC the I2C bus is named as I2C5, but it is connected * to logical I2C adapter 0 */ return pmic_init(I2C_0); +#else + return 0; +#endif } int dram_init(void) @@ -142,6 +146,7 @@ int board_mmc_init(bd_t *bis) #ifdef CONFIG_USB_GADGET static int s5pc1xx_phy_control(int on) { +#ifndef CONFIG_DM_I2C /* TODO(maintainer): Convert to driver model */ int ret; static int status; struct pmic *p = pmic_get("MAX8998_PMIC"); @@ -173,7 +178,7 @@ static int s5pc1xx_phy_control(int on) status = 0; } udelay(10000); - +#endif return 0; } |