Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp3692593pxv; Mon, 26 Jul 2021 09:31:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz8kNHD9dme9B/+Ep6jRJwzGca+LgkTCHTwFLh0cjgwwShDerD9cbtrv0f57UEZ8x+XHj+n X-Received: by 2002:a92:6902:: with SMTP id e2mr14043257ilc.275.1627317070633; Mon, 26 Jul 2021 09:31:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627317070; cv=none; d=google.com; s=arc-20160816; b=I/LB1iWOuxynuWpdDYtNgGz1by9VaRNErLH19+pW6b63Ynl53Am8539OrDrYKeu5Bp 9MC61BU2EVLfApoqpVWaulCaKZ5Bklk6G+kLQak8V1118MiUnAOOGQJWw6n+GhjivVFI cDqzNCoGHxrWA876xo6aPgNyRxR5zd2zDg9+mf9hDLrgPqqhfoS7VK0W03MKDJ9OcBSz 7TRZqBaKKi1Q/x+3moFXlk4E+jBrvkh6Dn4fGvejiYguioh2YY55JsiVxqe5d+nGd4w5 82amj/V2yuEzWKNwP5/08IUjdkNH9T7GcZqZVnThiqqa0c0jF4xl1tKfIOSSUvGjxymd rEpg== 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=YBoV83r7/BMqtX5JSohXPUQHptzsTChnHwnUtQXzbrk=; b=GaO2rLK3LBSAJBJlrm0XHONA307eqKfHPjCvMJ78vaPPnE1Y1/lGGqpf/8g59eaDN+ HwFQmHA0T+Bj+8chZih0dFxEA8+Lib9MMy/AQEI2+HTV+yRJasuxyLrpaojk8tk2edIW JeReNxKlNQL9u3F3EDWmaUY65B/25efFLu5gEdE7TW+EhTy4oL82F8TFce3NXDWBgzTl tvWdKQeUk+PiTqo1amWu4/YL8HG6jhVVgQ/N+YthQhW5YZ4nSdPCXwzflGmEAVuCPZwL MsPcTyXdtzLuwKGjKXOYqzEydn+Rz6iy7vD56UjSfzqPjREaAYjeM3chSmYkC8yR6Fuq Wtbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1SVooL+w; 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 x1si331647ilp.101.2021.07.26.09.30.56; Mon, 26 Jul 2021 09:31:10 -0700 (PDT) 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=1SVooL+w; 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 S238989AbhGZPsi (ORCPT + 99 others); Mon, 26 Jul 2021 11:48:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:45012 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238132AbhGZP3r (ORCPT ); Mon, 26 Jul 2021 11:29:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0379B60C41; Mon, 26 Jul 2021 16:10:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627315816; bh=3MUxDA/ipaemF8mrHDTU6gGRbdt2p2zGuhEsJYwkbLg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1SVooL+wLh/0ESDlsTlZX5MPlXpjGp9vjWb8n8hk2kjtja4eU865KlyiVT0GGCLbg o1RGYtDNIos42cOOt6VMpJdYXvVWMSgV4tCqzqQZRJKuldEqmaCOQFsUjr9EBKvkHc CDY9k9hxWoVWooWBGCo8fQrLnXrmWBBW3eSX4wro= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Geert Uytterhoeven , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Sasha Levin Subject: [PATCH 5.13 079/223] net: dsa: mv88e6xxx: NET_DSA_MV88E6XXX_PTP should depend on NET_DSA_MV88E6XXX Date: Mon, 26 Jul 2021 17:37:51 +0200 Message-Id: <20210726153848.835533236@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210726153846.245305071@linuxfoundation.org> References: <20210726153846.245305071@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: Geert Uytterhoeven [ Upstream commit 99bb2ebab953435852340cdb198c5abbf0bb5dd3 ] Making global2 support mandatory removed the Kconfig symbol NET_DSA_MV88E6XXX_GLOBAL2. This symbol also served as an intermediate symbol to make NET_DSA_MV88E6XXX_PTP depend on NET_DSA_MV88E6XXX. With the symbol removed, the user is always asked about PTP support for Marvell 88E6xxx switches, even if the latter support is not enabled. Fix this by reinstating the dependency. Fixes: 63368a7416df144b ("net: dsa: mv88e6xxx: Make global2 support mandatory") Signed-off-by: Geert Uytterhoeven Reviewed-by: Andrew Lunn Reviewed-by: Vladimir Oltean Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/dsa/mv88e6xxx/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/mv88e6xxx/Kconfig b/drivers/net/dsa/mv88e6xxx/Kconfig index 05af632b0f59..634a48e6616b 100644 --- a/drivers/net/dsa/mv88e6xxx/Kconfig +++ b/drivers/net/dsa/mv88e6xxx/Kconfig @@ -12,7 +12,7 @@ config NET_DSA_MV88E6XXX config NET_DSA_MV88E6XXX_PTP bool "PTP support for Marvell 88E6xxx" default n - depends on PTP_1588_CLOCK + depends on NET_DSA_MV88E6XXX && PTP_1588_CLOCK help Say Y to enable PTP hardware timestamping on Marvell 88E6xxx switch chips that support it. -- 2.30.2