From patchwork Thu Oct 3 12:44:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 2982661 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id ABD6ABFF0B for ; Thu, 3 Oct 2013 12:46:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0E2D520103 for ; Thu, 3 Oct 2013 12:46:21 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B69C5200F4 for ; Thu, 3 Oct 2013 12:46:19 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRiI4-0003Lw-MY; Thu, 03 Oct 2013 12:46:00 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRiHw-0001ZQ-5B; Thu, 03 Oct 2013 12:45:52 +0000 Received: from mail-bk0-x236.google.com ([2a00:1450:4008:c01::236]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRiHt-0001Xs-4s for linux-arm-kernel@lists.infradead.org; Thu, 03 Oct 2013 12:45:50 +0000 Received: by mail-bk0-f54.google.com with SMTP id mz12so902502bkb.41 for ; Thu, 03 Oct 2013 05:45:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6ihsSNw4KwjKro18L91p0zW0HIJvOAQLAGmNiNyVkCE=; b=fXAPk/G/9XHe3p5RTO4Vy0zbTDYR7+UGEHVi0QHay8qjfpngJf34WRFG5cOnb2dHQl j3+jo9A1x+sLqt3c7Epd8Zghz23dW4q9usQ9OhmmNEAgW/GPfBahK6n1XLpaQWX15evn wYuI2jL5p0MnyOMCLeiz1W/KufZq6k+TftdpHzJ95GkROP6eoMHwmvFd0nnYkZWFLODr k3+yiU2zm4C3d7WzjYil+GyRdO2Puyuekdib/TzgroBoAhu7GPzKa4AxxW+7+vmcIjrT OgjDgu+TaGPYs/njL1OR3AEfPUAqSAiNDpmi7CAA2f73aSu1arfudftPEfKMoRWt250n fZQA== X-Received: by 10.204.78.8 with SMTP id i8mr7547143bkk.3.1380804326467; Thu, 03 Oct 2013 05:45:26 -0700 (PDT) Received: from topkick.lan (dslc-082-083-247-252.pools.arcor-ip.net. [82.83.247.252]) by mx.google.com with ESMTPSA id b7sm4638961bkg.1.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Oct 2013 05:45:25 -0700 (PDT) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Subject: [PATCH 2/2] ARM: kirkwood: remove ethernet clock gate workaround Date: Thu, 3 Oct 2013 14:44:54 +0200 Message-Id: <1380804294-13726-2-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1380804294-13726-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1380804294-13726-1-git-send-email-sebastian.hesselbarth@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131003_084549_384236_FA6D48DA X-CRM114-Status: GOOD ( 10.55 ) X-Spam-Score: -2.0 (--) Cc: Andrew Lunn , Russell King , Jason Cooper , linux-kernel@vger.kernel.org, Jason Gunthorpe , Ezequiel Garcia , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP With a proper fix for Kirkwood ethernet IP MAC address clock gating issue, we can now remove the clock gating workaround that always enabled ethernet clocks. Signed-off-by: Sebastian Hesselbarth --- Cc: Jason Cooper Cc: Andrew Lunn Cc: Russell King Cc: Jason Gunthorpe Cc: Ezequiel Garcia Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm/mach-kirkwood/board-dt.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c index a2974ad..a3bf0c7 100644 --- a/arch/arm/mach-kirkwood/board-dt.c +++ b/arch/arm/mach-kirkwood/board-dt.c @@ -41,7 +41,6 @@ static void __init kirkwood_legacy_clk_init(void) struct device_node *np = of_find_compatible_node( NULL, NULL, "marvell,kirkwood-gating-clock"); struct of_phandle_args clkspec; - struct clk *clk; clkspec.np = np; clkspec.args_count = 1; @@ -53,19 +52,6 @@ static void __init kirkwood_legacy_clk_init(void) clkspec.args[0] = CGC_BIT_PEX1; orion_clkdev_add("1", "pcie", of_clk_get_from_provider(&clkspec)); - - /* - * The ethernet interfaces forget the MAC address assigned by - * u-boot if the clocks are turned off. Until proper DT support - * is available we always enable them for now. - */ - clkspec.args[0] = CGC_BIT_GE0; - clk = of_clk_get_from_provider(&clkspec); - clk_prepare_enable(clk); - - clkspec.args[0] = CGC_BIT_GE1; - clk = of_clk_get_from_provider(&clkspec); - clk_prepare_enable(clk); } #define MV643XX_ETH_MAC_ADDR_LOW 0x0414