[U-Boot] [PATCH v3 1/2] rockchip: sysreset: merge into one common driver

[U-Boot] [PATCH v3 1/2] rockchip: sysreset: merge into one common driver

[Kever Yang]

Use a common driver for all Rockchip SOC instead of one for each SoC.
Use driver_data for reg offset.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
---

Changes in v3: None
Changes in v2:
- use udev priv member instead of driver_data

 arch/arm/include/asm/arch-rockchip/clock.h |  5 +++
 drivers/sysreset/Makefile                  | 12 +-----
 drivers/sysreset/sysreset_rk3036.c         | 45 ----------------------
 drivers/sysreset/sysreset_rk3128.c         | 45 ----------------------
 drivers/sysreset/sysreset_rk3188.c         | 62 ------------------------------
 drivers/sysreset/sysreset_rk322x.c         | 45 ----------------------
 drivers/sysreset/sysreset_rk3288.c         | 47 ----------------------
 drivers/sysreset/sysreset_rk3328.c         | 45 ----------------------
 drivers/sysreset/sysreset_rk3368.c         | 62 ------------------------------
 drivers/sysreset/sysreset_rk3399.c         | 45 ----------------------
 drivers/sysreset/sysreset_rockchip.c       | 47 ++++++++++++++++++++++
 drivers/sysreset/sysreset_rv1108.c         | 46 ----------------------
 12 files changed, 53 insertions(+), 453 deletions(-)
 delete mode 100644 drivers/sysreset/sysreset_rk3036.c
 delete mode 100644 drivers/sysreset/sysreset_rk3128.c
 delete mode 100644 drivers/sysreset/sysreset_rk3188.c
 delete mode 100644 drivers/sysreset/sysreset_rk322x.c
 delete mode 100644 drivers/sysreset/sysreset_rk3288.c
 delete mode 100644 drivers/sysreset/sysreset_rk3328.c
 delete mode 100644 drivers/sysreset/sysreset_rk3368.c
 delete mode 100644 drivers/sysreset/sysreset_rk3399.c
 create mode 100644 drivers/sysreset/sysreset_rockchip.c
 delete mode 100644 drivers/sysreset/sysreset_rv1108.c

diff --git a/arch/arm/include/asm/arch-rockchip/clock.h b/arch/arm/include/asm/arch-rockchip/clock.h
index 641df58..736b260 100644
--- a/arch/arm/include/asm/arch-rockchip/clock.h
+++ b/arch/arm/include/asm/arch-rockchip/clock.h
@@ -39,6 +39,11 @@ static inline int rk_pll_id(enum rk_clk_id clk_id)
 	return clk_id - 1;
 }
 
