leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Samuel Holland 2022-05-09 00:29:33 -05:00 committed by Andre Przywara
parent 6827aba348
commit d39088ad9c
18 changed files with 29 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/clk/sunxi/clk_a10.c
View File

@ -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,
};

7
drivers/clk/sunxi/clk_a10s.c
View File

@ -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,
};

7
drivers/clk/sunxi/clk_a23.c
View File

@ -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,
};

7
drivers/clk/sunxi/clk_a31.c
View File

@ -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,
};

7
drivers/clk/sunxi/clk_a31_r.c
View File

@ -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,
};

7
drivers/clk/sunxi/clk_a64.c
View File

@ -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,
};

12
drivers/clk/sunxi/clk_a80.c
View File

@ -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,
};

7
drivers/clk/sunxi/clk_a83t.c
View File

@ -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,
};

7
drivers/clk/sunxi/clk_f1c100s.c
View File

@ -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,
};

7
drivers/clk/sunxi/clk_h3.c
View File

@ -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,
};

7
drivers/clk/sunxi/clk_h6.c
View File

@ -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,
};

7
drivers/clk/sunxi/clk_h616.c
View File

@ -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,
};

7
drivers/clk/sunxi/clk_h6_r.c
View File

@ -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,
};

7
drivers/clk/sunxi/clk_r40.c
View File

@ -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,
};

5
drivers/clk/sunxi/clk_sunxi.c
View File

@ -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);

7
drivers/clk/sunxi/clk_v3s.c
View File

@ -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,
};

6
drivers/reset/reset-sunxi.c
View File

@ -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);

9
include/clk/sunxi.h
View File

@ -85,6 +85,12 @@ struct ccu_priv {
const struct ccu_desc *desc;
};
/**
* 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 */