Merge branch 'master' of git://git.denx.de/u-boot-sh

[oweals/u-boot.git] / arch / arm / mach-rockchip / rk3288 / reset_rk3288.c

diff --git a/arch/arm/mach-rockchip/rk3288/reset_rk3288.c b/arch/arm/mach-rockchip/rk3288/reset_rk3288.c
index 7affd11d2ff25902a18d956710d94e62fcdea622..0aad1c2160134e99a9a93d726d981cec696e5509 100644 (file)
--- a/arch/arm/mach-rockchip/rk3288/reset_rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/reset_rk3288.c
@@ -7,26 +7,26 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
-#include <reset.h>
+#include <sysreset.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/cru_rk3288.h>
 #include <asm/arch/hardware.h>
 #include <linux/err.h>
 
-int rk3288_reset_request(struct udevice *dev, enum reset_t type)
+int rk3288_sysreset_request(struct udevice *dev, enum sysreset_t type)
 {
        struct rk3288_cru *cru = rockchip_get_cru();
 
        if (IS_ERR(cru))
                return PTR_ERR(cru);
        switch (type) {
-       case RESET_WARM:
-               writel(RK_CLRBITS(0xffff), &cru->cru_mode_con);
+       case SYSRESET_WARM:
+               rk_clrreg(&cru->cru_mode_con, 0xffff);
                writel(0xeca8, &cru->cru_glb_srst_snd_value);
                break;
-       case RESET_COLD:
-               writel(RK_CLRBITS(0xffff), &cru->cru_mode_con);
+       case SYSRESET_COLD:
+               rk_clrreg(&cru->cru_mode_con, 0xffff);
                writel(0xfdb9, &cru->cru_glb_srst_fst_value);
                break;
        default:
@@ -36,12 +36,12 @@ int rk3288_reset_request(struct udevice *dev, enum reset_t type)
        return -EINPROGRESS;
 }
 
-static struct reset_ops rk3288_reset = {
-       .request        = rk3288_reset_request,
+static struct sysreset_ops rk3288_sysreset = {
+       .request        = rk3288_sysreset_request,
 };
 
-U_BOOT_DRIVER(reset_rk3288) = {
-       .name   = "rk3288_reset",
-       .id     = UCLASS_RESET,
-       .ops    = &rk3288_reset,
+U_BOOT_DRIVER(sysreset_rk3288) = {
+       .name   = "rk3288_sysreset",
+       .id     = UCLASS_SYSRESET,
+       .ops    = &rk3288_sysreset,
 };