aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2018-03-12 09:45:09 -0400
committerGeert Uytterhoeven <geert+renesas@glider.be>2018-03-21 13:18:18 -0400
commitcbe0dd9ad5b2290ef5946890545446d008496966 (patch)
tree8578b36fbfac1706785390ea4944456d615283cb
parent43a51cd5d623c6142ca050dffc25d5e9972a7a12 (diff)
pinctrl: sh-pfc: r8a7795: 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: 30c078de6f3785fe ("pinctrl: sh-pfc: r8a7795: Add EtherAVB pins, groups and function") 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-r8a7795.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
index 7c77ddc920c7..d39636c3bbb8 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
@@ -1712,11 +1712,11 @@ static const unsigned int avb_phy_int_pins[] = {
1712static const unsigned int avb_phy_int_mux[] = { 1712static const unsigned int avb_phy_int_mux[] = {
1713 AVB_PHY_INT_MARK, 1713 AVB_PHY_INT_MARK,
1714}; 1714};
1715static const unsigned int avb_mdc_pins[] = { 1715static const unsigned int avb_mdio_pins[] = {
1716 /* AVB_MDC, AVB_MDIO */ 1716 /* AVB_MDC, AVB_MDIO */
1717 RCAR_GP_PIN(2, 9), PIN_NUMBER('A', 9), 1717 RCAR_GP_PIN(2, 9), PIN_NUMBER('A', 9),
1718}; 1718};
1719static const unsigned int avb_mdc_mux[] = { 1719static const unsigned int avb_mdio_mux[] = {
1720 AVB_MDC_MARK, AVB_MDIO_MARK, 1720 AVB_MDC_MARK, AVB_MDIO_MARK,
1721}; 1721};
1722static const unsigned int avb_mii_pins[] = { 1722static const unsigned int avb_mii_pins[] = {
@@ -4343,7 +4343,8 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
4343 SH_PFC_PIN_GROUP(avb_link), 4343 SH_PFC_PIN_GROUP(avb_link),
4344 SH_PFC_PIN_GROUP(avb_magic), 4344 SH_PFC_PIN_GROUP(avb_magic),
4345 SH_PFC_PIN_GROUP(avb_phy_int), 4345 SH_PFC_PIN_GROUP(avb_phy_int),
4346 SH_PFC_PIN_GROUP(avb_mdc), 4346 SH_PFC_PIN_GROUP_ALIAS(avb_mdc, avb_mdio), /* Deprecated */
4347 SH_PFC_PIN_GROUP(avb_mdio),
4347 SH_PFC_PIN_GROUP(avb_mii), 4348 SH_PFC_PIN_GROUP(avb_mii),
4348 SH_PFC_PIN_GROUP(avb_avtp_pps), 4349 SH_PFC_PIN_GROUP(avb_avtp_pps),
4349 SH_PFC_PIN_GROUP(avb_avtp_match_a), 4350 SH_PFC_PIN_GROUP(avb_avtp_match_a),
@@ -4693,7 +4694,8 @@ static const char * const avb_groups[] = {
4693 "avb_link", 4694 "avb_link",
4694 "avb_magic", 4695 "avb_magic",
4695 "avb_phy_int", 4696 "avb_phy_int",
4696 "avb_mdc", 4697 "avb_mdc", /* Deprecated, please use "avb_mdio" instead */
4698 "avb_mdio",
4697 "avb_mii", 4699 "avb_mii",
4698 "avb_avtp_pps", 4700 "avb_avtp_pps",
4699 "avb_avtp_match_a", 4701 "avb_avtp_match_a",