Merge "net: stmmac: Fix regulator enable sequence" (b8fe9139) · Commits · e / devices / android_kernel_xiaomi_sm6125

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

+20 −20

Original line number	Diff line number	Diff line
		@@ -88,26 +88,6 @@ int ethqos_init_reqgulators(struct qcom_ethqos *ethqos)
		ETHQOSDBG("Enabled <%s>\n", EMAC_GDSC_EMAC_NAME);
		}

		if (of_property_read_bool(ethqos->pdev->dev.of_node,
		"vreg_rgmii-supply") && (2500000 ==
		regulator_get_voltage(ethqos->reg_rgmii_io_pads))) {
		ethqos->reg_rgmii =
		devm_regulator_get(&ethqos->pdev->dev, EMAC_VREG_RGMII_NAME);
		if (IS_ERR(ethqos->reg_rgmii)) {
		ETHQOSERR("Can not get <%s>\n", EMAC_VREG_RGMII_NAME);
		return PTR_ERR(ethqos->reg_rgmii);
		}

		ret = regulator_enable(ethqos->reg_rgmii);
		if (ret) {
		ETHQOSERR("Can not enable <%s>\n",
		EMAC_VREG_RGMII_NAME);
		goto reg_error;
		}

		ETHQOSDBG("Enabled <%s>\n", EMAC_VREG_RGMII_NAME);
		}

		if (of_property_read_bool(ethqos->pdev->dev.of_node,
		"vreg_emac_phy-supply")) {
		ethqos->reg_emac_phy =
		@@ -148,6 +128,26 @@ int ethqos_init_reqgulators(struct qcom_ethqos *ethqos)
		ETHQOSDBG("Enabled <%s>\n", EMAC_VREG_RGMII_IO_PADS_NAME);
		}

		if (of_property_read_bool(ethqos->pdev->dev.of_node,
		"vreg_rgmii-supply") && (2500000 ==
		regulator_get_voltage(ethqos->reg_rgmii_io_pads))) {
		ethqos->reg_rgmii =
		devm_regulator_get(&ethqos->pdev->dev, EMAC_VREG_RGMII_NAME);
		if (IS_ERR(ethqos->reg_rgmii)) {
		ETHQOSERR("Can not get <%s>\n", EMAC_VREG_RGMII_NAME);
		return PTR_ERR(ethqos->reg_rgmii);
		}

		ret = regulator_enable(ethqos->reg_rgmii);
		if (ret) {
		ETHQOSERR("Can not enable <%s>\n",
		EMAC_VREG_RGMII_NAME);
		goto reg_error;
		}

		ETHQOSDBG("Enabled <%s>\n", EMAC_VREG_RGMII_NAME);
		}

		return ret;

		reg_error: