The MPIC_MDC_CLK clock setting value differs between R-Car S4 and R-Car X5H. Parametrize the value in preparation for R-Car X5H addition into this driver. No functional change.
Signed-off-by: Marek Vasut <[email protected]> --- Cc: Jerome Forissier <[email protected]> Cc: Joe Hershberger <[email protected]> Cc: Nobuhiro Iwamatsu <[email protected]> Cc: Paul Barker <[email protected]> Cc: Ramon Fried <[email protected]> Cc: Simon Glass <[email protected]> Cc: Tom Rini <[email protected]> Cc: [email protected] --- drivers/net/rswitch.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/rswitch.c b/drivers/net/rswitch.c index f0350d42b7a..54ecb95344f 100644 --- a/drivers/net/rswitch.c +++ b/drivers/net/rswitch.c @@ -127,7 +127,6 @@ #define MPIC_PSMCS_MASK (0x7f << 16) #define MPIC_PSMHT_MASK (0x06 << 24) -#define MPIC_MDC_CLK_SET (0x06050000) #define MPSM_MFF_C45 BIT(2) #define MPSM_MFF_C22 0x0 @@ -277,6 +276,7 @@ struct rswitch_drv_data { u32 coma_offset; u32 etha_offset; u32 gwca_offset; + u32 mpid_mdc_clk; u8 etha_incr; u8 gwdcbac_offset; u8 fwpbfcsdc_offset; @@ -469,7 +469,7 @@ static int rswitch_mii_read_c45(struct mii_dev *miidev, int phyad, int devad, in /* Enable Station Management clock */ clrsetbits_le32(etha_mii->addr + MPIC, MPIC_PSMCS_MASK | MPIC_PSMHT_MASK, - MPIC_MDC_CLK_SET); + priv->drv_data->mpid_mdc_clk); /* Access PHY register */ if (devad != MDIO_DEVAD_NONE) /* Definitelly C45 */ @@ -503,7 +503,7 @@ int rswitch_mii_write_c45(struct mii_dev *miidev, int phyad, int devad, int rega /* Enable Station Management clock */ clrsetbits_le32(etha_mii->addr + MPIC, MPIC_PSMCS_MASK | MPIC_PSMHT_MASK, - MPIC_MDC_CLK_SET); + priv->drv_data->mpid_mdc_clk); /* Access PHY register */ if (devad != MDIO_DEVAD_NONE) /* Definitelly C45 */ @@ -1200,6 +1200,7 @@ static const struct rswitch_drv_data r8a779f0_drv_data = { .coma_offset = 0x9000, .etha_offset = 0xa000, .gwca_offset = 0x10000, + .mpid_mdc_clk = 0x06050000, .etha_incr = 0x10, .gwdcbac_offset = 0x0, .fwpbfcsdc_offset = 0x0, -- 2.51.0
