reset: sunxi: Get the reset count from the CCU descriptor

This allows all of the clock drivers to use a common bind function.

Signed-off-by: Samuel Holland <samuel@sholland.org>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
[Andre: add F1C100s support]
Signed-off-by: Andre Przywara <andre.przywara@arm.com>

18 files changed, 29 insertions, 101 deletions

diff --git a/drivers/clk/sunxi/clk_a10.c b/drivers/clk/sunxi/clk_a10.c
index b3cca2aa3a0..7bd9a379d7c 100644
--- a/drivers/clk/sunxi/clk_a10.c
+++ b/drivers/clk/sunxi/clk_a10.c
@@ -71,11 +71,6 @@ static const struct ccu_desc a10_ccu_desc = {
 	.num_resets = ARRAY_SIZE(a10_resets),
 };
 
-static int a10_clk_bind(struct udevice *dev)
-{
-	return sunxi_reset_bind(dev, ARRAY_SIZE(a10_resets));
-}
-
 static const struct udevice_id a10_ccu_ids[] = {
 	{ .compatible = "allwinner,sun4i-a10-ccu",
 	  .data = (ulong)&a10_ccu_desc },
@@ -91,5 +86,5 @@ U_BOOT_DRIVER(clk_sun4i_a10) = {
 	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
-	.bind		= a10_clk_bind,
+	.bind		= sunxi_clk_bind,
 };
diff --git a/drivers/clk/sunxi/clk_a10s.c b/drivers/clk/sunxi/clk_a10s.c
index 0e75c303d06..4a83d6b2159 100644
--- a/drivers/clk/sunxi/clk_a10s.c
+++ b/drivers/clk/sunxi/clk_a10s.c
@@ -56,11 +56,6 @@ static const struct ccu_desc a10s_ccu_desc = {
 	.num_resets = ARRAY_SIZE(a10s_resets),
 };
 
-static int a10s_clk_bind(struct udevice *dev)
-{
-	return sunxi_reset_bind(dev, ARRAY_SIZE(a10s_resets));
-}
-
 static const struct udevice_id a10s_ccu_ids[] = {
 	{ .compatible = "allwinner,sun5i-a10s-ccu",
 	  .data = (ulong)&a10s_ccu_desc },
@@ -76,5 +71,5 @@ U_BOOT_DRIVER(clk_sun5i_a10s) = {
 	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
-	.bind		= a10s_clk_bind,
+	.bind		= sunxi_clk_bind,
 };
diff --git a/drivers/clk/sunxi/clk_a23.c b/drivers/clk/sunxi/clk_a23.c
index a9c77bad208..c7f516d7333 100644
--- a/drivers/clk/sunxi/clk_a23.c
+++ b/drivers/clk/sunxi/clk_a23.c
@@ -75,11 +75,6 @@ static const struct ccu_desc a23_ccu_desc = {
 	.num_resets = ARRAY_SIZE(a23_resets),
 };
 
-static int a23_clk_bind(struct udevice *dev)
-{
-	return sunxi_reset_bind(dev, ARRAY_SIZE(a23_resets));
-}
-
 static const struct udevice_id a23_clk_ids[] = {
 	{ .compatible = "allwinner,sun8i-a23-ccu",
 	  .data = (ulong)&a23_ccu_desc },
@@ -95,5 +90,5 @@ U_BOOT_DRIVER(clk_sun8i_a23) = {
 	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
-	.bind		= a23_clk_bind,
+	.bind		= sunxi_clk_bind,
 };
diff --git a/drivers/clk/sunxi/clk_a31.c b/drivers/clk/sunxi/clk_a31.c
index 69df4e08d0f..aa113fa714c 100644
--- a/drivers/clk/sunxi/clk_a31.c
+++ b/drivers/clk/sunxi/clk_a31.c
@@ -96,11 +96,6 @@ static const struct ccu_desc a31_ccu_desc = {
 	.num_resets = ARRAY_SIZE(a31_resets),
 };
 
-static int a31_clk_bind(struct udevice *dev)
-{
-	return sunxi_reset_bind(dev, ARRAY_SIZE(a31_resets));
-}
-
 static const struct udevice_id a31_clk_ids[] = {
 	{ .compatible = "allwinner,sun6i-a31-ccu",
 	  .data = (ulong)&a31_ccu_desc },
@@ -114,5 +109,5 @@ U_BOOT_DRIVER(clk_sun6i_a31) = {
 	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
-	.bind		= a31_clk_bind,
+	.bind		= sunxi_clk_bind,
 };
diff --git a/drivers/clk/sunxi/clk_a31_r.c b/drivers/clk/sunxi/clk_a31_r.c
index 7bf1c4578c5..04c238204dc 100644
--- a/drivers/clk/sunxi/clk_a31_r.c
+++ b/drivers/clk/sunxi/clk_a31_r.c
@@ -35,11 +35,6 @@ static const struct ccu_desc a31_r_ccu_desc = {
 	.num_resets = ARRAY_SIZE(a31_r_resets),
 };
 
-static int a31_r_clk_bind(struct udevice *dev)
-{
-	return sunxi_reset_bind(dev, ARRAY_SIZE(a31_r_resets));
-}
-
 static const struct udevice_id a31_r_clk_ids[] = {
 	{ .compatible = "allwinner,sun8i-a83t-r-ccu",
 	  .data = (ulong)&a31_r_ccu_desc },
@@ -57,5 +52,5 @@ U_BOOT_DRIVER(clk_sun6i_a31_r) = {
 	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
-	.bind		= a31_r_clk_bind,
+	.bind		= sunxi_clk_bind,
 };
diff --git a/drivers/clk/sunxi/clk_a64.c b/drivers/clk/sunxi/clk_a64.c
index e24d5c5ca32..eac1151e966 100644
--- a/drivers/clk/sunxi/clk_a64.c
+++ b/drivers/clk/sunxi/clk_a64.c
@@ -84,11 +84,6 @@ static const struct ccu_desc a64_ccu_desc = {
 	.num_resets = ARRAY_SIZE(a64_resets),
 };
 
-static int a64_clk_bind(struct udevice *dev)
-{
-	return sunxi_reset_bind(dev, ARRAY_SIZE(a64_resets));
-}
-
 static const struct udevice_id a64_ccu_ids[] = {
 	{ .compatible = "allwinner,sun50i-a64-ccu",
 	  .data = (ulong)&a64_ccu_desc },
@@ -102,5 +97,5 @@ U_BOOT_DRIVER(clk_sun50i_a64) = {
 	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
-	.bind		= a64_clk_bind,
+	.bind		= sunxi_clk_bind,
 };
diff --git a/drivers/clk/sunxi/clk_a80.c b/drivers/clk/sunxi/clk_a80.c
index adedcba1665..426205d7482 100644
--- a/drivers/clk/sunxi/clk_a80.c
+++ b/drivers/clk/sunxi/clk_a80.c
@@ -88,16 +88,6 @@ static const struct ccu_desc a80_mmc_clk_desc = {
 	.num_resets = ARRAY_SIZE(a80_mmc_resets),
 };
 
-static int a80_clk_bind(struct udevice *dev)
-{
-	ulong count = ARRAY_SIZE(a80_resets);
-
-	if (device_is_compatible(dev, "allwinner,sun9i-a80-mmc-config-clk"))
-		count = ARRAY_SIZE(a80_mmc_resets);
-
-	return sunxi_reset_bind(dev, count);
-}
-
 static const struct udevice_id a80_ccu_ids[] = {
 	{ .compatible = "allwinner,sun9i-a80-ccu",
 	  .data = (ulong)&a80_ccu_desc },
@@ -113,5 +103,5 @@ U_BOOT_DRIVER(clk_sun9i_a80) = {
 	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
-	.bind		= a80_clk_bind,
+	.bind		= sunxi_clk_bind,
 };
diff --git a/drivers/clk/sunxi/clk_a83t.c b/drivers/clk/sunxi/clk_a83t.c
index 4a0659af3e2..464e95c07da 100644
--- a/drivers/clk/sunxi/clk_a83t.c
+++ b/drivers/clk/sunxi/clk_a83t.c
@@ -79,11 +79,6 @@ static const struct ccu_desc a83t_ccu_desc = {
 	.num_resets = ARRAY_SIZE(a83t_resets),
 };
 
-static int a83t_clk_bind(struct udevice *dev)
-{
-	return sunxi_reset_bind(dev, ARRAY_SIZE(a83t_resets));
-}
-
 static const struct udevice_id a83t_clk_ids[] = {
 	{ .compatible = "allwinner,sun8i-a83t-ccu",
 	  .data = (ulong)&a83t_ccu_desc },
@@ -97,5 +92,5 @@ U_BOOT_DRIVER(clk_sun8i_a83t) = {
 	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
-	.bind		= a83t_clk_bind,
+	.bind		= sunxi_clk_bind,
 };
diff --git a/drivers/clk/sunxi/clk_f1c100s.c b/drivers/clk/sunxi/clk_f1c100s.c
index cb0159ecbc7..acba8f2ebec 100644
--- a/drivers/clk/sunxi/clk_f1c100s.c
+++ b/drivers/clk/sunxi/clk_f1c100s.c
@@ -54,11 +54,6 @@ static const struct ccu_desc f1c100s_ccu_desc = {
 	.num_resets = ARRAY_SIZE(f1c100s_resets),
 };
 
-static int f1c100s_clk_bind(struct udevice *dev)
-{
-	return sunxi_reset_bind(dev, ARRAY_SIZE(f1c100s_resets));
-}
-
 static const struct udevice_id f1c100s_clk_ids[] = {
 	{ .compatible = "allwinner,suniv-f1c100s-ccu",
 	  .data = (ulong)&f1c100s_ccu_desc },
@@ -72,5 +67,5 @@ U_BOOT_DRIVER(clk_suniv_f1c100s) = {
 	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
-	.bind		= f1c100s_clk_bind,
+	.bind		= sunxi_clk_bind,
 };
diff --git a/drivers/clk/sunxi/clk_h3.c b/drivers/clk/sunxi/clk_h3.c
index d69cb04b824..474cf98f644 100644
--- a/drivers/clk/sunxi/clk_h3.c
+++ b/drivers/clk/sunxi/clk_h3.c
@@ -97,11 +97,6 @@ static const struct ccu_desc h3_ccu_desc = {
 	.num_resets = ARRAY_SIZE(h3_resets),
 };
 
-static int h3_clk_bind(struct udevice *dev)
-{
-	return sunxi_reset_bind(dev, ARRAY_SIZE(h3_resets));
-}
-
 static const struct udevice_id h3_ccu_ids[] = {
 	{ .compatible = "allwinner,sun8i-h3-ccu",
 	  .data = (ulong)&h3_ccu_desc },
@@ -117,5 +112,5 @@ U_BOOT_DRIVER(clk_sun8i_h3) = {
 	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
-	.bind		= h3_clk_bind,
+	.bind		= sunxi_clk_bind,
 };
diff --git a/drivers/clk/sunxi/clk_h6.c b/drivers/clk/sunxi/clk_h6.c
index f8d2379b494..4e717afa26e 100644
--- a/drivers/clk/sunxi/clk_h6.c
+++ b/drivers/clk/sunxi/clk_h6.c
@@ -98,11 +98,6 @@ static const struct ccu_desc h6_ccu_desc = {
 	.num_resets = ARRAY_SIZE(h6_resets),
 };
 
-static int h6_clk_bind(struct udevice *dev)
-{
-	return sunxi_reset_bind(dev, ARRAY_SIZE(h6_resets));
-}
-
 static const struct udevice_id h6_ccu_ids[] = {
 	{ .compatible = "allwinner,sun50i-h6-ccu",
 	  .data = (ulong)&h6_ccu_desc },
@@ -116,5 +111,5 @@ U_BOOT_DRIVER(clk_sun50i_h6) = {
 	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
-	.bind		= h6_clk_bind,
+	.bind		= sunxi_clk_bind,
 };
diff --git a/drivers/clk/sunxi/clk_h616.c b/drivers/clk/sunxi/clk_h616.c
index 34cfcffb49d..1ecccd7620c 100644
--- a/drivers/clk/sunxi/clk_h616.c
+++ b/drivers/clk/sunxi/clk_h616.c
@@ -116,11 +116,6 @@ static const struct ccu_desc h616_ccu_desc = {
 	.num_resets = ARRAY_SIZE(h616_resets),
 };
 
-static int h616_clk_bind(struct udevice *dev)
-{
-	return sunxi_reset_bind(dev, ARRAY_SIZE(h616_resets));
-}
-
 static const struct udevice_id h616_ccu_ids[] = {
 	{ .compatible = "allwinner,sun50i-h616-ccu",
 	  .data = (ulong)&h616_ccu_desc },
@@ -134,5 +129,5 @@ U_BOOT_DRIVER(clk_sun50i_h616) = {
 	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
-	.bind		= h616_clk_bind,
+	.bind		= sunxi_clk_bind,
 };
diff --git a/drivers/clk/sunxi/clk_h6_r.c b/drivers/clk/sunxi/clk_h6_r.c
index 18913751fb7..bb67d58fa47 100644
--- a/drivers/clk/sunxi/clk_h6_r.c
+++ b/drivers/clk/sunxi/clk_h6_r.c
@@ -41,11 +41,6 @@ static const struct ccu_desc h6_r_ccu_desc = {
 	.num_resets = ARRAY_SIZE(h6_r_resets),
 };
 
-static int h6_r_clk_bind(struct udevice *dev)
-{
-	return sunxi_reset_bind(dev, ARRAY_SIZE(h6_r_resets));
-}
-
 static const struct udevice_id h6_r_clk_ids[] = {
 	{ .compatible = "allwinner,sun50i-h6-r-ccu",
 	  .data = (ulong)&h6_r_ccu_desc },
@@ -61,5 +56,5 @@ U_BOOT_DRIVER(clk_sun50i_h6_r) = {
 	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
-	.bind		= h6_r_clk_bind,
+	.bind		= sunxi_clk_bind,
 };
diff --git a/drivers/clk/sunxi/clk_r40.c b/drivers/clk/sunxi/clk_r40.c
index 81e4a0219a9..daab6ad33b4 100644
--- a/drivers/clk/sunxi/clk_r40.c
+++ b/drivers/clk/sunxi/clk_r40.c
@@ -106,11 +106,6 @@ static const struct ccu_desc r40_ccu_desc = {
 	.num_resets = ARRAY_SIZE(r40_resets),
 };
 
-static int r40_clk_bind(struct udevice *dev)
-{
-	return sunxi_reset_bind(dev, ARRAY_SIZE(r40_resets));
-}
-
 static const struct udevice_id r40_clk_ids[] = {
 	{ .compatible = "allwinner,sun8i-r40-ccu",
 	  .data = (ulong)&r40_ccu_desc },
@@ -124,5 +119,5 @@ U_BOOT_DRIVER(clk_sun8i_r40) = {
 	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
-	.bind		= r40_clk_bind,
+	.bind		= sunxi_clk_bind,
 };
diff --git a/drivers/clk/sunxi/clk_sunxi.c b/drivers/clk/sunxi/clk_sunxi.c
index 62e77386be7..23d81f68c5c 100644
--- a/drivers/clk/sunxi/clk_sunxi.c
+++ b/drivers/clk/sunxi/clk_sunxi.c
@@ -67,6 +67,11 @@ struct clk_ops sunxi_clk_ops = {
 	.disable = sunxi_clk_disable,
 };
 
+int sunxi_clk_bind(struct udevice *dev)
+{
+	return sunxi_reset_bind(dev);
+}
+
 int sunxi_clk_probe(struct udevice *dev)
 {
 	struct ccu_priv *priv = dev_get_priv(dev);
diff --git a/drivers/clk/sunxi/clk_v3s.c b/drivers/clk/sunxi/clk_v3s.c
index f45e9400419..5b5afa68715 100644
--- a/drivers/clk/sunxi/clk_v3s.c
+++ b/drivers/clk/sunxi/clk_v3s.c
@@ -56,11 +56,6 @@ static const struct ccu_desc v3s_ccu_desc = {
 	.num_resets = ARRAY_SIZE(v3s_resets),
 };
 
-static int v3s_clk_bind(struct udevice *dev)
-{
-	return sunxi_reset_bind(dev, ARRAY_SIZE(v3s_resets));
-}
-
 static const struct udevice_id v3s_clk_ids[] = {
 	{ .compatible = "allwinner,sun8i-v3s-ccu",
 	  .data = (ulong)&v3s_ccu_desc },
@@ -76,5 +71,5 @@ U_BOOT_DRIVER(clk_sun8i_v3s) = {
 	.priv_auto	= sizeof(struct ccu_priv),
 	.ops		= &sunxi_clk_ops,
 	.probe		= sunxi_clk_probe,
-	.bind		= v3s_clk_bind,
+	.bind		= sunxi_clk_bind,
 };
diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c
index e2a9c2a142b..621912ad237 100644
--- a/drivers/reset/reset-sunxi.c
+++ b/drivers/reset/reset-sunxi.c
@@ -19,7 +19,6 @@
 
 struct sunxi_reset_priv {
 	void *base;
-	ulong count;
 	const struct ccu_desc *desc;
 };
 
@@ -35,7 +34,7 @@ static int sunxi_reset_request(struct reset_ctl *reset_ctl)
 
 	debug("%s: (RST#%ld)\n", __func__, reset_ctl->id);
 
-	if (reset_ctl->id >= priv->count)
+	if (reset_ctl->id >= priv->desc->num_resets)
 		return -EINVAL;
 
 	return 0;
@@ -91,7 +90,7 @@ static int sunxi_reset_probe(struct udevice *dev)
 	return 0;
 }
 
-int sunxi_reset_bind(struct udevice *dev, ulong count)
+int sunxi_reset_bind(struct udevice *dev)
 {
 	struct udevice *rst_dev;
 	struct sunxi_reset_priv *priv;
@@ -104,7 +103,6 @@ int sunxi_reset_bind(struct udevice *dev, ulong count)
 		return ret;
 	}
 	priv = malloc(sizeof(struct sunxi_reset_priv));
-	priv->count = count;
 	priv->desc = (const struct ccu_desc *)dev_get_driver_data(dev);
 	dev_set_priv(rst_dev, priv);
 
diff --git a/include/clk/sunxi.h b/include/clk/sunxi.h
index f1717a5e954..a70119304a7 100644
--- a/include/clk/sunxi.h
+++ b/include/clk/sunxi.h
@@ -86,6 +86,12 @@ struct ccu_priv {
 };
 
 /**
+ * sunxi_clk_bind - common sunxi clock bind
+ * @dev:	clock device
+ */
+int sunxi_clk_bind(struct udevice *dev);
+
+/**
  * sunxi_clk_probe - common sunxi clock probe
  * @dev:	clock device
  */
@@ -97,9 +103,8 @@ extern struct clk_ops sunxi_clk_ops;
  * sunxi_reset_bind() - reset binding
  *
  * @dev:       reset device
- * @count:     reset count
  * Return: 0 success, or error value
  */
-int sunxi_reset_bind(struct udevice *dev, ulong count);
+int sunxi_reset_bind(struct udevice *dev);
 
 #endif /* _CLK_SUNXI_H */