rockchip: clk: guard set_parent implementations against OF_PLATDATA

The set_parent implementations do not make sense when OF_PLATDATA is
enabled.  We guard these against OF_PLATDATA and don't populate the
set_parent-op when this is the case.

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
master
Philipp Tomsich 7 years ago
parent 64a12202ed
commit 75b381aae8
  1. 6
      drivers/clk/rockchip/clk_rk3288.c
  2. 6
      drivers/clk/rockchip/clk_rk3368.c
  3. 6
      drivers/clk/rockchip/clk_rk3399.c

@ -842,7 +842,7 @@ static ulong rk3288_clk_set_rate(struct clk *clk, ulong rate)
return new_rate; return new_rate;
} }
static int rk3288_gmac_set_parent(struct clk *clk, struct clk *parent) static int __maybe_unused rk3288_gmac_set_parent(struct clk *clk, struct clk *parent)
{ {
struct rk3288_clk_priv *priv = dev_get_priv(clk->dev); struct rk3288_clk_priv *priv = dev_get_priv(clk->dev);
struct rk3288_cru *cru = priv->cru; struct rk3288_cru *cru = priv->cru;
@ -880,7 +880,7 @@ static int rk3288_gmac_set_parent(struct clk *clk, struct clk *parent)
return -EINVAL; return -EINVAL;
} }
static int rk3288_clk_set_parent(struct clk *clk, struct clk *parent) static int __maybe_unused rk3288_clk_set_parent(struct clk *clk, struct clk *parent)
{ {
switch (clk->id) { switch (clk->id) {
case SCLK_MAC: case SCLK_MAC:
@ -896,7 +896,9 @@ static int rk3288_clk_set_parent(struct clk *clk, struct clk *parent)
static struct clk_ops rk3288_clk_ops = { static struct clk_ops rk3288_clk_ops = {
.get_rate = rk3288_clk_get_rate, .get_rate = rk3288_clk_get_rate,
.set_rate = rk3288_clk_set_rate, .set_rate = rk3288_clk_set_rate,
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
.set_parent = rk3288_clk_set_parent, .set_parent = rk3288_clk_set_parent,
#endif
}; };
static int rk3288_clk_ofdata_to_platdata(struct udevice *dev) static int rk3288_clk_ofdata_to_platdata(struct udevice *dev)

@ -520,7 +520,7 @@ static ulong rk3368_clk_set_rate(struct clk *clk, ulong rate)
return ret; return ret;
} }
static int rk3368_gmac_set_parent(struct clk *clk, struct clk *parent) static int __maybe_unused rk3368_gmac_set_parent(struct clk *clk, struct clk *parent)
{ {
struct rk3368_clk_priv *priv = dev_get_priv(clk->dev); struct rk3368_clk_priv *priv = dev_get_priv(clk->dev);
struct rk3368_cru *cru = priv->cru; struct rk3368_cru *cru = priv->cru;
@ -557,7 +557,7 @@ static int rk3368_gmac_set_parent(struct clk *clk, struct clk *parent)
return -EINVAL; return -EINVAL;
} }
static int rk3368_clk_set_parent(struct clk *clk, struct clk *parent) static int __maybe_unused rk3368_clk_set_parent(struct clk *clk, struct clk *parent)
{ {
switch (clk->id) { switch (clk->id) {
case SCLK_MAC: case SCLK_MAC:
@ -571,7 +571,9 @@ static int rk3368_clk_set_parent(struct clk *clk, struct clk *parent)
static struct clk_ops rk3368_clk_ops = { static struct clk_ops rk3368_clk_ops = {
.get_rate = rk3368_clk_get_rate, .get_rate = rk3368_clk_get_rate,
.set_rate = rk3368_clk_set_rate, .set_rate = rk3368_clk_set_rate,
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
.set_parent = rk3368_clk_set_parent, .set_parent = rk3368_clk_set_parent,
#endif
}; };
static int rk3368_clk_probe(struct udevice *dev) static int rk3368_clk_probe(struct udevice *dev)

@ -943,7 +943,7 @@ static ulong rk3399_clk_set_rate(struct clk *clk, ulong rate)
return ret; return ret;
} }
static int rk3399_gmac_set_parent(struct clk *clk, struct clk *parent) static int __maybe_unused rk3399_gmac_set_parent(struct clk *clk, struct clk *parent)
{ {
struct rk3399_clk_priv *priv = dev_get_priv(clk->dev); struct rk3399_clk_priv *priv = dev_get_priv(clk->dev);
const char *clock_output_name; const char *clock_output_name;
@ -978,7 +978,7 @@ static int rk3399_gmac_set_parent(struct clk *clk, struct clk *parent)
return -EINVAL; return -EINVAL;
} }
static int rk3399_clk_set_parent(struct clk *clk, struct clk *parent) static int __maybe_unused rk3399_clk_set_parent(struct clk *clk, struct clk *parent)
{ {
switch (clk->id) { switch (clk->id) {
case SCLK_RMII_SRC: case SCLK_RMII_SRC:
@ -1006,7 +1006,9 @@ static int rk3399_clk_enable(struct clk *clk)
static struct clk_ops rk3399_clk_ops = { static struct clk_ops rk3399_clk_ops = {
.get_rate = rk3399_clk_get_rate, .get_rate = rk3399_clk_get_rate,
.set_rate = rk3399_clk_set_rate, .set_rate = rk3399_clk_set_rate,
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
.set_parent = rk3399_clk_set_parent, .set_parent = rk3399_clk_set_parent,
#endif
.enable = rk3399_clk_enable, .enable = rk3399_clk_enable,
}; };

Loading…
Cancel
Save