Skip to content

Commit eebfc30

Browse files
committed
phy: apple: atc: Reorder ACIOPHY_CROSSBAR and ACIOPHY_MISC ops
Use the same order of operations as macOS 13.5 for simpler comparisons of Linux and macOS traces. Signed-off-by: Janne Grunau <j@jannau.net>
1 parent 4f8e7f5 commit eebfc30

1 file changed

Lines changed: 9 additions & 8 deletions

File tree

drivers/phy/apple/atc.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -828,11 +828,6 @@ static void atcphy_configure_lanes(struct apple_atcphy *atcphy,
828828

829829
trace_atcphy_configure_lanes(mode, mode_cfg);
830830

831-
if (mode_cfg->set_swap)
832-
core_set32(atcphy, ATCPHY_MISC, ATCPHY_MISC_LANE_SWAP);
833-
else
834-
core_clear32(atcphy, ATCPHY_MISC, ATCPHY_MISC_LANE_SWAP);
835-
836831
if (mode_cfg->dp_lane[0]) {
837832
core_set32(atcphy, LN0_AUSPMA_RX_TOP + LN_AUSPMA_RX_TOP_PMAFSM,
838833
LN_AUSPMA_RX_TOP_PMAFSM_PCS_OV);
@@ -859,15 +854,21 @@ static void atcphy_configure_lanes(struct apple_atcphy *atcphy,
859854
core_mask32(atcphy, ACIOPHY_CROSSBAR, ACIOPHY_CROSSBAR_PROTOCOL,
860855
FIELD_PREP(ACIOPHY_CROSSBAR_PROTOCOL, mode_cfg->crossbar));
861856

862-
core_mask32(atcphy, ACIOPHY_CROSSBAR, ACIOPHY_CROSSBAR_DP_SINGLE_PMA,
863-
FIELD_PREP(ACIOPHY_CROSSBAR_DP_SINGLE_PMA,
864-
mode_cfg->crossbar_dp_single_pma));
857+
if (mode_cfg->set_swap)
858+
core_set32(atcphy, ATCPHY_MISC, ATCPHY_MISC_LANE_SWAP);
859+
else
860+
core_clear32(atcphy, ATCPHY_MISC, ATCPHY_MISC_LANE_SWAP);
861+
865862
if (mode_cfg->crossbar_dp_both_pma)
866863
core_set32(atcphy, ACIOPHY_CROSSBAR,
867864
ACIOPHY_CROSSBAR_DP_BOTH_PMA);
868865
else
869866
core_clear32(atcphy, ACIOPHY_CROSSBAR,
870867
ACIOPHY_CROSSBAR_DP_BOTH_PMA);
868+
869+
core_mask32(atcphy, ACIOPHY_CROSSBAR, ACIOPHY_CROSSBAR_DP_SINGLE_PMA,
870+
FIELD_PREP(ACIOPHY_CROSSBAR_DP_SINGLE_PMA,
871+
mode_cfg->crossbar_dp_single_pma));
871872
}
872873

873874
static int atcphy_pipehandler_lock(struct apple_atcphy *atcphy)

0 commit comments

Comments
 (0)