summaryrefslogtreecommitdiff
path: root/board/samsung
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-11-23 06:34:41 -0700
committerHeiko Schocher <hs@denx.de>2016-12-05 13:27:29 +0100
commit08848e9c317cb337d438cc657e63f2c3ae92d6d3 (patch)
treeee1316e79c8b736c171e0ffe1d41cb5792014939 /board/samsung
parentfc47cf9d054b79299274f4386cfb867a80af8c7b (diff)
arm: samsung: Convert s5p_goni and smdkc100 to DM_I2C
These are the last two samsung boards that don't use DM_I2C. Move them over, leaving #ifdefs to allow the maintainer to complete this work. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'board/samsung')
-rw-r--r--board/samsung/goni/goni.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index e8329bba6c..b066832e5f 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;
}