Commit 1a9b5a26 authored by Claudiu Beznea's avatar Claudiu Beznea Committed by David S. Miller
Browse files

net: macb: add support for mii on rgmii 



Cadence IP has option to enable MII support on RGMII interface. This
could be selected though bit 28 of network control register. This option
is not enabled on all the IP versions thus add a software capability to
be selected by the proper implementation of this IP.

Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d7b3485f

drivers/net/ethernet/cadence/macb.h

+3 −0
Original line number Diff line number Diff line
@@ -246,6 +246,8 @@ 
#define MACB_SRTSM_OFFSET	15 /* Store Receive Timestamp to Memory */

#define MACB_OSSMODE_OFFSET	24 /* Enable One Step Synchro Mode */

#define MACB_OSSMODE_SIZE	1

#define MACB_MIIONRGMII_OFFSET	28 /* MII Usage on RGMII Interface */

#define MACB_MIIONRGMII_SIZE	1



/* Bitfields in NCFGR */

#define MACB_SPD_OFFSET		0 /* Speed */
@@ -713,6 +715,7 @@ 
#define MACB_CAPS_GEM_HAS_PTP			0x00000040

#define MACB_CAPS_BD_RD_PREFETCH		0x00000080

#define MACB_CAPS_NEEDS_RSTONUBR		0x00000100

#define MACB_CAPS_MIIONRGMII			0x00000200

#define MACB_CAPS_CLK_HW_CHG			0x04000000

#define MACB_CAPS_MACB_IS_EMAC			0x08000000

#define MACB_CAPS_FIFO_MODE			0x10000000

drivers/net/ethernet/cadence/macb_main.c

+3 −0
Original line number Diff line number Diff line
@@ -684,6 +684,9 @@ static void macb_mac_config(struct phylink_config *config, unsigned int mode, 
		} else if (state->interface == PHY_INTERFACE_MODE_10GBASER) {

			ctrl |= GEM_BIT(PCSSEL);

			ncr |= GEM_BIT(ENABLE_HS_MAC);

		} else if (bp->caps & MACB_CAPS_MIIONRGMII &&

			   bp->phy_interface == PHY_INTERFACE_MODE_MII) {

			ncr |= MACB_BIT(MIIONRGMII);

		}

	}