summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPali Rohár <pali@kernel.org>2022-01-18 12:33:20 +0300
committerStefan Roese <sr@denx.de>2022-01-20 16:46:03 +0300
commit2928d2cd502a73eca2773f9ce3d5d96daca72788 (patch)
tree51dd3deb4effe20525bb8049b02c7cf9bcaa9f9b
parentf33d67647f8ac1fdb940865053348176d9afe20b (diff)
downloadu-boot-2928d2cd502a73eca2773f9ce3d5d96daca72788.tar.xz
phy: marvell: Remove unused function comphy_update_map()
This weak function is not used anymore, so completely remove it. Private struct comphy_map is not used by any board code anymore, so move it into private driver header file comphy_core.h. Signed-off-by: Pali Rohár <pali@kernel.org> Reviewed-by: Stefan Roese <sr@denx.de>
-rw-r--r--drivers/phy/marvell/comphy_core.c9
-rw-r--r--drivers/phy/marvell/comphy_core.h9
-rw-r--r--include/mvebu/comphy.h11
3 files changed, 9 insertions, 20 deletions
diff --git a/drivers/phy/marvell/comphy_core.c b/drivers/phy/marvell/comphy_core.c
index 233a973035..5bb994fe42 100644
--- a/drivers/phy/marvell/comphy_core.c
+++ b/drivers/phy/marvell/comphy_core.c
@@ -79,11 +79,6 @@ int comphy_rx_training(struct udevice *dev, u32 lane)
return 0;
}
-__weak int comphy_update_map(struct comphy_map *serdes_map, int count)
-{
- return 0;
-}
-
static int comphy_probe(struct udevice *dev)
{
int node = dev_of_offset(dev);
@@ -126,10 +121,6 @@ static int comphy_probe(struct udevice *dev)
if (res < 0)
return res;
- res = comphy_update_map(chip_cfg->comphy_map_data, chip_cfg->comphy_lanes_count);
- if (res < 0)
- return res;
-
/* Save CP index for MultiCP devices (A8K) */
chip_cfg->cp_index = current_idx++;
/* PHY power UP sequence */
diff --git a/drivers/phy/marvell/comphy_core.h b/drivers/phy/marvell/comphy_core.h
index d573776c05..f3d0493938 100644
--- a/drivers/phy/marvell/comphy_core.h
+++ b/drivers/phy/marvell/comphy_core.h
@@ -8,6 +8,7 @@
#include <fdtdec.h>
#include <mvebu/comphy.h>
+#include <dt-bindings/comphy/comphy_data.h>
#if defined(DEBUG)
#define debug_enter() printf("----> Enter %s\n", __func__);
@@ -20,6 +21,14 @@
#define MAX_LANE_OPTIONS 10
#define MAX_UTMI_PHY_COUNT 6
+struct comphy_map {
+ u32 type;
+ u32 speed;
+ u32 invert;
+ bool clk_src;
+ bool end_point;
+};
+
struct comphy_mux_options {
u32 type;
u32 mux_value;
diff --git a/include/mvebu/comphy.h b/include/mvebu/comphy.h
index 4d1b70393b..14431576e6 100644
--- a/include/mvebu/comphy.h
+++ b/include/mvebu/comphy.h
@@ -6,17 +6,6 @@
#ifndef _MVEBU_COMPHY_H_
#define _MVEBU_COMPHY_H_
-#include <dt-bindings/comphy/comphy_data.h>
-
-struct comphy_map {
- u32 type;
- u32 speed;
- u32 invert;
- bool clk_src;
- bool end_point;
-};
-
int comphy_rx_training(struct udevice *dev, u32 lane);
-int comphy_update_map(struct comphy_map *serdes_map, int count);
#endif /* _MVEBU_COMPHY_H_ */