diff options
| author | Tom Rini <trini@konsulko.com> | 2015-07-10 09:40:59 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-07-10 09:40:59 -0400 |
| commit | 2650dbcf8a9ddfee4c5bf2d1c961c303988c9f97 (patch) | |
| tree | 39232680f8bd5cd036030324eaf11ecb8877f9e2 | |
| parent | a70e86ffca84d2e3c8b1d8d40553cf8e3aae4896 (diff) | |
| parent | 8fd3ec770c41115b95ca80f0f0ba344ac59dc293 (diff) | |
Merge git://git.denx.de/u-boot-samsung
| -rw-r--r-- | board/samsung/smdk5420/MAINTAINERS | 1 | ||||
| -rw-r--r-- | drivers/i2c/s3c24x0_i2c.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/board/samsung/smdk5420/MAINTAINERS b/board/samsung/smdk5420/MAINTAINERS index a26ea689f29..0361657eded 100644 --- a/board/samsung/smdk5420/MAINTAINERS +++ b/board/samsung/smdk5420/MAINTAINERS @@ -14,3 +14,4 @@ M: Przemyslaw Marczak <p.marczak@samsung.com> S: Maintained F: board/samsung/smdk5420/ F: include/configs/odroid_xu3.h +F: configs/odroid-xu3_defconfig diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c index c053e84cdb6..9a04e48a0f3 100644 --- a/drivers/i2c/s3c24x0_i2c.c +++ b/drivers/i2c/s3c24x0_i2c.c @@ -1035,7 +1035,7 @@ static void process_nodes(const void *blob, int node_list[], int count, CONFIG_SYS_I2C_S3C24X0_SPEED); bus->node = node; bus->bus_num = i; - exynos_pinmux_config(PERIPH_ID_I2C0 + bus->id, flags); + exynos_pinmux_config(bus->id, flags); /* Mark position as used */ node_list[i] = -1; |