In preparation for moving a1 versions of several common functions into a
shared file, rename all the conflicting functions to have a soc-specific
component.
Signed-off-by: Sean Anderson <[email protected]>
---
drivers/clk/meson/axg-ao.c | 8 ++++----
drivers/clk/meson/axg.c | 12 ++++++------
drivers/clk/meson/g12a-ao.c | 8 ++++----
drivers/clk/meson/g12a.c | 20 ++++++++++----------
drivers/clk/meson/gxbb.c | 20 ++++++++++----------
5 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/drivers/clk/meson/axg-ao.c b/drivers/clk/meson/axg-ao.c
index 6ccf52127b0..3215391006e 100644
--- a/drivers/clk/meson/axg-ao.c
+++ b/drivers/clk/meson/axg-ao.c
@@ -35,12 +35,12 @@ static int meson_set_gate(struct clk *clk, bool on)
return 0;
}
-static int meson_clk_enable(struct clk *clk)
+static int meson_axg_ao_clk_enable(struct clk *clk)
{
return meson_set_gate(clk, true);
}
-static int meson_clk_disable(struct clk *clk)
+static int meson_axg_ao_clk_disable(struct clk *clk)
{
return meson_set_gate(clk, false);
}
@@ -65,8 +65,8 @@ static int meson_clk_request(struct clk *clk)
}
static struct clk_ops meson_clk_ops = {
- .disable = meson_clk_disable,
- .enable = meson_clk_enable,
+ .disable = meson_axg_ao_clk_disable,
+ .enable = meson_axg_ao_clk_enable,
.request = meson_clk_request,
};
diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c
index c421a622a58..e20d3feaade 100644
--- a/drivers/clk/meson/axg.c
+++ b/drivers/clk/meson/axg.c
@@ -69,12 +69,12 @@ static int meson_set_gate(struct clk *clk, bool on)
return 0;
}
-static int meson_clk_enable(struct clk *clk)
+static int meson_axg_clk_enable(struct clk *clk)
{
return meson_set_gate(clk, true);
}
-static int meson_clk_disable(struct clk *clk)
+static int meson_axg_clk_disable(struct clk *clk)
{
return meson_set_gate(clk, false);
}
@@ -279,7 +279,7 @@ static ulong meson_clk_get_rate_by_id(struct clk *clk,
unsigned long id)
return rate;
}
-static ulong meson_clk_get_rate(struct clk *clk)
+static ulong meson_axg_clk_get_rate(struct clk *clk)
{
return meson_clk_get_rate_by_id(clk, clk->id);
}
@@ -305,9 +305,9 @@ static int meson_clk_probe(struct udevice *dev)
}
static struct clk_ops meson_clk_ops = {
- .disable = meson_clk_disable,
- .enable = meson_clk_enable,
- .get_rate = meson_clk_get_rate,
+ .disable = meson_axg_clk_disable,
+ .enable = meson_axg_clk_enable,
+ .get_rate = meson_axg_clk_get_rate,
};
static const struct udevice_id meson_clk_ids[] = {
diff --git a/drivers/clk/meson/g12a-ao.c b/drivers/clk/meson/g12a-ao.c
index 61d489c6e1c..e89638d65b5 100644
--- a/drivers/clk/meson/g12a-ao.c
+++ b/drivers/clk/meson/g12a-ao.c
@@ -35,12 +35,12 @@ static int meson_set_gate(struct clk *clk, bool on)
return 0;
}
-static int meson_clk_enable(struct clk *clk)
+static int meson_g12a_ao_clk_enable(struct clk *clk)
{
return meson_set_gate(clk, true);
}
-static int meson_clk_disable(struct clk *clk)
+static int meson_g12a_ao_clk_disable(struct clk *clk)
{
return meson_set_gate(clk, false);
}
@@ -65,8 +65,8 @@ static int meson_clk_request(struct clk *clk)
}
static struct clk_ops meson_clk_ops = {
- .disable = meson_clk_disable,
- .enable = meson_clk_enable,
+ .disable = meson_g12a_ao_clk_disable,
+ .enable = meson_g12a_ao_clk_enable,
.request = meson_clk_request,
};
diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
index f33938e1419..cc7bfe9e2a2 100644
--- a/drivers/clk/meson/g12a.c
+++ b/drivers/clk/meson/g12a.c
@@ -194,12 +194,12 @@ static int meson_set_gate_by_id(struct clk *clk, unsigned
long id, bool on)
return 0;
}
-static int meson_clk_enable(struct clk *clk)
+static int meson_g12a_clk_enable(struct clk *clk)
{
return meson_set_gate_by_id(clk, clk->id, true);
}
-static int meson_clk_disable(struct clk *clk)
+static int meson_g12a_clk_disable(struct clk *clk)
{
return meson_set_gate_by_id(clk, clk->id, false);
}
@@ -858,7 +858,7 @@ static ulong meson_clk_get_rate_by_id(struct clk *clk,
unsigned long id)
return rate;
}
-static ulong meson_clk_get_rate(struct clk *clk)
+static ulong meson_g12a_clk_get_rate(struct clk *clk)
{
return meson_clk_get_rate_by_id(clk, clk->id);
}
@@ -888,7 +888,7 @@ static ulong meson_pcie_pll_set_rate(struct clk *clk, ulong
rate)
return 100000000;
}
-static int meson_clk_set_parent(struct clk *clk, struct clk *parent)
+static int meson_g12a_clk_set_parent(struct clk *clk, struct clk *parent)
{
return meson_mux_set_parent(clk, clk->id, parent->id);
}
@@ -958,7 +958,7 @@ static ulong meson_clk_set_rate_by_id(struct clk *clk,
unsigned long id,
return -EINVAL;
}
-static ulong meson_clk_set_rate(struct clk *clk, ulong rate)
+static ulong meson_g12a_clk_set_rate(struct clk *clk, ulong rate)
{
ulong current_rate = meson_clk_get_rate_by_id(clk, clk->id);
int ret;
@@ -1000,11 +1000,11 @@ static int meson_clk_probe(struct udevice *dev)
}
static struct clk_ops meson_clk_ops = {
- .disable = meson_clk_disable,
- .enable = meson_clk_enable,
- .get_rate = meson_clk_get_rate,
- .set_parent = meson_clk_set_parent,
- .set_rate = meson_clk_set_rate,
+ .disable = meson_g12a_clk_disable,
+ .enable = meson_g12a_clk_enable,
+ .get_rate = meson_g12a_clk_get_rate,
+ .set_parent = meson_g12a_clk_set_parent,
+ .set_rate = meson_g12a_clk_set_rate,
};
static const struct udevice_id meson_clk_ids[] = {
diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
index bf46f4d50bc..24b5f9b5d40 100644
--- a/drivers/clk/meson/gxbb.c
+++ b/drivers/clk/meson/gxbb.c
@@ -236,12 +236,12 @@ static int meson_set_gate_by_id(struct clk *clk, unsigned
long id, bool on)
return 0;
}
-static int meson_clk_enable(struct clk *clk)
+static int meson_gxbb_clk_enable(struct clk *clk)
{
return meson_set_gate_by_id(clk, clk->id, true);
}
-static int meson_clk_disable(struct clk *clk)
+static int meson_gxbb_clk_disable(struct clk *clk)
{
return meson_set_gate_by_id(clk, clk->id, false);
}
@@ -840,12 +840,12 @@ static ulong meson_clk_get_rate_by_id(struct clk *clk,
unsigned long id)
return rate;
}
-static ulong meson_clk_get_rate(struct clk *clk)
+static ulong meson_gxbb_clk_get_rate(struct clk *clk)
{
return meson_clk_get_rate_by_id(clk, clk->id);
}
-static int meson_clk_set_parent(struct clk *clk, struct clk *parent)
+static int meson_gxbb_clk_set_parent(struct clk *clk, struct clk *parent)
{
return meson_mux_set_parent(clk, clk->id, parent->id);
}
@@ -912,7 +912,7 @@ static ulong meson_clk_set_rate_by_id(struct clk *clk,
unsigned long id,
return -EINVAL;
}
-static ulong meson_clk_set_rate(struct clk *clk, ulong rate)
+static ulong meson_gxbb_clk_set_rate(struct clk *clk, ulong rate)
{
ulong current_rate = meson_clk_get_rate_by_id(clk, clk->id);
int ret;
@@ -954,11 +954,11 @@ static int meson_clk_probe(struct udevice *dev)
}
static struct clk_ops meson_clk_ops = {
- .disable = meson_clk_disable,
- .enable = meson_clk_enable,
- .get_rate = meson_clk_get_rate,
- .set_parent = meson_clk_set_parent,
- .set_rate = meson_clk_set_rate,
+ .disable = meson_gxbb_clk_disable,
+ .enable = meson_gxbb_clk_enable,
+ .get_rate = meson_gxbb_clk_get_rate,
+ .set_parent = meson_gxbb_clk_set_parent,
+ .set_rate = meson_gxbb_clk_set_rate,
};
static const struct udevice_id meson_clk_ids[] = {
