From patchwork Tue Oct 17 12:19:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 116079 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp4823407qgn; Tue, 17 Oct 2017 05:21:57 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCmrFk58xX7e/KF3KkvuygAkgk1Cz0dNzAucaxgTjesv8/qYqsNLZrscamooxCjJjrLKV4g X-Received: by 10.80.149.20 with SMTP id u20mr17195432eda.137.1508242916922; Tue, 17 Oct 2017 05:21:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508242916; cv=none; d=google.com; s=arc-20160816; b=uUQ2+naafYpfh0Gv2PKDoQEEBOBm3HaJbXwKu5dlyrp/9Kdfq/gEIC4pSj1M/UtIgj SE73nQPk/+zhqDIiSD9LK0HAuW7t9Bqbxg1PIGhdvyVxVkgaAbcGaadHlMhqB9HWKFs7 OGojjk3bSrWzWjH3UDfMzXYcJX1l2gd6fUdJaTCYH53vSGHmIut4hlNbIvqE3vjSDcN4 obQR2HXQnghFCKTqxhqcvL1sUn4IYi51BhUZjbI9R9+/uMhlcChrzhwwd9FRG/2yheGh fXeDc83QTaPX62805NqVPw/Lf5zMB53j4ngwsdMoIt+6AYOmx+0dng+9KcJMUiObFRtf F7hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=D+G7zI45K2eOwMTdy/ZRpQgiKunaGN4rqCf4Fwmioqs=; b=r44SBZGUlGtlRnac8EDpesUz0PmqqgFRBIsq7I9AI1GTc58OySI3Z9te9J/cfqIVvk e4sVIR8H3i4YhvQllSdQCDdqqzfFrrM5yZKCMB96yS19ZlJYzd2Gk9ZUnIdL9GVwUo1h vn+mpx51ZvVKzGzs5C2GluczC+CRQKsWXnAlHkHgIz0N5o7efPVQGXTpL/qyeIG0YPV1 qE0bmm1SBkX0HVTNbwBMRiog4pc6LLEP13VtpwrLm+nrRxdsojamaSgLzGyXnhvPPOgU 6UrRvzr9g84AEosGzzo0PEf3H6WxQhYlAx5RAJ4a++Z7EvST6FPQp/ojPV3Y6Ea/o74L X9FQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=28gsxluv; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id d31si682928edc.404.2017.10.17.05.21.56; Tue, 17 Oct 2017 05:21:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=28gsxluv; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 7D888C21D76; Tue, 17 Oct 2017 12:21:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 7797DC21DA0; Tue, 17 Oct 2017 12:20:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6333BC21E0E; Tue, 17 Oct 2017 12:20:12 +0000 (UTC) Received: from conuserg-11.nifty.com (conuserg-11.nifty.com [210.131.2.78]) by lists.denx.de (Postfix) with ESMTPS id C6D52C21DDD for ; Tue, 17 Oct 2017 12:20:08 +0000 (UTC) Received: from grover.sesame (FL1-122-131-185-176.osk.mesh.ad.jp [122.131.185.176]) (authenticated) by conuserg-11.nifty.com with ESMTP id v9HCJkdT004480; Tue, 17 Oct 2017 21:19:47 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com v9HCJkdT004480 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1508242787; bh=4E40XmlSNa+Hf0sxsvSRHPA/KUfpvuzw/UJVT3SmjAU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=28gsxluvFKZ8pOJTw5LUo553V5WpKM8dMlPsINAywCsCFBs7FOCLU1IGxZrB3zZOS mlLes/jrV4Jxsp13xoRyCX6xMdvwNMsx8QGu0HQbkx9ki0XpJUCrZ+DwqV/wF9NDt0 kuWwtVCkGZow4Ps/zX5+b8IUpFM7CnkaYUq0VIdBK8ad0fowRLMWIl73YV6ffKq9tn 0jBQf09NyzHu4JasEYMGkLodDr2+1roM58osJo5Bn/8ePdWpmtK7OznF0nxI6od03M xjod5vzxHmRaGbsxq5cGk3Ua536w+a0DzGEjU/INMu8d0Zld1qBGmwPuYAGvwiNGHa 06gsLf34i2uhg== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 17 Oct 2017 21:19:41 +0900 Message-Id: <1508242783-21107-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508242783-21107-1-git-send-email-yamada.masahiro@socionext.com> References: <1508242783-21107-1-git-send-email-yamada.masahiro@socionext.com> Cc: Marek Vasut Subject: [U-Boot] [PATCH 2/4] ARM: uniphier: remove CONFIG_UNIPHIER_ETH X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The option is never enabled by anyone. Remove the code surrounded by its ifdef. This should be handled by the clock/reset drivers. CONFIG_UNIPHIER_ETH in scripts/config_whitelist.txt will be dropped at the next resync. Signed-off-by: Masahiro Yamada --- arch/arm/mach-uniphier/clk/clk-ld4.c | 6 ------ arch/arm/mach-uniphier/clk/clk-pro4.c | 6 ------ arch/arm/mach-uniphier/clk/clk-pxs2.c | 6 ------ 3 files changed, 18 deletions(-) diff --git a/arch/arm/mach-uniphier/clk/clk-ld4.c b/arch/arm/mach-uniphier/clk/clk-ld4.c index def87c1..64fa12e 100644 --- a/arch/arm/mach-uniphier/clk/clk-ld4.c +++ b/arch/arm/mach-uniphier/clk/clk-ld4.c @@ -17,9 +17,6 @@ void uniphier_ld4_clk_init(void) /* deassert reset */ tmp = readl(SC_RSTCTRL); -#ifdef CONFIG_UNIPHIER_ETH - tmp |= SC_RSTCTRL_NRST_ETHER; -#endif #ifdef CONFIG_NAND_DENALI tmp |= SC_RSTCTRL_NRST_NAND; #endif @@ -28,9 +25,6 @@ void uniphier_ld4_clk_init(void) /* provide clocks */ tmp = readl(SC_CLKCTRL); -#ifdef CONFIG_UNIPHIER_ETH - tmp |= SC_CLKCTRL_CEN_ETHER; -#endif #ifdef CONFIG_USB_EHCI_HCD tmp |= SC_CLKCTRL_CEN_MIO | SC_CLKCTRL_CEN_STDMAC; #endif diff --git a/arch/arm/mach-uniphier/clk/clk-pro4.c b/arch/arm/mach-uniphier/clk/clk-pro4.c index 8a978d2..09c03cd 100644 --- a/arch/arm/mach-uniphier/clk/clk-pro4.c +++ b/arch/arm/mach-uniphier/clk/clk-pro4.c @@ -21,9 +21,6 @@ void uniphier_pro4_clk_init(void) tmp |= SC_RSTCTRL_NRST_USB3B0 | SC_RSTCTRL_NRST_USB3C0 | SC_RSTCTRL_NRST_GIO; #endif -#ifdef CONFIG_UNIPHIER_ETH - tmp |= SC_RSTCTRL_NRST_ETHER; -#endif #ifdef CONFIG_NAND_DENALI tmp |= SC_RSTCTRL_NRST_NAND; #endif @@ -43,9 +40,6 @@ void uniphier_pro4_clk_init(void) tmp |= SC_CLKCTRL_CEN_USB31 | SC_CLKCTRL_CEN_USB30 | SC_CLKCTRL_CEN_GIO; #endif -#ifdef CONFIG_UNIPHIER_ETH - tmp |= SC_CLKCTRL_CEN_ETHER; -#endif #ifdef CONFIG_USB_EHCI_HCD tmp |= SC_CLKCTRL_CEN_MIO | SC_CLKCTRL_CEN_STDMAC; #endif diff --git a/arch/arm/mach-uniphier/clk/clk-pxs2.c b/arch/arm/mach-uniphier/clk/clk-pxs2.c index 9775127..27fb2f4 100644 --- a/arch/arm/mach-uniphier/clk/clk-pxs2.c +++ b/arch/arm/mach-uniphier/clk/clk-pxs2.c @@ -19,9 +19,6 @@ void uniphier_pxs2_clk_init(void) #ifdef CONFIG_USB_DWC3_UNIPHIER tmp |= SC_RSTCTRL_NRST_USB3B0 | SC_RSTCTRL_NRST_GIO; #endif -#ifdef CONFIG_UNIPHIER_ETH - tmp |= SC_RSTCTRL_NRST_ETHER; -#endif #ifdef CONFIG_NAND_DENALI tmp |= SC_RSTCTRL_NRST_NAND; #endif @@ -45,9 +42,6 @@ void uniphier_pxs2_clk_init(void) tmp |= BIT(20) | BIT(19) | SC_CLKCTRL_CEN_USB31 | SC_CLKCTRL_CEN_USB30 | SC_CLKCTRL_CEN_GIO; #endif -#ifdef CONFIG_UNIPHIER_ETH - tmp |= SC_CLKCTRL_CEN_ETHER; -#endif #ifdef CONFIG_NAND_DENALI tmp |= SC_CLKCTRL_CEN_NAND; #endif