diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-09 19:48:09 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-09 19:48:09 (GMT) |
| commit | a284212963277114ad60e3442d74f095102a9de5 (patch) | |
| tree | ade5bcb8f4c46b8766d439785ed7d0a210628913 /drivers/phy/marvell/comphy_mux.c | |
| parent | e6ceaff1b5f1ff6a0b135fcd931562958e9c91bd (diff) | |
| parent | e38f5fc8d80d946b401ba0e9ba0fcb52d6e7e74b (diff) | |
| download | u-boot-a284212963277114ad60e3442d74f095102a9de5.tar.xz | |
Merge git://www.denx.de/git/u-boot-marvell
Diffstat (limited to 'drivers/phy/marvell/comphy_mux.c')
| -rw-r--r-- | drivers/phy/marvell/comphy_mux.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/phy/marvell/comphy_mux.c b/drivers/phy/marvell/comphy_mux.c index 1dc7426..b036fb1 100644 --- a/drivers/phy/marvell/comphy_mux.c +++ b/drivers/phy/marvell/comphy_mux.c @@ -27,6 +27,10 @@ static void comphy_mux_check_config(struct comphy_mux_data *mux_data, for (lane = 0; lane < comphy_max_lanes; lane++, comphy_map_data++, mux_data++) { + /* Don't check ignored COMPHYs */ + if (comphy_map_data->type == PHY_TYPE_IGNORE) + continue; + mux_opt = mux_data->mux_values; for (opt = 0, valid = 0; opt < mux_data->max_lane_values; opt++, mux_opt++) { @@ -83,6 +87,9 @@ static void comphy_mux_reg_write(struct comphy_mux_data *mux_data, for (lane = 0; lane < comphy_max_lanes; lane++, comphy_map_data++, mux_data++) { + if (comphy_map_data->type == PHY_TYPE_IGNORE) + continue; + offset = lane * bitcount; mask = (((1 << bitcount) - 1) << offset); value = (comphy_mux_get_mux_value(mux_data, |