+struct sysreset_reg {
+	unsigned int glb_srst_fst_value;
+	unsigned int glb_srst_snd_value;
+};
+
 /**
  * clk_get_divisor() - Calculate the required clock divisior
  *
diff --git a/drivers/sysreset/Makefile b/drivers/sysreset/Makefile
index 6f0dfda..20f371b 100644
--- a/drivers/sysreset/Makefile
+++ b/drivers/sysreset/Makefile
@@ -9,19 +9,9 @@ obj-$(CONFIG_SYSRESET_PSCI) += sysreset_psci.o
 obj-$(CONFIG_SYSRESET_SYSCON) += sysreset_syscon.o
 obj-$(CONFIG_SYSRESET_WATCHDOG) += sysreset_watchdog.o
 
-ifndef CONFIG_SPL_BUILD
-obj-$(CONFIG_ROCKCHIP_RK3036) += sysreset_rk3036.o
-endif
-obj-$(CONFIG_ROCKCHIP_RK3128) += sysreset_rk3128.o
-obj-$(CONFIG_ROCKCHIP_RK3188) += sysreset_rk3188.o
-obj-$(CONFIG_ROCKCHIP_RK322X) += sysreset_rk322x.o
-obj-$(CONFIG_ROCKCHIP_RK3288) += sysreset_rk3288.o
-obj-$(CONFIG_ROCKCHIP_RK3328) += sysreset_rk3328.o
-obj-$(CONFIG_ROCKCHIP_RK3368) += sysreset_rk3368.o
-obj-$(CONFIG_ROCKCHIP_RK3399) += sysreset_rk3399.o
-obj-$(CONFIG_ROCKCHIP_RV1108) += sysreset_rv1108.o
 obj-$(CONFIG_SANDBOX) += sysreset_sandbox.o
 obj-$(CONFIG_ARCH_SNAPDRAGON) += sysreset_snapdragon.o
 obj-$(CONFIG_ARCH_STI) += sysreset_sti.o
 obj-$(CONFIG_TARGET_XTFPGA) += sysreset_xtfpga.o
 obj-$(CONFIG_ARCH_ASPEED) += sysreset_ast.o
+obj-$(CONFIG_ARCH_ROCKCHIP) += sysreset_rockchip.o
diff --git a/drivers/sysreset/sysreset_rk3036.c b/drivers/sysreset/sysreset_rk3036.c
deleted file mode 100644
index b3d2113..0000000
--- a/drivers/sysreset/sysreset_rk3036.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * (C) Copyright 2015 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier:     GPL-2.0+
- */
-
-#include <common.h>
-#include <dm.h>
-#include <errno.h>
-#include <sysreset.h>
-#include <asm/io.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/cru_rk3036.h>
-#include <asm/arch/hardware.h>
-#include <linux/err.h>
-
-int rk3036_sysreset_request(struct udevice *dev, enum sysreset_t type)
-{
-	struct rk3036_cru *cru = rockchip_get_cru();
-
-	if (IS_ERR(cru))
-		return PTR_ERR(cru);
-	switch (type) {
-	case SYSRESET_WARM:
-		writel(0xeca8, &cru->cru_glb_srst_snd_value);
-		break;
-	case SYSRESET_COLD:
-		writel(0xfdb9, &cru->cru_glb_srst_fst_value);
-		break;
-	default:
-		return -EPROTONOSUPPORT;
-	}
-
-	return -EINPROGRESS;
-}
-
-static struct sysreset_ops rk3036_sysreset = {
-	.request	= rk3036_sysreset_request,
-};
-
-U_BOOT_DRIVER(sysreset_rk3036) = {
-	.name	= "rk3036_sysreset",
-	.id	= UCLASS_SYSRESET,
-	.ops	= &rk3036_sysreset,
-};
diff --git a/drivers/sysreset/sysreset_rk3128.c b/drivers/sysreset/sysreset_rk3128.c
deleted file mode 100644
index 5aab8ec..0000000
--- a/drivers/sysreset/sysreset_rk3128.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * (C) Copyright 2017 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier:     GPL-2.0+
- */
-
-#include <common.h>
-#include <dm.h>
-#include <errno.h>
-#include <sysreset.h>
-#include <asm/io.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/cru_rk3128.h>
-#include <asm/arch/hardware.h>
-#include <linux/err.h>
-
-int rk3128_sysreset_request(struct udevice *dev, enum sysreset_t type)
-{
-	struct rk3128_cru *cru = rockchip_get_cru();
-
-	if (IS_ERR(cru))
-		return PTR_ERR(cru);
-	switch (type) {
-	case SYSRESET_WARM:
-		writel(0xeca8, &cru->cru_glb_srst_snd_value);
-		break;
-	case SYSRESET_COLD:
-		writel(0xfdb9, &cru->cru_glb_srst_fst_value);
-		break;
-	default:
-		return -EPROTONOSUPPORT;
-	}
-
-	return -EINPROGRESS;
-}
-
-static struct sysreset_ops rk3128_sysreset = {
-	.request	= rk3128_sysreset_request,
-};
-
-U_BOOT_DRIVER(sysreset_rk3128) = {
-	.name	= "rk3128_sysreset",
-	.id	= UCLASS_SYSRESET,
-	.ops	= &rk3128_sysreset,
-};
diff --git a/drivers/sysreset/sysreset_rk3188.c b/drivers/sysreset/sysreset_rk3188.c
deleted file mode 100644
index 053a634..0000000
--- a/drivers/sysreset/sysreset_rk3188.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * (C) Copyright 2015 Google, Inc
- *
- * SPDX-License-Identifier:	GPL-2.0
- */
-
-#include <common.h>
-#include <dm.h>
-#include <errno.h>
-#include <syscon.h>
-#include <sysreset.h>
-#include <asm/io.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/cru_rk3188.h>
-#include <asm/arch/grf_rk3188.h>
-#include <asm/arch/hardware.h>
-#include <linux/err.h>
-
-int rk3188_sysreset_request(struct udevice *dev, enum sysreset_t type)
-{
-	struct rk3188_cru *cru = rockchip_get_cru();
-	struct rk3188_grf *grf;
-
-	if (IS_ERR(cru))
-		return PTR_ERR(cru);
-	switch (type) {
-	case SYSRESET_WARM:
-		grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
-		if (IS_ERR(grf))
-			return -EPROTONOSUPPORT;
-
-		/*
-		 * warm-reset keeps the remap value,
-		 * so make sure it's disabled.
-		 */
-		rk_clrsetreg(&grf->soc_con0,
-			NOC_REMAP_MASK << NOC_REMAP_SHIFT,
-			0 << NOC_REMAP_SHIFT);
-
-		rk_clrreg(&cru->cru_mode_con, 0xffff);
-		writel(0xeca8, &cru->cru_glb_srst_snd_value);
-		break;
-	case SYSRESET_COLD:
-		rk_clrreg(&cru->cru_mode_con, 0xffff);
-		writel(0xfdb9, &cru->cru_glb_srst_fst_value);
-		break;
-	default:
-		return -EPROTONOSUPPORT;
-	}
-
-	return -EINPROGRESS;
-}
-
-static struct sysreset_ops rk3188_sysreset = {
-	.request	= rk3188_sysreset_request,
-};
-
-U_BOOT_DRIVER(sysreset_rk3188) = {
-	.name	= "rk3188_sysreset",
-	.id	= UCLASS_SYSRESET,
-	.ops	= &rk3188_sysreset,
-};
diff --git a/drivers/sysreset/sysreset_rk322x.c b/drivers/sysreset/sysreset_rk322x.c
deleted file mode 100644
index 5fce79b..0000000
--- a/drivers/sysreset/sysreset_rk322x.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * (C) Copyright 2017 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier:     GPL-2.0+
- */
-
-#include <common.h>
-#include <dm.h>
-#include <errno.h>
-#include <sysreset.h>
-#include <asm/io.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/cru_rk322x.h>
-#include <asm/arch/hardware.h>
-#include <linux/err.h>
-
-int rk322x_sysreset_request(struct udevice *dev, enum sysreset_t type)
-{
-	struct rk322x_cru *cru = rockchip_get_cru();
-
-	if (IS_ERR(cru))
-		return PTR_ERR(cru);
-	switch (type) {
-	case SYSRESET_WARM:
-		writel(0xeca8, &cru->cru_glb_srst_snd_value);
-		break;
-	case SYSRESET_COLD:
-		writel(0xfdb9, &cru->cru_glb_srst_fst_value);
-		break;
-	default:
-		return -EPROTONOSUPPORT;
-	}
-
-	return -EINPROGRESS;
-}
-
-static struct sysreset_ops rk322x_sysreset = {
-	.request	= rk322x_sysreset_request,
-};
-
-U_BOOT_DRIVER(sysreset_rk322x) = {
-	.name	= "rk322x_sysreset",
-	.id	= UCLASS_SYSRESET,
-	.ops	= &rk322x_sysreset,
-};
diff --git a/drivers/sysreset/sysreset_rk3288.c b/drivers/sysreset/sysreset_rk3288.c
deleted file mode 100644
index 0aad1c2..0000000
--- a/drivers/sysreset/sysreset_rk3288.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * (C) Copyright 2015 Google, Inc
- *
- * SPDX-License-Identifier:	GPL-2.0
- */
-
-#include <common.h>
-#include <dm.h>
-#include <errno.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_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 SYSRESET_WARM:
-		rk_clrreg(&cru->cru_mode_con, 0xffff);
-		writel(0xeca8, &cru->cru_glb_srst_snd_value);
-		break;
-	case SYSRESET_COLD:
-		rk_clrreg(&cru->cru_mode_con, 0xffff);
-		writel(0xfdb9, &cru->cru_glb_srst_fst_value);
-		break;
-	default:
-		return -EPROTONOSUPPORT;
-	}
-
-	return -EINPROGRESS;
-}
-
-static struct sysreset_ops rk3288_sysreset = {
-	.request	= rk3288_sysreset_request,
-};
-
-U_BOOT_DRIVER(sysreset_rk3288) = {
-	.name	= "rk3288_sysreset",
-	.id	= UCLASS_SYSRESET,
-	.ops	= &rk3288_sysreset,
-};
diff --git a/drivers/sysreset/sysreset_rk3328.c b/drivers/sysreset/sysreset_rk3328.c
deleted file mode 100644
index 7b9af09..0000000
--- a/drivers/sysreset/sysreset_rk3328.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier:	GPL-2.0
- */
-
-#include <common.h>
-#include <dm.h>
-#include <errno.h>
-#include <sysreset.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/cru_rk3328.h>
-#include <asm/arch/hardware.h>
-#include <asm/io.h>
-#include <linux/err.h>
-
-int rk3328_sysreset_request(struct udevice *dev, enum sysreset_t type)
-{
-	struct rk3328_cru *cru = rockchip_get_cru();
-
-	if (IS_ERR(cru))
-		return PTR_ERR(cru);
-	switch (type) {
-	case SYSRESET_WARM:
-		writel(0xeca8, &cru->glb_srst_snd_value);
-		break;
-	case SYSRESET_COLD:
-		writel(0xfdb9, &cru->glb_srst_fst_value);
-		break;
-	default:
-		return -EPROTONOSUPPORT;
-	}
-
-	return -EINPROGRESS;
-}
-
-static struct sysreset_ops rk3328_sysreset = {
-	.request	= rk3328_sysreset_request,
-};
-
-U_BOOT_DRIVER(sysreset_rk3328) = {
-	.name	= "rk3328_sysreset",
-	.id	= UCLASS_SYSRESET,
-	.ops	= &rk3328_sysreset,
-};
diff --git a/drivers/sysreset/sysreset_rk3368.c b/drivers/sysreset/sysreset_rk3368.c
deleted file mode 100644
index de62921..0000000
--- a/drivers/sysreset/sysreset_rk3368.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * (C) Copyright Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier:	GPL-2.0
- */
-
-#include <common.h>
-#include <dm.h>
-#include <errno.h>
-#include <sysreset.h>
-#include <asm/io.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/cru_rk3368.h>
-#include <asm/arch/hardware.h>
-#include <linux/err.h>
-
-static void rk3368_pll_enter_slow_mode(struct rk3368_cru *cru)
-{
-	struct rk3368_pll *pll;
-	int i;
-
-	for (i = 0; i < 6; i++) {
-		pll = &cru->pll[i];
-		rk_clrreg(&pll->con3, PLL_MODE_MASK);
-	}
-}
-
-static int rk3368_sysreset_request(struct udevice *dev, enum sysreset_t type)
-{
-	struct rk3368_cru *cru = rockchip_get_cru();
-
-	if (IS_ERR(cru))
-		return PTR_ERR(cru);
-	switch (type) {
-	case SYSRESET_WARM:
-		rk3368_pll_enter_slow_mode(cru);
-		rk_clrsetreg(&cru->glb_rst_con, PMU_GLB_SRST_CTRL_MASK,
-			     PMU_RST_BY_SND_GLB_SRST << PMU_GLB_SRST_CTRL_SHIFT);
-		writel(0xeca8, &cru->glb_srst_snd_val);
-		break;
-	case SYSRESET_COLD:
-		rk3368_pll_enter_slow_mode(cru);
-		rk_clrsetreg(&cru->glb_rst_con, PMU_GLB_SRST_CTRL_MASK,
-			     PMU_RST_BY_FST_GLB_SRST << PMU_GLB_SRST_CTRL_SHIFT);
-		writel(0xfdb9, &cru->glb_srst_fst_val);
-		break;
-	default:
-		return -EPROTONOSUPPORT;
-	}
-
-	return -EINPROGRESS;
-}
-
-static struct sysreset_ops rk3368_sysreset = {
-	.request	= rk3368_sysreset_request,
-};
-
-U_BOOT_DRIVER(sysreset_rk3368) = {
-	.name	= "rk3368_sysreset",
-	.id	= UCLASS_SYSRESET,
-	.ops	= &rk3368_sysreset,
-};
diff --git a/drivers/sysreset/sysreset_rk3399.c b/drivers/sysreset/sysreset_rk3399.c
deleted file mode 100644
index 9a55546..0000000
--- a/drivers/sysreset/sysreset_rk3399.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier:	GPL-2.0
- */
-
-#include <common.h>
-#include <dm.h>
-#include <errno.h>
-#include <sysreset.h>
-#include <asm/io.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/cru_rk3399.h>
-#include <asm/arch/hardware.h>
-#include <linux/err.h>
-
-int rk3399_sysreset_request(struct udevice *dev, enum sysreset_t type)
-{
-	struct rk3399_cru *cru = rockchip_get_cru();
-
-	if (IS_ERR(cru))
-		return PTR_ERR(cru);
-	switch (type) {
-	case SYSRESET_WARM:
-		writel(0xeca8, &cru->glb_srst_snd_value);
-		break;
-	case SYSRESET_COLD:
-		writel(0xfdb9, &cru->glb_srst_fst_value);
-		break;
-	default:
-		return -EPROTONOSUPPORT;
-	}
-
-	return -EINPROGRESS;
-}
-
-static struct sysreset_ops rk3399_sysreset = {
-	.request	= rk3399_sysreset_request,
-};
-
-U_BOOT_DRIVER(sysreset_rk3399) = {
-	.name	= "rk3399_sysreset",
-	.id	= UCLASS_SYSRESET,
-	.ops	= &rk3399_sysreset,
-};
diff --git a/drivers/sysreset/sysreset_rockchip.c b/drivers/sysreset/sysreset_rockchip.c
new file mode 100644
index 0000000..894975f
--- /dev/null
+++ b/drivers/sysreset/sysreset_rockchip.c
@@ -0,0 +1,47 @@
+/*
+ * (C) Copyright 2017 Rockchip Electronics Co., Ltd
+ *
+ * SPDX-License-Identifier:	GPL-2.0
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <sysreset.h>
+#include <asm/io.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/cru_rk3328.h>
+#include <asm/arch/hardware.h>
+#include <linux/err.h>
+
+int rockchip_sysreset_request(struct udevice *dev, enum sysreset_t type)
+{
+	struct sysreset_reg *offset = dev_get_priv(dev);
+	unsigned long cru_base = (unsigned long)rockchip_get_cru();
+
+	if (IS_ERR_VALUE(cru_base))
+		return (int)cru_base;
+
+	switch (type) {
+	case SYSRESET_WARM:
+		writel(0xeca8, cru_base + offset->glb_srst_snd_value);
+		break;
+	case SYSRESET_COLD:
+		writel(0xfdb9, cru_base + offset->glb_srst_fst_value);
+		break;
+	default:
+		return -EPROTONOSUPPORT;
+	}
+
+	return -EINPROGRESS;
+}
+
+static struct sysreset_ops rockchip_sysreset = {
+	.request	= rockchip_sysreset_request,
+};
+
+U_BOOT_DRIVER(sysreset_rockchip) = {
+	.name	= "rockchip_sysreset",
+	.id	= UCLASS_SYSRESET,
+	.ops	= &rockchip_sysreset,
+};
diff --git a/drivers/sysreset/sysreset_rv1108.c b/drivers/sysreset/sysreset_rv1108.c
deleted file mode 100644
index 9d8e9f7..0000000
--- a/drivers/sysreset/sysreset_rv1108.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * (C) Copyright 2015 Rockchip Electronics Co., Ltd
- * Author: Andy Yan <andy.yan@rock-chips.com>
- * SPDX-License-Identifier:     GPL-2.0+
- */
-
-#include <common.h>
-#include <dm.h>
-#include <errno.h>
-#include <sysreset.h>
-#include <asm/io.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/cru_rv1108.h>
-#include <asm/arch/hardware.h>
-#include <linux/err.h>
-
-int rv1108_sysreset_request(struct udevice *dev, enum sysreset_t type)
-{
-	struct rv1108_cru *cru = rockchip_get_cru();
-
-	if (IS_ERR(cru))
-		return PTR_ERR(cru);
-
-	switch (type) {
-	case SYSRESET_WARM:
-		writel(0xeca8, &cru->glb_srst_snd_val);
-		break;
-	case SYSRESET_COLD:
-		writel(0xfdb9, &cru->glb_srst_fst_val);
-		break;
-	default:
-		return -EPROTONOSUPPORT;
-	}
-
-	return -EINPROGRESS;
-}
-
-static struct sysreset_ops rv1108_sysreset = {
-	.request	= rv1108_sysreset_request,
-};
-
-U_BOOT_DRIVER(sysreset_rv1108) = {
-	.name	= "rv1108_sysreset",
-	.id	= UCLASS_SYSRESET,
-	.ops	= &rv1108_sysreset,
-};
-- 
1.9.1

