devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peter Griffin <peter.griffin@linaro.org>
To: linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, kernel@stlinux.com,
	patrice.chotard@st.com, devicetree@vger.kernel.org
Cc: peter.griffin@linaro.org, lee.jones@linaro.org,
	peppe.cavallaro@st.com, alexandre.torgue@st.com,
	netdev@vger.kernel.org
Subject: [PATCH 18/19] stmmac: dwmac-sti: Remove obsolete STi platforms
Date: Wed, 14 Sep 2016 14:27:56 +0100	[thread overview]
Message-ID: <1473859677-9231-19-git-send-email-peter.griffin@linaro.org> (raw)
In-Reply-To: <1473859677-9231-1-git-send-email-peter.griffin@linaro.org>

This patch removes support for STiH415/6 SoC's from the
dwmac-sti driver and dt binding doc, as support for these
platforms is being removed from the kernel. It also removes
STiD127 related code, which has never actually been supported
upstream.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Cc: <peppe.cavallaro@st.com>
Cc: <alexandre.torgue@st.com>
Cc: <netdev@vger.kernel.org>
---
 .../devicetree/bindings/net/sti-dwmac.txt          |  3 +-
 drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c    | 37 ----------------------
 2 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/Documentation/devicetree/bindings/net/sti-dwmac.txt b/Documentation/devicetree/bindings/net/sti-dwmac.txt
index d05c1e1..2031786 100644
--- a/Documentation/devicetree/bindings/net/sti-dwmac.txt
+++ b/Documentation/devicetree/bindings/net/sti-dwmac.txt
@@ -7,8 +7,7 @@ and what is needed on STi platforms to program the stmmac glue logic.
 The device node has following properties.
 
 Required properties:
- - compatible	: Can be "st,stih415-dwmac", "st,stih416-dwmac",
-   "st,stih407-dwmac", "st,stid127-dwmac".
+ - compatible	: Should be "st,stih407-dwmac".
  - st,syscon : Should be phandle/offset pair. The phandle to the syscon node which
    encompases the glue register, and the offset of the control register.
  - st,gmac_en: this is to enable the gmac into a dedicated sysctl control
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
index 58c05ac..fcbe374 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
@@ -198,36 +198,6 @@ static void stih4xx_fix_retime_src(void *priv, u32 spd)
 			   stih4xx_tx_retime_val[src]);
 }
 
