Commit 030f1d59 authored by Andrew Halaney's avatar Andrew Halaney Committed by Paolo Abeni
Browse files

net: stmmac: dwmac-qcom-ethqos: Use loopback_en for all speeds 



It seems that this variable should be used for all speeds, not just
1000/100.

While at it refactor it slightly to be more readable, including fixing
the typo in the variable name.

Signed-off-by: default avatarAndrew Halaney <ahalaney@redhat.com>
Reviewed-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarBrian Masney <bmasney@redhat.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 164a9ebe

drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c

+17 −19
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ struct ethqos_emac_por { 
struct ethqos_emac_driver_data {

	const struct ethqos_emac_por *por;

	unsigned int num_por;

	bool rgmii_config_looback_en;

	bool rgmii_config_loopback_en;

};



struct qcom_ethqos {
@@ -91,7 +91,7 @@ struct qcom_ethqos { 


	const struct ethqos_emac_por *por;

	unsigned int num_por;

	bool rgmii_config_looback_en;

	bool rgmii_config_loopback_en;

};



static int rgmii_readl(struct qcom_ethqos *ethqos, unsigned int offset)
@@ -183,7 +183,7 @@ static const struct ethqos_emac_por emac_v2_3_0_por[] = { 
static const struct ethqos_emac_driver_data emac_v2_3_0_data = {

	.por = emac_v2_3_0_por,

	.num_por = ARRAY_SIZE(emac_v2_3_0_por),

	.rgmii_config_looback_en = true,

	.rgmii_config_loopback_en = true,

};



static const struct ethqos_emac_por emac_v2_1_0_por[] = {
@@ -198,7 +198,7 @@ static const struct ethqos_emac_por emac_v2_1_0_por[] = { 
static const struct ethqos_emac_driver_data emac_v2_1_0_data = {

	.por = emac_v2_1_0_por,

	.num_por = ARRAY_SIZE(emac_v2_1_0_por),

	.rgmii_config_looback_en = false,

	.rgmii_config_loopback_en = false,

};



static int ethqos_dll_configure(struct qcom_ethqos *ethqos)
@@ -281,6 +281,7 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) 
{

	int phase_shift;

	int phy_mode;

	int loopback;



	/* Determine if the PHY adds a 2 ns TX delay or the MAC handles it */

	phy_mode = device_get_phy_mode(&ethqos->pdev->dev);
@@ -294,6 +295,12 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) 
	rgmii_updatel(ethqos, RGMII_CONFIG2_TX_TO_RX_LOOPBACK_EN,

		      0, RGMII_IO_MACRO_CONFIG2);



	/* Determine if this platform wants loopback enabled after programming */

	if (ethqos->rgmii_config_loopback_en)

		loopback = RGMII_CONFIG_LOOPBACK_EN;

	else

		loopback = 0;



	/* Select RGMII, write 0 to interface select */

	rgmii_updatel(ethqos, RGMII_CONFIG_INTF_SEL,

		      0, RGMII_IO_MACRO_CONFIG);
@@ -326,12 +333,8 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) 
		rgmii_updatel(ethqos, SDCC_DDR_CONFIG_PRG_DLY_EN,

			      SDCC_DDR_CONFIG_PRG_DLY_EN,

			      SDCC_HC_REG_DDR_CONFIG);

		if (ethqos->rgmii_config_looback_en)

		rgmii_updatel(ethqos, RGMII_CONFIG_LOOPBACK_EN,

				      RGMII_CONFIG_LOOPBACK_EN, RGMII_IO_MACRO_CONFIG);

		else

			rgmii_updatel(ethqos, RGMII_CONFIG_LOOPBACK_EN,

				      0, RGMII_IO_MACRO_CONFIG);

			      loopback, RGMII_IO_MACRO_CONFIG);

		break;



	case SPEED_100:
@@ -363,13 +366,8 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) 
		rgmii_updatel(ethqos, SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_EN,

			      SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_EN,

			      SDCC_HC_REG_DDR_CONFIG);

		if (ethqos->rgmii_config_looback_en)

		rgmii_updatel(ethqos, RGMII_CONFIG_LOOPBACK_EN,

				      RGMII_CONFIG_LOOPBACK_EN, RGMII_IO_MACRO_CONFIG);

		else

			rgmii_updatel(ethqos, RGMII_CONFIG_LOOPBACK_EN,

				      0, RGMII_IO_MACRO_CONFIG);



			      loopback, RGMII_IO_MACRO_CONFIG);

		break;



	case SPEED_10:
@@ -403,7 +401,7 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) 
			      SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_EN,

			      SDCC_HC_REG_DDR_CONFIG);

		rgmii_updatel(ethqos, RGMII_CONFIG_LOOPBACK_EN,

			      RGMII_CONFIG_LOOPBACK_EN, RGMII_IO_MACRO_CONFIG);

			      loopback, RGMII_IO_MACRO_CONFIG);

		break;

	default:

		dev_err(&ethqos->pdev->dev,
@@ -548,7 +546,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev) 
	data = of_device_get_match_data(&pdev->dev);

	ethqos->por = data->por;

	ethqos->num_por = data->num_por;

	ethqos->rgmii_config_looback_en = data->rgmii_config_looback_en;

	ethqos->rgmii_config_loopback_en = data->rgmii_config_loopback_en;



	ethqos->rgmii_clk = devm_clk_get(&pdev->dev, "rgmii");

	if (IS_ERR(ethqos->rgmii_clk)) {