[U-Boot] [PATCH v3 2/2] rockchip: clock: update sysreset driver bingding

[Kever Yang]

Using priv for new sysreset driver binding.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
---

Changes in v3:
- do not init priv if driver bind fail

Changes in v2:
- use udev priv member instead of driver_data

 drivers/clk/rockchip/clk_rk3036.c | 17 ++++++++++++++---
 drivers/clk/rockchip/clk_rk3128.c | 17 ++++++++++++++---
 drivers/clk/rockchip/clk_rk3188.c | 17 ++++++++++++++---
 drivers/clk/rockchip/clk_rk322x.c | 17 ++++++++++++++---
 drivers/clk/rockchip/clk_rk3288.c | 17 ++++++++++++++---
 drivers/clk/rockchip/clk_rk3328.c | 17 ++++++++++++++---
 drivers/clk/rockchip/clk_rk3368.c | 17 ++++++++++++++---
 drivers/clk/rockchip/clk_rk3399.c | 17 ++++++++++++++---
 drivers/clk/rockchip/clk_rv1108.c | 17 ++++++++++++++---
 9 files changed, 126 insertions(+), 27 deletions(-)

diff --git a/drivers/clk/rockchip/clk_rk3036.c b/drivers/clk/rockchip/clk_rk3036.c
index 83f4ae6..280ebb9 100644
--- a/drivers/clk/rockchip/clk_rk3036.c
+++ b/drivers/clk/rockchip/clk_rk3036.c
@@ -330,11 +330,22 @@ static int rk3036_clk_probe(struct udevice *dev)
 static int rk3036_clk_bind(struct udevice *dev)
 {
 	int ret;
+	struct udevice *sys_child;
+	struct sysreset_reg *priv;
 
 	/* The reset driver does not have a device node, so bind it here */
-	ret = device_bind_driver(gd->dm_root, "rk3036_sysreset", "reset", &dev);
-	if (ret)
-		debug("Warning: No RK3036 reset driver: ret=%d\n", ret);
+	ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset",
+				 &sys_child);
+	if (ret) {
+		debug("Warning: No sysreset driver: ret=%d\n", ret);
+	} else {
+		priv = malloc(sizeof(struct sysreset_reg));
+		priv->glb_srst_fst_value = offsetof(struct rk3036_cru,
+						    cru_glb_srst_fst_value);
+		priv->glb_srst_snd_value = offsetof(struct rk3036_cru,
+						    cru_glb_srst_snd_value);
+		sys_child->priv = priv;
+	}
 
 	return 0;
 }
