diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2018-03-12 14:54:47 +0100 |
|---|---|---|
| committer | Geert Uytterhoeven <geert+renesas@glider.be> | 2018-03-21 18:18:32 +0100 |
| commit | 3b047a9597e4e252991899f019bbfd0271cda814 (patch) | |
| tree | dd8de6294335e98fb8ff7305e421f07ed02a7aa3 | |
| parent | f7ce295cfdf67404a9332e22127ee296c3512155 (diff) | |
| download | linux-3b047a9597e4e252991899f019bbfd0271cda814.tar.bz2 | |
pinctrl: sh-pfc: r8a77995: Rename EtherAVB "mdc" pin group to "mdio"
On other Renesas SoCs, the pin group for the MDIO bus is named "mdio"
instead of "mdc". Fix the inconsistency, while retaining backwards
compatibility with old DTBs using a pin group alias.
Fixes: 66abd968d0ef3eb1 ("pinctrl: sh-pfc: r8a77995: Add EthernetAVB pins, groups and functions")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
| -rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-r8a77995.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77995.c b/drivers/pinctrl/sh-pfc/pfc-r8a77995.c index 27b9417be59b..cc80dbe1841d 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a77995.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a77995.c @@ -988,11 +988,11 @@ static const unsigned int avb0_phy_int_pins[] = { static const unsigned int avb0_phy_int_mux[] = { AVB0_PHY_INT_MARK, }; -static const unsigned int avb0_mdc_pins[] = { +static const unsigned int avb0_mdio_pins[] = { /* AVB0_MDC, AVB0_MDIO */ RCAR_GP_PIN(5, 17), RCAR_GP_PIN(5, 16), }; -static const unsigned int avb0_mdc_mux[] = { +static const unsigned int avb0_mdio_mux[] = { AVB0_MDC_MARK, AVB0_MDIO_MARK, }; static const unsigned int avb0_mii_pins[] = { @@ -1800,7 +1800,8 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(avb0_link), SH_PFC_PIN_GROUP(avb0_magic), SH_PFC_PIN_GROUP(avb0_phy_int), - SH_PFC_PIN_GROUP(avb0_mdc), + SH_PFC_PIN_GROUP_ALIAS(avb0_mdc, avb0_mdio), /* Deprecated */ + SH_PFC_PIN_GROUP(avb0_mdio), SH_PFC_PIN_GROUP(avb0_mii), SH_PFC_PIN_GROUP(avb0_avtp_pps_a), SH_PFC_PIN_GROUP(avb0_avtp_match_a), @@ -1901,7 +1902,8 @@ static const char * const avb0_groups[] = { "avb0_link", "avb0_magic", "avb0_phy_int", - "avb0_mdc", + "avb0_mdc", /* Deprecated, please use "avb0_mdio" instead */ + "avb0_mdio", "avb0_mii", "avb0_avtp_pps_a", "avb0_avtp_match_a", |