aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2018-03-12 09:55:44 -0400
committerGeert Uytterhoeven <geert+renesas@glider.be>2018-03-21 13:18:30 -0400
commitf7ce295cfdf67404a9332e22127ee296c3512155 (patch)
treec15ce4810e168ba1c5a6d0cf22ecf8a00bb37e15
parent350aba9a74cc3e74ce53642daa9c94326d08c6c3 (diff)
pinctrl: sh-pfc: r8a77965: 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: fa3e8b71b955af86 ("pinctrl: sh-pfc: r8a77965: Add EtherAVB groups/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-r8a77965.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77965.c b/drivers/pinctrl/sh-pfc/pfc-r8a77965.c
index ce2e85033ff4..cea9d0599c12 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a77965.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a77965.c
@@ -1597,11 +1597,11 @@ static const unsigned int avb_phy_int_pins[] = {
1597static const unsigned int avb_phy_int_mux[] = { 1597static const unsigned int avb_phy_int_mux[] = {
1598 AVB_PHY_INT_MARK, 1598 AVB_PHY_INT_MARK,
1599}; 1599};
1600static const unsigned int avb_mdc_pins[] = { 1600static const unsigned int avb_mdio_pins[] = {
1601 /* AVB_MDC, AVB_MDIO */ 1601 /* AVB_MDC, AVB_MDIO */
1602 RCAR_GP_PIN(2, 9), PIN_NUMBER('A', 9), 1602 RCAR_GP_PIN(2, 9), PIN_NUMBER('A', 9),
1603}; 1603};
1604static const unsigned int avb_mdc_mux[] = { 1604static const unsigned int avb_mdio_mux[] = {
1605 AVB_MDC_MARK, AVB_MDIO_MARK, 1605 AVB_MDC_MARK, AVB_MDIO_MARK,
1606}; 1606};
1607static const unsigned int avb_mii_pins[] = { 1607static const unsigned int avb_mii_pins[] = {
@@ -1951,7 +1951,8 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
1951 SH_PFC_PIN_GROUP(avb_link), 1951 SH_PFC_PIN_GROUP(avb_link),
1952 SH_PFC_PIN_GROUP(avb_magic), 1952 SH_PFC_PIN_GROUP(avb_magic),
1953 SH_PFC_PIN_GROUP(avb_phy_int), 1953 SH_PFC_PIN_GROUP(avb_phy_int),
1954 SH_PFC_PIN_GROUP(avb_mdc), 1954 SH_PFC_PIN_GROUP_ALIAS(avb_mdc, avb_mdio), /* Deprecated */
1955 SH_PFC_PIN_GROUP(avb_mdio),
1955 SH_PFC_PIN_GROUP(avb_mii), 1956 SH_PFC_PIN_GROUP(avb_mii),
1956 SH_PFC_PIN_GROUP(avb_avtp_pps), 1957 SH_PFC_PIN_GROUP(avb_avtp_pps),
1957 SH_PFC_PIN_GROUP(avb_avtp_match_a), 1958 SH_PFC_PIN_GROUP(avb_avtp_match_a),
@@ -2002,7 +2003,8 @@ static const char * const avb_groups[] = {
2002 "avb_link", 2003 "avb_link",
2003 "avb_magic", 2004 "avb_magic",
2004 "avb_phy_int", 2005 "avb_phy_int",
2005 "avb_mdc", 2006 "avb_mdc", /* Deprecated, please use "avb_mdio" instead */
2007 "avb_mdio",
2006 "avb_mii", 2008 "avb_mii",
2007 "avb_avtp_pps", 2009 "avb_avtp_pps",
2008 "avb_avtp_match_a", 2010 "avb_avtp_match_a",