Merge branch 'master' of git://git.denx.de/u-boot-blackfin

[oweals/u-boot.git] / board / avionic-design / common / tamonten-ng.c

diff --git a/board/avionic-design/common/tamonten-ng.c b/board/avionic-design/common/tamonten-ng.c
index 9d395c676e070146b84fde7f16b6a6e90cbb29be..1704627112642027a42bf1f8f13bfd8436808d09 100644 (file)
--- a/board/avionic-design/common/tamonten-ng.c
+++ b/board/avionic-design/common/tamonten-ng.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/gp_padctrl.h>
 #include <asm/arch/gpio.h>
@@ -28,14 +29,14 @@
 
 void pinmux_init(void)
 {
-       pinmux_config_table(tamonten_ng_pinmux_common,
-                           ARRAY_SIZE(tamonten_ng_pinmux_common));
-       pinmux_config_table(unused_pins_lowpower,
-                           ARRAY_SIZE(unused_pins_lowpower));
+       pinmux_config_pingrp_table(tamonten_ng_pinmux_common,
+               ARRAY_SIZE(tamonten_ng_pinmux_common));
+       pinmux_config_pingrp_table(unused_pins_lowpower,
+               ARRAY_SIZE(unused_pins_lowpower));
 
        /* Initialize any non-default pad configs (APB_MISC_GP regs) */
-       padgrp_config_table(tamonten_ng_padctrl,
-                           ARRAY_SIZE(tamonten_ng_padctrl));
+       pinmux_config_drvgrp_table(tamonten_ng_padctrl,
+               ARRAY_SIZE(tamonten_ng_padctrl));
 }
 
 void gpio_early_init(void)
@@ -51,8 +52,15 @@ void gpio_early_init(void)
 
 void pmu_write(uchar reg, uchar data)
 {
-       i2c_set_bus_num(4);     /* PMU is on bus 4 */
-       i2c_write(PMU_I2C_ADDRESS, reg, 1, &data, 1);
+       struct udevice *dev;
+       int ret;
+
+       ret = i2c_get_chip_for_busnum(4, PMU_I2C_ADDRESS, 1, &dev);
+       if (ret) {
+               debug("%s: Cannot find PMIC I2C chip\n", __func__);
+               return;
+       }
+       dm_i2c_write(dev, reg, &data, 1);
 }
 
 /*