diff options
| author | Tom Rini <trini@konsulko.com> | 2022-03-30 18:08:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-03-30 18:14:33 -0400 |
| commit | 23e354f82c04a1c070ca59907abc6b042761b0e7 (patch) | |
| tree | fc73baee17217f3b8c2f116a868eaa190a1bb0a4 /drivers/spi/bcm63xx_hsspi.c | |
| parent | d2e5250be49fce4653689c41a5dc7e2d7e7ecf33 (diff) | |
| parent | 682e73d23555afdd733c20810d282d9cc2bc0e0f (diff) | |
Merge tag 'clk-2022.04-next' of https://source.denx.de/u-boot/custodians/u-boot-clk into next
Clock patches for u-boot/next
This is mostly cleanups/consolidations. clk_free is made to return void, and the
CCF wrappers present in almost every CCF clock are consolidated. I would
particularly like to have the latter upstream, since there are at least two
series adding support for new CCF drivers (imx8mq and imxrt1170) which can
benefit from these commits.
I had to fix up the last commit since I missed an include for at91.
CI: https://source.denx.de/u-boot/custodians/u-boot-clk/-/pipelines/11521
Diffstat (limited to 'drivers/spi/bcm63xx_hsspi.c')
| -rw-r--r-- | drivers/spi/bcm63xx_hsspi.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/spi/bcm63xx_hsspi.c b/drivers/spi/bcm63xx_hsspi.c index 85108df565c..47002f8b566 100644 --- a/drivers/spi/bcm63xx_hsspi.c +++ b/drivers/spi/bcm63xx_hsspi.c @@ -355,9 +355,7 @@ static int bcm63xx_hsspi_probe(struct udevice *dev) if (ret < 0 && ret != -ENOSYS) return ret; - ret = clk_free(&clk); - if (ret < 0 && ret != -ENOSYS) - return ret; + clk_free(&clk); /* get clock rate */ ret = clk_get_by_name(dev, "pll", &clk); @@ -366,9 +364,7 @@ static int bcm63xx_hsspi_probe(struct udevice *dev) priv->clk_rate = clk_get_rate(&clk); - ret = clk_free(&clk); - if (ret < 0 && ret != -ENOSYS) - return ret; + clk_free(&clk); /* perform reset */ ret = reset_get_by_index(dev, 0, &rst_ctl); |