diff --git a/drivers/clk/rockchip/clk_rk3128.c b/drivers/clk/rockchip/clk_rk3128.c
index ace154f..c75cbf8 100644
--- a/drivers/clk/rockchip/clk_rk3128.c
+++ b/drivers/clk/rockchip/clk_rk3128.c
@@ -325,11 +325,22 @@ static int rk3128_clk_probe(struct udevice *dev)
 static int rk3128_clk_bind(struct udevice *dev)
 {
 	int ret;
+	struct udevice *sys_child;
+	struct sysreset_reg *priv;
 
 	/* The reset driver does not have a device node, so bind it here */
-	ret = device_bind_driver(gd->dm_root, "rk3128_sysreset", "reset", &dev);
-	if (ret)
-		debug("Warning: No RK3128 reset driver: ret=%d\n", ret);
+	ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset",
+				 &sys_child);
+	if (ret) {
+		debug("Warning: No sysreset driver: ret=%d\n", ret);
+	} else {
+		priv = malloc(sizeof(struct sysreset_reg));
+		priv->glb_srst_fst_value = offsetof(struct rk3128_cru,
+						    cru_glb_srst_fst_value);
+		priv->glb_srst_snd_value = offsetof(struct rk3128_cru,
+						    cru_glb_srst_snd_value);
+		sys_child->priv = priv;
+	}
 
 	return 0;
 }
