fsl/fman: use of_get_phy_mode() (6fa85192) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/net/ethernet/freescale/fman/mac.c

+2 −31

Original line number	Diff line number	Diff line
		@@ -583,31 +583,6 @@ static void setup_memac(struct mac_device *mac_dev)

		static DEFINE_MUTEX(eth_lock);

		static const char phy_str[][11] = {
		[PHY_INTERFACE_MODE_MII] = "mii",
		[PHY_INTERFACE_MODE_GMII] = "gmii",
		[PHY_INTERFACE_MODE_SGMII] = "sgmii",
		[PHY_INTERFACE_MODE_TBI] = "tbi",
		[PHY_INTERFACE_MODE_RMII] = "rmii",
		[PHY_INTERFACE_MODE_RGMII] = "rgmii",
		[PHY_INTERFACE_MODE_RGMII_ID] = "rgmii-id",
		[PHY_INTERFACE_MODE_RGMII_RXID] = "rgmii-rxid",
		[PHY_INTERFACE_MODE_RGMII_TXID] = "rgmii-txid",
		[PHY_INTERFACE_MODE_RTBI] = "rtbi",
		[PHY_INTERFACE_MODE_XGMII] = "xgmii"
		};

		static phy_interface_t __pure __attribute__((nonnull)) str2phy(const char *str)
		{
		int i;

		for (i = 0; i < ARRAY_SIZE(phy_str); i++)
		if (strcmp(str, phy_str[i]) == 0)
		return (phy_interface_t)i;

		return PHY_INTERFACE_MODE_MII;
		}

		static const u16 phy2speed[] = {
		[PHY_INTERFACE_MODE_MII] = SPEED_100,
		[PHY_INTERFACE_MODE_GMII] = SPEED_1000,
		@@ -686,7 +661,6 @@ static int mac_probe(struct platform_device *_of_dev)
		struct resource res;
		struct mac_priv_s *priv;
		const u8 *mac_addr;
		const char *char_prop;
		const u32 *u32_prop;
		u8 fman_id;

		@@ -870,15 +844,12 @@ static int mac_probe(struct platform_device *_of_dev)
		}

		/* Get the PHY connection type */
		char_prop = (const char *)of_get_property(mac_node,
		"phy-connection-type", NULL);
		if (!char_prop) {
		priv->phy_if = of_get_phy_mode(mac_node);
		if (priv->phy_if < 0) {
		dev_warn(dev,
		"of_get_property(%s, phy-connection-type) failed. Defaulting to MII\n",
		mac_node->full_name);
		priv->phy_if = PHY_INTERFACE_MODE_MII;
		} else {
		priv->phy_if = str2phy(char_prop);
		}

		priv->speed = phy2speed[priv->phy_if];