From: Thierry Reding Date: Tue, 21 Mar 2017 15:12:10 +0000 (+0100) Subject: net: stmmac: Restore DT backwards-compatibility X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=33e85b8dd69e7f2fbf77f04bfc97ea7c76bccf9b;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git net: stmmac: Restore DT backwards-compatibility Recent changes to support multiple queues in the device tree bindings resulted in the number of RX and TX queues to be initialized to zero for device trees not adhering to the new bindings. Restore backwards-compatibility with those device trees by falling back to a single RX and TX queues each. Signed-off-by: Thierry Reding Acked-By: Joao Pinto Tested-by: Corentin Labbe Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index f5c8b1bca002..7fc3a1ef395a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -143,6 +143,13 @@ static void stmmac_mtl_setup(struct platform_device *pdev, struct device_node *tx_node; u8 queue = 0; + /* For backwards-compatibility with device trees that don't have any + * snps,mtl-rx-config or snps,mtl-tx-config properties, we fall back + * to one RX and TX queues each. + */ + plat->rx_queues_to_use = 1; + plat->tx_queues_to_use = 1; + rx_node = of_parse_phandle(pdev->dev.of_node, "snps,mtl-rx-config", 0); if (!rx_node) return;