Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7132ab7f authored by Andy Fleming's avatar Andy Fleming Committed by Jeff Garzik
Browse files

Fix RGMII-ID handling in gianfar 



The TSEC/eTSEC can detect the interface to the PHY automatically,
but it isn't able to detect whether the RGMII connection needs internal
delay.  So we need to detect that change in the device tree, propagate
it to the platform data, and then check it if we're in RGMII.  This fixes
a bug on the 8641D HPCN board where the Vitesse PHY doesn't use the delay
for RGMII.

Signed-off-by: default avatarAndy Fleming <afleming@freescale.com>
parent af2d940d

arch/powerpc/sysdev/fsl_soc.c

+9 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ static int __init gfar_of_init(void) 
		struct gianfar_platform_data gfar_data;

		const unsigned int *id;

		const char *model;

		const char *ctype;

		const void *mac_addr;

		const phandle *ph;

		int n_res = 2;
@@ -254,6 +255,14 @@ static int __init gfar_of_init(void) 
			    FSL_GIANFAR_DEV_HAS_VLAN |

			    FSL_GIANFAR_DEV_HAS_EXTENDED_HASH;



		ctype = of_get_property(np, "phy-connection-type", NULL);



		/* We only care about rgmii-id.  The rest are autodetected */

		if (ctype && !strcmp(ctype, "rgmii-id"))

			gfar_data.interface = PHY_INTERFACE_MODE_RGMII_ID;

		else

			gfar_data.interface = PHY_INTERFACE_MODE_MII;



		ph = of_get_property(np, "phy-handle", NULL);

		phy = of_find_node_by_phandle(*ph);

drivers/net/gianfar.c

+11 −1
Original line number Diff line number Diff line
@@ -420,9 +420,19 @@ static phy_interface_t gfar_get_interface(struct net_device *dev) 
	if (ecntrl & ECNTRL_REDUCED_MODE) {

		if (ecntrl & ECNTRL_REDUCED_MII_MODE)

			return PHY_INTERFACE_MODE_RMII;

		else

		else {

			phy_interface_t interface = priv->einfo->interface;



			/*

			 * This isn't autodetected right now, so it must

			 * be set by the device tree or platform code.

			 */

			if (interface == PHY_INTERFACE_MODE_RGMII_ID)

				return PHY_INTERFACE_MODE_RGMII_ID;



			return PHY_INTERFACE_MODE_RGMII;

		}

	}



	if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_GIGABIT)

		return PHY_INTERFACE_MODE_GMII;

include/linux/fsl_devices.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ struct gianfar_platform_data { 
	u32	bus_id;

	u32	phy_id;

	u8	mac_addr[6];

	phy_interface_t interface;

};



struct gianfar_mdio_data {