Received: by 2002:ac0:aed5:0:0:0:0:0 with SMTP id t21csp5904798imb; Fri, 8 Mar 2019 05:10:18 -0800 (PST) X-Google-Smtp-Source: APXvYqx6g21ldiQaggsCoN7Yb33Kxmj0URM9l1R3TWlZC2c6VQxvpm2/Aq9g0QqUVJs6DsupXdC+ X-Received: by 2002:a62:bd09:: with SMTP id a9mr18155764pff.61.1552050618285; Fri, 08 Mar 2019 05:10:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1552050618; cv=none; d=google.com; s=arc-20160816; b=0IXSAisO+LxvHxvnSdq1eRrP7UoiaGSzIwoaxwmnzLhppWJ6BkjIaPLGgIHgNJ4gfc c8WHZvhnSJcq1vIjAkeQ6tqQMPweTEu6LkKV8iCNY6NLolIhz/HYNmdeqVDbsSAVd/P/ GwwUrX+n3hiJuwPiS8rvtuEb0YWy4G80r3ZyJ1HRYmECHyz1nmyOgefTSH/M0CB1QR1C GgEsc/9th9kthFrendm+/ignmP1CbgpVjZoU/dFPeTMOku9WWGRWX2dk+jSQKVM9SJLX 6YZCNgY7N7j7xjnv+xpxut0n+2/2XPpPAIBL1dsOeow6bzjVuAOeheb3lIHVhRYyC2ih Cc9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=o8uUBCABb6s7cNPZ5WuId+fP1z3XQKyg3OoHfSViRas=; b=Artxd7nVIAjkPA25s/SknRI5Ode0Z1v1VoXOkQmpp2YscPelagpJ9Q5SRXZb9epscS nOgAClk/lBe9nTp0LllBUEb2/5fcat8BJtsCo6/c7kx+xTdks6C6ZEhpuSBjpoPVOcHB E0DIRZ2VzdiZg+4Swi+fS/qqi44obEy3ZK7vPBVsGtYnQDj+dUMMEaqw9gfSUn7Xjxw1 NiBhAKICiPc+sqHQBvRm/RdEtnpvT9sAy9dy6wA/gYYKF/sN1JcPHi12wzqSFnP1sGx1 hGzK0qNAQkl2GU89W2HBmdxXXQoAhSHIkiL+D7VaF+3o3xY9mx9GveO6335c4ReG3uUY G6vQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=lFWvdLik; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u71si6310427pgd.579.2019.03.08.05.10.03; Fri, 08 Mar 2019 05:10:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=lFWvdLik; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726772AbfCHMvj (ORCPT + 99 others); Fri, 8 Mar 2019 07:51:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:54848 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726764AbfCHMvh (ORCPT ); Fri, 8 Mar 2019 07:51:37 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 09B7321019; Fri, 8 Mar 2019 12:51:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552049496; bh=IdHsUZiMazwry2KxSiATNJWfGNpVZ0nOHBAHhS73thA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lFWvdLikxxzzVh/oBZLqVCWUiro5L7jhD6esgr7NMCBrfjGDzzYrsE02habH7bi2Q XmSCnPY00gJ/z9yPuG6DyzbvQsXDqAE/c0UeDnbvmCQjD/zPWUQG3SnUdtVQqz4Jft M5I7rBJeJD7oMGbzANuVpDdAx0SadrpX9s3k8Oqw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Heiner Kallweit , Andrew Lunn , "David S. Miller" Subject: [PATCH 5.0 20/46] net: dsa: mv8e6xxx: fix number of internal PHYs for 88E6x90 family Date: Fri, 8 Mar 2019 13:49:53 +0100 Message-Id: <20190308124903.558050430@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190308124902.257040783@linuxfoundation.org> References: <20190308124902.257040783@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 5.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Heiner Kallweit [ Upstream commit 95150f29ae480276e76368cdf8a9524b5a96c0ca ] Ports 9 and 10 don't have internal PHY's but are (dependent on the version) SERDES/SGMII/XAUI/RXAUI ports. v2: - fix it for all 88E6x90 family members Fixes: bc3931557d1d ("net: dsa: mv88e6xxx: Add number of internal PHYs") Signed-off-by: Heiner Kallweit Reviewed-by: Andrew Lunn Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/dsa/mv88e6xxx/chip.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -4222,7 +4222,7 @@ static const struct mv88e6xxx_info mv88e .name = "Marvell 88E6190", .num_databases = 4096, .num_ports = 11, /* 10 + Z80 */ - .num_internal_phys = 11, + .num_internal_phys = 9, .num_gpio = 16, .max_vid = 8191, .port_base_addr = 0x0, @@ -4245,7 +4245,7 @@ static const struct mv88e6xxx_info mv88e .name = "Marvell 88E6190X", .num_databases = 4096, .num_ports = 11, /* 10 + Z80 */ - .num_internal_phys = 11, + .num_internal_phys = 9, .num_gpio = 16, .max_vid = 8191, .port_base_addr = 0x0, @@ -4268,7 +4268,7 @@ static const struct mv88e6xxx_info mv88e .name = "Marvell 88E6191", .num_databases = 4096, .num_ports = 11, /* 10 + Z80 */ - .num_internal_phys = 11, + .num_internal_phys = 9, .max_vid = 8191, .port_base_addr = 0x0, .phy_base_addr = 0x0, @@ -4315,7 +4315,7 @@ static const struct mv88e6xxx_info mv88e .name = "Marvell 88E6290", .num_databases = 4096, .num_ports = 11, /* 10 + Z80 */ - .num_internal_phys = 11, + .num_internal_phys = 9, .num_gpio = 16, .max_vid = 8191, .port_base_addr = 0x0, @@ -4477,7 +4477,7 @@ static const struct mv88e6xxx_info mv88e .name = "Marvell 88E6390", .num_databases = 4096, .num_ports = 11, /* 10 + Z80 */ - .num_internal_phys = 11, + .num_internal_phys = 9, .num_gpio = 16, .max_vid = 8191, .port_base_addr = 0x0, @@ -4500,7 +4500,7 @@ static const struct mv88e6xxx_info mv88e .name = "Marvell 88E6390X", .num_databases = 4096, .num_ports = 11, /* 10 + Z80 */ - .num_internal_phys = 11, + .num_internal_phys = 9, .num_gpio = 16, .max_vid = 8191, .port_base_addr = 0x0,