@@ -202,6 +202,7 @@ static void enable_lvds(struct display_info_t const *dev)
enable_backlight();
}
+#ifndef CONFIG_DM_I2C
static struct i2c_pads_info i2c_pad_info1 = {
.scl = {
.i2c_mode = MX6_PAD_KEY_COL3__I2C2_SCL | I2C_PAD,
@@ -214,6 +215,7 @@ static struct i2c_pads_info i2c_pad_info1 = {
.gp = IMX_GPIO_NR(4, 13)
}
};
+#endif
static void setup_spi(void)
{
@@ -594,8 +596,9 @@ int board_init(void)
#ifdef CONFIG_MXC_SPI
setup_spi();
#endif
+#ifndef CONFIG_DM_I2C
setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
-
+#endif
#ifdef CONFIG_USB_EHCI_MX6
setup_usb();
#endif
@@ -603,6 +606,7 @@ int board_init(void)
return 0;
}
+#ifndef CONFIG_DM_PMIC
int power_init_board(void)
{
struct pmic *p;
@@ -631,6 +635,7 @@ int power_init_board(void)
return 0;
}
+#endif
#ifdef CONFIG_MXC_SPI
int board_spi_cs_gpio(unsigned bus, unsigned cs)
@@ -50,10 +50,13 @@ CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y
CONFIG_OF_CONTROL=y
+CONFIG_DM_I2C=y
CONFIG_DM_GPIO=y
CONFIG_DM_MMC=y
+CONFIG_DM_PMIC=y
# CONFIG_BLK is not set
# CONFIG_DM_MMC_OPS is not set
+CONFIG_DM_PMIC_PFUZE100=y
CONFIG_SYS_I2C_MXC=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX6=y
@@ -50,10 +50,13 @@ CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y
CONFIG_OF_CONTROL=y
+CONFIG_DM_I2C=y
CONFIG_DM_GPIO=y
CONFIG_DM_MMC=y
+CONFIG_DM_PMIC=y
# CONFIG_BLK is not set
# CONFIG_DM_MMC_OPS is not set
+CONFIG_DM_PMIC_PFUZE100=y
CONFIG_SYS_I2C_MXC=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX6=y
@@ -52,7 +52,7 @@
#endif
/* I2C Configs */
-#ifdef CONFIG_SYS_I2C_MXC
+#if defined(CONFIG_SYS_I2C_MXC) && !defined(CONFIG_DM_I2C)
#define CONFIG_SYS_I2C
#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
@@ -61,10 +61,12 @@
#endif
/* PMIC */
+#ifndef CONFIG_DM_PMIC_PFUZE100
#define CONFIG_POWER
#define CONFIG_POWER_I2C
#define CONFIG_POWER_PFUZE100
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
+#endif
/* USB Configs */
#ifdef CONFIG_CMD_USB