From patchwork Wed Sep 14 13:27:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 76192 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp1876532qgf; Wed, 14 Sep 2016 06:30:11 -0700 (PDT) X-Received: by 10.98.106.65 with SMTP id f62mr4499205pfc.107.1473859811000; Wed, 14 Sep 2016 06:30:11 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bd6si4793796pab.146.2016.09.14.06.30.10; Wed, 14 Sep 2016 06:30:10 -0700 (PDT) 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; dkim=pass header.i=@linaro.org; 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=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762766AbcINNaC (ORCPT + 27 others); Wed, 14 Sep 2016 09:30:02 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:38547 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762469AbcINN3Z (ORCPT ); Wed, 14 Sep 2016 09:29:25 -0400 Received: by mail-wm0-f47.google.com with SMTP id 1so31265369wmz.1 for ; Wed, 14 Sep 2016 06:29:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mE0nwk8obitMP3YN/cjA2jYb3Iey5K3bxf1OK/oRhy0=; b=IvsovNsguHVNa2FezzLMysDEjsWcVOzwZ86uf3krO0qaHQnsiLKuWK3ic6b4mqV3Uv nZAiIfgPPpjqvWdlzmKf60wPkCiIYvxyQfI40hx8ePnZdANtI8aNkf2gdUsUYTdcQEyW IHAWvpkkoNTKqaETF+OvSg/YZSQKE1RUVURXA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mE0nwk8obitMP3YN/cjA2jYb3Iey5K3bxf1OK/oRhy0=; b=GFr5l99J0mpXSUQYTEo3W4L2+JS/6COjxNvZ7Eo0iFMnhbloSiz/isUJ37QKWCRuUc jmS5NIfZ6xjdxFKW99uMqS8wkhhMCYOq/r+wIcK8MTb8E+KjKq2uk6GcjVdTHZ2Jl0cE SOQo7Cenk0tGrbAtLmaq5fBJIoqPTAw1ZUMroE8LSuQAMG0qRj5Qf9IH1rkZ2XTg6Yb1 Xcdt1KtouwdPUaR9bWcTeiBEUOkTw3lG3xQQsa+MHNOJjiDFXWEjqAerHOVKXUcEAWu5 b9qxVU4OTUDLUOxJef+pGiq/NAuHmo2peoj3WvX4O9+cdR6f+1+SaDDu9f9pFagP8Z6N Ts0g== X-Gm-Message-State: AE9vXwM/ALkgFqbFjLweU/4C4Ul+Mzvg0uObikLeWOgJkLdiiGKze0oDjBigpBQ5Uc/X+HrI X-Received: by 10.194.123.228 with SMTP id md4mr2620849wjb.78.1473859764254; Wed, 14 Sep 2016 06:29:24 -0700 (PDT) Received: from localhost.localdomain (cpc89244-aztw30-2-0-cust4998.18-1.cable.virginm.net. [86.31.179.135]) by smtp.gmail.com with ESMTPSA id c5sm4212812wjw.29.2016.09.14.06.29.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Sep 2016 06:29:22 -0700 (PDT) From: Peter Griffin 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, , , Subject: [PATCH 18/19] stmmac: dwmac-sti: Remove obsolete STi platforms Date: Wed, 14 Sep 2016 14:27:56 +0100 Message-Id: <1473859677-9231-19-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1473859677-9231-1-git-send-email-peter.griffin@linaro.org> References: <1473859677-9231-1-git-send-email-peter.griffin@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 Cc: Cc: Cc: --- .../devicetree/bindings/net/sti-dwmac.txt | 3 +- drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 37 ---------------------- 2 files changed, 1 insertion(+), 39 deletions(-) -- 1.9.1 Acked-by: Rob Herring 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}, { } };