Merge git://git.denx.de/u-boot-samsung

This commit is contained in:
Tom Rini
2017-01-18 07:21:12 -05:00
16 changed files with 339 additions and 135 deletions

View File

@@ -155,6 +155,11 @@ config SYS_I2C_SANDBOX
};
};
config SYS_I2C_S3C24X0
bool "Samsung I2C driver"
depends on ARCH_EXYNOS4 && DM_I2C
help
Support for Samsung I2C controller as Samsung SoCs.
config SYS_I2C_UNIPHIER
bool "UniPhier I2C driver"

View File

@@ -24,6 +24,12 @@
#include <i2c.h>
#include "s3c24x0_i2c.h"
#ifndef CONFIG_SYS_I2C_S3C24X0_SLAVE
#define SYS_I2C_S3C24X0_SLAVE_ADDR 0
#else
#define SYS_I2C_S3C24X0_SLAVE_ADDR CONFIG_SYS_I2C_S3C24X0_SLAVE
#endif
DECLARE_GLOBAL_DATA_PTR;
/*
@@ -87,7 +93,7 @@ static int s3c24x0_i2c_set_bus_speed(struct udevice *dev, unsigned int speed)
i2c_bus->clock_frequency = speed;
i2c_ch_init(i2c_bus->regs, i2c_bus->clock_frequency,
CONFIG_SYS_I2C_S3C24X0_SLAVE);
SYS_I2C_S3C24X0_SLAVE_ADDR);
return 0;
}