mmc: sdhci: use the generic error number

[u-boot] / drivers / clk / clk_pic32.c

diff --git a/drivers/clk/clk_pic32.c b/drivers/clk/clk_pic32.c
index 5d883544d5136e9677ca4c8630ed7ec3d9914f65..70ec3543cf90eadf9b79e8f01631e1a8a454e3d7 100644 (file)
--- a/drivers/clk/clk_pic32.c
+++ b/drivers/clk/clk_pic32.c
@@ -6,7 +6,7 @@
  */
 
 #include <common.h>
-#include <clk.h>
+#include <clk-uclass.h>
 #include <dm.h>
 #include <div64.h>
 #include <wait_bit.h>
@@ -339,24 +339,17 @@ static void pic32_clk_init(struct udevice *dev)
        pic32_mpll_init(priv);
 }
 
-static ulong pic32_clk_get_rate(struct udevice *dev)
+static ulong pic32_get_rate(struct clk *clk)
 {
-       struct pic32_clk_priv *priv = dev_get_priv(dev);
-
-       return pic32_get_cpuclk(priv);
-}
-
-static ulong pic32_get_periph_rate(struct udevice *dev, int periph)
-{
-       struct pic32_clk_priv *priv = dev_get_priv(dev);
+       struct pic32_clk_priv *priv = dev_get_priv(clk->dev);
        ulong rate;
 
-       switch (periph) {
+       switch (clk->id) {
        case PB1CLK ... PB7CLK:
-               rate = pic32_get_pbclk(priv, periph);
+               rate = pic32_get_pbclk(priv, clk->id);
                break;
        case REF1CLK ... REF5CLK:
-               rate = pic32_get_refclk(priv, periph);
+               rate = pic32_get_refclk(priv, clk->id);
                break;
        case PLLCLK:
                rate = pic32_get_pll_rate(priv);
@@ -372,15 +365,15 @@ static ulong pic32_get_periph_rate(struct udevice *dev, int periph)
        return rate;
 }
 
-static ulong pic32_set_periph_rate(struct udevice *dev, int periph, ulong rate)
+static ulong pic32_set_rate(struct clk *clk, ulong rate)
 {
-       struct pic32_clk_priv *priv = dev_get_priv(dev);
+       struct pic32_clk_priv *priv = dev_get_priv(clk->dev);
        ulong pll_hz;
 
-       switch (periph) {
+       switch (clk->id) {
        case REF1CLK ... REF5CLK:
                pll_hz = pic32_get_pll_rate(priv);
-               pic32_set_refclk(priv, periph, pll_hz, rate, ROCLK_SRC_SPLL);
+               pic32_set_refclk(priv, clk->id, pll_hz, rate, ROCLK_SRC_SPLL);
                break;
        default:
                break;
@@ -390,9 +383,8 @@ static ulong pic32_set_periph_rate(struct udevice *dev, int periph, ulong rate)
 }
 
 static struct clk_ops pic32_pic32_clk_ops = {
-       .get_rate = pic32_clk_get_rate,
-       .set_periph_rate = pic32_set_periph_rate,
-       .get_periph_rate = pic32_get_periph_rate,
+       .set_rate = pic32_set_rate,
+       .get_rate = pic32_get_rate,
 };
 
 static int pic32_clk_probe(struct udevice *dev)