From: Tom Rini <trini@konsulko.com>
Date: Mon, 11 Jan 2021 18:55:03 +0000 (-0500)
Subject: Merge branch 'next'
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=d71be1990218957b9f05dbf13a72859a2abe06d7;p=u-boot.git

Merge branch 'next'

Signed-off-by: Tom Rini <trini@konsulko.com>
---

d71be1990218957b9f05dbf13a72859a2abe06d7
diff --cc board/nokia/rx51/rx51.c
index 2dd41604c9,253ee3c7b2..ceb4317901
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@@ -703,13 -703,13 +703,13 @@@ void board_mmc_power_init(void
  	twl4030_power_mmc_init(1);
  }
  
- static const struct omap_i2c_platdata rx51_i2c[] = {
+ static const struct omap_i2c_plat rx51_i2c[] = {
 -	{ I2C_BASE1, 2200000, OMAP_I2C_REV_V1 },
 +	{ I2C_BASE1, 100000, OMAP_I2C_REV_V1 },
  	{ I2C_BASE2, 100000, OMAP_I2C_REV_V1 },
 -	{ I2C_BASE3, 400000, OMAP_I2C_REV_V1 },
 +	{ I2C_BASE3, 100000, OMAP_I2C_REV_V1 },
  };
  
- U_BOOT_DEVICES(rx51_i2c) = {
+ U_BOOT_DRVINFOS(rx51_i2c) = {
  	{ "i2c_omap", &rx51_i2c[0] },
  	{ "i2c_omap", &rx51_i2c[1] },
  	{ "i2c_omap", &rx51_i2c[2] },