diff --git a/drivers/clk/rockchip/clk_rk3188.c b/drivers/clk/rockchip/clk_rk3188.c
index 8c2c9bc..fca6899 100644
--- a/drivers/clk/rockchip/clk_rk3188.c
+++ b/drivers/clk/rockchip/clk_rk3188.c
@@ -573,11 +573,22 @@ static int rk3188_clk_probe(struct udevice *dev)
 static int rk3188_clk_bind(struct udevice *dev)
 {
 	int ret;
+	struct udevice *sys_child;
+	struct sysreset_reg *priv;
 
 	/* The reset driver does not have a device node, so bind it here */
-	ret = device_bind_driver(gd->dm_root, "rk3188_sysreset", "reset", &dev);
-	if (ret)
-		debug("Warning: No rk3188 reset driver: ret=%d\n", ret);
+	ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset",
+				 &sys_child);
+	if (ret) {
+		debug("Warning: No sysreset driver: ret=%d\n", ret);
+	} else {
+		priv = malloc(sizeof(struct sysreset_reg));
+		priv->glb_srst_fst_value = offsetof(struct rk3188_cru,
+						    cru_glb_srst_fst_value);
+		priv->glb_srst_snd_value = offsetof(struct rk3188_cru,
+						    cru_glb_srst_snd_value);
+		sys_child->priv = priv;
+	}
 
 	return 0;
 }
diff --git a/drivers/clk/rockchip/clk_rk322x.c b/drivers/clk/rockchip/clk_rk322x.c
index e87267d..ff52b55 100644
--- a/drivers/clk/rockchip/clk_rk322x.c
+++ b/drivers/clk/rockchip/clk_rk322x.c
@@ -385,11 +385,22 @@ static int rk322x_clk_probe(struct udevice *dev)
 static int rk322x_clk_bind(struct udevice *dev)
 {
 	int ret;
+	struct udevice *sys_child;
+	struct sysreset_reg *priv;
 
 	/* The reset driver does not have a device node, so bind it here */
-	ret = device_bind_driver(gd->dm_root, "rk322x_sysreset", "reset", &dev);
-	if (ret)
-		debug("Warning: No RK322x reset driver: ret=%d\n", ret);
+	ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset",
+				 &sys_child);
+	if (ret) {
+		debug("Warning: No sysreset driver: ret=%d\n", ret);
+	} else {
+		priv = malloc(sizeof(struct sysreset_reg));
+		priv->glb_srst_fst_value = offsetof(struct rk322x_cru,
+						    cru_glb_srst_fst_value);
+		priv->glb_srst_snd_value = offsetof(struct rk322x_cru,
+						    cru_glb_srst_snd_value);
+		sys_child->priv = priv;
+	}
 
 	return 0;
 }
diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c
index a133810..ac53239 100644
--- a/drivers/clk/rockchip/clk_rk3288.c
+++ b/drivers/clk/rockchip/clk_rk3288.c
@@ -859,11 +859,22 @@ static int rk3288_clk_probe(struct udevice *dev)
 static int rk3288_clk_bind(struct udevice *dev)
 {
 	int ret;
+	struct udevice *sys_child;
+	struct sysreset_reg *priv;
 
 	/* The reset driver does not have a device node, so bind it here */
-	ret = device_bind_driver(gd->dm_root, "rk3288_sysreset", "reset", &dev);
-	if (ret)
-		debug("Warning: No RK3288 reset driver: ret=%d\n", ret);
+	ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset",
+				 &sys_child);
+	if (ret) {
+		debug("Warning: No sysreset driver: ret=%d\n", ret);
+	} else {
+		priv = malloc(sizeof(struct sysreset_reg));
+		priv->glb_srst_fst_value = offsetof(struct rk3288_cru,
+						    cru_glb_srst_fst_value);
+		priv->glb_srst_snd_value = offsetof(struct rk3288_cru,
+						    cru_glb_srst_snd_value);
+		sys_child->priv = priv;
+	}
 
 	return 0;
 }
diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c
index 540d910..4d522a7 100644
--- a/drivers/clk/rockchip/clk_rk3328.c
+++ b/drivers/clk/rockchip/clk_rk3328.c
@@ -597,11 +597,22 @@ static int rk3328_clk_ofdata_to_platdata(struct udevice *dev)
 static int rk3328_clk_bind(struct udevice *dev)
 {
 	int ret;
+	struct udevice *sys_child;
+	struct sysreset_reg *priv;
 
 	/* The reset driver does not have a device node, so bind it here */
-	ret = device_bind_driver(gd->dm_root, "rk3328_sysreset", "reset", &dev);
-	if (ret)
-		printf("Warning: No RK3328 reset driver: ret=%d\n", ret);
+	ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset",
+				 &sys_child);
+	if (ret) {
+		debug("Warning: No sysreset driver: ret=%d\n", ret);
+	} else {
+		priv = malloc(sizeof(struct sysreset_reg));
+		priv->glb_srst_fst_value = offsetof(struct rk3328_cru,
+						    glb_srst_fst_value);
+		priv->glb_srst_snd_value = offsetof(struct rk3328_cru,
+						    glb_srst_snd_value);
+		sys_child->priv = priv;
+	}
 
 	return ret;
 }
diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c
index 3661769..bfeef39 100644
--- a/drivers/clk/rockchip/clk_rk3368.c
+++ b/drivers/clk/rockchip/clk_rk3368.c
@@ -526,11 +526,22 @@ static int rk3368_clk_ofdata_to_platdata(struct udevice *dev)
 static int rk3368_clk_bind(struct udevice *dev)
 {
 	int ret;
+	struct udevice *sys_child;
+	struct sysreset_reg *priv;
 
 	/* The reset driver does not have a device node, so bind it here */
-	ret = device_bind_driver(gd->dm_root, "rk3368_sysreset", "reset", &dev);
-	if (ret)
-		pr_err("bind RK3368 reset driver failed: ret=%d\n", ret);
+	ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset",
+				 &sys_child);
+	if (ret) {
+		debug("Warning: No sysreset driver: ret=%d\n", ret);
+	} else {
+		priv = malloc(sizeof(struct sysreset_reg));
+		priv->glb_srst_fst_value = offsetof(struct rk3368_cru,
+						    glb_srst_fst_val);
+		priv->glb_srst_snd_value = offsetof(struct rk3368_cru,
+						    glb_srst_snd_val);
+		sys_child->priv = priv;
+	}
 
 	return ret;
 }
diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
index 6f85a38..e21d056 100644
--- a/drivers/clk/rockchip/clk_rk3399.c
+++ b/drivers/clk/rockchip/clk_rk3399.c
@@ -1033,11 +1033,22 @@ static int rk3399_clk_ofdata_to_platdata(struct udevice *dev)
 static int rk3399_clk_bind(struct udevice *dev)
 {
 	int ret;
+	struct udevice *sys_child;
+	struct sysreset_reg *priv;
 
 	/* The reset driver does not have a device node, so bind it here */
-	ret = device_bind_driver(gd->dm_root, "rk3399_sysreset", "reset", &dev);
-	if (ret)
-		printf("Warning: No RK3399 reset driver: ret=%d\n", ret);
+	ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset",
+				 &sys_child);
+	if (ret) {
+		debug("Warning: No sysreset driver: ret=%d\n", ret);
+	} else {
+		priv = malloc(sizeof(struct sysreset_reg));
+		priv->glb_srst_fst_value = offsetof(struct rk3399_cru,
+						    glb_srst_fst_value);
+		priv->glb_srst_snd_value = offsetof(struct rk3399_cru,
+						    glb_srst_snd_value);
+		sys_child->priv = priv;
+	}
 
 	return 0;
 }
