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

10 years ago · 2650dbcf8a
parent a70e86ffca 8fd3ec770c
commit 2650dbcf8a
2 changed files with 2 additions and 1 deletions
--- 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
--- 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;