Commit fd4a5177 authored by Vinod Koul's avatar Vinod Koul Committed by David S. Miller

net: stmmac: fix num_por initialization

Driver missed initializing num_por which is one of the por values that
driver configures to hardware. In order to get these values, add a new
structure ethqos_emac_driver_data which holds por and num_por values
and populate that in driver probe.

Fixes: a7c30e62 ("net: stmmac: Add driver for Qualcomm ethqos")
Reported-by: default avatarRahul Ankushrao Kawadgave <rahulak@qti.qualcomm.com>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Reviewed-by: default avatarAmit Kucheria <amit.kucheria@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9de5d235
...@@ -75,6 +75,11 @@ struct ethqos_emac_por { ...@@ -75,6 +75,11 @@ struct ethqos_emac_por {
unsigned int value; unsigned int value;
}; };
struct ethqos_emac_driver_data {
const struct ethqos_emac_por *por;
unsigned int num_por;
};
struct qcom_ethqos { struct qcom_ethqos {
struct platform_device *pdev; struct platform_device *pdev;
void __iomem *rgmii_base; void __iomem *rgmii_base;
...@@ -171,6 +176,11 @@ static const struct ethqos_emac_por emac_v2_3_0_por[] = { ...@@ -171,6 +176,11 @@ static const struct ethqos_emac_por emac_v2_3_0_por[] = {
{ .offset = RGMII_IO_MACRO_CONFIG2, .value = 0x00002060 }, { .offset = RGMII_IO_MACRO_CONFIG2, .value = 0x00002060 },
}; };
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),
};
static int ethqos_dll_configure(struct qcom_ethqos *ethqos) static int ethqos_dll_configure(struct qcom_ethqos *ethqos)
{ {
unsigned int val; unsigned int val;
...@@ -442,6 +452,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev) ...@@ -442,6 +452,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct plat_stmmacenet_data *plat_dat; struct plat_stmmacenet_data *plat_dat;
struct stmmac_resources stmmac_res; struct stmmac_resources stmmac_res;
const struct ethqos_emac_driver_data *data;
struct qcom_ethqos *ethqos; struct qcom_ethqos *ethqos;
struct resource *res; struct resource *res;
int ret; int ret;
...@@ -471,7 +482,9 @@ static int qcom_ethqos_probe(struct platform_device *pdev) ...@@ -471,7 +482,9 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
goto err_mem; goto err_mem;
} }
ethqos->por = of_device_get_match_data(&pdev->dev); data = of_device_get_match_data(&pdev->dev);
ethqos->por = data->por;
ethqos->num_por = data->num_por;
ethqos->rgmii_clk = devm_clk_get(&pdev->dev, "rgmii"); ethqos->rgmii_clk = devm_clk_get(&pdev->dev, "rgmii");
if (IS_ERR(ethqos->rgmii_clk)) { if (IS_ERR(ethqos->rgmii_clk)) {
...@@ -526,7 +539,7 @@ static int qcom_ethqos_remove(struct platform_device *pdev) ...@@ -526,7 +539,7 @@ static int qcom_ethqos_remove(struct platform_device *pdev)
} }
static const struct of_device_id qcom_ethqos_match[] = { static const struct of_device_id qcom_ethqos_match[] = {
{ .compatible = "qcom,qcs404-ethqos", .data = &emac_v2_3_0_por}, { .compatible = "qcom,qcs404-ethqos", .data = &emac_v2_3_0_data},
{ } { }
}; };
MODULE_DEVICE_TABLE(of, qcom_ethqos_match); MODULE_DEVICE_TABLE(of, qcom_ethqos_match);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment