From patchwork Mon Nov 26 00:15:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grygorii Strashko X-Patchwork-Id: 151959 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4970712ljp; Sun, 25 Nov 2018 16:16:09 -0800 (PST) X-Google-Smtp-Source: AFSGD/W/bZAoSuL6EV6MWzPP/a4u698Mah21UtHQAq5FymQCs2bDDOq1I7Bgzk+dhNZJuL685CxD X-Received: by 2002:a63:6445:: with SMTP id y66mr23181142pgb.250.1543191369087; Sun, 25 Nov 2018 16:16:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543191369; cv=none; d=google.com; s=arc-20160816; b=Pq5PgRAg/JNoYiaN+blk+6wbY6k7j965pfcrYebW+81J81PqxdU5IEwG7ciLI0P82R w26bp5uRxRk61g1z1NsGDjp/JRJ8S7KugfTYEIbKwpfK9AZVBdMRypOKdwfFCy8kOJwH pN0ER9EaHEWa8QvDvembftdLKMj7hRs5GxmT0qM87P3GRzTscFkXNoqr3er9RIprolm5 qHlIDpZ7CalnvlfG/iRRjoIgtO7zAUhsmNM7DrLsVNk3ALia+y36iDPPnQZaBq4/E52l WAdHNwbvvpoh1NYVIBLnMN2+dmFZF9fFHiox+vX2D1BSFO2GRxUHMFr1Nw5Sc0wDLO2+ vP1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=85hfGuh+Ks3roiNMaMUxBKOuiJrYoqG3YSSqK90z+B4=; b=j2yEVgiHnVRztC2D6RszmDHCBMO0390mhoDkmvo68W87S9sI7zJFnjb6SZTeE7+QiY DUsNTD0SzSm8x8kyKc+xedo0FTZsHZjM8xfJ9WFW313vTYnCeR4mj8CxNxiqZC9WDJ+I uLPonk8htfqYQrkeAOAJssibBsNzb+bmFV952hPIqO/aiJ6fZSu8+OEx/yyXREp/6nsc KyfxLN1i5brEh+AHMPzFY+MXI57Uu+lZKpBxVFjKe9wRLVxrXmGF+GhZkoT6aroO3Ye3 1W2ohErR38ObzKBDpPZc0vrcwmncwKpuUZ3yKni5YUEJ15XALdc/YdDW+ZOxYD6h5dbl R7WQ== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v5si58559537pgg.1.2018.11.25.16.16.08; Sun, 25 Nov 2018 16:16:09 -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; 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; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726359AbeKZLI0 (ORCPT + 32 others); Mon, 26 Nov 2018 06:08:26 -0500 Received: from fllv0016.ext.ti.com ([198.47.19.142]:51986 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726313AbeKZLIZ (ORCPT ); Mon, 26 Nov 2018 06:08:25 -0500 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id wAQ0FZ6P097212; Sun, 25 Nov 2018 18:15:35 -0600 Received: from DLEE100.ent.ti.com (dlee100.ent.ti.com [157.170.170.30]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id wAQ0FZl5020867 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Sun, 25 Nov 2018 18:15:35 -0600 Received: from DLEE109.ent.ti.com (157.170.170.41) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Sun, 25 Nov 2018 18:15:35 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1591.10 via Frontend Transport; Sun, 25 Nov 2018 18:15:35 -0600 Received: from legion.dal.desgin.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id wAQ0FZLK010640; Sun, 25 Nov 2018 18:15:35 -0600 Received: from localhost (uda0226610.dhcp.ti.com [128.247.59.147]) by legion.dal.desgin.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id wAQ0FZU04374; Sun, 25 Nov 2018 18:15:35 -0600 (CST) From: Grygorii Strashko To: "David S. Miller" , Tony Lindgren , Kishon Vijay Abraham I , Rob Herring CC: , Sekhar Nori , , , Andrew Lunn , , , Grygorii Strashko Subject: [PATCH linux-next 10/10] net: ethernet: ti: cpsw: deprecate cpsw-phy-sel driver Date: Sun, 25 Nov 2018 18:15:31 -0600 Message-ID: <20181126001531.12974-11-grygorii.strashko@ti.com> X-Mailer: git-send-email 2.10.5 In-Reply-To: <20181126001531.12974-1-grygorii.strashko@ti.com> References: <20181126001531.12974-1-grygorii.strashko@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Deprecate cpsw-phy-sel driver as it's been replaced with new TI phy-gmii-sel PHY driver. Cc: Kishon Vijay Abraham I Cc: Tony Lindgren Signed-off-by: Grygorii Strashko --- drivers/net/ethernet/ti/Kconfig | 6 +++--- drivers/net/ethernet/ti/cpsw.h | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) -- 2.10.5 diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig index f932923..96415da 100644 --- a/drivers/net/ethernet/ti/Kconfig +++ b/drivers/net/ethernet/ti/Kconfig @@ -49,10 +49,11 @@ config TI_DAVINCI_CPDMA will be called davinci_cpdma. This is recommended. config TI_CPSW_PHY_SEL - bool + bool "TI CPSW Phy mode Selection (DEPRECATED)" + default n ---help--- This driver supports configuring of the phy mode connected to - the CPSW. + the CPSW. DEPRECATED: use PHY_TI_GMII_SEL. config TI_CPSW_ALE tristate "TI CPSW ALE Support" @@ -64,7 +65,6 @@ config TI_CPSW depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || COMPILE_TEST select TI_DAVINCI_CPDMA select TI_DAVINCI_MDIO - select TI_CPSW_PHY_SEL select TI_CPSW_ALE select MFD_SYSCON select REGMAP diff --git a/drivers/net/ethernet/ti/cpsw.h b/drivers/net/ethernet/ti/cpsw.h index cf111db..907e05fc 100644 --- a/drivers/net/ethernet/ti/cpsw.h +++ b/drivers/net/ethernet/ti/cpsw.h @@ -21,7 +21,13 @@ ((mac)[2] << 16) | ((mac)[3] << 24)) #define mac_lo(mac) (((mac)[4] << 0) | ((mac)[5] << 8)) +#if IS_ENABLED(CONFIG_TI_CPSW_PHY_SEL) void cpsw_phy_sel(struct device *dev, phy_interface_t phy_mode, int slave); +#else +static inline +void cpsw_phy_sel(struct device *dev, phy_interface_t phy_mode, int slave) +{} +#endif int ti_cm_get_macid(struct device *dev, int slave, u8 *mac_addr); #endif /* __CPSW_H__ */