-static void stid127_fix_retime_src(void *priv, u32 spd)
-{
-	struct sti_dwmac *dwmac = priv;
-	u32 reg = dwmac->ctrl_reg;
-	u32 freq = 0;
-	u32 val = 0;
-
-	if (dwmac->interface == PHY_INTERFACE_MODE_MII) {
-		val = STID127_ETH_SEL_INTERNAL_NOTEXT_TXCLK;
-	} else if (dwmac->interface == PHY_INTERFACE_MODE_RMII) {
-		if (!dwmac->ext_phyclk) {
-			val = STID127_ETH_SEL_INTERNAL_NOTEXT_PHYCLK;
-			freq = DWMAC_50MHZ;
-		}
-	} else if (IS_PHY_IF_MODE_RGMII(dwmac->interface)) {
-		val = STID127_ETH_SEL_INTERNAL_NOTEXT_TXCLK;
-		if (spd == SPEED_1000)
-			freq = DWMAC_125MHZ;
-		else if (spd == SPEED_100)
-			freq = DWMAC_25MHZ;
-		else if (spd == SPEED_10)
-			freq = DWMAC_2_5MHZ;
-	}
-
-	if (dwmac->clk && freq)
-		clk_set_rate(dwmac->clk, freq);
-
-	regmap_update_bits(dwmac->regmap, reg, STID127_RETIME_SRC_MASK, val);
-}
-
 static int sti_dwmac_init(struct platform_device *pdev, void *priv)
 {
 	struct sti_dwmac *dwmac = priv;
@@ -372,14 +342,7 @@ static const struct sti_dwmac_of_data stih4xx_dwmac_data = {
 	.fix_retime_src = stih4xx_fix_retime_src,
 };
 
-static const struct sti_dwmac_of_data stid127_dwmac_data = {
-	.fix_retime_src = stid127_fix_retime_src,
-};
-
 static const struct of_device_id sti_dwmac_match[] = {
-	{ .compatible = "st,stih415-dwmac", .data = &stih4xx_dwmac_data},
-	{ .compatible = "st,stih416-dwmac", .data = &stih4xx_dwmac_data},
-	{ .compatible = "st,stid127-dwmac", .data = &stid127_dwmac_data},
 	{ .compatible = "st,stih407-dwmac", .data = &stih4xx_dwmac_data},
 	{ }
 };
-- 
1.9.1

  parent reply	other threads:[~2016-09-14 13:27 UTC|newest]

Thread overview: 61+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-14 13:27 [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support Peter Griffin
2016-09-14 13:27 ` [PATCH 02/19] phy: stih41x-usb: Remove usb phy driver and dt binding documentation Peter Griffin
2016-09-23 15:06   ` Rob Herring
2016-10-18  7:47     ` Patrice Chotard
     [not found]       ` <778bd4b2-9e82-326b-f6e0-43360323d453-qxv4g6HH51o@public.gmane.org>
2016-10-18  8:52         ` [STLinux Kernel] " Patrice Chotard
2016-10-18  9:06           ` Kishon Vijay Abraham I
     [not found]   ` <1473859677-9231-3-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-11-15 13:07     ` Kishon Vijay Abraham I
2016-09-14 13:27 ` [PATCH 06/19] ARM: multi_v7_defconfig: Remove stih41x phy Kconfig symbol Peter Griffin
     [not found]   ` <1473859677-9231-7-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-10-18  7:53     ` Patrice Chotard
2016-09-14 13:27 ` [PATCH 07/19] ahci: st: Remove STiH416 dt example Peter Griffin
     [not found]   ` <1473859677-9231-8-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-09-16 15:54     ` Tejun Heo
2016-09-19  7:19       ` Patrice Chotard
2016-09-23 15:07   ` Rob Herring
2016-09-14 13:27 ` [PATCH 08/19] thermal: sti: Remove obsolete platforms from the DT doc Peter Griffin
     [not found]   ` <1473859677-9231-9-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-09-23 15:08     ` Rob Herring
2016-10-18  7:56       ` Patrice Chotard
2016-09-14 13:27 ` [PATCH 10/19] watchdog: bindings: Remove obsolete platforms from dt doc Peter Griffin
2016-09-14 22:16   ` Guenter Roeck
     [not found]   ` <1473859677-9231-11-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-09-23 15:08     ` Rob Herring
2016-10-08 14:04     ` Wim Van Sebroeck
2016-09-14 13:27 ` [PATCH 12/19] reset: sti: Remove obsolete platforms from dt binding doc Peter Griffin
2016-09-23 15:10   ` Rob Herring
2016-10-18  8:02     ` Patrice Chotard
     [not found] ` <1473859677-9231-1-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-09-14 13:27   ` [PATCH 01/19] phy: phy-miphy365x: Remove miphy365 driver and dt binding documentation Peter Griffin
     [not found]     ` <1473859677-9231-2-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-09-23 15:06       ` Rob Herring
2016-10-18  7:47         ` Patrice Chotard
     [not found]           ` <12506413-515f-1a33-a642-ede60287ca3b-qxv4g6HH51o@public.gmane.org>
2016-10-18  8:45             ` [STLinux Kernel] " Patrice Chotard
     [not found]               ` <75b370f3-a1cd-ac6e-ce8a-b77e4c0c3847-qxv4g6HH51o@public.gmane.org>
2016-10-18  9:18                 ` Kishon Vijay Abraham I
2016-09-14 13:27   ` [PATCH 03/19] MAINTAINERS: Remove phy-miphy365x.c entry from STi arch Peter Griffin
2016-10-18  7:48     ` Patrice Chotard
2016-09-14 13:27   ` [PATCH 04/19] MAINTAINERS: Remove phy-stih41x-usb.c " Peter Griffin
     [not found]     ` <1473859677-9231-5-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-10-18  7:50       ` Patrice Chotard
2016-09-14 13:27   ` [PATCH 05/19] ARM: multi_v7_defconfig: Remove miphy365 phy Peter Griffin
     [not found]     ` <1473859677-9231-6-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-10-18  7:53       ` Patrice Chotard
2016-10-18  9:22     ` Patrice Chotard
2016-09-14 13:27   ` [PATCH 09/19] thermal: sti: Remove obsolete STiH416 platform support Peter Griffin
2016-09-14 13:27   ` [PATCH 11/19] watchdog: st_wdt: Remove support for obsolete platforms Peter Griffin
2016-09-14 22:16     ` Guenter Roeck
2016-09-14 13:27   ` [PATCH 13/19] pinctrl: st: Remove STiH415/6 SoC pinctrl driver support Peter Griffin
     [not found]     ` <1473859677-9231-14-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-09-15 12:33       ` Linus Walleij
2016-09-14 13:27   ` [PATCH 15/19] reset: sti: Remove STiH415/6 reset support Peter Griffin
     [not found]     ` <1473859677-9231-16-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-09-27  8:02       ` Philipp Zabel
2016-10-11  7:05         ` Patrice Chotard
2016-10-20 10:36           ` Philipp Zabel
2016-09-14 13:38   ` [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support Arnd Bergmann
2016-09-14 14:04     ` Patrice Chotard
2016-09-15  7:01     ` Peter Griffin
2016-09-15 12:00       ` Arnd Bergmann
2016-09-19  8:56         ` Peter Griffin
2016-09-14 13:27 ` [PATCH 14/19] pinctrl: st: Remove obsolete platforms from pinctrl-st dt doc Peter Griffin
     [not found]   ` <1473859677-9231-15-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-09-15 12:37     ` Linus Walleij
2016-09-14 13:27 ` [PATCH 16/19] power: reset: st-poweroff: Remove obsolete platforms Peter Griffin
2016-09-19 19:34   ` Sebastian Reichel
2016-09-14 13:27 ` [PATCH 17/19] power: reset: st: Remove obsolete platforms from dt doc Peter Griffin
     [not found]   ` <1473859677-9231-18-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-09-19 19:34     ` Sebastian Reichel
2016-09-14 13:27 ` Peter Griffin [this message]
2016-09-23 15:11   ` [PATCH 18/19] stmmac: dwmac-sti: Remove obsolete STi platforms Rob Herring
2016-10-18  8:05     ` Patrice Chotard
     [not found]       ` <dcbb8065-b272-0a2f-8efb-c55217712caf-qxv4g6HH51o@public.gmane.org>
2016-10-18  8:59         ` [STLinux Kernel] " Patrice Chotard
2016-09-14 13:27 ` [PATCH 19/19] reset: sti: softreset: Remove obsolete platforms from dt binding doc Peter Griffin
     [not found]   ` <1473859677-9231-20-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-09-23 15:12     ` Rob Herring

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1473859677-9231-19-git-send-email-peter.griffin@linaro.org \
    --to=peter.griffin@linaro.org \
    --cc=alexandre.torgue@st.com \
    --cc=devicetree@vger.kernel.org \
    --cc=kernel@stlinux.com \
    --cc=lee.jones@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=patrice.chotard@st.com \
    --cc=peppe.cavallaro@st.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).