Received: by 2002:a05:6a10:2785:0:0:0:0 with SMTP id ia5csp2831302pxb; Mon, 11 Jan 2021 22:40:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJxVuaEoByEJkatLlJOMwvrDx255ccL9L6SCyKDITTbP176IBYEFV2nn7YZce1VqEZrWUAZF X-Received: by 2002:a17:906:b287:: with SMTP id q7mr2034959ejz.311.1610433615298; Mon, 11 Jan 2021 22:40:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610433615; cv=none; d=google.com; s=arc-20160816; b=Dbi2xAvjMqFUMu+lAi96MAp9zdtbG25aF/YrHBxR7DHMKaWdiAKH0wz4XEvx8kc2w1 j2jWPTzedsVI0pd5/wU3YSdvaILBTSH7mEAg6TFf+eeeQ8UihEq/cZk1Zgu7hIkRWGlj IZzM5PZ6BE9kGZI74HpSSeAZxnc4300EXq7KMCk75zf/GX1MLv28Ustg0u77UyFps0IT sEajzQHM9MAii3lFss0gOG9Yyql5LrpGJxMbikXuMWqp+pkAVykjV2JIwf9gclhiwBlK niz1CROEYWW7QECIPjvYmHwlSmBQkah2q2I3qZK7jBc/5q/Dhzm3C/7WhHo1ydwCkRAv FVKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=G21ymisHFlCjuq4DHruAv1NhwSNycszET5GhsCzsxAA=; b=dhKsCuYL7OSvn5o6/HJSRbR1ROXPYNT7xXWKfhW9qOONWcuM6hQ9KddeLKxztu6w/d h5S8KcRbBNG3d8zH6wL7npHv8zQLccxNb/U4UFDbf6L8udQS44l6ECJ0cPpr4rxxTDFh lo+WPxBHVcDiAmoVXtvQNMWGF2Pa8EoSEQBbr5tWFxV1Bw/SWnICtMUNItj4/KQvc13w fYdRd1bam6VQF05rYs4DnClSsjmzXXXdGA8dQbsjT6gFdowjtTzn3aiYfv8tam7mr8LI +oxZWTanh/PaeOnfbGEIcDSBfreYUjxl9Qg9MyZ7NBOFc544sr0/dK4Crs/QoqVykzV+ kyPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KLEjoQ2B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f19si740688ejx.368.2021.01.11.22.39.52; Mon, 11 Jan 2021 22:40:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KLEjoQ2B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729142AbhAKN5v (ORCPT + 99 others); Mon, 11 Jan 2021 08:57:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:54548 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730405AbhAKNG5 (ORCPT ); Mon, 11 Jan 2021 08:06:57 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 47961227C3; Mon, 11 Jan 2021 13:06:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1610370376; bh=aVqh9PJ0QM0Lb8SGPiK90Bxi6gHdH5jX3dEMJxdfz3U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KLEjoQ2BOgj7cOuYf5nKhDq20s5XTXoG7QUKPVqfKJX1fbkG1NAyYWmLA0P9zy+MK o/8FeuXUbwFUZ1PcXnelOt0KOfTgz86jZobeiRDv+rR4LWmeI4eujdvm6dLRMqXRPq gSDbhfuwGk70f0S5MHvKHTbW8ZvtTBYMCmxhPoVc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marcin Wojtas , Stefan Chulski , Jakub Kicinski Subject: [PATCH 4.14 25/57] net: mvpp2: Fix GoP port 3 Networking Complex Control configurations Date: Mon, 11 Jan 2021 14:01:44 +0100 Message-Id: <20210111130034.935432182@linuxfoundation.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210111130033.715773309@linuxfoundation.org> References: <20210111130033.715773309@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stefan Chulski [ Upstream commit 2575bc1aa9d52a62342b57a0b7d0a12146cf6aed ] During GoP port 2 Networking Complex Control mode of operation configurations, also GoP port 3 mode of operation was wrongly set. Patch removes these configurations. Fixes: f84bf386f395 ("net: mvpp2: initialize the GoP") Acked-by: Marcin Wojtas Signed-off-by: Stefan Chulski Link: https://lore.kernel.org/r/1608462149-1702-1-git-send-email-stefanc@marvell.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/marvell/mvpp2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -4349,7 +4349,7 @@ static void mvpp22_gop_init_rgmii(struct regmap_read(priv->sysctrl_base, GENCONF_CTRL0, &val); if (port->gop_id == 2) - val |= GENCONF_CTRL0_PORT0_RGMII | GENCONF_CTRL0_PORT1_RGMII; + val |= GENCONF_CTRL0_PORT0_RGMII; else if (port->gop_id == 3) val |= GENCONF_CTRL0_PORT1_RGMII_MII; regmap_write(priv->sysctrl_base, GENCONF_CTRL0, val);