From patchwork Mon Mar 13 16:58:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101389 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp1256918qgd; Mon, 13 Mar 2017 09:59:36 -0700 (PDT) X-Received: by 10.99.237.17 with SMTP id d17mr37353060pgi.82.1489424376351; Mon, 13 Mar 2017 09:59:36 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a14si11922084pgd.80.2017.03.13.09.59.36; Mon, 13 Mar 2017 09:59:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754394AbdCMQ7f (ORCPT + 5 others); Mon, 13 Mar 2017 12:59:35 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:62099 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932204AbdCMQ7e (ORCPT ); Mon, 13 Mar 2017 12:59:34 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MVM1m-1cjacG2PwU-00Ym67; Mon, 13 Mar 2017 17:58:58 +0100 From: Arnd Bergmann To: "David S. Miller" Cc: Arnd Bergmann , Nicolas Pitre , stable@vger.kernel.org, Grygorii Strashko , Thomas Gleixner , John Stultz , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH -net] cpsw/netcp: cpts depends on posix_timers Date: Mon, 13 Mar 2017 17:58:25 +0100 Message-Id: <20170313165849.1378558-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:7kgAdoG1JJq/LAY9l11JP3SQ3yY8YMlSZvpJ8vs/FsG+oA7Giot AN0ihP5y0vGNk+tn/mnRfJLfiCXclJlRbheq0YxQmi0LqKJ4CCw6eAlH8YEDC/9i3kps0A5 4Molyke1dumskAyV56KpfHYMahQnUWmTAYmdJa1U6LjJM+zy0BcdZh/nKo5hVaM19bgonUM ks4TEqUwyQach+cvVZZBw== X-UI-Out-Filterresults: notjunk:1; V01:K0:Bn6o7LgioYU=:DqwpZZtSm779ZV2jhbSm9J Twdm/ImwOSyKC4DkNby1lrksuSE941RbqThyRm21sg2gBVquWp1Vu3lAumdPTXA/kIrksbeho NxOS05AKlmtuWYpcFJsXImqxLWi/jFdUztLZA2tsFUqdFHhyw76KiaO1tN8Ryrg0y7d8Ue3mk vmndWa9hfcmieiIBIBDyOEfO7p7MRCwvke6LiLDepZCkviEdXsQGSQjU1IDmOI5mutU9F5qFK 5QV4TIyWvPt8dqrrLZ1XnRvUXS+Nv3ZfPs58R+W7zhDQ1hISJ2h4fwZK6iXC8A5XHiLtQRwjK uAOCPF6n0Gyu1IVcnYMXMrbTOQvXR1JshcEKB3UUqlsXDNhf2PwHAy5Txaycnr0JjyfPONx/Y VAW80AqGqiW1/vuPJusHsSJffoJ8tHdNEyDFeskkEb40pKGdS78yp+UHIcthZP0gEdiTwzCcr BVbvbZ5UkTonVdV75AA1bYJM7CgHaZwxNDDtfjxCZLSpDBFRkxYcPiYoHIXFrmrBmr3PgSF+p C3RuEt+sFm1m67pXZvjlzrlgQswpLDefzN1Ag3ywbFwBEgInD3uRkrsge+juRWhLCkG8n+7Hf AiYT8uMuVZ9Ft9aeXiv+W9WljQtMuh/cy9Ete/g+ZqdK6hq8I/cGbhqEwvMpwz/KJIWmeJ60e Xnw0o9BWKmzM/kD8u0NyparW7ck7g262PbAXFj0s+s6mhHTn8I8GCW1z4REMuK633/vc= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org With posix timers having become optional, we get a build error with the cpts time sync option of the CPSW driver: drivers/net/ethernet/ti/cpts.c: In function 'cpts_find_ts': drivers/net/ethernet/ti/cpts.c:291:23: error: implicit declaration of function 'ptp_classify_raw';did you mean 'ptp_classifier_init'? [-Werror=implicit-function-declaration] It really makes no sense to build this driver if we can't use PTP, so it's better to go back to 'select PTP_1588_CLOCK' but instead add a dependency on POSIX_TIMERS. Adding 'depends on PTP_1588_CLOCK' might also work, but has the risk of circular dependencies when mixed with other drivers using 'imply'. Fixes: baa73d9e478f ("posix-timers: Make them configurable") Cc: Nicolas Pitre Cc: stable@vger.kernel.org Signed-off-by: Arnd Bergmann --- Originally submitted on Dec 16, but not applied after I missed a reply from Nico. I confirmed that this is still needed for v4.10 and v4.11-rc2 and am resending it without changes. --- drivers/net/ethernet/ti/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig index d42257fbe9d9..c114efcd1575 100644 --- a/drivers/net/ethernet/ti/Kconfig +++ b/drivers/net/ethernet/ti/Kconfig @@ -76,7 +76,8 @@ config TI_CPSW config TI_CPTS_ENABLE bool "TI Common Platform Time Sync (CPTS) Support" depends on TI_CPSW || TI_KEYSTONE_NETCP - imply PTP_1588_CLOCK + depends on POSIX_TIMERS + select PTP_1588_CLOCK ---help--- This driver supports the Common Platform Time Sync unit of the CPSW Ethernet Switch and Keystone 2 1g/10g Switch Subsystem.