diff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c
index 55741c3..a119548 100644
--- a/drivers/clk/rockchip/clk_rv1108.c
+++ b/drivers/clk/rockchip/clk_rv1108.c
@@ -223,11 +223,22 @@ static int rv1108_clk_probe(struct udevice *dev)
 static int rv1108_clk_bind(struct udevice *dev)
 {
 	int ret;
+	struct udevice *sys_child;
+	struct sysreset_reg *priv;
 
 	/* The reset driver does not have a device node, so bind it here */
-	ret = device_bind_driver(gd->dm_root, "rv1108_sysreset", "reset", &dev);
-	if (ret)
-		pr_err("No Rv1108 reset driver: ret=%d\n", ret);
+	ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset",
+				 &sys_child);
+	if (ret) {
+		debug("Warning: No sysreset driver: ret=%d\n", ret);
+	} else {
+		priv = malloc(sizeof(struct sysreset_reg));
+		priv->glb_srst_fst_value = offsetof(struct rv1108_cru,
+						    glb_srst_fst_val);
+		priv->glb_srst_snd_value = offsetof(struct rv1108_cru,
+						    glb_srst_snd_val);
+		sys_child->priv = priv;
+	}
 
 	return 0;
 }
-- 
1.9.1

[U-Boot] [U-Boot, v3, 2/2] rockchip: clock: update sysreset driver bingding

[Philipp Tomsich]

> Using priv for new sysreset driver binding.
> 
> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
> ---
> 
> Changes in v3:
> - do not init priv if driver bind fail
> 
> Changes in v2:
> - use udev priv member instead of driver_data
> 
>  drivers/clk/rockchip/clk_rk3036.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3128.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3188.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk322x.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3288.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3328.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3368.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3399.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rv1108.c | 17 ++++++++++++++---
>  9 files changed, 126 insertions(+), 27 deletions(-)
> 

Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

[U-Boot] [U-Boot, v3, 1/2] rockchip: sysreset: merge into one common driver

[Philipp Tomsich]

> Use a common driver for all Rockchip SOC instead of one for each SoC.
> Use driver_data for reg offset.
> 
> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
> ---
> 
> Changes in v3: None
> Changes in v2:
> - use udev priv member instead of driver_data
> 
>  arch/arm/include/asm/arch-rockchip/clock.h |  5 +++
>  drivers/sysreset/Makefile                  | 12 +-----
>  drivers/sysreset/sysreset_rk3036.c         | 45 ----------------------
>  drivers/sysreset/sysreset_rk3128.c         | 45 ----------------------
>  drivers/sysreset/sysreset_rk3188.c         | 62 ------------------------------
>  drivers/sysreset/sysreset_rk322x.c         | 45 ----------------------
>  drivers/sysreset/sysreset_rk3288.c         | 47 ----------------------
>  drivers/sysreset/sysreset_rk3328.c         | 45 ----------------------
>  drivers/sysreset/sysreset_rk3368.c         | 62 ------------------------------
>  drivers/sysreset/sysreset_rk3399.c         | 45 ----------------------
>  drivers/sysreset/sysreset_rockchip.c       | 47 ++++++++++++++++++++++
>  drivers/sysreset/sysreset_rv1108.c         | 46 ----------------------
>  12 files changed, 53 insertions(+), 453 deletions(-)
>  delete mode 100644 drivers/sysreset/sysreset_rk3036.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3128.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3188.c
>  delete mode 100644 drivers/sysreset/sysreset_rk322x.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3288.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3328.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3368.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3399.c
>  create mode 100644 drivers/sysreset/sysreset_rockchip.c
>  delete mode 100644 drivers/sysreset/sysreset_rv1108.c
> 

Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

[U-Boot] [U-Boot, v3, 2/2] rockchip: clock: update sysreset driver bingding

[Philipp Tomsich]

> Using priv for new sysreset driver binding.
> 
> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ---
> 
> Changes in v3:
> - do not init priv if driver bind fail
> 
> Changes in v2:
> - use udev priv member instead of driver_data
> 
>  drivers/clk/rockchip/clk_rk3036.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3128.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3188.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk322x.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3288.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3328.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3368.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3399.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rv1108.c | 17 ++++++++++++++---
>  9 files changed, 126 insertions(+), 27 deletions(-)
> 

Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

[U-Boot] [U-Boot, v3, 1/2] rockchip: sysreset: merge into one common driver

[Philipp Tomsich]

> Use a common driver for all Rockchip SOC instead of one for each SoC.
> Use driver_data for reg offset.
> 
> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ---
> 
> Changes in v3: None
> Changes in v2:
> - use udev priv member instead of driver_data
> 
>  arch/arm/include/asm/arch-rockchip/clock.h |  5 +++
>  drivers/sysreset/Makefile                  | 12 +-----
>  drivers/sysreset/sysreset_rk3036.c         | 45 ----------------------
>  drivers/sysreset/sysreset_rk3128.c         | 45 ----------------------
>  drivers/sysreset/sysreset_rk3188.c         | 62 ------------------------------
>  drivers/sysreset/sysreset_rk322x.c         | 45 ----------------------
>  drivers/sysreset/sysreset_rk3288.c         | 47 ----------------------
>  drivers/sysreset/sysreset_rk3328.c         | 45 ----------------------
>  drivers/sysreset/sysreset_rk3368.c         | 62 ------------------------------
>  drivers/sysreset/sysreset_rk3399.c         | 45 ----------------------
>  drivers/sysreset/sysreset_rockchip.c       | 47 ++++++++++++++++++++++
>  drivers/sysreset/sysreset_rv1108.c         | 46 ----------------------
>  12 files changed, 53 insertions(+), 453 deletions(-)
>  delete mode 100644 drivers/sysreset/sysreset_rk3036.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3128.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3188.c
>  delete mode 100644 drivers/sysreset/sysreset_rk322x.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3288.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3328.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3368.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3399.c
>  create mode 100644 drivers/sysreset/sysreset_rockchip.c
>  delete mode 100644 drivers/sysreset/sysreset_rv1108.c
> 

Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

