--- a/arch/arm/include/asm/arch-sunxi/gpio.h
+++ b/arch/arm/include/asm/arch-sunxi/gpio.h
@@ -123,6 +123,8 @@ enum sunxi_gpio_number {
 #define SUN7I_GPA0_GMAC                5

 #define SUNXI_GPB0_TWI0                2
+#define SUNXI_GPB0_TWI1                2
+#define SUNXI_GPB0_TWI2                2

 #define SUN4I_GPB22_UART0_TX   2
 #define SUN4I_GPB23_UART0_RX   2
--- a/arch/arm/include/asm/arch-sunxi/i2c.h
+++ b/arch/arm/include/asm/arch-sunxi/i2c.h
@@ -8,7 +8,7 @@

 #include <asm/arch/cpu.h>

-#define CONFIG_I2C_MVTWSI_BASE SUNXI_TWI0_BASE
+#define CONFIG_I2C_MVTWSI_BASE SUNXI_TWI1_BASE
 /* This is abp0-clk on sun4i/5i/7i / abp1-clk on sun6i/sun8i which is 24MHz */
 #define CONFIG_SYS_TCLK                24000000

--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -129,8 +129,8 @@ int board_mmc_init(bd_t *bis)

 void i2c_init_board(void)
 {
-       sunxi_gpio_set_cfgpin(SUNXI_GPB(0), SUNXI_GPB0_TWI0);
-       sunxi_gpio_set_cfgpin(SUNXI_GPB(1), SUNXI_GPB0_TWI0);
+       sunxi_gpio_set_cfgpin(SUNXI_GPB(18), SUNXI_GPB0_TWI1);
+       sunxi_gpio_set_cfgpin(SUNXI_GPB(19), SUNXI_GPB0_TWI1);
        clock_twi_onoff(0, 1);
 }

--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -320,8 +320,8 @@
 /* No CONFIG_SYS_I2C as we use the non converted mvtwsi driver */
 #define CONFIG_HARD_I2C
 #define CONFIG_SYS_I2C_SUNXI
-#define CONFIG_SYS_I2C_SPEED           400000
-#define CONFIG_SYS_I2C_SLAVE           0x7f
+#define CONFIG_SYS_I2C_SPEED           100000
+#define CONFIG_SYS_I2C_SLAVE           0x50
 #define CONFIG_CMD_I2C

 /* Watchdog */