| From 5e922e8fd19b3f774ef3889757da4b6b4e1e4269 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Mon, 12 Mar 2018 14:53:13 +0100 |
| Subject: [PATCH 0878/1795] pinctrl: sh-pfc: r8a7796: Rename EtherAVB "mdc" pin |
| group to "mdio" |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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> |
| (cherry picked from commit 350aba9a74cc3e74ce53642daa9c94326d08c6c3) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 10 ++++++---- |
| 1 file 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[] = { |
| static const unsigned int avb_phy_int_mux[] = { |
| AVB_PHY_INT_MARK, |
| }; |
| -static const unsigned int avb_mdc_pins[] = { |
| +static const unsigned int avb_mdio_pins[] = { |
| /* AVB_MDC, AVB_MDIO */ |
| RCAR_GP_PIN(2, 9), PIN_NUMBER('A', 9), |
| }; |
| -static const unsigned int avb_mdc_mux[] = { |
| +static const unsigned int avb_mdio_mux[] = { |
| AVB_MDC_MARK, AVB_MDIO_MARK, |
| }; |
| static const unsigned int avb_mii_pins[] = { |
| @@ -4311,7 +4311,8 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { |
| SH_PFC_PIN_GROUP(avb_link), |
| SH_PFC_PIN_GROUP(avb_magic), |
| SH_PFC_PIN_GROUP(avb_phy_int), |
| - SH_PFC_PIN_GROUP(avb_mdc), |
| + SH_PFC_PIN_GROUP_ALIAS(avb_mdc, avb_mdio), /* Deprecated */ |
| + SH_PFC_PIN_GROUP(avb_mdio), |
| SH_PFC_PIN_GROUP(avb_mii), |
| SH_PFC_PIN_GROUP(avb_avtp_pps), |
| SH_PFC_PIN_GROUP(avb_avtp_match_a), |
| @@ -4656,7 +4657,8 @@ static const char * const avb_groups[] = { |
| "avb_link", |
| "avb_magic", |
| "avb_phy_int", |
| - "avb_mdc", |
| + "avb_mdc", /* Deprecated, please use "avb_mdio" instead */ |
| + "avb_mdio", |
| "avb_mii", |
| "avb_avtp_pps", |
| "avb_avtp_match_a", |
| -- |
| 2.19.0 |
| |