[U-Boot] [U-Boot, v3, 1/2] rockchip: sysreset: merge into one common driver

[Philipp Tomsich]

> Use a common driver for all Rockchip SOC instead of one for each SoC.
> Use driver_data for reg offset.
> 
> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ---
> 
> Changes in v3: None
> Changes in v2:
> - use udev priv member instead of driver_data
> 
>  arch/arm/include/asm/arch-rockchip/clock.h |  5 +++
>  drivers/sysreset/Makefile                  | 12 +-----
>  drivers/sysreset/sysreset_rk3036.c         | 45 ----------------------
>  drivers/sysreset/sysreset_rk3128.c         | 45 ----------------------
>  drivers/sysreset/sysreset_rk3188.c         | 62 ------------------------------
>  drivers/sysreset/sysreset_rk322x.c         | 45 ----------------------
>  drivers/sysreset/sysreset_rk3288.c         | 47 ----------------------
>  drivers/sysreset/sysreset_rk3328.c         | 45 ----------------------
>  drivers/sysreset/sysreset_rk3368.c         | 62 ------------------------------
>  drivers/sysreset/sysreset_rk3399.c         | 45 ----------------------
>  drivers/sysreset/sysreset_rockchip.c       | 47 ++++++++++++++++++++++
>  drivers/sysreset/sysreset_rv1108.c         | 46 ----------------------
>  12 files changed, 53 insertions(+), 453 deletions(-)
>  delete mode 100644 drivers/sysreset/sysreset_rk3036.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3128.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3188.c
>  delete mode 100644 drivers/sysreset/sysreset_rk322x.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3288.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3328.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3368.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3399.c
>  create mode 100644 drivers/sysreset/sysreset_rockchip.c
>  delete mode 100644 drivers/sysreset/sysreset_rv1108.c
> 

Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

[U-Boot] [U-Boot, v3, 2/2] rockchip: clock: update sysreset driver bingding

[Philipp Tomsich]

> Using priv for new sysreset driver binding.
> 
> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ---
> 
> Changes in v3:
> - do not init priv if driver bind fail
> 
> Changes in v2:
> - use udev priv member instead of driver_data
> 
>  drivers/clk/rockchip/clk_rk3036.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3128.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3188.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk322x.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3288.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3328.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3368.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3399.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rv1108.c | 17 ++++++++++++++---
>  9 files changed, 126 insertions(+), 27 deletions(-)
> 

Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

[U-Boot] [U-Boot, v3, 1/2] rockchip: sysreset: merge into one common driver

[Philipp Tomsich]

> Use a common driver for all Rockchip SOC instead of one for each SoC.
> Use driver_data for reg offset.
> 
> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ---
> 
> Changes in v3: None
> Changes in v2:
> - use udev priv member instead of driver_data
> 
>  arch/arm/include/asm/arch-rockchip/clock.h |  5 +++
>  drivers/sysreset/Makefile                  | 12 +-----
>  drivers/sysreset/sysreset_rk3036.c         | 45 ----------------------
>  drivers/sysreset/sysreset_rk3128.c         | 45 ----------------------
>  drivers/sysreset/sysreset_rk3188.c         | 62 ------------------------------
>  drivers/sysreset/sysreset_rk322x.c         | 45 ----------------------
>  drivers/sysreset/sysreset_rk3288.c         | 47 ----------------------
>  drivers/sysreset/sysreset_rk3328.c         | 45 ----------------------
>  drivers/sysreset/sysreset_rk3368.c         | 62 ------------------------------
>  drivers/sysreset/sysreset_rk3399.c         | 45 ----------------------
>  drivers/sysreset/sysreset_rockchip.c       | 47 ++++++++++++++++++++++
>  drivers/sysreset/sysreset_rv1108.c         | 46 ----------------------
>  12 files changed, 53 insertions(+), 453 deletions(-)
>  delete mode 100644 drivers/sysreset/sysreset_rk3036.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3128.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3188.c
>  delete mode 100644 drivers/sysreset/sysreset_rk322x.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3288.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3328.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3368.c
>  delete mode 100644 drivers/sysreset/sysreset_rk3399.c
>  create mode 100644 drivers/sysreset/sysreset_rockchip.c
>  delete mode 100644 drivers/sysreset/sysreset_rv1108.c
> 

Applied to u-boot-rockchip/next, thanks!

[U-Boot] [U-Boot, v3, 2/2] rockchip: clock: update sysreset driver bingding

[Philipp Tomsich]

> Using priv for new sysreset driver binding.
> 
> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ---
> 
> Changes in v3:
> - do not init priv if driver bind fail
> 
> Changes in v2:
> - use udev priv member instead of driver_data
> 
>  drivers/clk/rockchip/clk_rk3036.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3128.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3188.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk322x.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3288.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3328.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3368.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rk3399.c | 17 ++++++++++++++---
>  drivers/clk/rockchip/clk_rv1108.c | 17 ++++++++++++++---
>  9 files changed, 126 insertions(+), 27 deletions(-)
> 

Applied to u-boot-rockchip/next, thanks!