From patchwork Tue Mar 21 15:12:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 741629 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vnc465n86z9s7v for ; Wed, 22 Mar 2017 02:21:58 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="JJDfUNjY"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757800AbdCUPVq (ORCPT ); Tue, 21 Mar 2017 11:21:46 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:36193 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757598AbdCUPVm (ORCPT ); Tue, 21 Mar 2017 11:21:42 -0400 Received: by mail-wr0-f193.google.com with SMTP id l37so22855053wrc.3; Tue, 21 Mar 2017 08:21:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9+uvuyZ18JH0aMuSF3sBrPKbU44DXufk5lOy+UDddkM=; b=JJDfUNjY3Br9zLh6swncFROWG7/GcQNyrWl6pk7snc1lokOeV+gaT676nFFxjtEWtL MVe+FtJy68R1L0LnmndGSFHo2TtJcG/kISJVTO885zHUMtl82S8dZppIYFDYjBbaxwsA 7SFXHV4ATZzwztmb87vq6W41rIXZ+qAYyHtiw7Wh8a2Xh1z61g21n3XY6Kr6iRZmAAaE NekELuYUY0GAFP7+JNh4FtR9c6fGebiOql+c1yLUkVoPBirz8Y9is9pD4HXASYqeZGfA rAZE8fYq4gYhyAR64oM/IFZSF1wcaLl7yJMEdmim2kCnaJpLtT9NxWTVNaP7yjof+WVB yyvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9+uvuyZ18JH0aMuSF3sBrPKbU44DXufk5lOy+UDddkM=; b=rOaNHp9GaTpXh0+zwjFv+JWmHYop0a+CKTPfZsLI6DZHidZjaPEstLYsKfZ9ZZ2kU8 ydE5H21HGehdmXctkYWU4SFlNxRIY0612OIwFjc2rZcIzuwjXy5Ie9yRNcrCOL3/2bjl OO6gR63d/gIe7ZNhuDBLAlGsuNrWNvAUn4CIwE9jAWVvNtfKGSivNsKljoc1j208nzr9 CNOFTWPccaV4sJcgZVylzY9aeJKtfpQyVl40ym+vNhUCLZPuSrII5gPV2WKt4cSPDkmo XOkJhuI5eNCzJIe2O3NhNYZq7ueEPtHbnsnmeyGuLwngEV2FTT5HGBNXTJrSUOEb/8bI zUZg== X-Gm-Message-State: AFeK/H0m4uXJE8pP5RGEl8VL7G+gMiftYYzdF1zYZNlFBPSg/yy4GuLj+90TmTQw2WvXEw== X-Received: by 10.223.145.97 with SMTP id j88mr30534856wrj.178.1490109134103; Tue, 21 Mar 2017 08:12:14 -0700 (PDT) Received: from localhost (port-52488.pppoe.wtnet.de. [46.59.205.174]) by smtp.gmail.com with ESMTPSA id l90sm4942452wmi.25.2017.03.21.08.12.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Mar 2017 08:12:13 -0700 (PDT) From: Thierry Reding To: "David S . Miller" Cc: Giuseppe Cavallaro , Alexandre Torgue , Joao Pinto , LABBE Corentin , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] net: stmmac: Restore DT backwards-compatibility Date: Tue, 21 Mar 2017 16:12:10 +0100 Message-Id: <20170321151211.31841-2-thierry.reding@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170321151211.31841-1-thierry.reding@gmail.com> References: <20170321151211.31841-1-thierry.reding@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Thierry Reding 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 --- drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 37f550ae76a5..74b0aff79b25 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;