summaryrefslogtreecommitdiff
path: root/drivers/clk
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-05-27 15:49:43 -0400
committerTom Rini <trini@konsulko.com>2016-05-27 20:34:12 -0400
commite4a94ce4ac77396b181663c0493c50bc2d5b9143 (patch)
tree7564e2d5e7e24841a763460f7eaf91409abd0312 /drivers/clk
parent378f9134eba4665ea94a63653393d25418665fda (diff)
parent3c27b6ad540828c44a62d209030df5ba86896df0 (diff)
downloadu-boot-imx-e4a94ce4ac77396b181663c0493c50bc2d5b9143.zip
u-boot-imx-e4a94ce4ac77396b181663c0493c50bc2d5b9143.tar.gz
u-boot-imx-e4a94ce4ac77396b181663c0493c50bc2d5b9143.tar.bz2
Merge git://git.denx.de/u-boot-dm
For odroid-c2 (arch-meson) for now disable designware eth as meson now needs to do some harder GPIO work. Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: lib/efi_loader/efi_disk.c Modified: configs/odroid-c2_defconfig
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/clk_rk3036.c2
-rw-r--r--drivers/clk/clk_rk3288.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/clk_rk3036.c b/drivers/clk/clk_rk3036.c
index bd5f22a..7ec65bd 100644
--- a/drivers/clk/clk_rk3036.c
+++ b/drivers/clk/clk_rk3036.c
@@ -407,7 +407,7 @@ static int rk3036_clk_bind(struct udevice *dev)
}
/* The reset driver does not have a device node, so bind it here */
- ret = device_bind_driver(gd->dm_root, "rk3036_reset", "reset", &dev);
+ ret = device_bind_driver(gd->dm_root, "rk3036_sysreset", "reset", &dev);
if (ret)
debug("Warning: No RK3036 reset driver: ret=%d\n", ret);
diff --git a/drivers/clk/clk_rk3288.c b/drivers/clk/clk_rk3288.c
index a110a1c..d88893c 100644
--- a/drivers/clk/clk_rk3288.c
+++ b/drivers/clk/clk_rk3288.c
@@ -891,7 +891,7 @@ static int rk3288_clk_bind(struct udevice *dev)
}
/* The reset driver does not have a device node, so bind it here */
- ret = device_bind_driver(gd->dm_root, "rk3288_reset", "reset", &dev);
+ ret = device_bind_driver(gd->dm_root, "rk3288_sysreset", "reset", &dev);
if (ret)
debug("Warning: No RK3288 reset driver: ret=%d\n", ret);