aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2018-03-12 09:53:13 -0400
committerGeert Uytterhoeven <geert+renesas@glider.be>2018-03-21 13:18:25 -0400
commit350aba9a74cc3e74ce53642daa9c94326d08c6c3 (patch)
tree331a872d1f360c5bf91397b4a56068d8d89986b8
parent24cfe1a9704711a62eef3bc7b921c976abd27cd2 (diff)
pinctrl: sh-pfc: r8a7796: 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: 41397032c4a17dff ("pinctrl: sh-pfc: r8a7796: Add group for AVB MDIO and MII pins") Fixes: 9c99a63ec74f34f7 ("pinctrl: sh-pfc: r8a7796: Add EtherAVB 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-r8a7796.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7796.c b/drivers/pinctrl/sh-pfc/pfc-r8a7796.c
index e6fff5518a97..d502b0cafeb0 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7796.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7796.c
@@ -1717,11 +1717,11 @@ static const unsigned int avb_phy_int_pins[] = {
1717static const unsigned int avb_phy_int_mux[] = { 1717static const unsigned int avb_phy_int_mux[] = {
1718 AVB_PHY_INT_MARK, 1718 AVB_PHY_INT_MARK,
1719}; 1719};
1720static const unsigned int avb_mdc_pins[] = { 1720static const unsigned int avb_mdio_pins[] = {
1721 /* AVB_MDC, AVB_MDIO */ 1721 /* AVB_MDC, AVB_MDIO */
1722 RCAR_GP_PIN(2, 9), PIN_NUMBER('A', 9), 1722 RCAR_GP_PIN(2, 9), PIN_NUMBER('A', 9),
1723}; 1723};
1724static const unsigned int avb_mdc_mux[] = { 1724static const unsigned int avb_mdio_mux[] = {
1725 AVB_MDC_MARK, AVB_MDIO_MARK, 1725 AVB_MDC_MARK, AVB_MDIO_MARK,
1726}; 1726};
1727static const unsigned int avb_mii_pins[] = { 1727static const unsigned int avb_mii_pins[] = {
@@ -4311,7 +4311,8 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
4311 SH_PFC_PIN_GROUP(avb_link), 4311 SH_PFC_PIN_GROUP(avb_link),
4312 SH_PFC_PIN_GROUP(avb_magic), 4312 SH_PFC_PIN_GROUP(avb_magic),
4313 SH_PFC_PIN_GROUP(avb_phy_int), 4313 SH_PFC_PIN_GROUP(avb_phy_int),
4314 SH_PFC_PIN_GROUP(avb_mdc), 4314 SH_PFC_PIN_GROUP_ALIAS(avb_mdc, avb_mdio), /* Deprecated */
4315 SH_PFC_PIN_GROUP(avb_mdio),
4315 SH_PFC_PIN_GROUP(avb_mii), 4316 SH_PFC_PIN_GROUP(avb_mii),
4316 SH_PFC_PIN_GROUP(avb_avtp_pps), 4317 SH_PFC_PIN_GROUP(avb_avtp_pps),
4317 SH_PFC_PIN_GROUP(avb_avtp_match_a), 4318 SH_PFC_PIN_GROUP(avb_avtp_match_a),
@@ -4656,7 +4657,8 @@ static const char * const avb_groups[] = {
4656 "avb_link", 4657 "avb_link",
4657 "avb_magic", 4658 "avb_magic",
4658 "avb_phy_int", 4659 "avb_phy_int",
4659 "avb_mdc", 4660 "avb_mdc", /* Deprecated, please use "avb_mdio" instead */
4661 "avb_mdio",
4660 "avb_mii", 4662 "avb_mii",
4661 "avb_avtp_pps", 4663 "avb_avtp_pps",
4662 "avb_avtp_match_a", 4664 "avb_avtp_match_a",